Merge pull request #29 from brunohbrito/dev

requireHttps fix

Author: brunobritodev

src/Frontend/Jp.AdminUI/src/app/core/auth/auth-config.prod.ts

@@ -4,6 +4,7 @@ import { environment } from '@env/environment';
 export const authProdConfig: AuthConfig = {
     issuer: environment.IssuerUri,
     clientId: 'IS4-Admin',
+    requireHttps: environment.RequireHttps,
     redirectUri: environment.Uri + "/login-callback",
     silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
     scope: "openid profile email jp_api.is4",

src/Frontend/Jp.AdminUI/src/app/core/auth/auth-config.ts

@@ -4,6 +4,7 @@ import { environment } from '@env/environment';
 export const authConfig: AuthConfig = {
     issuer: environment.IssuerUri,
     clientId: 'IS4-Admin',
+    requireHttps: environment.RequireHttps,
     redirectUri: environment.Uri + "/login-callback",
     silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
     scope: "openid profile email jp_api.is4",

src/Frontend/Jp.AdminUI/src/app/core/auth/auth.config.ts

@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
 import { OAuthErrorEvent, OAuthService } from 'angular-oauth2-oidc';
 import { BehaviorSubject, combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
-import { environment } from '@env/environment.prod';
+import { environment } from '@env/environment';
 
 @Injectable({ providedIn: 'root' })
 export class AuthService {

src/Frontend/Jp.AdminUI/src/app/core/auth/auth.service.ts

@@ -305,7 +305,7 @@ public async Task<IActionResult> ExternalLoginCallback()
                 }
             }
 
-            return RedirectToAction("Index", "Home");
+            return Redirect(returnUrl);
         }
 
         /// <summary>

src/Frontend/Jp.UI.SSO/Controllers/Account/AccountController.cs

@@ -4,6 +4,7 @@ import { environment } from '@env/environment';
 export const authProdConfig: AuthConfig = {
     issuer: environment.AuthorityUri,
     clientId: "UserManagementUI",
+    requireHttps: environment.RequireHttps,
     redirectUri: environment.Uri + "/login-callback",
     silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
     scope: "openid profile email jp_api.user",

src/Frontend/Jp.UserManagement/src/app/core/auth/auth-config.prod.ts

@@ -1,9 +1,11 @@
 import { AuthConfig } from 'angular-oauth2-oidc';
 import { environment } from '@env/environment';
 
+
 export const authConfig: AuthConfig = {
     issuer: environment.AuthorityUri,
     clientId: "UserManagementUI",
+    requireHttps: environment.RequireHttps,
     redirectUri: environment.Uri + "/login-callback",
     silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
     scope: "openid profile email jp_api.user",

src/Frontend/Jp.UserManagement/src/app/core/auth/auth-config.ts

@@ -8,15 +8,15 @@
             "node"
         ],
         "paths": {
-            "@angular/*": [
-                "../node_modules/@angular/*"
-            ],
             "@env/*": [
                 "environments/*"
             ],
             "@core/*": [
                 "app/core/*"
             ],
+            "@angular/*": [
+                "../node_modules/@angular/*"
+            ]
         }
     },
     "exclude": [

src/Frontend/Jp.UserManagement/src/tsconfig.app.json

@@ -4,6 +4,7 @@
     "outDir": "../out-tsc/spec",
     "baseUrl": "./",
     "module": "commonjs",
+    "target": "es5",
     "types": [
       "jasmine",
       "node"

src/Frontend/Jp.UserManagement/src/tsconfig.spec.json

@@ -21,8 +21,11 @@
                 "src/environments/*"
             ],
             "@core/*": [
-                "app/core/*"
+                "src/app/core/*"
             ],
+            "@angular/*": [
+                "node_modules/@angular/*"
+            ]            
         }
     }
 }