Update auto-logout and fix breadcrumbs console error (kubernetes#5163)

bio170 · May 21, 2020 · 36eeea5 · 36eeea5
1 parent 1e2aa71
commit 36eeea5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/aio/gulp/conf.js b/aio/gulp/conf.js
@@ -214,13 +214,18 @@ export default {
     enableSkipButton: argv.enableSkipButton !== undefined ?
         argv.enableSkipButton :
         false,
-
     /**
      * Allows to enable login view when serving on http.
      */
     enableInsecureLogin: argv.enableInsecureLogin !== undefined ?
       argv.enableInsecureLogin :
       false,
+    /**
+     * Defines token time to live.
+     */
+    tokenTTL: argv.tokenTTL !== undefined ?
+      argv.tokenTTL :
+      0,
   },
 
   /**

diff --git a/aio/gulp/serve.js b/aio/gulp/serve.js
@@ -60,6 +60,10 @@ function getBackendArgs() {
     args.push(`--apiserver-host=${conf.backend.apiServerHost}`);
   }
 
+  if(conf.backend.tokenTTL) {
+    args.push(`--token-ttl=${conf.backend.tokenTTL}`);
+  }
+
   return args;
 }
 

diff --git a/src/app/frontend/common/components/breadcrumbs/component.ts b/src/app/frontend/common/components/breadcrumbs/component.ts
@@ -52,9 +52,10 @@ export class BreadcrumbsComponent implements OnInit {
     const currentRoute = this._getCurrentRoute();
     const url = this._router.url.includes('?') ? this._router.url.split('?')[0] : '';
     let urlArray = url.split('/');
-    let routeParamsCount = currentRoute.routeConfig.data.routeParamsCount
-      ? +currentRoute.routeConfig.data.routeParamsCount
-      : currentRoute.routeConfig.path.split('/').length;
+    let routeParamsCount =
+      currentRoute.routeConfig.data && currentRoute.routeConfig.data.routeParamsCount
+        ? +currentRoute.routeConfig.data.routeParamsCount
+        : currentRoute.routeConfig.path.split('/').length;
 
     this.breadcrumbs = [
       {

diff --git a/src/app/frontend/error/handler.ts b/src/app/frontend/error/handler.ts
@@ -49,10 +49,10 @@ export class GlobalErrorHandler implements ErrorHandler {
   private handleHTTPError_(error: HttpErrorResponse): void {
     this.ngZone_.run(() => {
       if (KdError.isError(error, ApiError.tokenExpired, ApiError.encryptionKeyChanged)) {
+        this.auth_.removeAuthCookies();
         this.router_.navigate(['login'], {
           state: {error: AsKdError(error)} as StateError,
         });
-        this.auth_.removeAuthCookies();
         return;
       }