Changeset 13739 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/ResourceController.cs

Timestamp:

03/29/16 17:02:16 (8 years ago)

Author:

jlodewyc

Message:

#2582 Overhaul Login service, done

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/ResourceController.cs (modified) (4 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/ResourceController.cs

@@ -1 +1 @@
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using Microsoft.AspNet.Hosting;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
 using System;
@@ -12 +13 @@
     public class ResourceController : Controller
     {
-        private HiveServiceClient client;
+        private WebLoginService weblog;
+        private HiveServiceLocatorWeb serviceLocator;
+        private HiveServiceClient serviceClient;
+        private HiveClientWeb clientWeb;
+        private Guid userId;
+
         private IHostingEnvironment _environment;
 
         public ResourceController(IHostingEnvironment env)
         {
-            HiveServiceLocatorWeb hiveServiceLocator = (HiveServiceLocatorWeb)HiveServiceLocatorWeb.Instance;
-            client = hiveServiceLocator.getHiveServiceClient();
+            weblog = WebLoginService.Instance;
+            var u = HttpContext.Session.GetString("UserId");
+            if (u == null || u == "" || Guid.Parse(u) == Guid.Empty)
+            {
+                userId = Guid.Empty;
+                serviceLocator = new HiveServiceLocatorWeb();
+                serviceClient = serviceLocator.getHiveServiceClient();
+                clientWeb = new HiveClientWeb(serviceLocator, userId);
+            }
+            else {
+                userId = Guid.Parse(u);
+
+                serviceLocator = weblog.getServiceLocator(userId);
+                serviceClient = serviceLocator.getHiveServiceClient();
+                clientWeb = weblog.getClientWeb(userId);
+            }
 
             _environment = env;
@@ -24 +44 @@
         public IActionResult Index()
         {
-            if (((HiveServiceLocatorWeb)(HiveServiceLocatorWeb.Instance)).CheckLogin())
+            if (serviceLocator.CheckLogin())
             {
 
@@ -32 +52 @@
             else
             {
-                HiveServiceLocatorWeb.SetLoginErrorMessage();
                 return RedirectToAction("Index", "Home");
             }