Remove Base64Url Duplicated Methods

Author: mckaragoz

src/CodeBeam.UltimateAuth.Client/Services/DefaultFlowClient.cs

@@ -6,6 +6,7 @@
 using CodeBeam.UltimateAuth.Client.Options;
 using CodeBeam.UltimateAuth.Core.Contracts;
 using CodeBeam.UltimateAuth.Core.Domain;
+using CodeBeam.UltimateAuth.Core.Infrastructure;
 using CodeBeam.UltimateAuth.Core.Options;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Options;
@@ -200,22 +201,14 @@ private Task NavigateToHubLoginAsync(string authorizationCode, string codeVerifi
         private static string CreateVerifier()
         {
             var bytes = RandomNumberGenerator.GetBytes(32);
-            return Base64UrlEncode(bytes);
+            return Base64Url.Encode(bytes);
         }
 
         private static string CreateChallenge(string verifier)
         {
             using var sha256 = SHA256.Create();
             var hash = sha256.ComputeHash(Encoding.ASCII.GetBytes(verifier));
-            return Base64UrlEncode(hash);
-        }
-
-        private static string Base64UrlEncode(byte[] input)
-        {
-            return Convert.ToBase64String(input)
-                .TrimEnd('=')
-                .Replace('+', '-')
-                .Replace('/', '_');
+            return Base64Url.Encode(hash);
         }
     }
 }

src/CodeBeam.UltimateAuth.Core/Options/HeaderTokenFormat.cs

@@ -1,8 +1,7 @@
-namespace CodeBeam.UltimateAuth.Core.Options
+namespace CodeBeam.UltimateAuth.Core.Options;
+
+public enum HeaderTokenFormat
 {
-    public enum HeaderTokenFormat
-    {
-        Bearer,
-        Raw
-    }
+    Bearer,
+    Raw
 }

src/CodeBeam.UltimateAuth.Core/Options/TokenResponseMode.cs

@@ -1,10 +1,9 @@
-namespace CodeBeam.UltimateAuth.Core.Options
+namespace CodeBeam.UltimateAuth.Core.Options;
+
+public enum TokenResponseMode
 {
-    public enum TokenResponseMode
-    {
-        None,
-        Cookie,
-        Header,
-        Body
-    }
+    None,
+    Cookie,
+    Header,
+    Body
 }

src/CodeBeam.UltimateAuth.Server/Infrastructure/Pkce/PkceAuthorizationValidator.cs

@@ -1,4 +1,5 @@
-using System.Security.Cryptography;
+using CodeBeam.UltimateAuth.Core.Infrastructure;
+using System.Security.Cryptography;
 using System.Text;
 
 namespace CodeBeam.UltimateAuth.Server.Infrastructure;
@@ -55,16 +56,8 @@ private static bool IsVerifierValid(string verifier, string expectedChallenge)
         using var sha256 = SHA256.Create();
         byte[] hash = sha256.ComputeHash(Encoding.ASCII.GetBytes(verifier));
 
-        string computedChallenge = Base64UrlEncode(hash);
+        string computedChallenge = Base64Url.Encode(hash);
 
         return CryptographicOperations.FixedTimeEquals(Encoding.ASCII.GetBytes(computedChallenge), Encoding.ASCII.GetBytes(expectedChallenge));
     }
-
-    private static string Base64UrlEncode(byte[] input)
-    {
-        return Convert.ToBase64String(input)
-            .TrimEnd('=')
-            .Replace('+', '-')
-            .Replace('/', '_');
-    }
 }

tests/CodeBeam.UltimateAuth.Tests.Unit/Core/UserIdConverterTests.cs

@@ -13,7 +13,7 @@ public void UserKey_Roundtrip_Should_Preserve_Value()
             var key = UserKey.New();
             var converter = new UAuthUserIdConverter<UserKey>();
 
-            var str = converter.ToString(key);
+            var str = converter.ToCanonicalString(key);
             var parsed = converter.FromString(str);
 
             Assert.Equal(key, parsed);
@@ -25,7 +25,7 @@ public void Guid_Roundtrip_Should_Work()
             var id = Guid.NewGuid();
             var converter = new UAuthUserIdConverter<Guid>();
 
-            var str = converter.ToString(id);
+            var str = converter.ToCanonicalString(id);
             var parsed = converter.FromString(str);
 
             Assert.Equal(id, parsed);
@@ -37,7 +37,7 @@ public void String_Roundtrip_Should_Work()
             var id = "user_123";
             var converter = new UAuthUserIdConverter<string>();
 
-            var str = converter.ToString(id);
+            var str = converter.ToCanonicalString(id);
             var parsed = converter.FromString(str);
 
             Assert.Equal(id, parsed);
@@ -49,7 +49,7 @@ public void Int_Should_Use_Invariant_Culture()
             var id = 1234;
             var converter = new UAuthUserIdConverter<int>();
 
-            var str = converter.ToString(id);
+            var str = converter.ToCanonicalString(id);
 
             Assert.Equal(id.ToString(CultureInfo.InvariantCulture), str);
         }
@@ -60,7 +60,7 @@ public void Long_Roundtrip_Should_Work()
             var id = 9_223_372_036_854_775_000L;
             var converter = new UAuthUserIdConverter<long>();
 
-            var str = converter.ToString(id);
+            var str = converter.ToCanonicalString(id);
             var parsed = converter.FromString(str);
 
             Assert.Equal(id, parsed);
@@ -71,7 +71,7 @@ public void Double_UserId_Should_Throw()
         {
             var converter = new UAuthUserIdConverter<double>();
 
-            Assert.ThrowsAny<Exception>(() => converter.ToString(12.34));
+            Assert.ThrowsAny<Exception>(() => converter.ToCanonicalString(12.34));
         }
 
         private sealed class CustomUserId
@@ -84,7 +84,7 @@ public void Custom_UserId_Should_Fail()
         {
             var converter = new UAuthUserIdConverter<CustomUserId>();
 
-            Assert.ThrowsAny<Exception>(() => converter.ToString(new CustomUserId()));
+            Assert.ThrowsAny<Exception>(() => converter.ToCanonicalString(new CustomUserId()));
         }
 
         [Fact]