X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cmd%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcmd%2Fperm%2FDelete.java;h=feffbdb0856710a44690a64de5aff92a70a63b5c;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=ed52a071d794bb653715613f1b121406843a0c14;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;p=aaf%2Fauthz.git

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 ed52a071..feffbdb0 100644
--- 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,16 +59,20 @@ 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),
                         pk);
-                if(fp.get(AAFcli.timeout())) {
+                if (fp.get(AAFcli.timeout())) {
                     pw().println("Deleted Permission");
                 } else {
-                    if(fp.code()==202) {
+                    if (fp.code()==202) {
                         pw().println("Permission Deletion Accepted, but requires Approvals before actualizing");
                     } else {
                         error(fp);