Changeset 4024 for branches/HeuristicLab.Services.Authentication Prototype/Service

Timestamp:

07/09/10 17:19:19 (14 years ago)

Author:

bfarka

Message:

last bugfixes for project #1046

Location:

branches/HeuristicLab.Services.Authentication Prototype/Service/Provider

Files:

• HeuristicLabMembershipProvider.cs (modified) (2 diffs)
• HeuristicLabRoleProvider.cs (modified) (4 diffs)

branches/HeuristicLab.Services.Authentication Prototype/Service/Provider/HeuristicLabMembershipProvider.cs

@@ -153 +153 @@
       using (DataClassesDataContext db = DatabaseUtil.createDataClassesDataContext()) {
         // check database connection
-        if (db == null) {
-          return false;
-        }
-
+       
         if (newPassword.Length < MinRequiredPasswordLength) {
           return false;
         }
-
-        try {
-          // try to get user
+        if (db.HeuristicLabUsers.Count(x => x.UserName == username) > 0) {
           HeuristicLabUser u = db.HeuristicLabUsers.Single(x => x.UserName == username);
 
@@ -171 +166 @@
           }
           return false;
-
-
-        }
-        catch (Exception) {
-          return false;
-        }
+        } else {
+          return false;
+        }
+
+        
       }
     }

branches/HeuristicLab.Services.Authentication Prototype/Service/Provider/HeuristicLabRoleProvider.cs

@@ -9 +9 @@
   class HeuristicLabRoleProvider : RoleProvider {
     protected string applicationName;
+
+
+
 
     public override void AddUsersToRoles(string[] usernames, string[] roleNames) {
@@ -85 +88 @@
       Persistence.DataClassesDataContext db = DatabaseUtil.createDataClassesDataContext();
       if (roleName != null && db.HeuristicLabRole.Count(r => r.RoleName == roleName) == 1) {
+        
         HeuristicLabRole role = db.HeuristicLabRole.Single(r => r.RoleName == roleName);
+      
         foreach (HeuristicLabUserRole userRole in role.HeuristicLabUserRoles) {
           if (userRole.HeuristicLabUser.UserName.Contains(usernameToMatch)) {
@@ -121 +126 @@
       context.Dispose();
       return roleList.ToArray();
+    }
+
+    public virtual void AddChildRole(string parentRoleName, string childRoleName) {
+      using (DataClassesDataContext db = DatabaseUtil.createDataClassesDataContext()) {
+
+        if (db.HeuristicLabRole.Count(x => x.RoleName == parentRoleName) > 0 && db.HeuristicLabRole.Count(x => x.RoleName == childRoleName) > 0) {
+
+          HeuristicLabRole parentRole = db.HeuristicLabRole.Single(x => x.RoleName == parentRoleName);
+          HeuristicLabRole childRole = db.HeuristicLabRole.Single(x => x.RoleName == childRoleName);
+          childRole.ParentRoleID = parentRole.ID;
+          parentRole.HeuristicLabRoleChilds.Add(childRole);
+          db.SubmitChanges();
+        }
+      }
+    
     }
 
@@ -142 +162 @@
       DataClassesDataContext context = DatabaseUtil.createDataClassesDataContext();
       if (username != null && roleName != null) {
-        returnValue = (context.HeuristicLabUserRole.Count(ur => ur.HeuristicLabRole.RoleName == roleName && ur.HeuristicLabUser.UserName == username) > 0);
+
+        Persistence.HeuristicLabUser user = context.HeuristicLabUsers.Single(x => x.UserName == username);
+        foreach (Persistence.HeuristicLabUserRole ur in user.HeuristicLabUserRoles) {
+          if (ur.HeuristicLabRole.RoleName.Equals(roleName)) {
+            return true;
+          } else {
+            List<HeuristicLabRole> tmpList = ur.HeuristicLabRole.HeuristicLabRoleChilds.ToList<HeuristicLabRole>();
+            if (ResolveChildRoles(tmpList, roleName)) {
+              return true;
+            }
+          }
+        }
+
+
+
       }
       context.Dispose();
       return returnValue;
     }
-
+    protected bool ResolveChildRoles(List<HeuristicLabRole> roles, string roleName)
+    {
+      bool returnValue = false;
+      foreach (HeuristicLabRole r in roles) {
+        if (r.RoleName.Equals(roleName)) {
+          return true;
+        } else {
+          if (ResolveChildRoles(r.HeuristicLabRoleChilds.ToList<HeuristicLabRole>(), roleName)) {
+            return true;
+          }
+        }
+      }
+      return returnValue;
+    }
     public override void RemoveUsersFromRoles(string[] usernames, string[] roleNames) {