Merge pull request #24 from brunohbrito/dev

- Bug fixes

Author: brunobritodev

README.md

@@ -111,6 +111,13 @@ We'll love it! Please [Read the docs](https://jp-project.readthedocs.io/en/lates
 If you need help building or running your Jp Project platform
 There are several ways we can help you out.
 
+## v1.3
+
+- Bug fixes
+  - angular-oauth2-oidc Session Improvements for Angular Apps. Incluind Admin UI
+  - Some Action attributes was HttpPost instead HttpPut (fixed)
+- New unity tests
+
 ## v1.2
 
 - Docker support

src/Backend/Jp.UserManagement/Controllers/ApiResourceController.cs

@@ -53,7 +53,7 @@ public async Task<ActionResult<DefaultResponse<bool>>> Save([FromBody] ApiResour
             return Response(true);
         }
 
-        [HttpPost, Route("update"), Authorize(Policy = "Admin")]
+        [HttpPut, Route("update"), Authorize(Policy = "Admin")]
         public async Task<ActionResult<DefaultResponse<bool>>> Update([FromBody] ApiResource model)
         {
             if (!ModelState.IsValid)

src/Frontend/Jp.AdminUI/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:4300",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}

src/Frontend/Jp.AdminUI/src/app/app.component.ts

@@ -2,11 +2,12 @@ import { Component, HostBinding, OnInit } from "@angular/core";
 declare var $: any;
 
 import { SettingsService } from "./core/settings/settings.service";
-import { OAuthService, JwksValidationHandler } from "angular-oauth2-oidc";
-import { Router } from "@angular/router";
-import { authConfig } from "./core/auth/auth.config";
-import { environment } from "../environments/environment";
-import { tap } from "rxjs/operators";
+// import { authConfig } from "./core/auth/auth.config";
+import { AuthService } from "@core/auth/auth.service";
+import { Observable } from "rxjs";
+
+
+
 
 @Component({
     selector: "app-root",
@@ -26,31 +27,22 @@ export class AppComponent implements OnInit {
     @HostBinding("class.aside-toggled") get asideToggled() { return this.settings.layout.asideToggled; }
     @HostBinding("class.aside-collapsed-text") get isCollapsedText() { return this.settings.layout.isCollapsedText; }
 
-    constructor(private router: Router,
-        private oauthService: OAuthService,
-        public settings: SettingsService) {
-            this.configureWithNewConfigApi();
-    }
+    isAuthenticated: Observable<boolean>;
+    isDoneLoading: Observable<boolean>;
+    canActivateProtectedRoutes: Observable<boolean>;
+
+    constructor(
+        private authService: AuthService,
+        public settings: SettingsService
+    ) {
+        this.isAuthenticated = this.authService.isAuthenticated$;
+        this.isDoneLoading = this.authService.isDoneLoading$;
+        this.canActivateProtectedRoutes = this.authService.canActivateProtectedRoutes$;
 
-    private async configureWithNewConfigApi() {
-        this.oauthService.configure(authConfig);
-        this.oauthService.setStorage(localStorage);
-        this.oauthService.tokenValidationHandler = new JwksValidationHandler();
-        
-
-        this.settings.loadDiscoveryDocumentAndTryLogin().pipe(tap(doc => {
-            if (!environment.production)
-                console.log(doc);
-        })).subscribe(a => {
-            this.oauthService.setupAutomaticSilentRefresh();
-        });
-        // this.oauthService.loadDiscoveryDocument().then(doc => {
-        //     if (!environment.production)
-        //     console.log(doc);
-        //     this.oauthService.tryLogin();
-        // });
+        this.authService.runInitialLoginSequence(); 
     }
 
+
     ngOnInit() {
         $(document).on("click", "[href=\"#\"]", e => e.preventDefault());
     }

src/Frontend/Jp.AdminUI/src/app/app.module.ts

@@ -11,7 +11,6 @@ import { CoreModule } from "./core/core.module";
 import { LayoutModule } from "./shared/layout/layout.module";
 import { SharedModule } from "./shared/shared.module";
 import { RoutesModule } from "./app.routing.module";
-import { AuthInterceptor } from "./core/interceptors/auth.interceptor";
 import { OAuthModule } from "angular-oauth2-oidc";
 import { environment } from "../environments/environment";
 
@@ -20,25 +19,7 @@ export function createTranslateLoader(http: HttpClient) {
     return new TranslateHttpLoader(http, "./assets/i18n/", ".json");
 }
 
-// import dev only modules
-let dev = [
-    {
-        provide: HTTP_INTERCEPTORS,
-        useClass: AuthInterceptor,
-        multi: true
-    }
-];
-let INTERCEPTORS = [
-    {
-        provide: HTTP_INTERCEPTORS,
-        useClass: AuthInterceptor,
-        multi: true
-    }
-];
-// if production clear dev imports and set to prod mode
-if (process.env.NODE_ENV === "production") {
-    dev = [];
-}
+
 
 @NgModule({
     declarations: [
@@ -47,13 +28,7 @@ if (process.env.NODE_ENV === "production") {
     imports: [
         HttpClientModule,
         BrowserAnimationsModule, // required for ng2-tag-input
-        OAuthModule.forRoot({
-            resourceServer: {
-                allowedUrls: [ environment.ResourceServer],
-                sendAccessToken: true
-            }
-        }),
-        CoreModule,
+        CoreModule.forRoot(),
         LayoutModule,
         SharedModule.forRoot(),
         RoutesModule,
@@ -66,8 +41,6 @@ if (process.env.NODE_ENV === "production") {
         })
     ],
     providers: [
-        ...dev,
-        ...INTERCEPTORS
     ],
     bootstrap: [AppComponent]
 })

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

@@ -0,0 +1,15 @@
+import { AuthConfig } from 'angular-oauth2-oidc';
+import { environment } from '@env/environment';
+
+export const authConfig: 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",
+    silentRefreshTimeout: 5000, // For faster testing
+    timeoutFactor: 0.25, // For faster testing
+    sessionChecksEnabled: true,
+    showDebugInformation: true, // Also requires enabling "Verbose" level in devtools
+    clearHashAfterLogin: false, // https://github.com/manfredsteyer/angular-oauth2-oidc/issues/457#issuecomment-431807040
+};

src/Frontend/Jp.AdminUI/src/app/core/auth/auth-guard-with-forced-login.service.ts

@@ -0,0 +1,27 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { filter, map, tap } from 'rxjs/operators';
+
+import { AuthService } from './auth.service';
+
+@Injectable()
+export class AuthGuardWithForcedLogin implements CanActivate {
+  private isAuthenticated: boolean;
+
+  constructor(
+    private authService: AuthService,
+  ) {
+    this.authService.isAuthenticated$.subscribe(i => this.isAuthenticated = i);
+  }
+
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot,
+  ): Observable<boolean> {
+    return this.authService.isDoneLoading$
+      .pipe(filter(isDone => isDone))
+      .pipe(tap(_ => this.isAuthenticated || this.authService.login(state.url)))
+      .pipe(map(_ => this.isAuthenticated));
+  }
+}

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

@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { tap } from 'rxjs/operators';
+
+import { AuthService } from './auth.service';
+
+@Injectable()
+export class AuthGuard implements CanActivate {
+  constructor(
+    private authService: AuthService,
+  ) { }
+
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot,
+  ): Observable<boolean> {
+    return this.authService.canActivateProtectedRoutes$
+      .pipe(tap(x => console.log('You tried to go to ' + state.url + ' and this guard said ' + x)));
+  }
+}

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

@@ -0,0 +1,9 @@
+import { OAuthModuleConfig } from 'angular-oauth2-oidc';
+import { environment } from '@env/environment';
+
+export const authModuleConfig: OAuthModuleConfig = {
+    resourceServer: {
+        allowedUrls: [environment.ResourceServer],
+        sendAccessToken: true
+    }
+};

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

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