From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Thu, 29 Nov 2018 11:34:13 +0000 (+0100)
Subject: merge master
X-Git-Tag: 1.4.0~97^2~6
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/8623f430ea556381f8681c2aea00e43e64d3f6d1

merge master

Feature #14498

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

8623f430ea556381f8681c2aea00e43e64d3f6d1
diff --cc src/services/auth-service/auth-service.ts
index 8221e489,edc6e24f..2c0c83d4
--- a/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 }