Changeset 1384 for trunk/sources/HeuristicLab.Security.Contracts

Timestamp:

03/20/09 20:27:15 (16 years ago)

Author:

svonolfe

Message:

Updated interfaces (#532)

Location:

trunk/sources/HeuristicLab.Security.Contracts

Files:

• BusinessObjects/GrantedPermission.cs (added)
• BusinessObjects/GrantedPermissions.cs (deleted)
• BusinessObjects/Permission.cs (modified) (2 diffs)
• BusinessObjects/PermissionOwner.cs (modified) (2 diffs)
• BusinessObjects/PersistableObject.cs (added)
• HeuristicLab.Security.Contracts.csproj (modified) (1 diff)
• Interfaces/IPermissionManager.cs (modified) (1 diff)
• Interfaces/ISecurityManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Security.Contracts/BusinessObjects/Permission.cs

@@ -24 +24 @@
 using System.Text;
 using System.Runtime.Serialization;
-using HeuristicLab.DataAccess;
 
 namespace HeuristicLab.Security.Contracts.BusinessObjects {
@@ -31 +30 @@
   public class Permission: PersistableObject {
     [DataMember]
-    public String Name { get; set; }
+    public String Description { get; set; }
+
+    [DataMember]
+    public Guid EntityId { get; set; }
   }
 }

trunk/sources/HeuristicLab.Security.Contracts/BusinessObjects/PermissionOwner.cs

@@ -24 +24 @@
 using System.Text;
 using System.Runtime.Serialization;
-using HeuristicLab.DataAccess;
 
 namespace HeuristicLab.Security.Contracts.BusinessObjects {
@@ -32 +31 @@
     [DataMember]
     public string Name { get; set; }
+
+    [DataMember]
+    public Guid EntityId { get; set; }
   }
 }

trunk/sources/HeuristicLab.Security.Contracts/HeuristicLab.Security.Contracts.csproj

@@ -42 +42 @@
   -->
   <ItemGroup>
-    <Compile Include="BusinessObjects\GrantedPermissions.cs" />
+    <Compile Include="BusinessObjects\GrantedPermission.cs" />
     <Compile Include="BusinessObjects\Permission.cs" />
     <Compile Include="BusinessObjects\PermissionOwner.cs" />
     <Compile Include="BusinessObjects\User.cs" />
     <Compile Include="BusinessObjects\UserGroup.cs" />
+    <Compile Include="BusinessObjects\PersistableObject.cs" />
     <Compile Include="SecurityContractsPlugin.cs" />
     <Compile Include="Interfaces\IPermissionManager.cs" />

trunk/sources/HeuristicLab.Security.Contracts/Interfaces/IPermissionManager.cs

@@ -6 +6 @@
   interface IPermissionManager {
     Guid Authenticate(String userName, String password);
-    bool CheckPermission(Guid sessionId, Guid permissionToken,
+    bool CheckPermission(Guid sessionId, Guid permissionId,
       Guid enitityId);
     void EndSession(Guid sessionId);

trunk/sources/HeuristicLab.Security.Contracts/Interfaces/ISecurityManager.cs

@@ -7 +7 @@
   interface ISecurityManager {
     User AddNewUser(User user);
-    bool RemoveUser(long userId);
+    bool RemoveUser(Guid userId);
     User UpdateUser(User user);
 
     UserGroup AddNewUserGroup(UserGroup group);
-    bool RemoveUserGroup(long groupId);
+    bool RemoveUserGroup(Guid groupId);
     UserGroup UpdateUserGroup(UserGroup group);
- 
-    bool AddPermissionOwnerToGroup(long groupId, long permissionOwnerId);
-    bool RemovePermissionOwnerFromGroup(long groupId, long permissionOwnerId);
 
-    bool GrantPermission(long permissionOwnerId, Guid permissionToken);
-    bool RevokePermission(long permissionOwnerId, Guid permissionToken);
+    bool AddPermissionOwnerToGroup(Guid groupId, Guid permissionOwnerId);
+    bool RemovePermissionOwnerFromGroup(Guid groupId, Guid permissionOwnerId);
+
+    bool GrantPermission(Guid permissionOwnerId, Guid permissionId);
+    bool RevokePermission(Guid permissionOwnerId, Guid permissionId);
   }
 }