Merge pull request #121 from Resgrid/develop

CU-8687yhbz5 oopsie
Resgrid · May 17, 2024 · 21b1267 · 21b1267
2 parents cee446b + 4e84145
commit 21b1267
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Web/Resgrid.WebCore/Areas/User/Apps/src/app/componetns/map/map.component.ts b/Web/Resgrid.WebCore/Areas/User/Apps/src/app/componetns/map/map.component.ts
@@ -243,7 +243,7 @@ export class MapComponent implements OnInit {
 
       if (!this.map) {
         var osm = L.tileLayer(
-          this.leafletosmurl+window['rgOsmKey'],
+          this.leafletosmurl,
           {
             maxZoom: 19,
             attribution: this.mapattribution,

diff --git a/Web/Resgrid.WebCore/Areas/User/Views/Shared/_UserLayout.cshtml b/Web/Resgrid.WebCore/Areas/User/Views/Shared/_UserLayout.cshtml
@@ -90,7 +90,6 @@
         window.rgApiBaseUrl = "@Resgrid.Config.SystemBehaviorConfig.ResgridApiBaseUrl";
         window.rgGoogleMapsKey = "@Resgrid.Config.MappingConfig.GoogleMapsJSKey";
         window.rgChannelUrl = "@Resgrid.Config.SystemBehaviorConfig.ResgridEventingBaseUrl";
-        window.rgOsmKey = "@Resgrid.Config.MappingConfig.OSMKey";
 
         resgrid.absoluteBaseUrl = "@Resgrid.Config.SystemBehaviorConfig.ResgridBaseUrl";
         resgrid.absoluteApiBaseUrl = "@Resgrid.Config.SystemBehaviorConfig.ResgridApiBaseUrl";

diff --git a/Web/Resgrid.WebCore/Controllers/AccountController.cs b/Web/Resgrid.WebCore/Controllers/AccountController.cs
@@ -190,7 +190,7 @@ await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
 		[AllowAnonymous]
 		public IActionResult Register(string returnUrl = null)
 		{
-			if (Config.SystemBehaviorConfig.RedirectHomeToLogin)
+			if (String.IsNullOrWhiteSpace(SystemBehaviorConfig.BillingApiBaseUrl) || String.IsNullOrWhiteSpace(ApiConfig.BackendInternalApikey))
 				return RedirectToAction("LogOn", "Account");
 
 			RegisterViewModel model = new RegisterViewModel();
@@ -208,7 +208,7 @@ public IActionResult Register(string returnUrl = null)
 		[ValidateAntiForgeryToken]
 		public async Task<IActionResult> Register(RegisterViewModel model, CancellationToken cancellationToken, string returnUrl = null)
 		{
-			if (Config.SystemBehaviorConfig.RedirectHomeToLogin)
+			if (String.IsNullOrWhiteSpace(SystemBehaviorConfig.BillingApiBaseUrl) || String.IsNullOrWhiteSpace(ApiConfig.BackendInternalApikey))
 				return RedirectToAction("LogOn", "Account");