update Approvals from Testing

[aaf/authz.git] / auth / auth-cmd / src / main / java / org / onap / aaf / auth / cmd / user / Cred.java

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java
index 40447c1..a1cb3e7 100644 (file)
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java
@@ -21,32 +21,37 @@
 
 package org.onap.aaf.auth.cmd.user;
 
+import java.util.List;
+
 import org.onap.aaf.auth.cmd.AAFcli;
 import org.onap.aaf.auth.cmd.Cmd;
 import org.onap.aaf.auth.cmd.Param;
 import org.onap.aaf.auth.rserv.HttpMethods;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.aaf.client.ErrMessage;
 import org.onap.aaf.cadi.client.Future;
 import org.onap.aaf.cadi.client.Rcli;
 import org.onap.aaf.cadi.client.Retryable;
 import org.onap.aaf.misc.env.APIException;
 
 import aaf.v2_0.CredRequest;
+import aaf.v2_0.Error;
 
 public class Cred extends Cmd {
     public static final String ATTEMPT_FAILED_SPECIFICS_WITHELD = "Attempt Failed.  Specifics witheld.";
     private static final String CRED_PATH = "/authn/cred";
     private static final String[] options = {"add","del","reset","extend"/*,"clean"*/};
-//        private Clean clean;
-    public Cred(User parent) {
+       private ErrMessage em;
+//     private RosettaDF<Error> errDF;
+    public Cred(User parent) throws APIException {
         super(parent,"cred",
                 new Param(optionsToString(options),true),
                 new Param("id",true),
                 new Param("password (! D|E)",false),
                 new Param("entry# (if multi)",false)
         );
-//            clean = new Clean(this);
+        em = new ErrMessage(aafcli.env());
     }
 
     @Override
@@ -57,16 +62,16 @@ public class Cred extends Cmd {
 
         final CredRequest cr = new CredRequest();
         cr.setId(args[idx++]);
-        if(option!=1 && option!=3) {
-            if(idx>=args.length) throw new CadiException("Password Required");
+        if (option!=1 && option!=3) {
+            if (idx>=args.length) throw new CadiException("Password Required");
             cr.setPassword(args[idx++]);
         }
-        if(args.length>idx)
-            cr.setEntry(args[idx++]);
+        if (args.length>idx) {
+            cr.setEntry(args[idx]);
+        }
         
         // Set Start/End commands
         setStartEnd(cr);
-//            final int cleanIDX = _idx+1;
         Integer ret = same(new Retryable<Integer>() {
             @Override
             public Integer code(Rcli<?> client) throws CadiException, APIException {
@@ -82,7 +87,6 @@ public class Cred extends Cmd {
                         verb = "Added Credential [";
                         break;
                     case 1:
-//                            if(aafcli.addForce())cr.setForce("TRUE");
                         setQueryParamsOn(client);
                         fp = client.delete(CRED_PATH,
                             getDF(CredRequest.class),
@@ -106,19 +110,32 @@ public class Cred extends Cmd {
                             );
                         verb = "Extended Credential [";
                         break;
-//                        case 4:
-//                            return clean.exec(cleanIDX, args);
+                    default:
+                        break;
                 }
-                if(fp==null) {
+                if (fp==null) {
                     return null; // get by Sonar check.
                 }
-                if(fp.get(AAFcli.timeout())) {
+                if (fp.get(AAFcli.timeout())) {
                     pw().print(verb);
                     pw().print(cr.getId());
                     pw().println(']');
-                } else if(fp.code()==202) {
+                } else if (fp.code()==202) {
                         pw().println("Credential Action Accepted, but requires Approvals before actualizing");
-                } else if(fp.code()==406 && option==1) {
+                } else if (fp.code()==300) {
+                       Error err = em.getError(fp);
+                       String text = err.getText();
+                       List<String> vars = err.getVariables();
+                       
+                       // IMPORTANT! We do this backward, because it is looking for string
+                       // %1 or %13.  If we replace %1 first, that messes up %13
+                       for(int i=vars.size()-1;i>0;--i) {
+                               text = text.replace("%"+(i+1), (i<10?" ":"") + i+") " + vars.get(i));
+                       }
+
+                       text = text.replace("%1",vars.get(0));
+                       pw().println(text);
+                } else if (fp.code()==406 && option==1) {
                         pw().println("You cannot delete this Credential");
                 } else {
                     pw().println(ATTEMPT_FAILED_SPECIFICS_WITHELD);
@@ -126,7 +143,7 @@ public class Cred extends Cmd {
                 return fp.code();
             }
         });
-        if(ret==null)ret = -1;
+        if (ret==null)ret = -1;
         return ret;
     }