merge master

Feature #14498

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --cc src/services/auth-service/auth-service.ts
index 8221e489de7f8b63a6e1569596cabbc48d70f1ad,edc6e24fce752b628a7573899f21af2e6063073b..2c0c83d47d4ce1f8664bb1eda23b828db56343e6
--- 1/src/services/auth-service/auth-service.ts
--- 2/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@@ -59,10 -59,9 +59,10 @@@ export class AuthService 
          const email = localStorage.getItem(USER_EMAIL_KEY);
          const firstName = localStorage.getItem(USER_FIRST_NAME_KEY);
          const lastName = localStorage.getItem(USER_LAST_NAME_KEY);
-         const uuid = localStorage.getItem(USER_UUID_KEY);
-         const ownerUuid = localStorage.getItem(USER_OWNER_UUID_KEY);
+         const uuid = this.getUuid();
+         const ownerUuid = this.getOwnerUuid();
          const isAdmin = this.getIsAdmin();
 +        console.log(isAdmin);
  
          return email && firstName && lastName && uuid && ownerUuid
              ? { email, firstName, lastName, uuid, ownerUuid, isAdmin }