improve login redirect performance + inntroducce ccode param for the …

…not-authorized route

src/app/pages/error/error.component.html

@@ -1 +1,4 @@
 <h2>{{errorMessage | translate}}</h2>
+<div *ngIf="code">
+  <div *ngIf="code == 'no-app-access-msg'">{{ 'no_app_access_msg' | translate }}</div>
+</div>

src/app/pages/error/error.component.ts

@@ -1,5 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
+import { GenericUtil } from '@worldskills/worldskills-angular-lib';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'app-error',
@@ -10,12 +12,22 @@ export class ErrorComponent implements OnInit {
 
   errorMessage: string;
 
-  constructor(private route: ActivatedRoute) {
+  code: string;
+
+  constructor(private route: ActivatedRoute, private translator: TranslateService) {
   }
 
   ngOnInit(): void {
     const data = this.route.snapshot.data;
     this.errorMessage = data && data.error ? data.error : 'Not found';
-  }
 
+    this.route.queryParams.subscribe(
+      queryParams => {
+        console.log(queryParams);
+        if (queryParams.hasOwnProperty('code')) {
+          this.code = queryParams.code;
+        }
+      }
+    );
+  }
 }

src/app/pages/home/home.component.html

@@ -1,3 +1,6 @@
+<ng-container *ngIf="initialized">
+  loaded
+</ng-container>
 <ng-container *ngIf="!initialized">
   <div class="mt-4">
     <ws-spinner></ws-spinner>

src/app/pages/home/home.component.ts

@@ -22,16 +22,18 @@ export class HomeComponent implements OnInit {
 
   ngOnInit(): void {
     const homepage = this.getHomepage();
-
-    this.handler.redirectOrReturn({url: [homepage], onlyIfExact: this.route})
-    .subscribe(() => {
-      if (homepage.length > 0) {
-        this.initialized = true;
-      } else {
-        this.auth.login();
-      }
-    });
-
+    if (homepage === 'not-authorized') {
+      this.router.navigate(['/not-authorized'], { queryParams: { code: 'no-app-access-msg'}});
+    } else {
+      this.handler.redirectOrReturn({url: [homepage], onlyIfExact: this.route})
+      .subscribe(() => {
+        if (homepage.length > 0) {
+          this.initialized = true;
+        } else {
+          this.auth.login();
+        }
+      });
+    }
   }
 
   // when admin then homepage = org
@@ -49,7 +51,7 @@ export class HomeComponent implements OnInit {
     } else {
       // tslint:disable-next-line:max-line-length
       if (user.roles && (user.roles.length === 0 || user.roles.filter(x => x.role_application.application_code === environment.worldskillsAppId).length === 0)) {
-        this.router.navigate(['/not-authorized']);
+        homepage = 'not-authorized';
       } else {
         const hasAdminRole = user.roles.filter(x => x.name === 'Admin').length > 0;
         if (hasAdminRole) {

src/assets/i18n/en.json

@@ -1,2 +1,3 @@
 {
+  "no_app_access_msg": "You do nnot have access to this application, please contact your member organization."
 }