From 1495cdda39d1e02d42f1dabef69f1885f20133f0 Mon Sep 17 00:00:00 2001 From: Wvader <34067397+wvader@users.noreply.github.com> Date: Fri, 28 Oct 2022 15:45:02 +0100 Subject: [PATCH] Bump dependencies --- BlueWest.Frontend | 2 +- BlueWest.Startup/BlueWest.Startup.csproj | 9 - BlueWest.Startup/Class1.cs | 278 ----------------------- include/BlueWest.EfMethods | 2 +- 4 files changed, 2 insertions(+), 289 deletions(-) delete mode 100644 BlueWest.Startup/BlueWest.Startup.csproj delete mode 100644 BlueWest.Startup/Class1.cs diff --git a/BlueWest.Frontend b/BlueWest.Frontend index b67ba4a..8b2e541 160000 --- a/BlueWest.Frontend +++ b/BlueWest.Frontend @@ -1 +1 @@ -Subproject commit b67ba4a1a6bb8a58ee44b34dbadbd6a0e99c5c87 +Subproject commit 8b2e541cfe92c7bfaada6a95e427a3d6c92ce768 diff --git a/BlueWest.Startup/BlueWest.Startup.csproj b/BlueWest.Startup/BlueWest.Startup.csproj deleted file mode 100644 index eb2460e..0000000 --- a/BlueWest.Startup/BlueWest.Startup.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - net6.0 - enable - enable - - - diff --git a/BlueWest.Startup/Class1.cs b/BlueWest.Startup/Class1.cs deleted file mode 100644 index f1237b6..0000000 --- a/BlueWest.Startup/Class1.cs +++ /dev/null @@ -1,278 +0,0 @@ -using System; -using System.Text; -using System.Threading.Tasks; -using BlueWest.Domain; -using BlueWest.Domain; -using BlueWest.Cryptography; -using BlueWest.Data.Application.Users; -using BlueWest.Data.Auth; -using BlueWest.Data.Auth.Context.Users; -using BlueWest.WebApi.Configuration; -using BlueWest.WebApi.Context.Users; -using BlueWest.WebApi.Session; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Identity; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Tokens; -using Redis.OM; - -namespace BlueWest.Startyp -{ - /// - /// Startup Extensions - /// - public static class StartupExtensions - { - private static MySqlServerVersion GetMySqlServerVersion(int major, int minor, int build) => new (new Version(major, minor, build)); - - private static BlueWestConnectionString GetConnectionString(this IConfigurationRoot configurationRoot) - { - // Docker / No-Docker - var startupMode = configurationRoot["mode"]; - - if (startupMode == "docker") - { - var config = configurationRoot.Get(); - return config; - } - else - { - var config = configurationRoot.Get(); - return config; - } - - return null; - } - - /// - /// Get MYSQL Connection String - /// - /// - /// - /// - private static DbContextOptionsBuilder GetMySqlSettings( - this DbContextOptionsBuilder optionsBuilder, - IConfiguration configuration, - IConfigurationRoot configurationRoot, - IWebHostEnvironment environment) - { - var sqlVersion = GetMySqlServerVersion(8, 0, 11); - - // Docker / No-Docker - - string mySqlConnectionString = configurationRoot.GetConnectionString().MySql; - - if (mySqlConnectionString == string.Empty) - { - throw new InvalidOperationException("Fatal error: MySQL Connection string is empty."); - } - - - optionsBuilder - .UseMySql( - mySqlConnectionString, - sqlVersion) - .UseMySql(sqlVersion, - builder => - { - builder.EnableRetryOnFailure(6, TimeSpan.FromSeconds(3), null); - }); - - // The following three options help with debugging, but should - // be changed or removed for production. - if (environment.IsDevelopment()) - { - optionsBuilder - .LogTo(Console.WriteLine, LogLevel.Information) - .EnableSensitiveDataLogging() - .EnableDetailedErrors(); - } - - return optionsBuilder; - } - - /// - /// Setup database Contexts - /// - /// - /// - /// - /// - public static IServiceCollection PrepareMySqlDatabasePool(this IServiceCollection serviceCollection, - IConfiguration configuration, IWebHostEnvironment environment, IConfigurationRoot configurationRoot) - { - return serviceCollection - .AddDbContextPool(options => - options.GetMySqlSettings(configuration, configurationRoot, environment)) - .AddDbContextPool(options => - options.GetMySqlSettings(configuration, configurationRoot, environment)) - .AddDbContextPool(options => - options.GetMySqlSettings(configuration, configurationRoot, environment)) - .AddDbContextPool(options => - options.GetMySqlSettings(configuration, configurationRoot, environment)) - .AddDbContextPool(options => - options.GetMySqlSettings(configuration, configurationRoot, environment)); - } - - /// - /// Setup database Contexts - /// - /// - /// - /// - /// - public static IServiceCollection PrepareSqlLiteDatabasePool(this IServiceCollection serviceCollection, - IConfiguration configuration, IWebHostEnvironment environment) - { - var sqliteConString = "Data Source=BlueWest.Api.db"; - - return serviceCollection - .AddDbContextPool(options => options.UseSqlite(sqliteConString)) - .AddDbContextPool(options => options.UseSqlite(sqliteConString)) - .AddDbContextPool(options => options.UseSqlite(sqliteConString)) - .AddDbContextPool(options => options.UseSqlite(sqliteConString)) - .AddDbContextPool(options => options.UseSqlite(sqliteConString)); - - } - - internal static IServiceCollection AddAuthServerServices(this IServiceCollection services, IConfiguration configuration , IWebHostEnvironment environment, IConfigurationRoot configurationRoot) - { - - var connectionString = configurationRoot.GetConnectionString(); - - if (connectionString == null) - { - throw new InvalidOperationException("Redis connection string is empty"); - } - - services - .AddSingleton(new RedisConnectionProvider(connectionString.Redis)) - .AddScoped() - .AddScoped() - .AddHostedService() - .AddSingleton() - .AddScoped() - .AddScoped() - .AddScoped() - .AddScoped(); - - // Database Context and Swagger - - - // Register the ConfigurationBuilder instance of AuthSettings - var authSettings = configuration.GetSection(nameof(AuthSettings)); - services.Configure(authSettings); - var signingKey = new SymmetricSecurityKey - (Encoding.ASCII.GetBytes(authSettings[nameof(AuthSettings.SecretKey)])); - - // jwt wire up - // Get options from app settings - var jwtAppSettingOptions = configuration - .GetSection(nameof(JwtIssuerOptions)); - - // Configure JwtIssuerOptions - services.Configure(options => - { - options.Issuer = jwtAppSettingOptions[nameof(JwtIssuerOptions.Issuer)]; - options.Audience = jwtAppSettingOptions[nameof(JwtIssuerOptions.Audience)]; - options.SigningCredentials = new SigningCredentials - (signingKey, SecurityAlgorithms.HmacSha256); - }); - - var tokenValidationParameters = new TokenValidationParameters - { - ValidateIssuer = true, - ValidIssuer = jwtAppSettingOptions[nameof(JwtIssuerOptions.Issuer)], - - ValidateAudience = true, - ValidAudience = jwtAppSettingOptions[nameof(JwtIssuerOptions.Audience)], - - ValidateIssuerSigningKey = true, - IssuerSigningKey = signingKey, - - RequireExpirationTime = false, - ValidateLifetime = true, - ClockSkew = TimeSpan.Zero - }; - - services.AddAuthentication(options => - { - - options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; - options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; - options.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme; - options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; - options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme; - }) - .AddCookie(options => - { - options.Cookie.SameSite = SameSiteMode.Lax; - options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest; - options.Cookie.MaxAge = SessionConstants.DefaultSessionMaxAge; - options.LoginPath = "/api/auth/logincookie"; - options.LogoutPath = "/api/auth/logout"; - }) - .AddJwtBearer(configureOptions => - { - configureOptions.ClaimsIssuer = jwtAppSettingOptions[nameof(JwtIssuerOptions.Issuer)]; - configureOptions.TokenValidationParameters = tokenValidationParameters; - configureOptions.SaveToken = true; - - configureOptions.Events = new JwtBearerEvents - { - OnAuthenticationFailed = context => - { - if (context.Exception.GetType() == typeof(SecurityTokenExpiredException)) - { - context.Response.Headers.Add("Token-Expired", "true"); - } - - return Task.CompletedTask; - }, - }; - }); - - - // api user claim policy - services.AddAuthorization(options => - { - options.AddPolicy(SessionConstants.ApiNamePolicy, - policy => policy.RequireClaim(Data.Auth.Context.Users.Constants.JwtClaimIdentifiers.Rol, - Data.Auth.Context.Users.Constants.JwtClaims.ApiAccess)); - - }); - - // add identity - var identityBuilder = services.AddIdentityCore(o => - { - o.User.RequireUniqueEmail = true; - - // configure identity options - o.Password.RequireDigit = false; - o.Password.RequireLowercase = false; - o.Password.RequireUppercase = false; - o.Password.RequireNonAlphanumeric = false; - o.Password.RequiredLength = 6; - }) - .AddUserManager() - .AddUserStore(); - - identityBuilder = new IdentityBuilder(identityBuilder.UserType, typeof(ApplicationRole), identityBuilder.Services); - identityBuilder - .AddEntityFrameworkStores() - .AddDefaultTokenProviders(); - - return services; - } - - } -} - - diff --git a/include/BlueWest.EfMethods b/include/BlueWest.EfMethods index f999ac5..05eef70 160000 --- a/include/BlueWest.EfMethods +++ b/include/BlueWest.EfMethods @@ -1 +1 @@ -Subproject commit f999ac592914792df3150d3513d1ba91496fbcdf +Subproject commit 05eef7070f990d692151d535564eaf6dc25d1ab8