Improvements/moving files around

.gitignore

@@ -5,6 +5,8 @@ project.lock.json
 *.pyc
 nupkg/
 
+appsettings.Internal.json
+
 # cert & key files
 compose/nginx/certs
 compose/nginx/keys

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Docker .NET Attach (Preview)",
+            "type": "docker",
+            "request": "attach",
+            "platform": "netCore",
+            "sourceFileMap": {
+                "/app": "${workspaceFolder}"
+            },
+            "processId": "${command:pickRemoteProcess}",
+            "containerName": "api",
+        },
+    ]
+}

README.md

@@ -54,4 +54,5 @@ This is implemented using GitHub Actions and the script can be found at `.github
 | ✅ | Safely manage not awaited calls | [#22](https://github.com/WorldWideWest/dotnet-template/issues/22)
 | ✅      | Global Error Handling | [#15](https://github.com/WorldWideWest/dotnet-template/issues/15)
 |  ❌      | Create an Actual .NET Project Template | [#16](https://github.com/WorldWideWest/dotnet-template/issues/16)
+|  ✅      | Adding External Login Provider support (Google) | )
 

compose/README.md

@@ -51,5 +51,5 @@ docker-compose -f ./docker-compose.debug.amd.yml down && docker-compose -f ./doc
 | Status of Implementation      | Description | Issue |
 | ----------- | ----------- |----------
 | ✅      | Compose file for AMD64 architecture | [#12](https://github.com/WorldWideWest/dotnet-template/issues/12)
-| ❌      | Debugging using VS Code Debugger | [#1](https://github.com/WorldWideWest/dotnet-template/issues/1)
+| ✅      | Debugging using VS Code Debugger | [#1](https://github.com/WorldWideWest/dotnet-template/issues/1)
 | ✅      | Startup Script that generates SSL certificates and runs the dotnet watch command | [#14](https://github.com/WorldWideWest/dotnet-template/issues/14)

compose/docker-compose.debug.amd.yml

@@ -70,6 +70,11 @@ services:
       timeout: 10s
       retries: 5
       start_period: 10s
+    develop:
+      watch:
+        - path: ./src
+          target: /app/src
+          action: sync
 
   nginx:
     build:

compose/docker-compose.debug.arm.yml

@@ -70,7 +70,11 @@ services:
       timeout: 10s
       retries: 5
       start_period: 10s
-
+    develop:
+      watch:
+        - path: ./src
+          target: /app/src
+          action: sync
 
   nginx:
     build:

compose/startup.sh

@@ -2,4 +2,5 @@ dotnet watch run \
     -v \
     --project /app/src/Template.Api/Template.Api.csproj \
     --urls "http://*:5000" \
-    --non-interactive
+    --non-interactive \
+    --disable-parallel

src/Template.Api/Controllers/IdentityController.cs

@@ -6,10 +6,13 @@
 using Template.Application.Identity.Commands.ChangePassword;
 using Template.Application.Identity.Commands.CreateUser;
 using Template.Application.Identity.Commands.DeleteUser;
+using Template.Application.Identity.Commands.ExternalSignIn;
 using Template.Application.Identity.Commands.ForgotPassword;
 using Template.Application.Identity.Commands.ResendConfirmationEmail;
 using Template.Application.Identity.Commands.ResetPassword;
 using Template.Application.Identity.Commands.VerifyEmail;
+using Template.Application.Identity.Queries.GetProvider;
+using Template.Domain.Common.Constants;
 using Template.Domain.Common.Models;
 using Template.Domain.Identity.Constants.Authorization;
 
@@ -18,9 +21,12 @@ namespace Template.Api.Controllers;
 [ApiController]
 [Route("api/[controller]")]
 [ApiVersion("1.0")]
-public class IdentityController(ILogger<IdentityController> _logger, IMediator _mediator)
+public class IdentityController(ILogger<IdentityController> logger, IMediator mediator)
     : ControllerBase
 {
+    private readonly ILogger<IdentityController> _logger = logger;
+    private readonly IMediator _mediator = mediator;
+
     [AllowAnonymous]
     [HttpPost("register")]
     [ProducesResponseType(typeof(Result<object>), StatusCodes.Status200OK)]
@@ -143,7 +149,7 @@ [FromBody] ResetPasswordCommand request
 
     [Authorize(
         AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme,
-        Policy = Policy.Update
+        Policy = Policy.UpdateProfilePasswordAccess
     )]
     [HttpPut("password/change")]
     [ProducesResponseType(typeof(Result<object>), StatusCodes.Status200OK)]
@@ -172,18 +178,16 @@ [FromBody] ChangePasswordCommand request
 
     [Authorize(
         AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme,
-        Policy = Policy.Delete
+        Policy = Policy.DeleteAccess
     )]
     [HttpDelete("delete")]
     [ProducesResponseType(typeof(Result<object>), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(Result<object>), StatusCodes.Status400BadRequest)]
-    public async Task<ActionResult<Result<object>>> DeleteUserAsync(
-        [FromBody] DeleteUserCommand request
-    )
+    public async Task<ActionResult<Result<object>>> DeleteUserAsync()
     {
         try
         {
-            request.Email = User.FindFirst(ClaimTypes.Email)?.Value;
+            var request = new DeleteUserCommand(User.FindFirst(ClaimTypes.Email)?.Value);
 
             var result = await _mediator.Send(request);
 
@@ -198,4 +202,70 @@ [FromBody] DeleteUserCommand request
             throw;
         }
     }
+
+    [AllowAnonymous]
+    [HttpGet(TemplateDefaults.LoginPath)]
+    public async Task<IActionResult> Login(string returnUrl)
+    {
+        try
+        {
+            var request = new GetProviderQuery(returnUrl, Request);
+
+            var result = await _mediator.Send(request);
+
+            if (!result.Succeeded)
+                return BadRequest(result);
+
+            return Challenge(result.Body.Properties, result.Body.Provider);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, ex.Message, nameof(Login));
+            throw;
+        }
+    }
+
+    [AllowAnonymous]
+    [HttpGet(TemplateDefaults.CallbackPath)]
+    public async Task<IActionResult> ExternalLoginCallback()
+    {
+        try
+        {
+            var request = new ExternalSignInCommand(HttpContext);
+
+            var result = await _mediator.Send(request);
+
+            if (!result.Succeeded)
+                return BadRequest(result);
+
+            return Redirect(result.Body);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, ex.Message, nameof(ExternalLoginCallback));
+            throw;
+        }
+    }
+
+    [AllowAnonymous]
+    [HttpGet(TemplateDefaults.LogoutPath)]
+    public async Task<IActionResult> Logout(string logoutId)
+    {
+        try
+        {
+            var request = new ExternalSignOutCommand(logoutId);
+
+            var result = await _mediator.Send(request);
+
+            if (!result.Succeeded)
+                return BadRequest(result);
+
+            return Redirect(result.Body);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, ex.Message, nameof(Logout));
+            throw;
+        }
+    }
 }

src/Template.Api/DependencyInjection.cs

@@ -1,4 +1,4 @@
-using Template.Api.Configurations;
+using Template.Api.Extensions;
 using Template.Api.Infrastructure;
 
 namespace Template.Api;
@@ -10,7 +10,7 @@ public static IServiceCollection AddApi(this IServiceCollection services)
         services.AddExceptionHandler<GlobalExceptionHandler>();
         services.AddProblemDetails();
 
-        services.ConfigureSwagger().ConfigureApiVersioning();
+        services.AddSwaggerConfiguration().AddApiVersioningConfiguration();
 
         return services;
     }

src/Template.Api/Configurations/ApiVersioningConfiguration.cs → src/Template.Api/Extensions/ApiVersioningExtension.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Versioning;
 
-namespace Template.Api.Configurations;
+namespace Template.Api.Extensions;
 
-public static class ApiVersioningConfiguration
+public static class ApiVersioningExtension
 {
-    public static IServiceCollection ConfigureApiVersioning(this IServiceCollection services)
+    public static IServiceCollection AddApiVersioningConfiguration(this IServiceCollection services)
     {
         services.AddApiVersioning(options =>
         {

src/Template.Api/Configurations/ForwardedHeadersConfiguration.cs → src/Template.Api/Extensions/ForwardedHeadersExtension.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.HttpOverrides;
 
-namespace Template.Api.Configurations;
+namespace Template.Api.Extensions;
 
-public static class ForwardedHeadersConfiguration
+public static class ForwardedHeadersExtension
 {
     public static IApplicationBuilder UseForwardedHeadersConfiguration(this IApplicationBuilder app)
     {

src/Template.Api/Configurations/SwaggerConfiguration.cs → src/Template.Api/Extensions/SwaggerExtension.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.OpenApi.Models;
 
-namespace Template.Api.Configurations;
+namespace Template.Api.Extensions;
 
-public static class SwaggerConfiguration
+public static class SwaggerExtension
 {
-    public static IServiceCollection ConfigureSwagger(this IServiceCollection services)
+    public static IServiceCollection AddSwaggerConfiguration(this IServiceCollection services)
     {
         services.AddSwaggerGen(options =>
         {

src/Template.Api/Infrastructure/GlobalExceptionHandler.cs

@@ -4,8 +4,10 @@
 
 namespace Template.Api.Infrastructure;
 
-public class GlobalExceptionHandler(ILogger<GlobalExceptionHandler> _logger) : IExceptionHandler
+public class GlobalExceptionHandler(ILogger<GlobalExceptionHandler> logger) : IExceptionHandler
 {
+    private readonly ILogger<GlobalExceptionHandler> _logger = logger;
+
     public async ValueTask<bool> TryHandleAsync(
         HttpContext httpContext,
         Exception exception,
@@ -16,7 +18,7 @@ CancellationToken cancellationToken
 
         var error = new Error
         {
-            Code = ErrorCode.INTERNAL_SERVER_ERROR,
+            Code = ErrorCode.InternalServerError,
             Description = ErrorMessage.INTERNAL_SERVER_ERROR
         };
 

src/Template.Api/Program.cs

@@ -1,14 +1,15 @@
 using Template.Api;
-using Template.Api.Configurations;
+using Template.Api.Extensions;
 using Template.Application;
 using Template.Infrastructure;
-using Template.Infrastructure.IdentityServer.Configurations;
+using Template.Infrastructure.IdentityServer.Extensions;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder
     .Configuration.SetBasePath(builder.Environment.ContentRootPath)
-    .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: false)
+    // * OPTIONAL set to true due to latter introduction to ConfigMap
+    .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true)
     .AddEnvironmentVariables();
 
 builder.Services.AddApi().AddInfrastructure(builder.Configuration).AddApplication();
@@ -17,19 +18,22 @@
 
 if (app.Environment.IsDevelopment())
 {
-    await IdentityServerMigrationConfiguration.ApplyMigrationsAsync(app);
+    await IdentityServerMigrationExtension.ApplyMigrationsAsync(app);
     app.UseDeveloperExceptionPage();
     app.UseSwaggerConfiguration();
 }
 
+app.UseCors(options =>
+{
+    options.AllowAnyHeader().AllowAnyOrigin().AllowAnyMethod();
+});
+
 app.UseForwardedHeadersConfiguration();
 
 app.UseExceptionHandler();
 
 app.UseIdentityServer();
 
-app.UseAuthentication();
-
 app.UseAuthorization();
 
 app.MapControllers();

src/Template.Api/Template.Api.csproj

@@ -7,13 +7,13 @@
 
   <ItemGroup>
     <PackageReference Include="MediatR" Version="12.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>

src/Template.Api/appsettings.Development.json

@@ -18,12 +18,12 @@
           "Secret": "Un1t4hyniisKJvGAJ6l30eW3D2vKt0"
         },
         "GoogleWeb": {
-          "InternalSecret": "",
-          "ExternalClientId": "",
-          "ExternalClientSecret": "",
-          "RedirectUri": "",
-          "PostLogoutRedirectUri": "",
-          "AllowedCorsOrigin": ""
+          "InternalSecret": "44CfU7C7fB0k3oeATDkbzuJqswh3zk",
+          "ExternalClientId": "############### GET YOUR CLIENT ID FROM THE GCP CONSOLE ###############",
+          "ExternalClientSecret": "############### GET YOUR CLIENT SECRET FROM THE GCP CONSOLE ###############",
+          "RedirectUri": "http://localhost:3000/signin-redirect",
+          "PostLogoutRedirectUri": "http://localhost:3000/signout-redirect",
+          "AllowedCorsOrigin": "http://localhost:3000"
         }
       },
       "IssuerUri": "http://localhost",