Merge "AAF-876-Block of commented files are removed from the file"

[aaf/authz.git] / auth / auth-cmd / src / main / java / org / onap / aaf / auth / cmd / perm / Delete.java

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/perm/Delete.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/perm/Delete.java
index 0f0c001..feffbdb 100644 (file)
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/perm/Delete.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/perm/Delete.java
@@ -59,8 +59,12 @@ public class Delete extends Cmd {
                 pk.setInstance(args[idx++]);
                 pk.setAction(args[idx++]);
         
-                // Set "Force" if set
-                setQueryParamsOn(client);
+                if(pk.getType().contains("@")) { // User Perm deletion... Must remove from hidden role
+                    client.setQueryParams("force");
+                } else {
+                    // Set "Force" if set
+                    setQueryParamsOn(client);
+                }
                 Future<PermRequest> fp = client.delete(
                         "/authz/perm", 
                         getDF(PermRequest.class),