Cleaned up old getAllowedRoles logic for #65

Moonshine-IDE · Nov 18, 2024 · 1906af1 · 1906af1
1 parent 554d5a4
commit 1906af1
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 38 deletions.
diff --git a/Super.Human.Portal_Agents/src/main/java/CategoryAgents/CategoryCreate.java b/Super.Human.Portal_Agents/src/main/java/CategoryAgents/CategoryCreate.java
@@ -18,7 +18,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		// return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use getRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/CategoryAgents/CategoryDelete.java b/Super.Human.Portal_Agents/src/main/java/CategoryAgents/CategoryDelete.java
@@ -18,7 +18,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		// return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use getRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/CategoryAgents/CategoryRead.java b/Super.Human.Portal_Agents/src/main/java/CategoryAgents/CategoryRead.java
@@ -20,7 +20,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		// return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use getRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/CategoryAgents/CategoryUpdate.java b/Super.Human.Portal_Agents/src/main/java/CategoryAgents/CategoryUpdate.java
@@ -18,7 +18,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		// return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use getRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/CustomBookmarkCreate.java b/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/CustomBookmarkCreate.java
@@ -23,7 +23,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		//return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/CustomBookmarkDelete.java b/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/CustomBookmarkDelete.java
@@ -17,7 +17,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		// return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/CustomBookmarkRead.java b/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/CustomBookmarkRead.java
@@ -29,7 +29,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		// return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/CustomBookmarkUpdate.java b/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/CustomBookmarkUpdate.java
@@ -31,7 +31,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		// return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/DatabaseRead.java b/Super.Human.Portal_Agents/src/main/java/CustomBookmarkAgents/DatabaseRead.java
@@ -39,7 +39,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		//return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/DocumentationFormAgents/DocumentationFormCreate.java b/Super.Human.Portal_Agents/src/main/java/DocumentationFormAgents/DocumentationFormCreate.java
@@ -18,7 +18,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		// return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/DocumentationFormAgents/DocumentationFormDelete.java b/Super.Human.Portal_Agents/src/main/java/DocumentationFormAgents/DocumentationFormDelete.java
@@ -18,7 +18,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		// return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/DocumentationFormAgents/DocumentationFormRead.java b/Super.Human.Portal_Agents/src/main/java/DocumentationFormAgents/DocumentationFormRead.java
@@ -18,7 +18,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		// return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/DocumentationFormAgents/DocumentationFormUpdate.java b/Super.Human.Portal_Agents/src/main/java/DocumentationFormAgents/DocumentationFormUpdate.java
@@ -18,7 +18,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		// return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/GenesisDirectoryAgents/GenesisDirectoryCreate.java b/Super.Human.Portal_Agents/src/main/java/GenesisDirectoryAgents/GenesisDirectoryCreate.java
@@ -19,7 +19,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		// return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/GenesisDirectoryAgents/GenesisDirectoryDelete.java b/Super.Human.Portal_Agents/src/main/java/GenesisDirectoryAgents/GenesisDirectoryDelete.java
@@ -17,7 +17,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		// return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/GenesisDirectoryAgents/GenesisDirectoryRead.java b/Super.Human.Portal_Agents/src/main/java/GenesisDirectoryAgents/GenesisDirectoryRead.java
@@ -19,7 +19,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		// return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/GenesisDirectoryAgents/GenesisDirectoryUpdate.java b/Super.Human.Portal_Agents/src/main/java/GenesisDirectoryAgents/GenesisDirectoryUpdate.java
@@ -17,7 +17,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		//return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		return null;  // use getRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/main/java/genesis/GenesisInstall.java b/Super.Human.Portal_Agents/src/main/java/genesis/GenesisInstall.java
@@ -32,7 +32,8 @@ public String getRoleRestrictionID() {
 
 	@Override
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		// return SecurityBuilder.buildList(SecurityBuilder.ROLE_ADMINISTRATOR);
+		return null;  // use GetRoleRestrictionID
 	}
 
 	@Override

diff --git a/Super.Human.Portal_Agents/src/main/java/genesis/GenesisRead.java b/Super.Human.Portal_Agents/src/main/java/genesis/GenesisRead.java
@@ -50,7 +50,8 @@ public String getRoleRestrictionID() {
 	}
 
 	public Collection<String> getAllowedRoles() {
-		return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		//return SecurityBuilder.buildList(SimpleRoleSecurity.ROLE_ALL);
+		return null;  // use getRoleRestrictionID
 	}
 
 	public SecurityInterface checkSecurity() {

diff --git a/Super.Human.Portal_Agents/src/test/groovy/auth/SimpleRoleSecuritySpec.groovy b/Super.Human.Portal_Agents/src/test/groovy/auth/SimpleRoleSecuritySpec.groovy
@@ -190,25 +190,25 @@ class SimpleRoleSecuritySpec extends Specification {
         new ConfigRead()                    | ['All']
         new XMLAuthenticationTest()         | ['All']
         // the rest were changed to useRoleRestrictionID
-        // new DocumentationFormRead()         | ['All']
-        // new DocumentationFormDelete()       | ['All']
-        // new DocumentationFormCreate()       | ['All']
-        // new DocumentationFormUpdate()       | ['All']
-        // new CategoryRead()                  | ['All']
-        // new CategoryDelete()                | ['All']
-        // new CategoryCreate()                | ['All']
-        // new CategoryUpdate()                | ['All']
-        // new CustomBookmarkDelete()          | ['Administrator']
-        // new CustomBookmarkCreate()          | ['Administrator']
-        // new CustomBookmarkUpdate()          | ['Administrator']
-        // new CustomBookmarkRead()            | ['All']
-        // new DatabaseRead()                  | ['All']
-        // new GenesisDirectoryUpdate()        | ['Administrator']
-        // new GenesisDirectoryCreate()        | ['Administrator']
-        // new GenesisDirectoryDelete()        | ['Administrator']
-        // new GenesisDirectoryRead()          | ['Administrator']
-        // new GenesisRead()                   | ['All']
-        // new GenesisInstall()                | ['Administrator']
+        new DocumentationFormRead()         | null //['All']
+        new DocumentationFormDelete()       | null //['All']
+        new DocumentationFormCreate()       | null //['All']
+        new DocumentationFormUpdate()       | null //['All']
+        new CategoryRead()                  | null //['All']
+        new CategoryDelete()                | null //['All']
+        new CategoryCreate()                | null //['All']
+        new CategoryUpdate()                | null //['All']
+        new CustomBookmarkDelete()          | null //['Administrator']
+        new CustomBookmarkCreate()          | null //'Administrator']
+        new CustomBookmarkUpdate()          | null //['Administrator']
+        new CustomBookmarkRead()            | null //['All']
+        new DatabaseRead()                  | null //['All']
+        new GenesisDirectoryUpdate()        | null //['Administrator']
+        new GenesisDirectoryCreate()        | null //['Administrator']
+        new GenesisDirectoryDelete()        | null //['Administrator']
+        new GenesisDirectoryRead()          | null //['Administrator']
+        new GenesisRead()                   | null //['All']
+        new GenesisInstall()                | null //['Administrator']