Merge pull request #1548 from borjasanes/feature/identity-api-migration

identity api net 5 migration

src/Services/Identity/Identity.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
 
 # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles

src/Services/Identity/Identity.API/Identity.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <UserSecretsId>aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5</UserSecretsId>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>

src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentInputModel.cs

@@ -2,11 +2,11 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class ConsentInputModel
+    public record ConsentInputModel
     {
-        public string Button { get; set; }
+        public string Button { get; init; }
-        public IEnumerable<string> ScopesConsented { get; set; }
+        public IEnumerable<string> ScopesConsented { get; init; }
-        public bool RememberConsent { get; set; }
+        public bool RememberConsent { get; init; }
-        public string ReturnUrl { get; set; }
+        public string ReturnUrl { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentViewModel.cs

@@ -1,12 +1,10 @@
-
+using System.Collections.Generic;
-
-using System.Collections.Generic;
 using System.Linq;
 using IdentityServer4.Models;
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class ConsentViewModel : ConsentInputModel
+    public record ConsentViewModel : ConsentInputModel
     {
         public ConsentViewModel(ConsentInputModel model, string returnUrl, AuthorizationRequest request, Client client, Resources resources)
         {
@@ -24,16 +22,16 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewMo
             ResourceScopes = resources.ApiResources.SelectMany(x => x.Scopes).Select(x => new ScopeViewModel(x, ScopesConsented.Contains(x.Name) || model == null)).ToArray();
         }
 
-        public string ClientName { get; set; }
+        public string ClientName { get; init; }
-        public string ClientUrl { get; set; }
+        public string ClientUrl { get; init; }
-        public string ClientLogoUrl { get; set; }
+        public string ClientLogoUrl { get; init; }
-        public bool AllowRememberConsent { get; set; }
+        public bool AllowRememberConsent { get; init; }
 
-        public IEnumerable<ScopeViewModel> IdentityScopes { get; set; }
+        public IEnumerable<ScopeViewModel> IdentityScopes { get; init; }
-        public IEnumerable<ScopeViewModel> ResourceScopes { get; set; }
+        public IEnumerable<ScopeViewModel> ResourceScopes { get; init; }
     }
 
-    public class ScopeViewModel
+    public record ScopeViewModel
     {
         public ScopeViewModel(Scope scope, bool check)
         {
@@ -55,11 +53,11 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewMo
             Checked = check || identity.Required;
         }
 
-        public string Name { get; set; }
+        public string Name { get; init; }
-        public string DisplayName { get; set; }
+        public string DisplayName { get; init; }
-        public string Description { get; set; }
+        public string Description { get; init; }
-        public bool Emphasize { get; set; }
+        public bool Emphasize { get; init; }
-        public bool Required { get; set; }
+        public bool Required { get; init; }
-        public bool Checked { get; set; }
+        public bool Checked { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/AccountViewModels/ForgotPasswordViewModel.cs

@@ -2,10 +2,10 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class ForgotPasswordViewModel
+    public record ForgotPasswordViewModel
     {
         [Required]
         [EmailAddress]
-        public string Email { get; set; }
+        public string Email { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/AccountViewModels/LoggedOutViewModel.cs

@@ -1,9 +1,9 @@
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class LoggedOutViewModel
+    public record LoggedOutViewModel
     {
-        public string PostLogoutRedirectUri { get; set; }
+        public string PostLogoutRedirectUri { get; init; }
-        public string ClientName { get; set; }
+        public string ClientName { get; init; }
-        public string SignOutIframeUrl { get; set; }
+        public string SignOutIframeUrl { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/AccountViewModels/LoginViewModel.cs

@@ -2,7 +2,7 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class LoginViewModel
+    public record LoginViewModel
     {
         [Required]
         [EmailAddress]

src/Services/Identity/Identity.API/Models/AccountViewModels/LogoutViewModel.cs

@@ -1,6 +1,6 @@
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class LogoutViewModel
+    public record LogoutViewModel
     {
         public string LogoutId { get; set; }
     }

src/Services/Identity/Identity.API/Models/AccountViewModels/RegisterViewModel.cs

@@ -2,24 +2,24 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class RegisterViewModel
+    public record RegisterViewModel
     {
         [Required]
         [EmailAddress]
         [Display(Name = "Email")]
-        public string Email { get; set; }
+        public string Email { get; init; }
 
         [Required]
         [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
         [DataType(DataType.Password)]
         [Display(Name = "Password")]
-        public string Password { get; set; }
+        public string Password { get; init; }
 
         [DataType(DataType.Password)]
         [Display(Name = "Confirm password")]
         [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
+        public string ConfirmPassword { get; init; }
 
-        public ApplicationUser User { get; set; }
+        public ApplicationUser User { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/AccountViewModels/ResetPasswordViewModel.cs

@@ -2,22 +2,22 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class ResetPasswordViewModel
+    public record ResetPasswordViewModel
     {
         [Required]
         [EmailAddress]
-        public string Email { get; set; }
+        public string Email { get; init; }
 
         [Required]
         [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
         [DataType(DataType.Password)]
-        public string Password { get; set; }
+        public string Password { get; init; }
 
         [DataType(DataType.Password)]
         [Display(Name = "Confirm password")]
         [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
+        public string ConfirmPassword { get; init; }
 
-        public string Code { get; set; }
+        public string Code { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/AccountViewModels/SendCodeViewModel.cs

@@ -3,14 +3,14 @@ using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class SendCodeViewModel
+    public record SendCodeViewModel
     {
-        public string SelectedProvider { get; set; }
+        public string SelectedProvider { get; init; }
 
-        public ICollection<SelectListItem> Providers { get; set; }
+        public ICollection<SelectListItem> Providers { get; init; }
 
-        public string ReturnUrl { get; set; }
+        public string ReturnUrl { get; init; }
 
-        public bool RememberMe { get; set; }
+        public bool RememberMe { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/AccountViewModels/VerifyCodeViewModel.cs

@@ -2,20 +2,20 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
 {
-    public class VerifyCodeViewModel
+    public record VerifyCodeViewModel
     {
         [Required]
-        public string Provider { get; set; }
+        public string Provider { get; init; }
 
         [Required]
-        public string Code { get; set; }
+        public string Code { get; init; }
 
-        public string ReturnUrl { get; set; }
+        public string ReturnUrl { get; init; }
 
         [Display(Name = "Remember this browser?")]
-        public bool RememberBrowser { get; set; }
+        public bool RememberBrowser { get; init; }
 
         [Display(Name = "Remember me?")]
-        public bool RememberMe { get; set; }
+        public bool RememberMe { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/ErrorViewModel.cs

@@ -6,7 +6,7 @@ using IdentityServer4.Models;
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models
 {
-    public class ErrorViewModel
+    public record ErrorViewModel
     {
         public ErrorMessage Error { get; set; }
     }

src/Services/Identity/Identity.API/Models/ManageViewModels/AddPhoneNumberViewModel.cs

@@ -2,11 +2,11 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
 {
-    public class AddPhoneNumberViewModel
+    public record AddPhoneNumberViewModel
     {
         [Required]
         [Phone]
         [Display(Name = "Phone number")]
-        public string PhoneNumber { get; set; }
+        public string PhoneNumber { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/ManageViewModels/ChangePasswordViewModel.cs

@@ -2,22 +2,22 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
 {
-    public class ChangePasswordViewModel
+    public record ChangePasswordViewModel
     {
         [Required]
         [DataType(DataType.Password)]
         [Display(Name = "Current password")]
-        public string OldPassword { get; set; }
+        public string OldPassword { get; init; }
 
         [Required]
         [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
         [DataType(DataType.Password)]
         [Display(Name = "New password")]
-        public string NewPassword { get; set; }
+        public string NewPassword { get; init; }
 
         [DataType(DataType.Password)]
         [Display(Name = "Confirm new password")]
         [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
+        public string ConfirmPassword { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
 {
-    public class ConfigureTwoFactorViewModel
+    public record ConfigureTwoFactorViewModel
     {
-        public string SelectedProvider { get; set; }
+        public string SelectedProvider { get; init; }
 
-        public ICollection<SelectListItem> Providers { get; set; }
+        public ICollection<SelectListItem> Providers { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/ManageViewModels/FactorViewModel.cs

@@ -1,7 +1,7 @@
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
 {
-    public class FactorViewModel
+    public record FactorViewModel
     {
-        public string Purpose { get; set; }
+        public string Purpose { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/ManageViewModels/IndexViewModel.cs

@@ -3,16 +3,16 @@ using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
 {
-    public class IndexViewModel
+    public record IndexViewModel
     {
-        public bool HasPassword { get; set; }
+        public bool HasPassword { get; init; }
 
-        public IList<UserLoginInfo> Logins { get; set; }
+        public IList<UserLoginInfo> Logins { get; init; }
 
-        public string PhoneNumber { get; set; }
+        public string PhoneNumber { get; init; }
 
-        public bool TwoFactor { get; set; }
+        public bool TwoFactor { get; init; }
 
-        public bool BrowserRemembered { get; set; }
+        public bool BrowserRemembered { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/ManageViewModels/SetPasswordViewModel.cs

@@ -2,17 +2,17 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
 {
-    public class SetPasswordViewModel
+    public record SetPasswordViewModel
     {
         [Required]
         [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
         [DataType(DataType.Password)]
         [Display(Name = "New password")]
-        public string NewPassword { get; set; }
+        public string NewPassword { get; init; }
 
         [DataType(DataType.Password)]
         [Display(Name = "Confirm new password")]
         [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
+        public string ConfirmPassword { get; init; }
     }
 }

src/Services/Identity/Identity.API/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs

@@ -2,14 +2,14 @@
 
 namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
 {
-    public class VerifyPhoneNumberViewModel
+    public record VerifyPhoneNumberViewModel
     {
         [Required]
-        public string Code { get; set; }
+        public string Code { get; init; }
 
         [Required]
         [Phone]
         [Display(Name = "Phone number")]
-        public string PhoneNumber { get; set; }
+        public string PhoneNumber { get; init; }
     }
 }

src/Services/Identity/Identity.API/Program.cs

@@ -1,6 +1,7 @@
 using IdentityServer4.EntityFramework.DbContexts;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.eShopOnContainers.Services.Identity.API;
 using Microsoft.eShopOnContainers.Services.Identity.API.Data;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,103 +12,92 @@ using Serilog;
 using System;
 using System.IO;
 
-namespace Microsoft.eShopOnContainers.Services.Identity.API
+string Namespace = typeof(Startup).Namespace;
+string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
+
+var configuration = GetConfiguration();
+
+Log.Logger = CreateSerilogLogger(configuration);
+
+try
 {
-    public class Program
+    Log.Information("Configuring web host ({ApplicationContext})...", AppName);
-    {
+    var host = BuildWebHost(configuration, args);
-        public static readonly string Namespace = typeof(Program).Namespace;
-        public static readonly string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
 
-        public static int Main(string[] args)
+    Log.Information("Applying migrations ({ApplicationContext})...", AppName);
+    host.MigrateDbContext<PersistedGrantDbContext>((_, __) => { })
+        .MigrateDbContext<ApplicationDbContext>((context, services) =>
         {
-            var configuration = GetConfiguration();
+            var env = services.GetService<IWebHostEnvironment>();
+            var logger = services.GetService<ILogger<ApplicationDbContextSeed>>();
+            var settings = services.GetService<IOptions<AppSettings>>();
 
-            Log.Logger = CreateSerilogLogger(configuration);
+            new ApplicationDbContextSeed()
-
+                .SeedAsync(context, env, logger, settings)
-            try
+                .Wait();
-            {
+        })
-                Log.Information("Configuring web host ({ApplicationContext})...", AppName);
+        .MigrateDbContext<ConfigurationDbContext>((context, services) =>
-                var host = BuildWebHost(configuration, args);
-
-                Log.Information("Applying migrations ({ApplicationContext})...", AppName);
-                host.MigrateDbContext<PersistedGrantDbContext>((_, __) => { })
-                    .MigrateDbContext<ApplicationDbContext>((context, services) =>
-                    {
-                        var env = services.GetService<IWebHostEnvironment>();
-                        var logger = services.GetService<ILogger<ApplicationDbContextSeed>>();
-                        var settings = services.GetService<IOptions<AppSettings>>();
-
-                        new ApplicationDbContextSeed()
-                            .SeedAsync(context, env, logger, settings)
-                            .Wait();
-                    })
-                    .MigrateDbContext<ConfigurationDbContext>((context, services) =>
-                    {
-                        new ConfigurationDbContextSeed()
-                            .SeedAsync(context, configuration)
-                            .Wait();
-                    });
-
-                Log.Information("Starting web host ({ApplicationContext})...", AppName);
-                host.Run();
-
-                return 0;
-            }
-            catch (Exception ex)
-            {
-                Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", AppName);
-                return 1;
-            }
-            finally
-            {
-                Log.CloseAndFlush();
-            }
-        }
-
-        private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .CaptureStartupErrors(false)
-                .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
-                .UseStartup<Startup>()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseSerilog()
-                .Build();
-
-        private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
         {
-            var seqServerUrl = configuration["Serilog:SeqServerUrl"];
+            new ConfigurationDbContextSeed()
-            var logstashUrl = configuration["Serilog:LogstashgUrl"];
+                .SeedAsync(context, configuration)
-            return new LoggerConfiguration()
+                .Wait();
-                .MinimumLevel.Verbose()
+        });
-                .Enrich.WithProperty("ApplicationContext", AppName)
-                .Enrich.FromLogContext()
-                .WriteTo.Console()
-                .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
-                .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://localhost:8080" : logstashUrl)
-                .ReadFrom.Configuration(configuration)
-                .CreateLogger();
-        }
 
-        private static IConfiguration GetConfiguration()
+    Log.Information("Starting web host ({ApplicationContext})...", AppName);
-        {
+    host.Run();
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables();
 
-            var config = builder.Build();
+    return 0;
-
+}
-            if (config.GetValue<bool>("UseVault", false))
+catch (Exception ex)
-            {
+{
-                builder.AddAzureKeyVault(
+    Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", AppName);
-                    $"https://{config["Vault:Name"]}.vault.azure.net/",
+    return 1;
-                    config["Vault:ClientId"],
+}
-                    config["Vault:ClientSecret"]);
+finally
-            }
+{
-
+    Log.CloseAndFlush();
-            return builder.Build();
-        }
-
-    }
 }
 
+IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
+    WebHost.CreateDefaultBuilder(args)
+        .CaptureStartupErrors(false)
+        .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
+        .UseStartup<Startup>()
+        .UseContentRoot(Directory.GetCurrentDirectory())
+        .UseSerilog()
+        .Build();
+
+Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
+{
+    var seqServerUrl = configuration["Serilog:SeqServerUrl"];
+    var logstashUrl = configuration["Serilog:LogstashgUrl"];
+    return new LoggerConfiguration()
+        .MinimumLevel.Verbose()
+        .Enrich.WithProperty("ApplicationContext", AppName)
+        .Enrich.FromLogContext()
+        .WriteTo.Console()
+        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
+        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://localhost:8080" : logstashUrl)
+        .ReadFrom.Configuration(configuration)
+        .CreateLogger();
+}
+
+IConfiguration GetConfiguration()
+{
+    var builder = new ConfigurationBuilder()
+        .SetBasePath(Directory.GetCurrentDirectory())
+        .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+        .AddEnvironmentVariables();
+
+    var config = builder.Build();
+
+    if (config.GetValue<bool>("UseVault", false))
+    {
+        builder.AddAzureKeyVault(
+            $"https://{config["Vault:Name"]}.vault.azure.net/",
+            config["Vault:ClientId"],
+            config["Vault:ClientSecret"]);
+    }
+
+    return builder.Build();
+}