Merge branch 'master' of https://github.com/odpi/egeria-ui into relea…

…se-3-2
odpi · Nov 29, 2021 · 0aa54ac · 0aa54ac
2 parents 0db6cac + 22aa53e
commit 0aa54ac
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 54 deletions.
diff --git a/new/egeria-app.container.js b/new/egeria-app.container.js
@@ -33,13 +33,12 @@ class EgeriaApp extends PolymerElement {
   constructor() {
     super();
 
-    this.isLoading = false;
     let path = window.location.pathname.substr(1);
 
     if( !['login', 'forbidden', 'error', 'empty'].includes(path) ) {
       //except for the pages not using the this data
       //especially login is not need this calls
-      this._initialRequiredAuthenticatedRequest();
+      this._getCurrentUser();
     }
   }
 
@@ -50,7 +49,6 @@ class EgeriaApp extends PolymerElement {
       appInfo: { type: Object, value: {} },
       roles: { type: Array, value: [] },
 
-      isLoading: { type: Boolean, value: true },
       isLoggedIn: { type: Boolean, value: false },
 
       queryParams: {},
@@ -70,35 +68,35 @@ class EgeriaApp extends PolymerElement {
   }
 
   /**
-   * performes requests needed by authenticated page
+   * process token
    * @private
    */
-  _initialRequiredAuthenticatedRequest() {
-    Promise.all([
-      egeriaFetch(`/api/public/app/info`),
-      egeriaFetch(`/api/users/components`),
-      egeriaFetch(`/api/users/current`),
-      egeriaFetch(`/api/users/roles`)
-    ]).then((responses) => {
-      let [ appInfo, components, currentUser, roles ] = responses;
-
-      this.components = components;
-      this.currentUser = currentUser;
-      this.roles = roles;
-      this.appInfo = appInfo;
-
-      this.isLoggedIn = currentUser !== null && currentUser.status === 200;
-
-      const hasComponents = components !== null && components.status === 200;
-      const hasCurrentUser = currentUser !== null && currentUser.status === 200;
-      const hasRoles = roles !== null &&  roles.status === 200;
-      const hasAppInfo = appInfo !== null && appInfo.status === 200;
-
-      this.isLoading = ![hasComponents, hasCurrentUser, hasRoles, hasAppInfo].includes(false);
-
-    });
+  _getCurrentUser() {
+
+      const jwtClaims = this._parseJwtClaims();
+      if ( jwtClaims ) {
+        let tokenUser = JSON.parse(jwtClaims.sub);
+        if (tokenUser) {
+
+          this.currentUser = tokenUser;
+          this.components = tokenUser.visibleComponents;
+          this.roles = tokenUser.roles;
+
+          this.isLoggedIn = this.currentUser !== null;
+        }
+      }
   }
 
+  _parseJwtClaims () {
+    const token = getCookie('token');
+    if(token !== undefined && token !== null){
+      const base64User = token.split('.')[1];
+      if( base64User !== undefined ) {
+        return JSON.parse( atob( base64User ) );
+      }
+    }
+  };
+
   _pagesChanged(newPages) {
     if(newPages && newPages.length >= 0) {
       const [removed, ...newArr] = this.pages;
@@ -146,12 +144,7 @@ class EgeriaApp extends PolymerElement {
 
       switch(route) {
         case '':
-          if(components.length) {
-            this.pages = ['homepage'];
-          } else {
-            this.pages = !getCookie('token') ? ['empty'] : ['forbidden'];
-          }
-
+          this.pages = ['homepage'];
           break;
         case 'login':
           this.pages = route.split('/');
@@ -194,9 +187,6 @@ class EgeriaApp extends PolymerElement {
                  data="{{ routeData }}"
                  tail="{{ tail }}"></app-route>
 
-      <template is="dom-if" if="[[ !isLoading ]]">
-        <template is="dom-if" if="[[ _isEqualTo(page, 'empty') ]]"></template>
-
         <template is="dom-if" if="[[ _isEqualTo(page, 'login') ]]">
           <egeria-login query-params="[[ queryParams ]]"></egeria-login>
         </template>
@@ -210,8 +200,7 @@ class EgeriaApp extends PolymerElement {
         </template>
 
         <template is="dom-if" if="[[ _isEqualTo(page, 'homepage') ]]">
-          <egeria-home title="[[ appInfo.title ]]"
-                       description="[[ appInfo.description ]]"
+          <egeria-home 
                        components="[[ components ]]"></egeria-home>
         </template>
 
@@ -223,13 +212,6 @@ class EgeriaApp extends PolymerElement {
                               is-logged-in="[[ isLoggedIn ]]"
                               pages="[[ pages ]]"></egeria-single-page>
         </template>
-      </template>
-
-      <template is="dom-if" if="[[ isLoading ]]">
-        <div class="is-loading">
-          Loading...
-        </div>
-      </template>
 
       <egeria-error-handling></egeria-error-handling>
     `;

diff --git a/new/egeria-home.component.js b/new/egeria-home.component.js
@@ -13,6 +13,26 @@ import { setCookie } from './commons/local-storage';
 import { RoleComponentsBehavior } from '../old/common/role-components';
 
 class EgeriaHome extends mixinBehaviors(RoleComponentsBehavior, PolymerElement) {
+
+  constructor() {
+    super();
+    egeriaFetch(`/api/public/app/info`)
+        .then(response => {
+          this.title = response.title;
+          this.description = response.description;
+          this.titleChunks = !['', undefined].includes(this.title) ? this.title.split('|') : [];
+
+          this.descriptionChunks = !['', undefined].includes(this.description) ? this.description.split('@@').map(d => {
+            let [ title, description ] = d.split('||');
+
+            return {
+              title: title,
+              description: description
+            }
+          }) : [];
+        });
+  }
+
   static get properties() {
     return {
       title: { type: String, value: '' },
@@ -27,16 +47,9 @@ class EgeriaHome extends mixinBehaviors(RoleComponentsBehavior, PolymerElement)
   ready() {
     super.ready();
 
-    this.titleChunks = !['', undefined].includes(this.title) ? this.title.split('|') : [];
 
-    this.descriptionChunks = !['', undefined].includes(this.description) ? this.description.split('@@').map(d => {
-      let [ title, description ] = d.split('||');
 
-      return {
-        title: title,
-        description: description
-      }
-    }) : [];
+
 
     egeriaFetch(`/api/assets/types`)
       .then(data => {