Skip to content

Stop replacing "%20" to "+" since it is obsoleted #5128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 11, 2025
Merged

Stop replacing "%20" to "+" since it is obsoleted #5128

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa13f29
Stop replacing "%20" to "+" since this standard is
fengga Feb 10, 2025
1fbf936
Add a test
fengga Feb 10, 2025
3ca9ea3
Update test
fengga Feb 10, 2025
8e7c111
Update src/client/Microsoft.Identity.Client/Utils/CoreHelpers.cs
fengga Feb 11, 2025
c91e29d
Merge branch 'main' into fengga/fix-5061
fengga Feb 11, 2025
0f86673
Update tests
fengga Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/client/Microsoft.Identity.Client/Utils/CoreHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public static string UrlEncode(string message)
}

message = Uri.EscapeDataString(message);
message = message.Replace("%20", "+");

return message;
}
Expand All @@ -44,7 +43,7 @@ public static string UrlDecode(string message)
{
return message;
}

// Keep trying to replace "+" to "%20" to increase compatibility
message = message.Replace("+", "%20");
message = Uri.UnescapeDataString(message);

Expand Down
26 changes: 26 additions & 0 deletions tests/Microsoft.Identity.Test.Unit/CoreTests/CoreHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.Identity.Client;
using Microsoft.Identity.Test.Common.Core.Helpers;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.Identity.Client.Internal;
using Microsoft.Identity.Client.Utils;

namespace Microsoft.Identity.Test.Unit.CoreTests
{
[TestClass]
public class CoreHelperTests
{
[TestMethod]
public void UrlEncodeDecodeTest()
{
Assert.AreEqual(CoreHelpers.UrlEncode("https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize"), "https%3A%2F%2Flogin.microsoftonline.com%2Forganizations%2Foauth2%2Fv2.0%2Fauthorize");
Assert.AreEqual(CoreHelpers.UrlEncode("https://management.core.windows.net//.default openid profile offline_access"), "https%3A%2F%2Fmanagement.core.windows.net%2F%2F.default%20openid%20profile%20offline_access");

Assert.AreEqual(CoreHelpers.UrlDecode("https%3A%2F%2Flogin.microsoftonline.com%2Forganizations%2Foauth2%2Fv2.0%2Fauthorize"), "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize");
Assert.AreEqual(CoreHelpers.UrlDecode("https%3A%2F%2Fmanagement.core.windows.net%2F%2F.default%20openid%20profile%20offline_access"), "https://management.core.windows.net//.default openid profile offline_access");
Assert.AreEqual(CoreHelpers.UrlDecode("https%3A%2F%2Fmanagement.core.windows.net%2F%2F.default+openid+profile+offline_access"), "https://management.core.windows.net//.default openid profile offline_access");
}
}
}
Loading