Merge pull request #7 from EpicOfficer/FEATURE/Wordle

Rework discord activity token handling in API and frontend (actually works now)

Blink3.API/Blink3.API.csproj

@@ -40,8 +40,4 @@
         <ProjectReference Include="..\Blink3.DataAccess\Blink3.DataAccess.csproj"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <Folder Include="Interfaces\"/>
-    </ItemGroup>
-
 </Project>

Blink3.API/Controllers/AuthController.cs

@@ -1,14 +1,11 @@
-using System.Net.Http.Headers;
-using System.Text.Json;
 using AspNet.Security.OAuth.Discord;
+using Blink3.API.Interfaces;
 using Blink3.API.Models;
-using Blink3.Core.Configuration;
 using Blink3.Core.DiscordAuth;
 using Blink3.Core.DiscordAuth.Extensions;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using Swashbuckle.AspNetCore.Annotations;
 
 namespace Blink3.API.Controllers;
@@ -17,14 +14,8 @@ namespace Blink3.API.Controllers;
 [ApiController]
 [SwaggerTag("Authentication related actions")]
 public class AuthController(IAuthenticationService authenticationService,
-    IHttpClientFactory httpClientFactory,
-    IOptions<BlinkConfiguration> config) : ControllerBase
+    IDiscordTokenService discordTokenService) : ControllerBase
 {
-    /// <summary>
-    ///     Represents the configuration settings for the application.
-    /// </summary>
-    private BlinkConfiguration Config => config.Value;
-
     [HttpGet("login")]
     [SwaggerOperation(
         Summary = "Initiates login via Discord",
@@ -74,42 +65,16 @@ public IActionResult Status()
     }
 
     [HttpPost("token")]
-    public async Task<IActionResult> Token([FromBody] DiscordTokenRequest tokenRequest)
+    [SwaggerOperation(
+        Summary = "Exchange an oauth code for an access token",
+        Description = "Returns the oauth2 access token",
+        OperationId = "Auth.Token",
+        Tags = ["Auth"]
+    )]
+    [SwaggerResponse(StatusCodes.Status200OK, "Returned access token", typeof(DiscordTokenResponse))]
+    [SwaggerResponse(StatusCodes.Status400BadRequest, "Failed to get an access token", typeof(ProblemDetails))]
+    public async Task<IActionResult> Token([FromBody] string code)
     {
-        string clientId = Config.Discord.ClientId;
-        string clientSecret = Config.Discord.ClientSecret;
-
-        using HttpClient httpClient = httpClientFactory.CreateClient();
-        FormUrlEncodedContent requestBody = new(new[]
-        {
-            new KeyValuePair<string, string>("client_id", clientId),
-            new KeyValuePair<string, string>("client_secret", clientSecret),
-            new KeyValuePair<string, string>("grant_type", "authorization_code"),
-            new KeyValuePair<string, string>("code", tokenRequest.Code)
-        });
-
-        httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-        HttpResponseMessage response;
-
-        try
-        {
-            response = await httpClient.PostAsync(DiscordAuthenticationDefaults.TokenEndpoint, requestBody);
-        }
-        catch (Exception ex)
-        {
-            return BadRequest("Request failed - " + ex.Message);
-        }
-
-        if (!response.IsSuccessStatusCode) return BadRequest();
-
-        string jsonResponse = await response.Content.ReadAsStringAsync();
-        Dictionary<string, string>? token = JsonSerializer.Deserialize<Dictionary<string, string>>(jsonResponse);
-        if (token is null || !token.TryGetValue("access_token", out string? value))
-        {
-            return BadRequest("Could not obtain access token");
-        }
-
-        return Ok(new { access_token = value });
+        return Ok(await discordTokenService.GetTokenAsync(code));
     }
 }

Blink3.API/Interfaces/IDiscordTokenService.cs

@@ -0,0 +1,19 @@
+using Blink3.API.Models;
+
+namespace Blink3.API.Interfaces;
+
+/// <summary>
+///     Represents the interface for handling Discord token operations.
+/// </summary>
+public interface IDiscordTokenService
+{
+    /// <summary>
+    ///     Retrieves a Discord access token asynchronously.
+    /// </summary>
+    /// <param name="code">The authorization code received from Discord.</param>
+    /// <returns>
+    ///     A task that represents the asynchronous operation. The task result contains a
+    ///     <see cref="DiscordTokenResponse" /> object representing the Discord access token information.
+    /// </returns>
+    Task<DiscordTokenResponse> GetTokenAsync(string code);
+}

Blink3.API/Models/DiscordTokenResponse.cs

@@ -0,0 +1,21 @@
+using System.Text.Json.Serialization;
+
+namespace Blink3.API.Models;
+
+public class DiscordTokenResponse
+{
+    [JsonPropertyName("token_type")]
+    public string? TokenType { get; set; }
+
+    [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; }
+}

Blink3.API/Program.cs

@@ -1,4 +1,5 @@
 using Blink3.API.Extensions;
+using Blink3.API.Interfaces;
 using Blink3.API.Services;
 using Blink3.Core.Caching.Extensions;
 using Blink3.Core.Configuration;
@@ -66,7 +67,9 @@
     builder.Services.AddSingleton<DiscordRestClient>();
     builder.Services.AddHostedService<DiscordStartupService>();
 
+    // For getting discord tokens
     builder.Services.AddHttpClient();
+    builder.Services.AddSingleton<IDiscordTokenService, DiscordTokenService>();
 
     // Configure Authentication and Discord OAuth
     builder.Services.AddDiscordAuth(appConfig);

Blink3.API/Services/DiscordTokenService.cs

@@ -0,0 +1,36 @@
+using System.Net.Http.Headers;
+using AspNet.Security.OAuth.Discord;
+using Blink3.API.Interfaces;
+using Blink3.API.Models;
+using Blink3.Core.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Blink3.API.Services;
+
+public class DiscordTokenService(
+    IHttpClientFactory httpClientFactory,
+    IOptions<BlinkConfiguration> config) : IDiscordTokenService
+{
+    private BlinkConfiguration Config => config.Value;
+
+    public async Task<DiscordTokenResponse> GetTokenAsync(string code)
+    {
+        using HttpClient httpClient = httpClientFactory.CreateClient();
+        FormUrlEncodedContent requestBody = new(new[]
+        {
+            new KeyValuePair<string, string>("client_id", Config.Discord.ClientId),
+            new KeyValuePair<string, string>("client_secret", Config.Discord.ClientSecret),
+            new KeyValuePair<string, string>("grant_type", "authorization_code"),
+            new KeyValuePair<string, string>("code", code)
+        });
+
+        httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        HttpResponseMessage response =
+            await httpClient.PostAsync(DiscordAuthenticationDefaults.TokenEndpoint, requestBody);
+        if (!response.IsSuccessStatusCode)
+            throw new ApplicationException("Error retrieving access token from Discord.");
+
+        return await response.Content.ReadFromJsonAsync<DiscordTokenResponse>() ?? new DiscordTokenResponse();
+    }
+}

Blink3.Activity/index.html

@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + React + TS</title>
   </head>

Blink3.Activity/package.json

@@ -10,9 +10,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@discord/embedded-app-sdk": "^1.1.0",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "@discord/embedded-app-sdk": "1.1.0"
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.66",
@@ -23,8 +23,8 @@
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
+    "type-fest": "^2.16.0",
     "typescript": "^5.2.2",
-    "vite": "^5.2.0",
-    "type-fest": "^2.16.0"
+    "vite": "^5.2.0"
   }
 }