Merge pull request #3 from EpicOfficer/FEATURE/Wordle

Implement Docker argument and update token endpoint

.github/workflows/docker-image.yml

@@ -55,4 +55,6 @@ jobs:
           file: ${{ matrix.dockerfile }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            VITE_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} 

Blink3.API/Controllers/AuthController.cs

@@ -1,18 +1,30 @@
+using System.Net.Http.Headers;
+using System.Text.Json;
 using AspNet.Security.OAuth.Discord;
+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;
 
 [Route("api/[controller]")]
 [ApiController]
 [SwaggerTag("Authentication related actions")]
-public class AuthController(IAuthenticationService authenticationService) : ControllerBase
+public class AuthController(IAuthenticationService authenticationService,
+    IHttpClientFactory httpClientFactory,
+    IOptions<BlinkConfiguration> config) : ControllerBase
 {
+    /// <summary>
+    ///     Represents the configuration settings for the application.
+    /// </summary>
+    private BlinkConfiguration Config => config.Value;
+
     [HttpGet("login")]
     [SwaggerOperation(
         Summary = "Initiates login via Discord",
@@ -60,4 +72,44 @@ public IActionResult Status()
     {
         return Ok(User.GetAuthStatusModel());
     }
+
+    [HttpPost("token")]
+    public async Task<IActionResult> Token([FromBody] DiscordTokenRequest tokenRequest)
+    {
+        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 });
+    }
 }

Blink3.API/Models/DiscordTokenRequest.cs

@@ -0,0 +1,8 @@
+using Newtonsoft.Json;
+
+namespace Blink3.API.Models;
+
+public class DiscordTokenRequest
+{
+    public string Code { get; set; } = string.Empty;
+}

Blink3.Activity/Dockerfile

@@ -2,6 +2,8 @@ FROM nginx:alpine AS base
 EXPOSE 80
 
 FROM node:21-alpine AS build
+ARG VITE_CLIENT_ID
+ENV VITE_CLIENT_ID=$VITE_CLIENT_ID
 WORKDIR /app
 COPY ["Blink3.Activity/package.json", "."]
 RUN npm install

Blink3.Activity/src/App.tsx

@@ -31,7 +31,7 @@ function App() {
             });
 
             // Retrieve an access_token from your activity's server
-            const response = await fetch('/api/token', {
+            const response = await fetch('/api/auth/token', {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
@@ -66,6 +66,7 @@ function App() {
                 </a>
             </div>
             <h1>Vite + React</h1>
+            <p>User: auth?.user.username</p>
             <div className="card">
                 <button onClick={() => setCount((count) => count + 1)}>
                     count is {count}