Merge pull request #402 from intersective/hotfix/av2-328/force-the-user-logout-when-the-apikey-is-invalid

[AV2-328]force the user logout when the apikey is invalid

Author: shawnm0705

src/app/auth/auth-logout/auth-logout.component.ts

@@ -1,19 +1,22 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { AuthService } from '../auth.service';
 import { Router } from '@angular/router';
+import { RouterEnter } from '@services/router-enter.service';
 
 @Component({
   selector: 'app-auth-logout',
   template: '',
 })
-export class AuthLogoutComponent implements OnInit {
-
+export class AuthLogoutComponent extends RouterEnter {
+  routeUrl = '/logout';
   constructor(
-    private router: Router,
+    public router: Router,
     private authService: AuthService
-  ) {}
+  ) {
+    super(router);
+  }
 
-  ngOnInit() {
+  onEnter() {
     this.authService.logout();
   }
 

src/app/shared/request/request.service.ts

@@ -35,6 +35,7 @@ export class QueryEncoder implements HttpParameterCodec {
 export class RequestService {
   private appkey: string;
   private prefixUrl: string;
+  private loggedOut: boolean;
 
   constructor(
     private http: HttpClient,
@@ -186,7 +187,15 @@ export class RequestService {
       console.error(error); // log to console instead
     }
     // log the user out if jwt expired
-    if (this.utils.has(error, 'error.message') && error.error.message === 'Expired apikey') {
+    if (this.utils.has(error, 'error.message') && ['Expired apikey', 'Invalid apikey'].includes(error.error.message) && !this.loggedOut) {
+      // in case lots of api returns the same apikey invalid at the same time
+      this.loggedOut = true;
+      setTimeout(
+        () => {
+          this.loggedOut = false;
+        },
+        2000
+      );
       this.router.navigate(['logout']);
     }
     // Return the error response data