Refactor OAuth handling and add GetAuthorizationUrl method

DiscordOAuth.cs

@@ -103,10 +103,10 @@ public class DiscordOAuth : IDiscord
 
         var response = await _httpClient.PostAsync("https://discord.com/api/oauth2/token", content);
         var responseString = await response.Content.ReadAsStringAsync();
-        var authToken = JsonSerializer.Deserialize<OAuthToken>(responseString);
+        var authToken = JsonSerializer.Deserialize<TokenDto>(responseString);
         AccessToken = authToken?.AccessToken;
-        token = authToken;
-        return authToken;
+        token = OAuthToken.FromDTO(authToken, _httpClient, ClientId, ClientSecret);
+        return token;
     }
 
     public ISession CreateSession()
@@ -116,6 +116,27 @@ public class DiscordOAuth : IDiscord
         else 
             throw new InvalidOperationException("Token is not set. Please call GetTokenAsync first.");
     }
+    
+    public string GetAuthorizationUrl(string state)
+    {
+
+        var uri = new UriBuilder("https://discord.com/api/oauth2/authorize?");
+        
+        var queryParameters = HttpUtility.ParseQueryString(uri.Query);
+        
+        queryParameters["client_id"] = ClientId.ToString();
+        queryParameters["redirect_uri"] = RedirectUri;
+        queryParameters["response_type"] = "code";
+        queryParameters["scope"] = Scopes.ToString();
+        queryParameters["state"] = state;
+        queryParameters["prompt"] = Prompt ? "consent" : "none";
+
+        return uri + string.Join("&", queryParameters.AllKeys
+            .SelectMany(key => queryParameters.GetValues(key)!
+                .Select(value => String.Format("{0}={1}", HttpUtility.UrlEncode(key), HttpUtility.UrlEncode(value))))
+            .ToArray());
+        
+    }
 
     
 }

Entities/DiscordSession.cs

@@ -70,28 +70,6 @@ internal class DiscordSession (IToken token, HttpClient httpClient, ScopesBuilde
         return await _req<DiscordConnection>("users/@me/connections");
     }
 
-    public string GetAuthorizationUrl(string state)
-    {
-
-        NameValueCollection query = new()
-        {
-            ["client_id"] = clientId.ToString(),
-            ["redirect_uri"] = redirectUri,
-            ["response_type"] = "code",
-            ["scope"] = scopes.ToString(),
-            ["state"] = state,
-            ["prompt"] = prompt ? "consent" : "none"
-        };
-
-        var uriBuilder = new UriBuilder("https://discord.com/api/oauth2/authorize")
-        {
-            Query = query.ToString()
-        };
-
-        return uriBuilder.ToString();
-        
-    }
-
     public IToken GetToken(CancellationToken cancellationToken = default)
     {
         if (token.AccessToken is null)

Entities/DiscordUser.cs

@@ -7,7 +7,7 @@ namespace yawaflua.Discord.Net.Entities;
 internal class DiscordUser : IUser
 {
     [JsonPropertyName("id")]
-    public ulong Id { get; set; }
+    public string Id { get; set; }
     
     [JsonPropertyName("username")]
     public string Username { get; set; }

Entities/OAuthToken.cs

@@ -7,15 +7,27 @@ namespace yawaflua.Discord.Net.Entities;
 
 internal class OAuthToken (HttpClient client, ulong ClientId, string ClientSecret) : IToken
 {
-    [JsonPropertyName("access_token")] public string AccessToken { get; set; }
+    public string AccessToken { get; set; }
 
-    [JsonPropertyName("expires_in")] public int ExpiresIn { get; set; }
+    public int ExpiresIn { get; set; }
 
-    [JsonPropertyName("refresh_token")] public string RefreshToken { get; set; }
+    public string RefreshToken { get; set; }
 
-    [JsonPropertyName("scope")] public string Scope { get; set; }
+    public string Scope { get; set; }
 
-    [JsonPropertyName("token_type")] public string TokenType { get; set; }
+    public string TokenType { get; set; }
+
+    public static OAuthToken FromDTO(TokenDto dto, HttpClient client, ulong ClientId, string ClientSecret)
+    {
+        return new(client, ClientId, ClientSecret)
+        {
+            AccessToken = dto.AccessToken,
+            ExpiresIn = dto.ExpiresIn,
+            RefreshToken = dto.RefreshToken,
+            Scope = dto.Scope,
+            TokenType = dto.TokenType
+        };
+    }
     public Task RevokeAsync(CancellationToken cancellationToken = default)
     {
         using var request = new HttpRequestMessage(HttpMethod.Post, "https://discord.com/api/oauth2/token/revoke")

Entities/TokenDto.cs

@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+
+namespace yawaflua.Discord.Net.Entities;
+
+public class TokenDto
+{
+    [JsonPropertyName("access_token")] public string AccessToken { get; set; }
+
+    [JsonPropertyName("expires_in")] public int ExpiresIn { get; set; }
+
+    [JsonPropertyName("refresh_token")] public string RefreshToken { get; set; }
+
+    [JsonPropertyName("scope")] public string Scope { get; set; }
+
+    [JsonPropertyName("token_type")] public string TokenType { get; set; }
+}

Interfaces/IDiscord.cs

@@ -6,4 +6,5 @@ public interface IDiscord
 {
     Task<IToken?> GetTokenAsync(string code);
     ISession? CreateSession();
+    string GetAuthorizationUrl(string state);
 }

Interfaces/Models/ISession.cs

@@ -9,8 +9,6 @@ public interface ISession
     
     Task<IConnection?> GetConnectionAsync(CancellationToken cancellationToken = default);
 
-
-    string GetAuthorizationUrl(string state);
     IToken GetToken(CancellationToken cancellationToken = default);
     
 }

Interfaces/Models/IUser.cs

@@ -8,7 +8,7 @@ public interface IUser
     /// 	the user's id
     /// </summary>
     /// <seealso href="https://discord.com/developers/docs/resources/user#user-object">User-object</seealso>
-    public ulong Id { get; set; }
+    public string Id { get; set; }
     
     /// <summary>
     /// 	the user's username, not unique across the platform

yawaflua.Discord.Net.csproj

@@ -18,7 +18,7 @@
         <RepositoryType>GIT</RepositoryType>
         <PackageTags>Discord-OAuth2;Discord-OAuth-2;Discord-OAuth;DiscordOAuth;Discord;yawaflua;OAuth;OAuth-2;OAuth2</PackageTags>
         <Deterministic>true</Deterministic>
-        <Version>1.0.5</Version>
+        <Version>1.0.6</Version>
     </PropertyGroup>
 
     <ItemGroup>