Added redirect to login (#758)

* Added redirect to login

* improved options null check

* Added xml-docs

* Expanded external uri context to use also in auth controller

* Removed unused namespaces

Author: strivitech

OutOfSchool/OutOfSchool.IdentityServer/Config/ExternalUriModels/AngularClientScopeExternalUrisConfig.cs

@@ -0,0 +1,14 @@
+namespace OutOfSchool.IdentityServer.Config.ExternalUriModels;
+
+/// <summary>
+/// Contains external uris that are used with OutOfSchoolAngular client.
+/// </summary>
+public class AngularClientScopeExternalUrisConfig
+{
+    public const string Name = "ExternalUris:AngularClientScope";
+
+    /// <summary>
+    /// Gets or sets login uri.
+    /// </summary>
+    public string Login { get; set; }
+}

OutOfSchool/OutOfSchool.IdentityServer/Controllers/AccountController.cs

@@ -205,7 +205,7 @@ public async Task<IActionResult> ConfirmEmail()
     }
 
     [HttpGet]
-    public async Task<IActionResult> EmailConfirmation(string userId, string token)
+    public async Task<IActionResult> EmailConfirmation(string userId, string token, string redirectUrl = null)
     {
         logger.LogDebug($"{path} started. User(id): {userId}.");
 
@@ -235,7 +235,7 @@ public async Task<IActionResult> EmailConfirmation(string userId, string token)
 
         logger.LogInformation($"{path} Email was confirmed. User(id): {userId}.");
 
-        return Ok();
+        return string.IsNullOrEmpty(redirectUrl) ? Ok() : Redirect(redirectUrl);
     }
 
     [HttpGet]

OutOfSchool/OutOfSchool.IdentityServer/Services/Interfaces/IProviderAdminChangesLogService.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-using OutOfSchool.Services.Enums;
-using OutOfSchool.Services.Models;
+using OutOfSchool.Services.Enums;
 
 namespace OutOfSchool.IdentityServer.Services.Interfaces;
 

OutOfSchool/OutOfSchool.IdentityServer/Services/Interfaces/IProviderAdminService.cs

@@ -1,9 +1,4 @@
-using System.Threading.Tasks;
-
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-using OutOfSchool.Common;
+using Microsoft.AspNetCore.Mvc;
 using OutOfSchool.Common.Models;
 
 namespace OutOfSchool.IdentityServer.Services.Interfaces;

OutOfSchool/OutOfSchool.IdentityServer/Services/Password/CryptoRandom.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Security.Cryptography;
+using System.Security.Cryptography;
 
 using IdentityModel;
 

OutOfSchool/OutOfSchool.IdentityServer/Services/Password/PasswordGenerator.cs

@@ -1,9 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-
-using Microsoft.AspNetCore.Identity;
-
-namespace OutOfSchool.IdentityServer.Services.Password;
+namespace OutOfSchool.IdentityServer.Services.Password;
 
 public static class PasswordGenerator
 {

OutOfSchool/OutOfSchool.IdentityServer/Services/ProfileService.cs

@@ -1,16 +1,8 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using IdentityServer4.Extensions;
 using IdentityServer4.Models;
 using IdentityServer4.Services;
-using Microsoft.AspNetCore.Identity;
-using OutOfSchool.Common;
-using OutOfSchool.Common.PermissionsModule;
 using OutOfSchool.Services.Enums;
-using OutOfSchool.Services.Models;
-using OutOfSchool.Services.Repository;
 
 namespace OutOfSchool.IdentityServer.Services;
 

OutOfSchool/OutOfSchool.IdentityServer/Services/ProviderAdminChangesLogService.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using OutOfSchool.IdentityServer.Services.Interfaces;
-using OutOfSchool.Services.Enums;
-using OutOfSchool.Services.Models;
-using OutOfSchool.Services.Repository;
+using OutOfSchool.Services.Enums;
 
 namespace OutOfSchool.IdentityServer.Services;
 

OutOfSchool/OutOfSchool.IdentityServer/Services/ProviderAdminService.cs

@@ -1,26 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using AutoMapper;
-using Microsoft.AspNetCore.Identity;
+using AutoMapper;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using OutOfSchool.Common;
 using OutOfSchool.Common.Models;
-using OutOfSchool.EmailSender;
-using OutOfSchool.IdentityServer.Config;
-using OutOfSchool.IdentityServer.Services.Interfaces;
+using OutOfSchool.IdentityServer.Config.ExternalUriModels;
 using OutOfSchool.IdentityServer.Services.Password;
 using OutOfSchool.RazorTemplatesData.Models.Emails;
-using OutOfSchool.RazorTemplatesData.Services;
-using OutOfSchool.Services;
 using OutOfSchool.Services.Enums;
-using OutOfSchool.Services.Models;
-using OutOfSchool.Services.Repository;
 
 namespace OutOfSchool.IdentityServer.Services;
 
@@ -31,6 +16,7 @@ public class ProviderAdminService : IProviderAdminService
     private readonly ILogger<ProviderAdminService> logger;
     private readonly IProviderAdminRepository providerAdminRepository;
     private readonly GRPCConfig gPRCConfig;
+    private readonly AngularClientScopeExternalUrisConfig externalUrisConfig;
 
     private readonly UserManager<User> userManager;
     private readonly OutOfSchoolDbContext context;
@@ -46,17 +32,20 @@ public ProviderAdminService(
         OutOfSchoolDbContext context,
         IRazorViewToStringRenderer renderer,
         IProviderAdminChangesLogService providerAdminChangesLogService,
-        IOptions<GRPCConfig> gRPCConfig)
+        IOptions<GRPCConfig> gRPCConfig,
+        IOptions<AngularClientScopeExternalUrisConfig> externalUrisConfig)
     {
-        this.mapper = mapper;
-        this.userManager = userManager;
-        this.context = context;
-        this.providerAdminRepository = providerAdminRepository;
-        this.logger = logger;
-        this.emailSender = emailSender;
-        this.renderer = renderer;
-        this.providerAdminChangesLogService = providerAdminChangesLogService;
-        this.gPRCConfig = gRPCConfig.Value;
+        this.mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
+        this.userManager = userManager ?? throw new ArgumentNullException(nameof(userManager));
+        this.context = context ?? throw new ArgumentNullException(nameof(context));
+        this.providerAdminRepository = providerAdminRepository ?? throw new ArgumentNullException(nameof(providerAdminRepository));
+        this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        this.emailSender = emailSender ?? throw new ArgumentNullException(nameof(emailSender));
+        this.renderer = renderer ?? throw new ArgumentNullException(nameof(renderer));
+        this.providerAdminChangesLogService = providerAdminChangesLogService ?? throw new ArgumentNullException(nameof(providerAdminChangesLogService));
+        this.gPRCConfig = gRPCConfig?.Value ?? throw new ArgumentNullException(nameof(gRPCConfig));
+        this.externalUrisConfig =
+            externalUrisConfig?.Value ?? throw new ArgumentNullException(nameof(externalUrisConfig));
     }
 
     public async Task<ResponseDto> CreateProviderAdminAsync(
@@ -162,11 +151,11 @@ await providerAdminChangesLogService.SaveChangesLogAsync(providerAdmin, userId,
 
                 string confirmationLink =
                     url is null
-                        ? $"{gPRCConfig.ProviderAdminConfirmationLink}?userId={user.Id}&token={token}"
+                        ? $"{gPRCConfig.ProviderAdminConfirmationLink}?userId={user.Id}&token={token}?redirectUrl={externalUrisConfig.Login}"
                         : url.Action(
                             "EmailConfirmation",
                             "Account",
-                            new { userId = user.Id, token },
+                            new { userId = user.Id, token, redirectUrl = externalUrisConfig.Login },
                             "https");
 
                 var subject = "Запрошення!";

OutOfSchool/OutOfSchool.IdentityServer/Services/ProviderAdminServiceGRPC.cs

@@ -1,10 +1,6 @@
-using System.Threading.Tasks;
 using AutoMapper;
 using Grpc.Core;
 using GrpcService;
-using Microsoft.AspNetCore.Authorization;
-using OutOfSchool.Common;
-using OutOfSchool.Common.Extensions;
 using OutOfSchool.Common.Models;
 
 namespace GrpcServiceServer;