Merge pull request #217 from Resgrid/develop

CU-868ba84kp Added missing Public call, fixing OIDC postgres db issue.

Author: ucswift

Providers/Resgrid.Providers.MigrationsPg/Sql/EF0001_PopulateOIDCDb.sql

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
+
 namespace Resgrid.Web.Services.Models
 {
 	public class ApplicationUser : IdentityUser { }

Web/Resgrid.Web.Services/Models/AuthorizationDbContext.cs

@@ -39,6 +39,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
+    <PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
     <PackageReference Include="GeoJSON.Net" Version="1.4.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
@@ -48,6 +49,7 @@
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageReference Include="Autofac.Extras.CommonServiceLocator" Version="6.1.0" />
     <PackageReference Include="BundlerMinifier.Core" Version="3.2.449" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
     <PackageReference Include="OpenIddict" Version="6.1.1" />
     <PackageReference Include="OpenIddict.Core" Version="6.1.1" />
     <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="6.1.1" />

Web/Resgrid.Web.Services/Resgrid.Web.Services.csproj

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Autofac;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -69,8 +70,8 @@ namespace Resgrid.Web.ServicesCore
 {
 	public class Startup
 	{
-        //public IConfiguration Configuration { get; }
-        public IConfigurationRoot Configuration { get; private set; }
+		//public IConfiguration Configuration { get; }
+		public IConfigurationRoot Configuration { get; private set; }
 		public ILifetimeScope AutofacContainer { get; private set; }
 		public AutofacServiceLocator Locator { get; private set; }
 		public IServiceCollection Services { get; private set; }
@@ -233,7 +234,7 @@ public void ConfigureServices(IServiceCollection services)
 						Title = "Resgrid API",
 						Version = "v4",
 						Description = "The Resgrid Computer Aided Dispatch (CAD) API reference. Documentation: https://resgrid-core.readthedocs.io/en/latest/api/index.html",
-						Contact = new OpenApiContact() {Email = "[email protected]", Name = "Resgrid Team", Url = new Uri("https://resgrid.com")},
+						Contact = new OpenApiContact() { Email = "[email protected]", Name = "Resgrid Team", Url = new Uri("https://resgrid.com") },
 						TermsOfService = new Uri("https://resgrid.com/Public/Terms")
 					}
 				);
@@ -246,7 +247,8 @@ public void ConfigureServices(IServiceCollection services)
 			services.AddSignalR(hubOptions =>
 			{
 				hubOptions.EnableDetailedErrors = true;
-			}).AddStackExchangeRedis(CacheConfig.RedisConnectionString, options => {
+			}).AddStackExchangeRedis(CacheConfig.RedisConnectionString, options =>
+			{
 				options.Configuration.ChannelPrefix = $"{Config.SystemBehaviorConfig.GetEnvPrefix()}resgrid-evt-sr";
 			});
 
@@ -397,17 +399,6 @@ public void ConfigureServices(IServiceCollection services)
 
 			StripeConfiguration.ApiKey = Config.PaymentProviderConfig.IsTestMode ? PaymentProviderConfig.TestApiKey : PaymentProviderConfig.ProductionApiKey;
 
-			services.AddDbContext<AuthorizationDbContext>(options =>
-			{
-				// Configure the context to use Microsoft SQL Server.
-				options.UseSqlServer(OidcConfig.ConnectionString);
-
-				// Register the entity sets needed by OpenIddict.
-				// Note: use the generic overload if you need
-				// to replace the default OpenIddict entities.
-				options.UseOpenIddict<Guid>();
-			});
-
 			// Register the Identity services.
 			//services.AddIdentity<ApplicationUser, IdentityRole>()
 			//	.AddEntityFrameworkStores<ApplicationDbContext>()
@@ -435,15 +426,51 @@ public void ConfigureServices(IServiceCollection services)
 			//// Register the Quartz.NET service and configure it to block shutdown until jobs are complete.
 			//services.AddQuartzHostedService(options => options.WaitForJobsToComplete = true);
 
+			if (OidcConfig.DatabaseType == DatabaseTypes.Postgres)
+			{
+				services.AddDbContext<AuthorizationDbContext>(options =>
+				{
+					// Configure the context to use Microsoft SQL Server.
+					options.UseNpgsql(
+						Config.OidcConfig.ConnectionString,
+						opt =>
+						{
+							opt.EnableRetryOnFailure(
+								maxRetryCount: 10,
+								maxRetryDelay: TimeSpan.FromSeconds(30),
+								errorCodesToAdd: new List<string>() { });
+
+							opt.UseAdminDatabase("postgres");
+						});//.UseLowerCaseNamingConvention();
+
+					options.UseOpenIddict<Guid>();
+				});
+
+				AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+			}
+			else
+			{
+				services.AddDbContext<AuthorizationDbContext>(options =>
+				{
+					// Configure the context to use Microsoft SQL Server.
+					options.UseSqlServer(OidcConfig.ConnectionString);
+
+					// Register the entity sets needed by OpenIddict.
+					// Note: use the generic overload if you need
+					// to replace the default OpenIddict entities.
+					options.UseOpenIddict<Guid>();
+				});
+			}
+
 			services.AddOpenIddict()
 				// Register the OpenIddict core components.
 				.AddCore(options =>
 				{
 					// Configure OpenIddict to use the Entity Framework Core stores and models.
 					// Note: call ReplaceDefaultEntities() to replace the default OpenIddict entities.
 					options.UseEntityFrameworkCore()
-					   .UseDbContext<AuthorizationDbContext>()
-					   .ReplaceDefaultEntities<Guid>();
+						.UseDbContext<AuthorizationDbContext>()
+						.ReplaceDefaultEntities<Guid>();
 
 					// Enable Quartz.NET integration.
 					//options.UseQuartz();
@@ -469,7 +496,7 @@ public void ConfigureServices(IServiceCollection services)
 					//options.AllowPasswordFlow()
 					//	   .AllowRefreshTokenFlow();
 					options//.AllowAuthorizationCodeFlow()
-					   //.AllowHybridFlow()
+						   //.AllowHybridFlow()
 					   .AllowClientCredentialsFlow()
 					   .AllowPasswordFlow()
 					   .AllowRefreshTokenFlow();
@@ -615,7 +642,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 			this.Locator = new AutofacServiceLocator(this.AutofacContainer);
 			ServiceLocator.SetLocatorProvider(() => this.Locator);
 
-			app.Use(async (context, next) => {
+			app.Use(async (context, next) =>
+			{
 				context.Response.Headers.Add("Strict-Transport-Security", "max-age=31536000");
 				context.Request.Scheme = "https";
 				await next.Invoke();