diff --git a/Gremlin_BlazorServer/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs b/Gremlin_BlazorServer/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs index 734d525..7cf19b1 100644 --- a/Gremlin_BlazorServer/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs +++ b/Gremlin_BlazorServer/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs @@ -15,14 +15,11 @@ namespace Gremlin_BlazorServer.Areas.Identity.Pages.Account private readonly UserManager _userManager; private readonly ILogger _logger; - public LoginWith2faModel( - SignInManager signInManager, - UserManager userManager, - ILogger logger) + public LoginWith2faModel(SignInManager signInManager, UserManager userManager, ILogger logger) { _signInManager = signInManager; - _userManager = userManager; - _logger = logger; + _userManager = userManager; + _logger = logger; } /// @@ -71,13 +68,7 @@ namespace Gremlin_BlazorServer.Areas.Identity.Pages.Account public async Task OnGetAsync(bool rememberMe, string returnUrl = null) { // Ensure the user has gone through the username & password screen first - IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); - - if (user == null) - { - throw new InvalidOperationException($"Unable to load two-factor authentication user."); - } - + _ = await _signInManager.GetTwoFactorAuthenticationUserAsync() ?? throw new InvalidOperationException($"Unable to load two-factor authentication user."); ReturnUrl = returnUrl; RememberMe = rememberMe; @@ -86,19 +77,11 @@ namespace Gremlin_BlazorServer.Areas.Identity.Pages.Account public async Task OnPostAsync(bool rememberMe, string returnUrl = null) { - if (!ModelState.IsValid) - { - return Page(); - } + if (!ModelState.IsValid) { return Page(); } returnUrl ??= Url.Content("~/"); - IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); - if (user == null) - { - throw new InvalidOperationException($"Unable to load two-factor authentication user."); - } - + IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync() ?? throw new InvalidOperationException($"Unable to load two-factor authentication user."); string authenticatorCode = Input.TwoFactorCode.Replace(" ", string.Empty).Replace("-", string.Empty); Microsoft.AspNetCore.Identity.SignInResult result = await _signInManager.TwoFactorAuthenticatorSignInAsync(authenticatorCode, rememberMe, Input.RememberMachine); diff --git a/Gremlin_BlazorServer/Areas/Identity/Pages/Shared/_LoginPartial.cshtml b/Gremlin_BlazorServer/Areas/Identity/Pages/Shared/_LoginPartial.cshtml index eda27e9..28777ff 100644 --- a/Gremlin_BlazorServer/Areas/Identity/Pages/Shared/_LoginPartial.cshtml +++ b/Gremlin_BlazorServer/Areas/Identity/Pages/Shared/_LoginPartial.cshtml @@ -1,10 +1,10 @@ @using Microsoft.AspNetCore.Identity -@inject SignInManager SignInManager -@inject UserManager UserManager +@inject SignInManager signInManager +@*@inject UserManager userManager*@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
    -@if (SignInManager.IsSignedIn(User)) +@if (signInManager.IsSignedIn(User)) {
  • Hello @User.Identity?.Name! diff --git a/Gremlin_BlazorServer/Data/ApplicationDbContext.cs b/Gremlin_BlazorServer/Data/BlazorAuthDb.cs similarity index 100% rename from Gremlin_BlazorServer/Data/ApplicationDbContext.cs rename to Gremlin_BlazorServer/Data/BlazorAuthDb.cs diff --git a/Gremlin_BlazorServer/Data/EntityClasses/Account.cs b/Gremlin_BlazorServer/Data/EntityClasses/Account.cs index 2c5ff37..b91eb4a 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/Account.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/Account.cs @@ -36,10 +36,10 @@ public DateTime DataModificationDate { get; set; } = DateTime.Now; public DateTime DataValidFrom { get; set; } = DateTime.Now; public DateTime DataValidUntil { get; set; } = DateTime.MaxValue; - public string DataModificationByUser { get; set; } = "Gremlin"; + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; public uint DataVersionNumber { get; set; } public string? DataVersionComment { get; set; } - public string? DataStatus { get; set; } + public string DataStatus { get; set; } = "Active"; //IBase //tbd diff --git a/Gremlin_BlazorServer/Data/EntityClasses/AccountType.cs b/Gremlin_BlazorServer/Data/EntityClasses/AccountType.cs index a89e938..fe9907f 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/AccountType.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/AccountType.cs @@ -20,9 +20,9 @@ namespace Gremlin_BlazorServer.Data.EntityClasses public DateTime DataModificationDate { get; set; } = DateTime.Now; public DateTime DataValidFrom { get; set; } = DateTime.Now; public DateTime DataValidUntil { get; set; } = DateTime.MaxValue; - public string? DataModificationByUser { get; set; } + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; public uint DataVersionNumber { get; set; } public string? DataVersionComment { get; set; } - public string? DataStatus { get; set; } + public string DataStatus { get; set; } = "Active"; } } diff --git a/Gremlin_BlazorServer/Data/EntityClasses/Contact.cs b/Gremlin_BlazorServer/Data/EntityClasses/Contact.cs index adafdd6..37f2464 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/Contact.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/Contact.cs @@ -47,7 +47,7 @@ public DateTime DataModificationDate { get; set; } = DateTime.Now; public DateTime DataValidFrom { get; set; } = DateTime.Now; public DateTime DataValidUntil { get; set; } = DateTime.MaxValue; - public string? DataModificationByUser { get; set; } + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; public uint DataVersionNumber { get; set; } public string? DataVersionComment { get; set; } public string DataStatus { get; set; } = "Active"; diff --git a/Gremlin_BlazorServer/Data/EntityClasses/CustomDescription.cs b/Gremlin_BlazorServer/Data/EntityClasses/CustomDescription.cs index 327606f..51ab8b0 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/CustomDescription.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/CustomDescription.cs @@ -29,7 +29,7 @@ public DateTime DataModificationDate { get; set; } = DateTime.Now; public DateTime DataValidFrom { get; set; } = DateTime.Now; public DateTime DataValidUntil { get; set; } = DateTime.MaxValue; - public string? DataModificationByUser { get; set; } + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; public uint DataVersionNumber { get; set; } public string? DataVersionComment { get; set; } public string DataStatus { get; set; } = "Active"; diff --git a/Gremlin_BlazorServer/Data/EntityClasses/IMetadata.cs b/Gremlin_BlazorServer/Data/EntityClasses/IMetadata.cs index 4db7a0d..6ccdf00 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/IMetadata.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/IMetadata.cs @@ -3,7 +3,7 @@ public interface IMetadata { DateTime DataCreationDate { get; set; } - string? DataModificationByUser { get; set; } + string DataModificationByUser { get; set; } DateTime DataModificationDate { get; set; } string DataStatus { get; set; } DateTime DataValidFrom { get; set; } diff --git a/Gremlin_BlazorServer/Data/EntityClasses/LineItem.cs b/Gremlin_BlazorServer/Data/EntityClasses/LineItem.cs index 4ae6ccf..1fae90a 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/LineItem.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/LineItem.cs @@ -31,9 +31,9 @@ //metadata: public DateTime DataCreationDate { get; set; } = DateTime.Now; - public string? DataModificationByUser { get; set; } + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; public DateTime DataModificationDate { get; set; } = DateTime.Now; - public string? DataStatus { get; set; } + public string DataStatus { get; set; } = "Active"; public DateTime DataValidFrom { get; set; } = DateTime.Now; public DateTime DataValidUntil { get; set; } = DateTime.MaxValue; public string? DataVersionComment { get; set; } diff --git a/Gremlin_BlazorServer/Data/EntityClasses/Product.cs b/Gremlin_BlazorServer/Data/EntityClasses/Product.cs index 7502694..c1c0408 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/Product.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/Product.cs @@ -31,7 +31,7 @@ public DateTime DataModificationDate { get; set; } = DateTime.Now; public DateTime DataValidFrom { get; set; } = DateTime.Now; public DateTime DataValidUntil { get; set; } = DateTime.MaxValue; - public string? DataModificationByUser { get; set; } + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; public uint DataVersionNumber { get; set; } public string? DataVersionComment { get; set; } public string DataStatus { get; set; } = "Active"; diff --git a/Gremlin_BlazorServer/Data/EntityClasses/ProductLine.cs b/Gremlin_BlazorServer/Data/EntityClasses/ProductLine.cs index f8b5d48..8008e52 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/ProductLine.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/ProductLine.cs @@ -20,9 +20,9 @@ namespace Gremlin_BlazorServer.Data.EntityClasses public DateTime DataModificationDate { get; set; } = DateTime.Now; public DateTime DataValidFrom { get; set; } = DateTime.Now; public DateTime DataValidUntil { get; set; } = DateTime.MaxValue; - public string? DataModificationByUser { get; set; } + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; public uint DataVersionNumber { get; set; } public string? DataVersionComment { get; set; } - public string? DataStatus { get; set; } + public string DataStatus { get; set; } = "Active"; } } diff --git a/Gremlin_BlazorServer/Data/EntityClasses/Quote.cs b/Gremlin_BlazorServer/Data/EntityClasses/Quote.cs index ad178f6..791ec4b 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/Quote.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/Quote.cs @@ -44,7 +44,7 @@ //metadata: public DateTime DataCreationDate { get; set; } = DateTime.Now; - public string? DataModificationByUser { get; set; } + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; public DateTime DataModificationDate { get; set; } = DateTime.Now; public string DataStatus { get; set; } = "Active"; public DateTime DataValidFrom { get; set; } = DateTime.Now; diff --git a/Gremlin_BlazorServer/Data/EntityClasses/RUSettings.cs b/Gremlin_BlazorServer/Data/EntityClasses/RUSettings.cs index 2309586..a4932ec 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/RUSettings.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/RUSettings.cs @@ -20,7 +20,7 @@ //metadata (subset of IMetadata) public DateTime DataCreationDate { get; set; } = DateTime.Now; public DateTime DataModificationDate { get; set; } = DateTime.Now; - public string DataModificationByUser { get; set; } = string.Empty; + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; protected virtual void Dispose(bool disposing) { diff --git a/Gremlin_BlazorServer/Data/EntityClasses/RegisteredUser.cs b/Gremlin_BlazorServer/Data/EntityClasses/RegisteredUser.cs index 12684a4..f45bc62 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/RegisteredUser.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/RegisteredUser.cs @@ -15,6 +15,6 @@ //metadata (subset of IMetadata) public DateTime DataCreationDate { get; set; } = DateTime.Now; public DateTime DataModificationDate { get; set; } = DateTime.Now; - public string? DataModificationByUser { get; set; } + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; } } diff --git a/Gremlin_BlazorServer/Data/EntityClasses/SubMarket.cs b/Gremlin_BlazorServer/Data/EntityClasses/SubMarket.cs index 0f3a948..31f23e8 100644 --- a/Gremlin_BlazorServer/Data/EntityClasses/SubMarket.cs +++ b/Gremlin_BlazorServer/Data/EntityClasses/SubMarket.cs @@ -19,9 +19,9 @@ namespace Gremlin_BlazorServer.Data.EntityClasses public DateTime DataModificationDate { get; set; } = DateTime.Now; public DateTime DataValidFrom { get; set; } = DateTime.Now; public DateTime DataValidUntil { get; set; } = DateTime.MaxValue; - public string? DataModificationByUser { get; set; } + public string DataModificationByUser { get; set; } = "Gremlin_BlazorServer"; public uint DataVersionNumber { get; set; } public string? DataVersionComment { get; set; } - public string? DataStatus { get; set; } + public string DataStatus { get; set; } = "Active"; } } diff --git a/Gremlin_BlazorServer/Gremlin_BlazorServer.csproj b/Gremlin_BlazorServer/Gremlin_BlazorServer.csproj index 150ee7f..abd2b89 100644 --- a/Gremlin_BlazorServer/Gremlin_BlazorServer.csproj +++ b/Gremlin_BlazorServer/Gremlin_BlazorServer.csproj @@ -6,6 +6,17 @@ enable a9d669d0-1af5-4bf8-912f-fb7ba89262fb Linux + False + + + + + + + + + + @@ -13,6 +24,7 @@ + @@ -26,7 +38,7 @@ - + diff --git a/Gremlin_BlazorServer/Migrations/20230117163307_InitialCreate.cs b/Gremlin_BlazorServer/Migrations/20230117163307_InitialCreate.cs deleted file mode 100644 index 341a064..0000000 --- a/Gremlin_BlazorServer/Migrations/20230117163307_InitialCreate.cs +++ /dev/null @@ -1,738 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace GremlinBlazorServer.Migrations -{ - /// - public partial class InitialCreate : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - _ = migrationBuilder.DropIndex( - name: "UserNameIndex", - table: "AspNetUsers"); - - _ = migrationBuilder.DropIndex( - name: "RoleNameIndex", - table: "AspNetRoles"); - - _ = migrationBuilder.AlterColumn( - name: "Value", - table: "AspNetUserTokens", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "Name", - table: "AspNetUserTokens", - type: "varchar(128)", - maxLength: 128, - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(128)", - oldMaxLength: 128) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "LoginProvider", - table: "AspNetUserTokens", - type: "varchar(128)", - maxLength: 128, - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(128)", - oldMaxLength: 128) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserId", - table: "AspNetUserTokens", - type: "varchar(255)", - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(450)") - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserName", - table: "AspNetUsers", - type: "varchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(256)", - oldMaxLength: 256, - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "TwoFactorEnabled", - table: "AspNetUsers", - type: "tinyint(1)", - nullable: false, - oldClrType: typeof(ulong), - oldType: "bit"); - - _ = migrationBuilder.AlterColumn( - name: "SecurityStamp", - table: "AspNetUsers", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "PhoneNumberConfirmed", - table: "AspNetUsers", - type: "tinyint(1)", - nullable: false, - oldClrType: typeof(ulong), - oldType: "bit"); - - _ = migrationBuilder.AlterColumn( - name: "PhoneNumber", - table: "AspNetUsers", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "PasswordHash", - table: "AspNetUsers", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "NormalizedUserName", - table: "AspNetUsers", - type: "varchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(256)", - oldMaxLength: 256, - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "NormalizedEmail", - table: "AspNetUsers", - type: "varchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(256)", - oldMaxLength: 256, - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "LockoutEnd", - table: "AspNetUsers", - type: "datetime(6)", - nullable: true, - oldClrType: typeof(DateTimeOffset), - oldType: "datetimeoffset(6)", - oldNullable: true); - - _ = migrationBuilder.AlterColumn( - name: "LockoutEnabled", - table: "AspNetUsers", - type: "tinyint(1)", - nullable: false, - oldClrType: typeof(ulong), - oldType: "bit"); - - _ = migrationBuilder.AlterColumn( - name: "EmailConfirmed", - table: "AspNetUsers", - type: "tinyint(1)", - nullable: false, - oldClrType: typeof(ulong), - oldType: "bit"); - - _ = migrationBuilder.AlterColumn( - name: "Email", - table: "AspNetUsers", - type: "varchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(256)", - oldMaxLength: 256, - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ConcurrencyStamp", - table: "AspNetUsers", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "Id", - table: "AspNetUsers", - type: "varchar(255)", - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(450)") - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "RoleId", - table: "AspNetUserRoles", - type: "varchar(255)", - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(450)") - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserId", - table: "AspNetUserRoles", - type: "varchar(255)", - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(450)") - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserId", - table: "AspNetUserLogins", - type: "varchar(255)", - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(450)") - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ProviderDisplayName", - table: "AspNetUserLogins", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ProviderKey", - table: "AspNetUserLogins", - type: "varchar(128)", - maxLength: 128, - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(128)", - oldMaxLength: 128) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "LoginProvider", - table: "AspNetUserLogins", - type: "varchar(128)", - maxLength: 128, - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(128)", - oldMaxLength: 128) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserId", - table: "AspNetUserClaims", - type: "varchar(255)", - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(450)") - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ClaimValue", - table: "AspNetUserClaims", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ClaimType", - table: "AspNetUserClaims", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "NormalizedName", - table: "AspNetRoles", - type: "varchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(256)", - oldMaxLength: 256, - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "Name", - table: "AspNetRoles", - type: "varchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(256)", - oldMaxLength: 256, - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ConcurrencyStamp", - table: "AspNetRoles", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "Id", - table: "AspNetRoles", - type: "varchar(255)", - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(450)") - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "RoleId", - table: "AspNetRoleClaims", - type: "varchar(255)", - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(450)") - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ClaimValue", - table: "AspNetRoleClaims", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ClaimType", - table: "AspNetRoleClaims", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.CreateIndex( - name: "UserNameIndex", - table: "AspNetUsers", - column: "NormalizedUserName", - unique: true); - - _ = migrationBuilder.CreateIndex( - name: "RoleNameIndex", - table: "AspNetRoles", - column: "NormalizedName", - unique: true); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - _ = migrationBuilder.DropIndex( - name: "UserNameIndex", - table: "AspNetUsers"); - - _ = migrationBuilder.DropIndex( - name: "RoleNameIndex", - table: "AspNetRoles"); - - _ = migrationBuilder.AlterColumn( - name: "Value", - table: "AspNetUserTokens", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "Name", - table: "AspNetUserTokens", - type: "nvarchar(128)", - maxLength: 128, - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(128)", - oldMaxLength: 128) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "LoginProvider", - table: "AspNetUserTokens", - type: "nvarchar(128)", - maxLength: 128, - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(128)", - oldMaxLength: 128) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserId", - table: "AspNetUserTokens", - type: "nvarchar(450)", - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(255)") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserName", - table: "AspNetUsers", - type: "nvarchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(256)", - oldMaxLength: 256, - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "TwoFactorEnabled", - table: "AspNetUsers", - type: "bit", - nullable: false, - oldClrType: typeof(bool), - oldType: "tinyint(1)"); - - _ = migrationBuilder.AlterColumn( - name: "SecurityStamp", - table: "AspNetUsers", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "PhoneNumberConfirmed", - table: "AspNetUsers", - type: "bit", - nullable: false, - oldClrType: typeof(bool), - oldType: "tinyint(1)"); - - _ = migrationBuilder.AlterColumn( - name: "PhoneNumber", - table: "AspNetUsers", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "PasswordHash", - table: "AspNetUsers", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "NormalizedUserName", - table: "AspNetUsers", - type: "nvarchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(256)", - oldMaxLength: 256, - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "NormalizedEmail", - table: "AspNetUsers", - type: "nvarchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(256)", - oldMaxLength: 256, - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "LockoutEnd", - table: "AspNetUsers", - type: "datetimeoffset(6)", - nullable: true, - oldClrType: typeof(DateTimeOffset), - oldType: "datetime(6)", - oldNullable: true); - - _ = migrationBuilder.AlterColumn( - name: "LockoutEnabled", - table: "AspNetUsers", - type: "bit", - nullable: false, - oldClrType: typeof(bool), - oldType: "tinyint(1)"); - - _ = migrationBuilder.AlterColumn( - name: "EmailConfirmed", - table: "AspNetUsers", - type: "bit", - nullable: false, - oldClrType: typeof(bool), - oldType: "tinyint(1)"); - - _ = migrationBuilder.AlterColumn( - name: "Email", - table: "AspNetUsers", - type: "nvarchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(256)", - oldMaxLength: 256, - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ConcurrencyStamp", - table: "AspNetUsers", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "Id", - table: "AspNetUsers", - type: "nvarchar(450)", - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(255)") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "RoleId", - table: "AspNetUserRoles", - type: "nvarchar(450)", - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(255)") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserId", - table: "AspNetUserRoles", - type: "nvarchar(450)", - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(255)") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserId", - table: "AspNetUserLogins", - type: "nvarchar(450)", - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(255)") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ProviderDisplayName", - table: "AspNetUserLogins", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ProviderKey", - table: "AspNetUserLogins", - type: "nvarchar(128)", - maxLength: 128, - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(128)", - oldMaxLength: 128) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "LoginProvider", - table: "AspNetUserLogins", - type: "nvarchar(128)", - maxLength: 128, - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(128)", - oldMaxLength: 128) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "UserId", - table: "AspNetUserClaims", - type: "nvarchar(450)", - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(255)") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ClaimValue", - table: "AspNetUserClaims", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ClaimType", - table: "AspNetUserClaims", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "NormalizedName", - table: "AspNetRoles", - type: "nvarchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(256)", - oldMaxLength: 256, - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "Name", - table: "AspNetRoles", - type: "nvarchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(256)", - oldMaxLength: 256, - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ConcurrencyStamp", - table: "AspNetRoles", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "Id", - table: "AspNetRoles", - type: "nvarchar(450)", - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(255)") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "RoleId", - table: "AspNetRoleClaims", - type: "nvarchar(450)", - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(255)") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ClaimValue", - table: "AspNetRoleClaims", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.AlterColumn( - name: "ClaimType", - table: "AspNetRoleClaims", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true) - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - _ = migrationBuilder.CreateIndex( - name: "UserNameIndex", - table: "AspNetUsers", - column: "NormalizedUserName", - unique: true, - filter: "[NormalizedUserName] IS NOT NULL"); - - _ = migrationBuilder.CreateIndex( - name: "RoleNameIndex", - table: "AspNetRoles", - column: "NormalizedName", - unique: true, - filter: "[NormalizedName] IS NOT NULL"); - } - } -} diff --git a/Gremlin_BlazorServer/Migrations/20230117163307_InitialCreate.Designer.cs b/Gremlin_BlazorServer/Migrations/20230118080017_InitialCreate.Designer.cs similarity index 99% rename from Gremlin_BlazorServer/Migrations/20230117163307_InitialCreate.Designer.cs rename to Gremlin_BlazorServer/Migrations/20230118080017_InitialCreate.Designer.cs index 5310dc0..5609550 100644 --- a/Gremlin_BlazorServer/Migrations/20230117163307_InitialCreate.Designer.cs +++ b/Gremlin_BlazorServer/Migrations/20230118080017_InitialCreate.Designer.cs @@ -8,10 +8,10 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace GremlinBlazorServer.Migrations +namespace Gremlin_BlazorServer.Migrations { [DbContext(typeof(BlazorAuthDb))] - [Migration("20230117163307_InitialCreate")] + [Migration("20230118080017_InitialCreate")] partial class InitialCreate { /// diff --git a/Gremlin_BlazorServer/Migrations/20230118080017_InitialCreate.cs b/Gremlin_BlazorServer/Migrations/20230118080017_InitialCreate.cs new file mode 100644 index 0000000..d42b0d4 --- /dev/null +++ b/Gremlin_BlazorServer/Migrations/20230118080017_InitialCreate.cs @@ -0,0 +1,262 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Gremlin_BlazorServer.Migrations +{ + /// + public partial class InitialCreate : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterDatabase() + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "AspNetRoles", + columns: table => new + { + Id = table.Column(type: "varchar(255)", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Name = table.Column(type: "varchar(256)", maxLength: 256, nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + NormalizedName = table.Column(type: "varchar(256)", maxLength: 256, nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + ConcurrencyStamp = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoles", x => x.Id); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "AspNetUsers", + columns: table => new + { + Id = table.Column(type: "varchar(255)", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + UserName = table.Column(type: "varchar(256)", maxLength: 256, nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + NormalizedUserName = table.Column(type: "varchar(256)", maxLength: 256, nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + Email = table.Column(type: "varchar(256)", maxLength: 256, nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + NormalizedEmail = table.Column(type: "varchar(256)", maxLength: 256, nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + EmailConfirmed = table.Column(type: "tinyint(1)", nullable: false), + PasswordHash = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + SecurityStamp = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + ConcurrencyStamp = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + PhoneNumber = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + PhoneNumberConfirmed = table.Column(type: "tinyint(1)", nullable: false), + TwoFactorEnabled = table.Column(type: "tinyint(1)", nullable: false), + LockoutEnd = table.Column(type: "datetime(6)", nullable: true), + LockoutEnabled = table.Column(type: "tinyint(1)", nullable: false), + AccessFailedCount = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUsers", x => x.Id); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "AspNetRoleClaims", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + RoleId = table.Column(type: "varchar(255)", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + ClaimType = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + ClaimValue = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "AspNetUserClaims", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + UserId = table.Column(type: "varchar(255)", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + ClaimType = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + ClaimValue = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetUserClaims_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "AspNetUserLogins", + columns: table => new + { + LoginProvider = table.Column(type: "varchar(128)", maxLength: 128, nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + ProviderKey = table.Column(type: "varchar(128)", maxLength: 128, nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + ProviderDisplayName = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + UserId = table.Column(type: "varchar(255)", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); + table.ForeignKey( + name: "FK_AspNetUserLogins_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "AspNetUserRoles", + columns: table => new + { + UserId = table.Column(type: "varchar(255)", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + RoleId = table.Column(type: "varchar(255)", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "AspNetUserTokens", + columns: table => new + { + UserId = table.Column(type: "varchar(255)", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + LoginProvider = table.Column(type: "varchar(128)", maxLength: 128, nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Name = table.Column(type: "varchar(128)", maxLength: 128, nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Value = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); + table.ForeignKey( + name: "FK_AspNetUserTokens_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetRoleClaims_RoleId", + table: "AspNetRoleClaims", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "RoleNameIndex", + table: "AspNetRoles", + column: "NormalizedName", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserClaims_UserId", + table: "AspNetUserClaims", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserLogins_UserId", + table: "AspNetUserLogins", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserRoles_RoleId", + table: "AspNetUserRoles", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "EmailIndex", + table: "AspNetUsers", + column: "NormalizedEmail"); + + migrationBuilder.CreateIndex( + name: "UserNameIndex", + table: "AspNetUsers", + column: "NormalizedUserName", + unique: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AspNetRoleClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserLogins"); + + migrationBuilder.DropTable( + name: "AspNetUserRoles"); + + migrationBuilder.DropTable( + name: "AspNetUserTokens"); + + migrationBuilder.DropTable( + name: "AspNetRoles"); + + migrationBuilder.DropTable( + name: "AspNetUsers"); + } + } +} diff --git a/Gremlin_BlazorServer/Migrations/AspNetUsers.sql b/Gremlin_BlazorServer/Migrations/AspNetUsers.sql deleted file mode 100644 index 2db3e1f..0000000 --- a/Gremlin_BlazorServer/Migrations/AspNetUsers.sql +++ /dev/null @@ -1,37 +0,0 @@ -SET QUOTED_IDENTIFIER ON -GO - -CREATE TABLE [dbo].[AspNetUsers] ( - [Id] NVARCHAR (450) NOT NULL, - [UserName] NVARCHAR (256) NULL, - [NormalizedUserName] NVARCHAR (256) NULL, - [Email] NVARCHAR (256) NULL, - [NormalizedEmail] NVARCHAR (256) NULL, - [EmailConfirmed] BIT NOT NULL, - [PasswordHash] NVARCHAR (MAX) NULL, - [SecurityStamp] NVARCHAR (MAX) NULL, - [ConcurrencyStamp] NVARCHAR (MAX) NULL, - [PhoneNumber] NVARCHAR (MAX) NULL, - [PhoneNumberConfirmed] BIT NOT NULL, - [TwoFactorEnabled] BIT NOT NULL, - [LockoutEnd] DATETIMEOFFSET (7) NULL, - [LockoutEnabled] BIT NOT NULL, - [AccessFailedCount] INT NOT NULL -); - - -GO -CREATE NONCLUSTERED INDEX [EmailIndex] - ON [dbo].[AspNetUsers]([NormalizedEmail] ASC); - - -GO -CREATE UNIQUE NONCLUSTERED INDEX [UserNameIndex] - ON [dbo].[AspNetUsers]([NormalizedUserName] ASC) WHERE ([NormalizedUserName] IS NOT NULL); - - -GO -ALTER TABLE [dbo].[AspNetUsers] - ADD CONSTRAINT [PK_AspNetUsers] PRIMARY KEY CLUSTERED ([Id] ASC); - - diff --git a/Gremlin_BlazorServer/GremlinBlazorServer/Migrations/BlazorAuthDbModelSnapshot.cs b/Gremlin_BlazorServer/Migrations/BlazorAuthDbModelSnapshot.cs similarity index 99% rename from Gremlin_BlazorServer/GremlinBlazorServer/Migrations/BlazorAuthDbModelSnapshot.cs rename to Gremlin_BlazorServer/Migrations/BlazorAuthDbModelSnapshot.cs index ad250e0..10dff20 100644 --- a/Gremlin_BlazorServer/GremlinBlazorServer/Migrations/BlazorAuthDbModelSnapshot.cs +++ b/Gremlin_BlazorServer/Migrations/BlazorAuthDbModelSnapshot.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace GremlinBlazorServer.Migrations +namespace Gremlin_BlazorServer.Migrations { [DbContext(typeof(BlazorAuthDb))] partial class BlazorAuthDbModelSnapshot : ModelSnapshot diff --git a/Gremlin_BlazorServer/Migrations/dbo.AspNetUsers.data.sql b/Gremlin_BlazorServer/Migrations/dbo.AspNetUsers.data.sql deleted file mode 100644 index 73a4b68..0000000 --- a/Gremlin_BlazorServer/Migrations/dbo.AspNetUsers.data.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT INTO [AspNetUsers] ([Id], [UserName], [NormalizedUserName], [Email], [NormalizedEmail], [EmailConfirmed], [PasswordHash], [SecurityStamp], [ConcurrencyStamp], [PhoneNumber], [PhoneNumberConfirmed], [TwoFactorEnabled], [LockoutEnd], [LockoutEnabled], [AccessFailedCount]) VALUES (N'44c5253a-52a1-4147-b280-7211d076e2eb', N'sascha@woitschetzki.de', N'SASCHA@WOITSCHETZKI.DE', N'sascha@woitschetzki.de', N'SASCHA@WOITSCHETZKI.DE', 1, N'AQAAAAIAAYagAAAAEMlw+bwiask31kpxmshQEXoBVbvZgGD3RyX9yvTdtKK4WCKqmLOBnGFbTcepUQabZw==', N'5TO5XR7JMXPUUPY2CZ44UGMO222CKAYP', N'9d8b8c88-5847-4449-af12-c5380aa9ae89', N'+4917622285334', 0, 1, NULL, 1, 0) diff --git a/Gremlin_BlazorServer/Migrations/migration.sql b/Gremlin_BlazorServer/Migrations/migration.sql deleted file mode 100644 index 81cfc56..0000000 --- a/Gremlin_BlazorServer/Migrations/migration.sql +++ /dev/null @@ -1,37 +0,0 @@ -CREATE TABLE IF NOT EXISTS `__EFMigrationsHistory` ( - `MigrationId` varchar(150) CHARACTER SET utf8mb4 NOT NULL, - `ProductVersion` varchar(32) CHARACTER SET utf8mb4 NOT NULL, - CONSTRAINT `PK___EFMigrationsHistory` PRIMARY KEY (`MigrationId`) -) CHARACTER SET=utf8mb4; - -START TRANSACTION; - -CREATE TABLE IF NOT EXISTS `AspNetUsers`; -ALTER TABLE `AspNetUsers` DROP INDEX `UserNameIndex`; - -CREATE TABLE IF NOT EXISTS `AspNetRoles`; -ALTER TABLE `AspNetRoles` DROP INDEX `RoleNameIndex`; - -CREATE TABLE `AspNetUserTokens` (`Value` longtext CHARACTER SET utf8mb4 NULL, `Name` varchar(128) CHARACTER SET utf8mb4 NOT NULL, `LoginProvider` varchar(128) CHARACTER SET utf8mb4 NOT NULL, `UserId` varchar(255) CHARACTER SET utf8mb4 NOT NULL); - -CREATE TABLE `AspNetUsers` (`UserName` varchar(256) CHARACTER SET utf8mb4 NULL,`TwoFactorEnabled` tinyint(1) NOT NULL,`SecurityStamp` longtext CHARACTER SET utf8mb4 NULL,`PhoneNumberConfirmed` tinyint(1) NOT NULL,`PhoneNumber` longtext CHARACTER SET utf8mb4 NULL,`PasswordHash` longtext CHARACTER SET utf8mb4 NULL,`NormalizedUserName` varchar(256) CHARACTER SET utf8mb4 NULL,`NormalizedEmail` varchar(256) CHARACTER SET utf8mb4 NULL,`LockoutEnd` datetime(6) NULL,`LockoutEnabled` tinyint(1) NOT NULL,`EmailConfirmed` tinyint(1) NOT NULL,`Email` varchar(256) CHARACTER SET utf8mb4 NULL,`ConcurrencyStamp` longtext CHARACTER SET utf8mb4 NULL,`Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL); - -CREATE TABLE `AspNetUserRoles` (`RoleId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, `UserId` varchar(255) CHARACTER SET utf8mb4 NOT NULL); - -CREATE TABLE `AspNetUserLogins` (`UserId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, `ProviderDisplayName` longtext CHARACTER SET utf8mb4 NULL, `ProviderKey` varchar(128) CHARACTER SET utf8mb4 NOT NULL, `LoginProvider` varchar(128) CHARACTER SET utf8mb4 NOT NULL); - -CREATE TABLE `AspNetUserClaims` (`UserId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, `ClaimValue` longtext CHARACTER SET utf8mb4 NULL, `ClaimType` longtext CHARACTER SET utf8mb4 NULL); - -CREATE TABLE `AspNetRoles` (`NormalizedName` varchar(256) CHARACTER SET utf8mb4 NULL, - `Name` varchar(256) CHARACTER SET utf8mb4 NULL, - `ConcurrencyStamp` longtext CHARACTER SET utf8mb4 NULL, - `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL); - -CREATE TABLE `AspNetRoleClaims` (`RoleId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, `ClaimValue` longtext CHARACTER SET utf8mb4 NULL, `ClaimType` longtext CHARACTER SET utf8mb4 NULL); - -CREATE UNIQUE INDEX `UserNameIndex` ON `AspNetUsers` (`NormalizedUserName`); -CREATE UNIQUE INDEX `RoleNameIndex` ON `AspNetRoles` (`NormalizedName`); - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20230117163307_InitialCreate', '7.0.2'); - diff --git a/Gremlin_BlazorServer/Pages/Accounts/AccountIndex.razor b/Gremlin_BlazorServer/Pages/Accounts/AccountIndex.razor index 7b72c08..acff871 100644 --- a/Gremlin_BlazorServer/Pages/Accounts/AccountIndex.razor +++ b/Gremlin_BlazorServer/Pages/Accounts/AccountIndex.razor @@ -38,24 +38,25 @@ @code { [CascadingParameter] - private Task authenticationStateTask { get; set; } + private Task? authenticationStateTask { get; set; } - private IList accounts; - private Account selectedAccount; + private IList? accounts; + private Account? selectedAccount; protected override async Task OnInitializedAsync() { - var user = (await authenticationStateTask).User; - - if (user.Identity.IsAuthenticated) + if (authenticationStateTask != null) { - accounts = GenericController.GetAll(); - selectedAccount = accounts.First(); + var user = (await authenticationStateTask).User; + + if (user.Identity != null && user.Identity.IsAuthenticated) + { + accounts = GenericController.GetAll(); + selectedAccount = accounts.First(); + } } } - private async Task OnSelectedAccountChanged(Account sA) - { - selectedAccount = sA; - } + private void OnSelectedAccountChanged(Account sA) => selectedAccount = sA; + } \ No newline at end of file diff --git a/Gremlin_BlazorServer/Pages/Shared/_LoginPartial.cshtml b/Gremlin_BlazorServer/Pages/Shared/_LoginPartial.cshtml deleted file mode 100644 index 1668c4a..0000000 --- a/Gremlin_BlazorServer/Pages/Shared/_LoginPartial.cshtml +++ /dev/null @@ -1,27 +0,0 @@ -@using Microsoft.AspNetCore.Identity - -@inject SignInManager SignInManager -@inject UserManager UserManager - - diff --git a/Gremlin_BlazorServer/Pages/Shared/_ValidationScriptsPartial.cshtml b/Gremlin_BlazorServer/Pages/Shared/_ValidationScriptsPartial.cshtml deleted file mode 100644 index efa2d88..0000000 --- a/Gremlin_BlazorServer/Pages/Shared/_ValidationScriptsPartial.cshtml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/Gremlin_BlazorServer/Pages/_ViewImports.cshtml b/Gremlin_BlazorServer/Pages/_ViewImports.cshtml deleted file mode 100644 index 0ee2253..0000000 --- a/Gremlin_BlazorServer/Pages/_ViewImports.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@using Microsoft.AspNetCore.Identity -@using Gremlin_BlazorServer.Areas.Identity - - -Gremlin_BlazorServer.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/Gremlin_BlazorServer/Program.cs b/Gremlin_BlazorServer/Program.cs index 111ad33..c684ccd 100644 --- a/Gremlin_BlazorServer/Program.cs +++ b/Gremlin_BlazorServer/Program.cs @@ -29,7 +29,6 @@ builder.Services.AddScoped>(); builder.Services.AddScoped(); builder.Services.AddScoped(); -builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddBlazorise(options => { options.Immediate = true; }).AddBootstrapProviders().AddFontAwesomeIcons(); @@ -40,10 +39,10 @@ string connection = "server0"; string connectionString = builder.Configuration.GetConnectionString(connection) ?? throw new InvalidOperationException($"Connection string '{connection}' not found."); ServerVersion serverVersion = ServerVersion.AutoDetect(connectionString); builder.Services.AddDbContext(options => options.UseMySql(connectionString, serverVersion)); -// - builder.Services.AddDefaultIdentity(options => options.SignIn.RequireConfirmedAccount = true).AddEntityFrameworkStores(); builder.Services.AddScoped>(); +builder.Services.AddControllersWithViews(); +// builder.WebHost.UseWebRoot("wwwroot"); builder.WebHost.UseStaticWebAssets(); diff --git a/Gremlin_BlazorServer/Services/LoginService.cs b/Gremlin_BlazorServer/Services/LoginService.cs deleted file mode 100644 index 001d9cd..0000000 --- a/Gremlin_BlazorServer/Services/LoginService.cs +++ /dev/null @@ -1,70 +0,0 @@ -using Gremlin_BlazorServer.Data.DBClasses; -using Gremlin_BlazorServer.Data.EntityClasses; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.EntityFrameworkCore; -using System.Diagnostics; - -namespace Gremlin_BlazorServer.Services; - -public class LoginService -{ - private readonly GremlinDb gremlinDb; - - public LoginService(GremlinDb gC) - { - gremlinDb = gC; - } - - private Task AuthenticationStateTask { get; set; } = default!; - - public void ConfigureServices(IServiceCollection services) - { - _ = services.AddDbContext(ServiceLifetime.Scoped); - } - - public async Task> GetAllRegisteredUserAsync() - { - return await gremlinDb.RegisteredUser.ToListAsync(); - } - - public async Task InsertRegisteredUserAsync(RegisteredUser registeredUser) - { - try - { - _ = await gremlinDb.RegisteredUser.AddAsync(registeredUser); - _ = await gremlinDb.SaveChangesAsync(); - return true; - } - catch (Exception exception) - { - Debug.WriteLine(exception.Message); - return false; - } - } - - private async Task GetRegisteredUserAsync(string registeredUserName) - { - return await gremlinDb.RegisteredUser.FirstOrDefaultAsync(rU => rU.UserName.Equals(registeredUserName)); - } - - public async Task UpdateRegisteredUserAsync(RegisteredUser registeredUser) - { - _ = gremlinDb.RegisteredUser.Update(registeredUser); - _ = await gremlinDb.SaveChangesAsync(); - return true; - } - - public async Task DeleteRegisteredUserAsync(RegisteredUser registeredUser) - { - _ = gremlinDb.Remove(registeredUser); - _ = await gremlinDb.SaveChangesAsync(); - return true; - } - - public async Task ValidateUserAsync(RegisteredUser registeredUser) - { - _ = await Task.Run(() => GetRegisteredUserAsync(registeredUser.UserName)); - AuthenticationState authState = await AuthenticationStateTask; - return authState.User.Identity is { IsAuthenticated: true }; - } -} \ No newline at end of file diff --git a/Gremlin_BlazorServer/Services/TexService.cs b/Gremlin_BlazorServer/Services/TexService.cs index f3f925a..a3c1304 100644 --- a/Gremlin_BlazorServer/Services/TexService.cs +++ b/Gremlin_BlazorServer/Services/TexService.cs @@ -17,7 +17,7 @@ namespace Gremlin_BlazorServer.Services return new(correctedTex); } - private StringBuilder CreateBriefkopf(Contact recipient, bool tex = false) + private static StringBuilder CreateBriefkopf(Contact recipient, bool tex = false) { StringBuilder briefkopf = new(); diff --git a/Gremlin_BlazorServer/libman.json b/Gremlin_BlazorServer/libman.json new file mode 100644 index 0000000..ceee271 --- /dev/null +++ b/Gremlin_BlazorServer/libman.json @@ -0,0 +1,5 @@ +{ + "version": "1.0", + "defaultProvider": "cdnjs", + "libraries": [] +} \ No newline at end of file