Minor bugs fix

brunobritodev · brunobritodev · commit 381e43f83d6d · 2019-05-27T22:49:40.000-03:00
- Fixed oidc flow
diff --git a/src/Frontend/Jp.AdminUI/src/app/core/auth/auth-config.prod.ts b/src/Frontend/Jp.AdminUI/src/app/core/auth/auth-config.prod.ts
@@ -0,0 +1,12 @@
+import { AuthConfig } from 'angular-oauth2-oidc';
+import { environment } from '@env/environment';
+
+export const authProdConfig: AuthConfig = {
+    issuer: environment.IssuerUri,
+    clientId: 'IS4-Admin',
+    redirectUri: environment.Uri + "/login-callback",
+    silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
+    scope: "openid profile email jp_api.is4",
+    sessionChecksEnabled: true,
+    clearHashAfterLogin: false, // https://github.com/manfredsteyer/angular-oauth2-oidc/issues/457#issuecomment-431807040
+};
diff --git a/src/Frontend/Jp.AdminUI/src/app/core/auth/auth.service.ts b/src/Frontend/Jp.AdminUI/src/app/core/auth/auth.service.ts
@@ -3,6 +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';
 
 @Injectable({ providedIn: 'root' })
 export class AuthService {
@@ -38,13 +39,14 @@ export class AuthService {
         private router: Router,
     ) {
         // Useful for debugging:
-        this.oauthService.events.subscribe(event => {
-            if (event instanceof OAuthErrorEvent) {
-                console.error(event);
-            } else {
-                console.warn(event);
-            }
-        });
+        if (!environment.production)
+            this.oauthService.events.subscribe(event => {
+                if (event instanceof OAuthErrorEvent) {
+                    console.error(event);
+                } else {
+                    console.warn(event);
+                }
+            });
 
         // This is tricky, as it might cause race conditions (where access_token is set in another
         // tab before everything is said and done there.
@@ -80,7 +82,6 @@ export class AuthService {
     }
 
     public runInitialLoginSequence(): Promise<void> {
-        this.oauthService.setStorage(localStorage);
 
         if (location.hash) {
             console.log('Encountered hash fragment, plotting as table...');
diff --git a/src/Frontend/Jp.AdminUI/src/app/core/core.module.ts b/src/Frontend/Jp.AdminUI/src/app/core/core.module.ts
@@ -12,11 +12,14 @@ import { HttpClientModule } from "@angular/common/http";
 import { authModuleConfig } from "./auth/auth-module-config";
 import { AuthGuard } from "./auth/auth-guard.service";
 import { authConfig } from "./auth/auth-config";
+import { authProdConfig } from "./auth/auth-config.prod";
+import { environment } from "@env/environment";
 
 export function storageFactory(): OAuthStorage {
     return localStorage;
 }
 
+
 @NgModule({
     imports: [
         HttpClientModule,
@@ -41,7 +44,7 @@ export class CoreModule {
         return {
             ngModule: CoreModule,
             providers: [
-                { provide: AuthConfig, useValue: authConfig },
+                { provide: AuthConfig, useValue: authProdConfig },
                 { provide: OAuthModuleConfig, useValue: authModuleConfig },
                 { provide: ValidationHandler, useClass: JwksValidationHandler },
                 { provide: OAuthStorage, useFactory: storageFactory },
diff --git a/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.ts b/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.ts
@@ -68,10 +68,6 @@ export class SettingsService {
 
     }
 
-    public logout() {
-        this.oauthService.logOut();
-    }
-
     public getUserProfile(): Observable<object> {
         if (this.user == null) {
             return this.userProfileObservable;
diff --git a/src/Frontend/Jp.AdminUI/src/app/pages/login-callback/login-callback.component.ts b/src/Frontend/Jp.AdminUI/src/app/pages/login-callback/login-callback.component.ts
@@ -1,26 +1,33 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, OnDestroy } from "@angular/core";
 import { Router } from "@angular/router";
 import { SettingsService } from "../../core/settings/settings.service";
 import { AuthService } from "@core/auth/auth.service";
-import { tap } from "rxjs/operators";
+import { Subscription } from "rxjs";
 
 @Component({
     selector: "app-login-callback",
     templateUrl: "login-callback.component.html",
     styleUrls: ["./login-callback.component.scss"],
 })
-export class LoginCallbackComponent implements OnInit {
+export class LoginCallbackComponent implements OnInit, OnDestroy {
+    stream: Subscription;
 
     constructor(
         private authService: AuthService,
         private router: Router,
         public settingsService: SettingsService) { }
 
-    ngOnInit() {
-        this.authService.canActivateProtectedRoutes$
-            .subscribe(yes => {
-                if (yes)
-                    return this.router.navigate(['/home']);
-            });
+
+    public ngOnInit() {
+        this.stream = this.authService.canActivateProtectedRoutes$.subscribe(yes => {
+            if (yes)
+                return this.router.navigate(['/home']);
+            else
+                return this.router.navigate(['/login']);
+        });
+    }
+
+    public ngOnDestroy() {
+        this.stream.unsubscribe();
     }
 }
diff --git a/src/Frontend/Jp.AdminUI/src/app/pages/login/login.component.ts b/src/Frontend/Jp.AdminUI/src/app/pages/login/login.component.ts
@@ -1,31 +1,36 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, OnDestroy } from "@angular/core";
 import { SettingsService } from "../../core/settings/settings.service";
 import { Router } from "@angular/router";
 import { AuthService } from "@core/auth/auth.service";
-
+import { Subscription } from "rxjs";
 
 
 @Component({
     selector: "app-login",
     templateUrl: "./login.component.html",
     styleUrls: ["./login.component.scss"],
 })
-export class LoginComponent implements OnInit {
+export class LoginComponent implements OnInit, OnDestroy {
+    private stream: Subscription;
+
     constructor(public settingsService: SettingsService,
         private authService: AuthService,
         private router: Router) {
 
     }
 
     public ngOnInit() {
-        this.authService.isAuthenticated$.subscribe(yes => {
-            if (!yes)
-                this.login();
+        this.stream = this.authService.canActivateProtectedRoutes$.subscribe(yes => {
+            if (yes)
+                this.router.navigate(['/home']);
+            else
+                this.authService.login('/login-callback');
         });
     }
 
-    public login() {
-        this.authService.login('/login-callback');
+    public ngOnDestroy() {
+        this.stream.unsubscribe();
     }
 
+    public login() { this.authService.login('/login-callback'); }
 }
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/header.component.ts b/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/header.component.ts
@@ -8,6 +8,7 @@ import { SettingsService } from "@core/settings/settings.service";
 import { MenuService } from "@core/menu/menu.service";
 import { Router } from "@angular/router";
 import { environment } from "@env/environment";
+import { AuthService } from "@core/auth/auth.service";
 
 @Component({
     selector: "app-header",
@@ -28,6 +29,7 @@ export class HeaderComponent implements OnInit {
         public menu: MenuService,
         public userblockService: UserblockService,
         public settings: SettingsService,
+        public authService: AuthService,
         private router: Router) {
         // show only a few items on demo
         this.menuItems = menu.getMenu().slice(0, 4); // for horizontal layout
@@ -43,7 +45,7 @@ export class HeaderComponent implements OnInit {
     }
 
     public async logout() {
-        await this.settings.logout();
+        await this.authService.logout();
     }
 
     toggleUserBlock(event) {
diff --git a/src/Frontend/Jp.AdminUI/src/environments/environment.prod.ts b/src/Frontend/Jp.AdminUI/src/environments/environment.prod.ts
@@ -1,7 +1,7 @@
 export const environment = {
   production: true,
-  ResourceServer: "https://jpproject.azurewebsites.net/api/",
-  IssuerUri:  "https://jpproject.azurewebsites.net/sso",
+  ResourceServer: "https://accounts.allto.com.br/api/",
+  IssuerUri:  "https://accounts.allto.com.br/sso",
   RequireHttps: true,
-  Uri: "https://jpproject.azurewebsites.net/admin-ui"
+  Uri: "https://accounts.allto.com.br/admin-ui"
 };
diff --git a/src/Frontend/Jp.UI.SSO/Util/Clients.cs b/src/Frontend/Jp.UI.SSO/Util/Clients.cs
@@ -1,4 +1,5 @@
-﻿using IdentityServer4;
+﻿using System;
+using IdentityServer4;
 using IdentityServer4.Models;
 using Microsoft.Extensions.Configuration;
 using System.Collections.Generic;
@@ -25,7 +26,10 @@ public static IEnumerable<Client> GetAdminClient(IConfiguration configuration)
                     ClientUri = configuration.GetValue<string>("ApplicationSettings:IS4AdminUi"),
                     AllowedGrantTypes = GrantTypes.Implicit,
                     AllowAccessTokensViaBrowser = true,
-                    RedirectUris = { $"{configuration.GetValue<string>("ApplicationSettings:IS4AdminUi")}/login-callback"},
+                    RedirectUris = new[] {
+                        $"{configuration.GetValue<string>("ApplicationSettings:IS4AdminUi")}/login-callback",
+                        $"{configuration.GetValue<string>("ApplicationSettings:IS4AdminUi")}/silent-refresh.html"
+                    },
                     AllowedCorsOrigins = { configuration.GetValue<string>("ApplicationSettings:IS4AdminUi")},
                     IdentityTokenLifetime = 3600,
                     AuthorizationCodeLifetime = 3600,
@@ -48,7 +52,10 @@ public static IEnumerable<Client> GetAdminClient(IConfiguration configuration)
                     AllowedGrantTypes = GrantTypes.Implicit,
                     AllowAccessTokensViaBrowser = true,
                     RequireConsent = true,
-                    RedirectUris = { $"{configuration.GetValue<string>("ApplicationSettings:UserManagementURL")}/login-callback" },
+                    RedirectUris =new[] {
+                        $"{configuration.GetValue<string>("ApplicationSettings:UserManagementURL")}/login-callback",
+                        $"{configuration.GetValue<string>("ApplicationSettings:UserManagementURL")}/silent-refresh.html"
+                    },
                     PostLogoutRedirectUris =  { $"{configuration.GetValue<string>("ApplicationSettings:UserManagementURL")}" },
                     AllowedCorsOrigins = { $"{configuration.GetValue<string>("ApplicationSettings:UserManagementURL")}" },
                     LogoUri = "~/images/clientLogo/1.jpg",
diff --git a/src/Frontend/Jp.UserManagement/src/app/core/auth/auth-config.prod.ts b/src/Frontend/Jp.UserManagement/src/app/core/auth/auth-config.prod.ts
@@ -0,0 +1,12 @@
+import { AuthConfig } from 'angular-oauth2-oidc';
+import { environment } from '@env/environment';
+
+export const authProdConfig: AuthConfig = {
+    issuer: environment.AuthorityUri,
+    clientId: "UserManagementUI",
+    redirectUri: environment.Uri + "/login-callback",
+    silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
+    scope: "openid profile email jp_api.user",
+    sessionChecksEnabled: true,
+    clearHashAfterLogin: false, // https://github.com/manfredsteyer/angular-oauth2-oidc/issues/457#issuecomment-431807040
+};
diff --git a/src/Frontend/Jp.UserManagement/src/app/core/auth/auth.service.ts b/src/Frontend/Jp.UserManagement/src/app/core/auth/auth.service.ts
@@ -3,6 +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';
 
 @Injectable({ providedIn: 'root' })
 export class OAuthenticationService {
@@ -38,13 +39,14 @@ export class OAuthenticationService {
         private router: Router,
     ) {
         // Useful for debugging:
-        this.oauthService.events.subscribe(event => {
-            if (event instanceof OAuthErrorEvent) {
-                console.error(event);
-            } else {
-                console.warn(event);
-            }
-        });
+        if (!environment.production)
+            this.oauthService.events.subscribe(event => {
+                if (event instanceof OAuthErrorEvent) {
+                    console.error(event);
+                } else {
+                    console.warn(event);
+                }
+            });
 
         // This is tricky, as it might cause race conditions (where access_token is set in another
         // tab before everything is said and done there.
@@ -80,7 +82,7 @@ export class OAuthenticationService {
     }
 
     public runInitialLoginSequence(): Promise<void> {
-        if (location.hash) {
+        if (location.hash && !environment.production) {
             console.log('Encountered hash fragment, plotting as table...');
             console.table(location.hash.substr(1).split('&').map(kvp => kvp.split('=')));
         }
diff --git a/src/Frontend/Jp.UserManagement/src/app/core/core.module.ts b/src/Frontend/Jp.UserManagement/src/app/core/core.module.ts
@@ -3,17 +3,16 @@ import { CommonModule } from '@angular/common';
 import { SettingsService } from './settings/settings.service';
 import { TranslatorService } from './translator/translator.service';
 import { AuthConfig, OAuthModuleConfig, ValidationHandler, OAuthStorage, JwksValidationHandler, OAuthModule } from 'angular-oauth2-oidc';
-import { authConfig } from './auth/auth.config';
 import { authModuleConfig } from './auth/auth-module-config';
 import { OAuthenticationService } from "./auth/auth.service";
 import { AuthGuardWithForcedLogin } from './auth/auth-guard-with-forced-login.service';
 import { AuthGuard } from './auth/auth-guard.service';
+import { authProdConfig } from './auth/auth-config.prod';
 
 export function storageFactory(): OAuthStorage {
     return localStorage;
 }
 
-
 @NgModule({
     imports: [
         CommonModule,
@@ -43,7 +42,7 @@ export class CoreModule {
             providers: [
                 TranslatorService,
                 SettingsService,
-                { provide: AuthConfig, useValue: authConfig },
+                { provide: AuthConfig, useValue: authProdConfig },
                 { provide: OAuthModuleConfig, useValue: authModuleConfig },
                 { provide: ValidationHandler, useClass: JwksValidationHandler },
                 { provide: OAuthStorage, useFactory: storageFactory }
diff --git a/src/Frontend/Jp.UserManagement/src/app/core/default-layout/default-layout.component.html b/src/Frontend/Jp.UserManagement/src/app/core/default-layout/default-layout.component.html
@@ -22,10 +22,10 @@
             </div>
         </li>
         <li class="nav-item dropdown" dropdown placement="bottom right">
-            <a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"
+            <a class="nav-link" data-toggle="dropdown" *ngIf="userProfile$ | async; let userProfile" href="#" role="button" aria-haspopup="true" aria-expanded="false"
                 dropdownToggle (click)="false">
-                <img *ngIf="userProfile?.picture" class="img-avatar" [src]="userProfile?.picture" alt="userProfile?.name" />
-                <img *ngIf="!userProfile?.picture" class="img-avatar" src="/assets/img/dummy.png" alt="userProfile?.name" />{{userProfile?.name}}&nbsp;&nbsp;
+                <img *ngIf="userProfile.picture" class="img-avatar" [src]="userProfile.picture" alt="userProfile.name" />
+                <img *ngIf="!userProfile.picture" class="img-avatar" src="/assets/img/dummy.png" alt="userProfile.name" />{{userProfile.name}}&nbsp;&nbsp;
             </a>
             <div class="dropdown-menu dropdown-menu-right pointer" *dropdownMenu aria-labelledby="simple-dropdown">
                 <div class="dropdown-header text-center"><strong>Account</strong></div>
diff --git a/src/Frontend/Jp.UserManagement/src/app/core/default-layout/default-layout.component.ts b/src/Frontend/Jp.UserManagement/src/app/core/default-layout/default-layout.component.ts
@@ -6,6 +6,7 @@ import { environment } from "@env/environment";
 import { Router } from "@angular/router";
 import { TranslatorService } from "../translator/translator.service";
 import { OAuthenticationService } from "../auth/auth.service";
+import { Observable } from "rxjs";
 
 @Component({
     selector: "app-dashboard",
@@ -18,7 +19,7 @@ export class DefaultLayoutComponent implements OnInit {
     public sidebarMinimized = true;
     private changes: MutationObserver;
     public element: HTMLElement = document.body;
-    public userProfile: any;
+    public userProfile$: Observable<object>;
     constructor(public settingsService: SettingsService,
         public authService: OAuthenticationService,
         private router: Router,
@@ -45,12 +46,11 @@ export class DefaultLayoutComponent implements OnInit {
     }
 
     public async getUserImage() {
-        this.settingsService.getUserProfile()
-             .pipe(
-                 tap(u => {
-                     if (!environment.production)
-                         console.table(u);
-                 }))
-            .subscribe(a => this.userProfile = a);
+        this.userProfile$ = this.settingsService.getUserProfile()
+            .pipe(
+                tap(u => {
+                    if (!environment.production)
+                        console.table(u);
+                }));
     }
 }
diff --git a/src/Frontend/Jp.UserManagement/src/app/core/settings/settings.service.ts b/src/Frontend/Jp.UserManagement/src/app/core/settings/settings.service.ts
@@ -28,7 +28,7 @@ export class SettingsService {
             docLoaded: false,
         };
 
-        this.userProfileObservable = of(this.oauthService.loadUserProfile()).pipe(share());
+        this.userProfileObservable = defer(() => from(this.oauthService.loadUserProfile())).pipe(share());
         this.loadDiscoveryDocumentAndTryLoginObservable = defer(() => from(this.oauthService.loadDiscoveryDocument())).pipe(share()).pipe(tap(a => this.doc = a)).pipe(switchMap(a => this.oauthService.tryLogin())).pipe(map(() => this.doc));
     }
 
diff --git a/src/Frontend/Jp.UserManagement/src/app/pages/login-callback/login-callback.component.ts b/src/Frontend/Jp.UserManagement/src/app/pages/login-callback/login-callback.component.ts
diff --git a/src/Frontend/Jp.UserManagement/src/app/pages/login/login.component.ts b/src/Frontend/Jp.UserManagement/src/app/pages/login/login.component.ts
diff --git a/src/Frontend/Jp.UserManagement/src/app/pages/pages.module.ts b/src/Frontend/Jp.UserManagement/src/app/pages/pages.module.ts
diff --git a/src/Frontend/Jp.UserManagement/src/environments/environment.prod.ts b/src/Frontend/Jp.UserManagement/src/environments/environment.prod.ts
diff --git a/src/Frontend/Jp.UserManagement/src/index.html b/src/Frontend/Jp.UserManagement/src/index.html

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,6 @@ export class SettingsService {`
`68`	`68`
`69`	`69`	`}`
`70`	`70`
`71`		`- public logout() {`
`72`		`- this.oauthService.logOut();`
`73`		`- }`
`74`		`-`
`75`	`71`	`public getUserProfile(): Observable<object> {`
`76`	`72`	`if (this.user == null) {`
`77`	`73`	`return this.userProfileObservable;`