diff --git a/SecurityService.DataTransferObjects/SecurityService.DataTransferObjects.csproj b/SecurityService.DataTransferObjects/SecurityService.DataTransferObjects.csproj index 55e8c2fd..f4313680 100644 --- a/SecurityService.DataTransferObjects/SecurityService.DataTransferObjects.csproj +++ b/SecurityService.DataTransferObjects/SecurityService.DataTransferObjects.csproj @@ -1,7 +1,7 @@ - + - net7.0;netstandard2.0 + net8.0;netstandard2.0 diff --git a/SecurityService.Database/SecurityService.Database.csproj b/SecurityService.Database/SecurityService.Database.csproj index 807c0a41..3a46379f 100644 --- a/SecurityService.Database/SecurityService.Database.csproj +++ b/SecurityService.Database/SecurityService.Database.csproj @@ -22,7 +22,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/SecurityService.sln b/SecurityService.sln index cda879f8..5a076c2f 100644 --- a/SecurityService.sln +++ b/SecurityService.sln @@ -29,8 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityService.OpenIdConne EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityService.SqlServerMigrations", "SecurityService.SqlServerMigrations\SecurityService.SqlServerMigrations.csproj", "{06507A50-DFDF-4842-9BA4-F70F194741D7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityService.MySqlMigrations", "SecurityService.MySqlMigrations\SecurityService.MySqlMigrations.csproj", "{701F392A-0D5B-4FDD-8135-DA037ECA7A8F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityService.UserInterface", "SecurityService.UserInterface\SecurityService.UserInterface.csproj", "{DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecurityService.IntegrationTesting.Helpers", "SecurityService.IntegrationTesting.Helpers\SecurityService.IntegrationTesting.Helpers.csproj", "{A06BD7CA-6CAF-48DE-BF78-D3772927951B}" @@ -85,10 +83,6 @@ Global {06507A50-DFDF-4842-9BA4-F70F194741D7}.Debug|Any CPU.Build.0 = Debug|Any CPU {06507A50-DFDF-4842-9BA4-F70F194741D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {06507A50-DFDF-4842-9BA4-F70F194741D7}.Release|Any CPU.Build.0 = Release|Any CPU - {701F392A-0D5B-4FDD-8135-DA037ECA7A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {701F392A-0D5B-4FDD-8135-DA037ECA7A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {701F392A-0D5B-4FDD-8135-DA037ECA7A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {701F392A-0D5B-4FDD-8135-DA037ECA7A8F}.Release|Any CPU.Build.0 = Release|Any CPU {DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU {DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,7 +107,6 @@ Global {28C72B39-1803-49D7-9289-C71A620E4EF1} = {62BD199E-BDB7-4D33-92E4-3FE97D5EBC91} {5BAEC61F-39FF-4197-A73A-A8A8B5BDFE86} = {62BD199E-BDB7-4D33-92E4-3FE97D5EBC91} {06507A50-DFDF-4842-9BA4-F70F194741D7} = {FBA324D4-A2B7-4539-B63E-AF254EA7DA50} - {701F392A-0D5B-4FDD-8135-DA037ECA7A8F} = {FBA324D4-A2B7-4539-B63E-AF254EA7DA50} {DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7} = {FBA324D4-A2B7-4539-B63E-AF254EA7DA50} {A06BD7CA-6CAF-48DE-BF78-D3772927951B} = {62BD199E-BDB7-4D33-92E4-3FE97D5EBC91} EndGlobalSection diff --git a/SecurityService/Common/StartupExtensions.cs b/SecurityService/Common/StartupExtensions.cs index 3ee6ecc8..7dbd98a3 100644 --- a/SecurityService/Common/StartupExtensions.cs +++ b/SecurityService/Common/StartupExtensions.cs @@ -18,48 +18,13 @@ public static class StartupExtensions public static IIdentityServerBuilder AddIdentityServerStorage(this IIdentityServerBuilder builder, String configurationConnectionString, String persistedGrantStoreConenctionString, - String authenticationConenctionString) - { - if (Startup.IsSqlServer) - { - builder.AddConfigurationStore(options => - { - options.ConfigureDbContext = - c => c.UseSqlServer(configurationConnectionString, sqlOptions => sqlOptions.MigrationsAssembly("SecurityService.SqlServerMigrations")); - }); - - builder.AddOperationalStore(options => - { - options.ConfigureDbContext = - c => c.UseSqlServer(persistedGrantStoreConenctionString, - sqlOptions => sqlOptions.MigrationsAssembly("SecurityService.SqlServerMigrations")); - }); - - builder.Services.AddDbContext(builder => builder.UseSqlServer(authenticationConenctionString, - sqlOptions => sqlOptions.MigrationsAssembly("SecurityService.SqlServerMigrations"))); - } - else if (Startup.IsMySql) - { - ServerVersion serverVersion = ServerVersion.Parse("8.0.27"); - - builder.AddConfigurationStore(options => - { - options.ConfigureDbContext = c => c.UseMySql(configurationConnectionString, - serverVersion, - sqlOptions => sqlOptions.MigrationsAssembly("SecurityService.MySqlMigrations")); }); - - builder.AddOperationalStore(options => - { - options.ConfigureDbContext = c => c.UseMySql(persistedGrantStoreConenctionString, - serverVersion, - sqlOptions => sqlOptions.MigrationsAssembly("SecurityService.MySqlMigrations")); - }); + String authenticationConenctionString) { + builder.AddConfigurationStore(options => { options.ConfigureDbContext = c => c.UseSqlServer(configurationConnectionString, sqlOptions => sqlOptions.MigrationsAssembly("SecurityService.SqlServerMigrations")); }); - builder.Services.AddDbContext(builder => builder.UseMySql(authenticationConenctionString, - serverVersion, - sqlOptions => sqlOptions.MigrationsAssembly("SecurityService.MySqlMigrations"))); - } + builder.AddOperationalStore(options => { options.ConfigureDbContext = c => c.UseSqlServer(persistedGrantStoreConenctionString, sqlOptions => sqlOptions.MigrationsAssembly("SecurityService.SqlServerMigrations")); }); + builder.Services.AddDbContext(builder => builder.UseSqlServer(authenticationConenctionString, sqlOptions => sqlOptions.MigrationsAssembly("SecurityService.SqlServerMigrations"))); + return builder; } diff --git a/SecurityService/Dockerfile b/SecurityService/Dockerfile index 96a90809..5f6f729c 100644 --- a/SecurityService/Dockerfile +++ b/SecurityService/Dockerfile @@ -1,4 +1,4 @@ -FROM stuartferguson/txnprocbase AS base +FROM stuartferguson/txnprocbase:2024.8.1 AS base WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build diff --git a/SecurityService/SecurityService.csproj b/SecurityService/SecurityService.csproj index 2ddfc587..266a5b40 100644 --- a/SecurityService/SecurityService.csproj +++ b/SecurityService/SecurityService.csproj @@ -32,8 +32,7 @@ - - + @@ -50,7 +49,6 @@ - diff --git a/SecurityService/Startup.cs b/SecurityService/Startup.cs index a93ba949..cc4e06b4 100644 --- a/SecurityService/Startup.cs +++ b/SecurityService/Startup.cs @@ -67,23 +67,6 @@ public Startup(IWebHostEnvironment webHostEnvironment) /// public static IConfigurationRoot Configuration { get; set; } - /// - /// Gets a value indicating whether this instance is my SQL. - /// - /// - /// true if this instance is my SQL; otherwise, false. - /// - public static Boolean IsMySql => string.Compare(Startup.GetDatabaseEngine, "MySql", StringComparison.InvariantCultureIgnoreCase) == 0; - - /// - /// Gets a value indicating whether this instance is SQL server. - /// - /// - /// true if this instance is SQL server; otherwise, false. - /// - public static Boolean IsSqlServer => - Startup.GetDatabaseEngine == null || string.Compare(Startup.GetDatabaseEngine, "SqlServer", StringComparison.InvariantCultureIgnoreCase) == 0; - /// /// Gets or sets the hosting environment. /// @@ -92,14 +75,6 @@ public Startup(IWebHostEnvironment webHostEnvironment) /// public static IWebHostEnvironment WebHostEnvironment { get; set; } - /// - /// Gets the get database engine. - /// - /// - /// The get database engine. - /// - private static String GetDatabaseEngine => ConfigurationReader.GetValue("AppSettings", "DatabaseEngine"); - #endregion #region Methods diff --git a/SecurityService/appsettings.json b/SecurityService/appsettings.json index 3713064a..58560b0f 100644 --- a/SecurityService/appsettings.json +++ b/SecurityService/appsettings.json @@ -21,17 +21,10 @@ } }, "ConnectionStrings": { - // Sql Server "PersistedGrantDbContext": "server=127.0.0.1;database=PersistedGrantStore;user id=sa;password=Sc0tland;Encrypt=false", "ConfigurationDbContext": "server=127.0.0.1;database=Configuration;user id=sa;password=Sc0tland;Encrypt=false", "AuthenticationDbContext": "server=127.0.0.1;database=Authentication;user id=sa;password=Sc0tland;Encrypt=false" - - // MySql - //"PersistedGrantDbContext": "server=127.0.0.1;userid=root;password=sp1ttal;database=PersistedGrantStore;", - //"ConfigurationDbContext": "server=127.0.0.1;userid=root;password=sp1ttal;database=Configuration;", - //"AuthenticationDbContext": "server=127.0.0.1;userid=root;password=sp1ttal;database=Authentication;" }, "AppSettings": { - "DatabaseEngine": "SqlServer" } }