Changeset 907

Timestamp:

12/04/08 17:22:06 (16 years ago)

Author:

msteinbi

Message:

Implementation of UserRoleManager (#417)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/Interfaces/IServerConsoleFacade.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Core/ClientManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/HiveServerMessages.resx (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/JobManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/ServerConsoleFacade.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/UserRoleManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Contracts/ApplicationConstants.cs

@@ -8 +8 @@
     public static string RESPONSE_LOGIN_USER_ALLREADY_ONLINE = "Login.UserAllreadyOnline";
     public static string RESPONSE_LOGIN_SUCCESS = "Login.Success";
+
     public static string RESPONSE_LOGOUT_CLIENT_NOT_REGISTERED = "Logout.ClientNotRegistered";
     public static string RESPONSE_LOGOUT_SUCCESS = "Logout.Success";
 
+    public static string RESPONSE_USERROLE_GET_ALL_USERS = "UserRole.GetAllUsers";
+    public static string RESPONSE_USERROLE_USER_EXISTS_ALLREADY = "UserRole.UserExistsAllready";
+    public static string RESPONSE_USERROLE_USER_SUCCESSFULLY_ADDED = "UserRole.UserSuccessfullyAdded";
+    public static string RESPONSE_USERROLE_USER_DOESNT_EXIST = "UserRole.UserDoesntExist";
+    public static string RESPONSE_USERROLE_USER_REMOVED = "UserRole.UserRemoved";
+
   }
 }

trunk/sources/HeuristicLab.Hive.Contracts/Interfaces/IServerConsoleFacade.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.ServiceModel;
+using System.Runtime.Serialization;
 
 namespace HeuristicLab.Hive.Contracts.Interfaces {
@@ -11 +33 @@
   [ServiceContract]
   public interface IServerConsoleFacade : IClientManager, IJobManager, IUserRoleManager {
+    [DataContract]
+    Response Login(String userName, String password);
   }
 }

trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

@@ -44 +44 @@
           if (client.State != State.offline) {
             response.Success = false;
-            response.StatusMessage = rm.GetString(ApplicationConstants.RESPONSE_LOGIN_USER_ALLREADY_ONLINE);
+            response.StatusMessage = ApplicationConstants.RESPONSE_LOGIN_USER_ALLREADY_ONLINE;
             break;
           } else
@@ -54 +54 @@
         clientAdapter.UpdateClient(clientInfo);
         response.Success = true;
-        response.StatusMessage = rm.GetString(ApplicationConstants.RESPONSE_LOGIN_SUCCESS);
+        response.StatusMessage = ApplicationConstants.RESPONSE_LOGIN_SUCCESS;
       }
 
@@ -102 +102 @@
       if (client == null) {
         response.Success = false;
-        response.StatusMessage = rm.GetString(ApplicationConstants.RESPONSE_LOGOUT_CLIENT_NOT_REGISTERED);
+        response.StatusMessage = ApplicationConstants.RESPONSE_LOGOUT_CLIENT_NOT_REGISTERED;
         return response;
       }
@@ -109 +109 @@
 
       response.Success = true;
-      response.StatusMessage = rm.GetString(ApplicationConstants.RESPONSE_LOGOUT_SUCCESS);
+      response.StatusMessage = ApplicationConstants.RESPONSE_LOGOUT_SUCCESS;
       
       return response;

trunk/sources/HeuristicLab.Hive.Server.Core/ClientManager.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -37 +58 @@
 
     public ResponseList<ClientInfo> GetAllClients() {
-      return null;
+      ResponseList<ClientInfo> response = new ResponseList<ClientInfo>();
+      response.List = clients;
+      response.Success = true;
+      return response;
     }
 
     public ResponseList<ClientGroup> GetAllClientGroups() {
-      return null;
+      ResponseList<ClientGroup> response = new ResponseList<ClientGroup>();
+      response.List = clientGroups;
+      response.Success = true;
+      return response;
     }
 
     public ResponseList<UpTimeStatistics> GetAllUpTimeStatistics() {
-      return null;
+      ResponseList<UpTimeStatistics> response = new ResponseList<UpTimeStatistics>();
+      response.Success = true;
+      return response;
     }
 

trunk/sources/HeuristicLab.Hive.Server.Core/HiveServerMessages.resx

@@ -130 +130 @@
     <value>A User with this GUID is allready logged in</value>
   </data>
+  <data name="UserRole.GetAllUsers" xml:space="preserve">
+    <value>All Users returned</value>
+  </data>
+  <data name="UserRole.UserDoesntExist" xml:space="preserve">
+    <value>Sorry, but this user doesn't exist</value>
+  </data>
+  <data name="UserRole.UserExistsAllready" xml:space="preserve">
+    <value>Sorry, but a user with this name exists allready in database</value>
+  </data>
+  <data name="UserRole.UserRemoved" xml:space="preserve">
+    <value>User sucessfully removed from database</value>
+  </data>
+  <data name="UserRole.UserSuccessfullyAdded" xml:space="preserve">
+    <value>User successfully added to database</value>
+  </data>
 </root>

trunk/sources/HeuristicLab.Hive.Server.Core/JobManager.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23 +44 @@
 
     public ResponseList<Job> GetAllJobs() {
-      return null;
+      ResponseList<Job> response = new ResponseList<Job>();
+      response.List = jobs;
+      return response;
     }
 

trunk/sources/HeuristicLab.Hive.Server.Core/ServerConsoleFacade.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -73 +94 @@
     #endregion
 
+
+    #region IServerConsoleFacade Members
+
+    public Response Login(string userName, string password) {
+      Response response = new Response();
+      response.Success = true;
+      retrurn response;
+    }
+
+    #endregion
   }
 }

trunk/sources/HeuristicLab.Hive.Server.Core/UserRoleManager.cs

@@ -37 +37 @@
 
     public ResponseList<User> GetAllUsers() {
-      return null;      
+      ResponseList<User> response = new ResponseList<User>();
+
+      List<User> allUsers = new List<User>(userAdapter.GetAllUsers());
+      response.List = allUsers;
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_GET_ALL_USERS;
+
+      return response;
     }
 
     public Response AddNewUser(User user) {
+      Response response = new Response();
+
       User dbUser = userAdapter.GetUserByName(user.Name);
-
-      return null;
+      if (dbUser != null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_USER_EXISTS_ALLREADY;
+        return response;
+      }
+      userAdapter.UpdateUser(user);
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_USER_SUCCESSFULLY_ADDED;
+      
+      return response;
     }
 
     public ResponseList<UserGroup> GetAllUserGroups() {
-      return null;
+      ResponseList<UserGroup> response = new ResponseList<UserGroup>();
+
+      return response;
     }
 
     public Response RemoveUser(long userId) {
-      return null;
+      Response response = new Response();
+      User user = userAdapter.GetUserById(userId);
+      if (user == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_USER_DOESNT_EXIST;
+        return response;
+      }
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_USER_REMOVED;
+
+      return response;
     }