Changeset 4298 for trunk/sources/HeuristicLab.Services.OKB/3.3/RunnerService.cs

Timestamp:

08/24/10 02:37:56 (14 years ago)

Author:

swagner

Message:

Worked on OKB user authentication (#1167)

File:

• trunk/sources/HeuristicLab.Services.OKB/3.3/RunnerService.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Services.OKB/3.3/RunnerService.cs

@@ -142 +142 @@
     public void AddRun(Algorithm algorithm, Problem problem, Project project) {
       Log("adding run for {0}@{1}({2})[{3}, {4}]",
-        algorithm.Name, problem.Name, project.Name, authentication.User.Name, authentication.Client.Name);
+        algorithm.Name, problem.Name, project.Name, currentUser.Name, currentClient.Name);
       try {
         using (OKBDataContext okb = new OKBDataContext()) {
-          var user = okb.Users.Single(u => u.Id == authentication.User.Id);
-          var client = okb.Clients.Single(c => c.Id == authentication.Client.Id);
-          Experiment experiment = GetOrCreateExperiment(algorithm, problem, project, authentication.User, okb);
+          Experiment experiment = GetOrCreateExperiment(algorithm, problem, project, currentUser, okb);
           Run run = new Run() {
             Experiment = experiment,
-            UserId = authentication.User.Id,
-            ClientId = authentication.Client.Id,
+            UserId = currentUser.Id,
+            ClientId = currentClient.Id,
             FinishedDate = DateTime.Now,
             ResultValues = algorithm.ResultValues
@@ -175 +173 @@
         Log("reusing existing experiment");
         Experiment experiment = experimentQuery.First();
-        if (experiment.ExperimentCreators.Where(ec => ec.UserId == user.Id).Count() == 0) {
-          experiment.ExperimentCreators.Add(new ExperimentCreator() { UserId = user.Id });
-        }
         return experiment;
       } else {
@@ -187 +182 @@
           ParameterValues = algorithm.ParameterValues
         };
-        experiment.ExperimentCreators.Add(new ExperimentCreator() { UserId = user.Id });
         okb.Experiments.InsertOnSubmit(experiment);
         return experiment;
@@ -292 +286 @@
     /// </summary>
     /// <returns>
-    ///   <c>true</c> if this instance is connected; otherwise, <c>false</c>.
+    ///   <c>true</c> if this instance is connected; otherwise, <c>false</c>.
     /// </returns>
     public bool IsConnected() {
-      return authentication != null;
-    }
-
-    Authentication authentication = null;
+      return currentUser != null;
+    }
+
+    User currentUser = null;
+    Client currentClient = null;
 
     /// <summary>
@@ -309 +304 @@
     /// <param name="clientname">The clientname.</param>
     /// <returns>
-    ///   <c>true</c> if the login was successful; <c>false</c> otherwise.
+    ///   <c>true</c> if the login was successful; <c>false</c> otherwise.
     /// </returns>
     public bool Login(string username, string clientname) {
@@ -320 +315 @@
       }
       using (OKBDataContext okb = new OKBDataContext()) {
-        authentication = new Authentication() {
-          User = okb.Users.SingleOrDefault(u => u.Name == username),
-          Client = okb.Clients.SingleOrDefault(c => c.Name == clientname)
-        };
-        if (authentication.User == null) {
-          User user = new User() { Name = username, Id = Guid.NewGuid() };
-          okb.Users.InsertOnSubmit(user);
-          authentication.User = user;
+        currentUser = okb.Users.SingleOrDefault(u => u.Name == username);
+        currentClient = okb.Clients.SingleOrDefault(c => c.Name == clientname);
+        if (currentUser == null) {
+          currentUser = new User() { Name = username, Id = Guid.NewGuid() };
+          okb.Users.InsertOnSubmit(currentUser);
           okb.SubmitChanges();
         }
-        if (authentication.Client == null) {
-          Client client = new Client() { Name = clientname, Id = Guid.NewGuid() };
-          okb.Clients.InsertOnSubmit(client);
-          authentication.Client = client;
+        if (currentClient == null) {
+          currentClient = new Client() { Name = clientname, Id = Guid.NewGuid() };
+          okb.Clients.InsertOnSubmit(currentClient);
           okb.SubmitChanges();
         }
-        Log("  auth = {0}", authentication);
+        Log("  user = {0}, client = {1}", currentUser, currentClient);
         return true;
       }
@@ -346 +337 @@
     public void Logout() {
       Log("Logging out");
-      authentication = null;
+      currentUser = null;
+      currentClient = null;
     }