WebAPI: Move SetupRedirectUri to DI

Author: jim60105

ASPNET_WebAPI/Controllers/AuthController.cs

@@ -33,7 +33,6 @@ public async Task<IActionResult> SigninOIDCAsync(string code, string state, stri
             throw new Exception(error);
         }
 
-        _oidcService.SetupRedirectUri(Request, "api/Auth/oidc/signin");
         string idToken = await _oidcService.GetIdTokenAsync(code);
 
         return Redirect($"{_config["FrontEndUri"]}?idToken={idToken}");

ASPNET_WebAPI/Program.cs

@@ -1,4 +1,5 @@
 using GoogleOIDC_Angular_ASPNETWebAPI_Auth_Code_Flow.Services;
+using Microsoft.AspNetCore.Http.Extensions;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -8,7 +9,9 @@
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
-builder.Services.AddScoped<OIDCService>();
+builder.Services.AddHttpContextAccessor();
+builder.Services.AddScoped(x 
+    => ActivatorUtilities.CreateInstance<OIDCService>(x, x.GetRequiredService<IHttpContextAccessor>().HttpContext?.Request.GetDisplayUrl() ?? ""));
 builder.Services.AddHttpClient();
 
 var app = builder.Build();

ASPNET_WebAPI/Services/OIDCService.cs

@@ -1,7 +1,6 @@
 using Google.Apis.Auth.OAuth2;
 using Google.Apis.Auth.OAuth2.Requests;
 using Google.Apis.Auth.OAuth2.Responses;
-using Microsoft.AspNetCore.Http.Extensions;
 
 namespace GoogleOIDC_Angular_ASPNETWebAPI_Auth_Code_Flow.Services;
 
@@ -10,17 +9,24 @@ public class OIDCService
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly IConfiguration _config;
 
-    private string RedirectUri { get; set; } = "http://localhost:7091/Auth/oidc/signin";
+    private string RedirectUri { get; set; } = "http://localhost:7091/api/Auth/oidc/signin";
     private string ClientId { get; }
     private string ClientSecret { get; }
 
-    public OIDCService(IHttpClientFactory httpClientFactory, IConfiguration config)
+    public OIDCService(IHttpClientFactory httpClientFactory,
+                       IConfiguration config,
+                       string requestUrl)
     {
         _httpClientFactory = httpClientFactory;
         _config = config;
 
+        if (!string.IsNullOrEmpty(requestUrl))
+            SetupRedirectUri(requestUrl);
+
         // Read redirectUri from configuration if it exists.
-        RedirectUri = config["Authentication:Google:RedirectUri"] ?? RedirectUri;
+        RedirectUri =  !string.IsNullOrEmpty(_config["Authentication:Google:RedirectUri"])
+            ? _config["Authentication:Google:RedirectUri"]
+            : RedirectUri;
         ClientId = _config["Authentication:Google:ClientId"];
         ClientSecret = _config["Authentication:Google:ClientSecret"];
     }
@@ -52,13 +58,13 @@ public async Task<string> GetIdTokenAsync(string authorization_code)
 
     #region Additional Feature
     /// <summary>
-    /// 由Request動態取得request URL，以產生並覆寫RedirectUri。在一進入Action時呼叫。
+    /// 動態取得request URL，以產生並覆寫RedirectUri
     /// </summary>
     /// <param name="request"></param>
     /// <param name="route"></param>
-    internal void SetupRedirectUri(HttpRequest request, string route)
+    internal void SetupRedirectUri(string requestUrl, string? route = "api/Auth/oidc/signin")
     {
-        Uri uri = new(request.GetDisplayUrl());
+        Uri uri = new(requestUrl);
         string port = uri.Scheme == "https" && uri.Port == 443
                       || uri.Scheme == "http" && uri.Port == 80
                       ? ""

ASPNET_WebAPI/appsettings.json

@@ -9,7 +9,8 @@
   "Authentication": {
     "Google": {
       "ClientId": "YOUR CLIENT ID",
-      "ClientSecret": "YOUR CLIENT SECRET"
+      "ClientSecret": "YOUR CLIENT SECRET",
+      "RedirectUri": ""
     }
   },
   "FrontEndUri": "http://localhost:4200"

Angular/src/app/authentication.service.ts

@@ -16,7 +16,7 @@ export class AuthenticationService {
       client_id: environment.clientId,
       scope: 'openid profile email',
       ux_mode: 'redirect',
-      redirect_uri: environment.apiUrl + '/Auth/oidc/signin',
+      redirect_uri: environment.apiUrl + '/api/Auth/oidc/signin',
       state: '12345GG',
     });
     client.requestCode();

Angular/src/environments/environment.ts

@@ -4,8 +4,8 @@
 
 export const environment = {
   production: false,
-  apiUrl: 'https://localhost:7091/api',
   clientId: 'YOUR CLIENT ID',
+  apiUrl: 'https://localhost:7091',
 };
 
 /*