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

Timestamp:

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

Author:

jlodewyc

Message:

#2582 Start angular OKB manager, data loaded

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services

Files:

• Imports/AccessAdministrationClient.cs (modified) (2 diffs)
• Imports/HiveAdminClientWeb.cs (modified) (3 diffs)
• Imports/HiveClientWeb.cs (modified) (1 diff)
• Imports/HiveServiceLocatorWeb.cs (modified) (1 diff)
• Imports/OkbAdministrationWebClient.cs (added)
• Imports/QueryWebClient.cs (added)
• JSONResolvers (added)
• JSONResolvers/JsonTaskResolver.cs (added)
• WebLoginService.cs (modified) (7 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/AccessAdministrationClient.cs

@@ -26 +26 @@
 using System.ServiceModel;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using System.Collections.Generic;
 using System.ServiceModel.Security;
-
-namespace HeuristicLab.Clients.Access.Administration
+using HeuristicLab.Clients.Access;
+
+namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
 {
     /// <summary>
@@ -485 +485 @@
         }
         #endregion
+
+        internal bool CheckLogin()
+        {
+            try
+            {
+                this.RefreshUsers();
+                return true;
+            }
+            catch (SecurityAccessDeniedException e)
+            {
+                return false;
+            }
+            catch (MessageSecurityException e)
+            {
+                return false;
+            }
+        }
     }
 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveAdminClientWeb.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
-
-namespace HeuristicLab.Clients.Hive
+using System.ServiceModel.Security;
+
+namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
 {
     [Item("Hive Administrator", "Hive Administrator")]
@@ -99 +100 @@
                 });
             }
-            catch
-            {
-                throw;
+            catch(Exception e)
+            {
+                throw e;
             }
             finally
@@ -200 +201 @@
             }
         }
+
+        internal bool CheckLogin()
+        {
+            try
+            {
+                this.Refresh();
+                return true;
+            }
+            catch (MessageSecurityException e)
+            {
+                return false;
+            }
+            catch(SecurityAccessDeniedException e)
+            {
+                return false;
+            }
+        }
     }
 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveClientWeb.cs

@@ -33 +33 @@
 using HeuristicLab.PluginInfrastructure;
 using TS = System.Threading.Tasks;
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
-using HeuristicLab.Clients.Common.Properties;
 using Microsoft.AspNetCore.Hosting;
-using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
-
-namespace HeuristicLab.Clients.Hive.WebJobManager
+
+namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
 {
     /// <summary>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveServiceLocatorWeb.cs

@@ -11 +11 @@
 using System.Threading.Tasks;
 
-namespace HeuristicLab.Clients.Hive.WebJobManager.Services
+namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
 {
     /// <summary>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/WebLoginService.cs

@@ -21 +21 @@
 
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Models;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
 using System;
@@ -48 +48 @@
         private List<HiveWebUser> loggedinUsers;
         private List<QueryWebClient> queryclients;
+        private List<OkbAdministrationWebClient> okbmanclients;
         /// <summary>
         /// Service instance that keeps all the information per user seperated. Data is in  different lists so 
@@ -77 +78 @@
             adminclients = new List<HiveAdminClientWeb>();
             loggedinUsers = new List<HiveWebUser>();
-            queryclients = new List<QueryWebClient>(); 
+            queryclients = new List<QueryWebClient>();
+            okbmanclients = new List<OkbAdministrationWebClient>();
         }
         /// <summary>
@@ -94 +96 @@
             loggedIn.Add(log);
             locators.Add(loc);
+            
             webclients.Add(new HiveClientWeb(loc, log.userId));
             fileopeners.Add(new FileOpeningService(log.userId));
             jobopeners.Add(new FileOpeningService(log.userId));
-            accessclients.Add(new AccessAdministrationClient(log.userId));
-            adminclients.Add(new HiveAdminClientWeb(log.userId));
+            var acc = new AccessAdministrationClient(log.userId);
+            if(acc.CheckLogin())
+                accessclients.Add(acc);
             loggedinUsers.Add(new HiveWebUser(log.userId, log.loginName, false).updateUserInfo());
-            queryclients.Add(new QueryWebClient(log.userId));
-        }
-        public void newLoginOKBOnly(LoginViewModel log, QueryWebClient qwc)
+            var ad = new HiveAdminClientWeb(log.userId);
+            if(ad.CheckLogin())
+                adminclients.Add(ad);  
+            var qu = new QueryWebClient(log.userId);
+            if(qu.CheckLogin())
+                queryclients.Add(qu);
+            var okb = new OkbAdministrationWebClient(log.userId);
+            if (okb.CheckLogin())
+                okbmanclients.Add(okb);
+        }
+        public void newLoginOKBOnly(LoginViewModel log, QueryWebClient qwc, string pass)
         {
             destroyPossiblePreviousSessions(log.loginName);
@@ -113 +125 @@
             queryclients.Add(qwc);
             loggedinUsers.Add(new HiveWebUser(log.userId, log.loginName, true).updateUserInfo());
+            var okb = new OkbAdministrationWebClient(log, pass);
+            if (okb.CheckLogin())
+                okbmanclients.Add(okb);
             
         }
@@ -194 +209 @@
         {
             return loggedinUsers.Find(x => x.webIdToken == id);
+        }
+
+        public OkbAdministrationWebClient getOkbAdminClient(Guid id)
+        {
+            return okbmanclients.Find(x => x.UserId == id);
         }
         /// <summary>
@@ -209 +229 @@
             adminclients.RemoveAll(x => x.userId == id);
             queryclients.RemoveAll(x => x.UserId == id);
+            okbmanclients.RemoveAll(x => x.UserId == id);
             loggedIn.RemoveAll(x => x.userId == id);
             loggedinUsers.RemoveAll(x => x.webIdToken == id);