Changeset 13739 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveServiceLocatorWeb.cs

Timestamp:

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

Author:

jlodewyc

Message:

#2582 Overhaul Login service, done

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveServiceLocatorWeb.cs (modified) (5 diffs)

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

@@ -2 +2 @@
 using HeuristicLab.Clients.Common.Properties;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
 using System;
@@ -17 +18 @@
     public class HiveServiceLocatorWeb : IHiveServiceLocator
     {
-        private static IHiveServiceLocator instance = null;
         private HiveServiceClient clientinst;
-        public static IHiveServiceLocator Instance
-        {
-            get
-            {
-                if (instance == null)
-                {
-                    instance = new HiveServiceLocatorWeb();
-                }
-                return instance;
-            }
-        }
+        public Guid UserId {get; set; }
         private string username;
         public string Username
@@ -47 +37 @@
         public string WorkingEndpoint { get; private set; }
 
-        public static void clear()
-        {
-            instance = null;
-        }
 
         #region #unknownCalls
@@ -132 +118 @@
             return false;
         }
-        public static void SetLoginErrorMessage()
-        {
-             LoginViewModelService.Instance.GetLoginViewModel().errorMessage = "Login timed out";
-        }
 
         public string GetEndpointInformation()
@@ -195 +177 @@
         }
 
-        public void destroy()
+        public void destroyClient()
         {
             clientinst = null;
-            instance = null;
         }
     }