Changeset 13862 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Models

Timestamp:

05/30/16 16:52:40 (8 years ago)

Author:

jlodewyc

Message:

#2582 Start angular OKB manager, data loaded

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Models/HiveWebUser.cs (modified) (5 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Models/HiveWebUser.cs

@@ -48 +48 @@
         public HiveWebUser updateUserInfo()
         {
-            
+
             try
             {
@@ -57 +57 @@
                 access.RefreshUserGroups();
                 access.RefreshRoles();
-            
+
                 currentUser = access.Users.Find(x => x.UserName == username);
                 subscribedGroups = access.CallAccessService(x => x.GetUserGroupsOfUser(currentUser.Id));
                 accessRoles = access.CallAccessService(x => x.GetRolesOfCurrentUser());
             }
-            catch(SecurityAccessDeniedException e)
+            catch (Exception e)
             {
-                currentUser = new User();
-                currentUser.FullName = username;
-                subscribedGroups = new List<UserGroup>();
-                accessRoles = new List<Role>();
+                if (e is SecurityAccessDeniedException || e is NullReferenceException)
+                {
+                    currentUser = new User();
+                    currentUser.FullName = username;
+                    subscribedGroups = new List<UserGroup>();
+                    accessRoles = new List<Role>();
+                }
+                else
+                    throw e;
             }
-            
+
             return this;
 
@@ -75 +80 @@
         public bool HasUserAdminAccess()
         {
-            if(accessRoles.Find(x => x.Name == "AccessService Administrator") != null)
+            if (accessRoles.Find(x => x.Name == "AccessService Administrator") != null || weblog.getAccessAdminClient(webIdToken) != null)
             {
                 return true;
@@ -83 +88 @@
         public bool hasResourceAdminAccess()
         {
-            if(accessRoles.Find(x =>x.Name == "Hive Administrator" ) != null
-                && accessRoles.Find(x => x.Name == "AccessService Administrator") != null)
+            if ((accessRoles.Find(x => x.Name == "Hive Administrator") != null
+                && accessRoles.Find(x => x.Name == "AccessService Administrator") != null))
             {
                 return true;
@@ -92 +97 @@
         public bool hasOKBAccess()
         {
-            if (OKBOnly || accessRoles.Find(x => x.Name == "OKB User") != null || accessRoles.Find(x => x.Name == "OKB Administrator") != null)
+            if (OKBOnly || accessRoles.Find(x => x.Name == "OKB User") != null || accessRoles.Find(x => x.Name == "OKB Administrator") != null
+                || weblog.getQueryClient(webIdToken) != null)
+            {
+                return true;
+            }
+            return false;
+        }
+        public bool hasOKBAdminAccess()
+        {
+            if (OKBOnly)
+            {
+                if (weblog.getOkbAdminClient(webIdToken) != null)
+                    return true;
+            }
+            else if (accessRoles.Find(x => x.Name == "OKB Administrator") != null || weblog.getOkbAdminClient(webIdToken) != null)
             {
                 return true;