Polishing external HTTP credentials support for the Shell

Author: ghillert

spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/TargetCredentials.java

@@ -37,9 +37,19 @@ public class TargetCredentials {
 
 	private final String password;
 
+	private final boolean usesAccessToken;
+
 	public TargetCredentials(String username, String password) {
 		this.username = username;
 		this.password = password;
+		this.usesAccessToken = false;
+	}
+
+	public TargetCredentials(boolean usesAccessToken) {
+		super();
+		this.username = null;
+		this.password = null;
+		this.usesAccessToken = usesAccessToken;
 	}
 
 	public String getUsername() {
@@ -51,7 +61,12 @@ public String getPassword() {
 	}
 
 	public String getDisplayableContents() {
-		return "[username='" + username + "', password='********']";
+		if (this.usesAccessToken) {
+			return "[Uses OAuth2 Access Token]";
+		}
+		else {
+			return "[username='" + username + "', password='********']";
+		}
 	}
 
 	public List<RoleType> getRoles() {

spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/command/ConfigCommands.java

@@ -43,6 +43,7 @@
 import org.springframework.cloud.dataflow.rest.util.ProcessOutputResource;
 import org.springframework.cloud.dataflow.rest.util.ResourceBasedAuthorizationInterceptor;
 import org.springframework.cloud.dataflow.shell.Target;
+import org.springframework.cloud.dataflow.shell.TargetCredentials;
 import org.springframework.cloud.dataflow.shell.TargetHolder;
 import org.springframework.cloud.dataflow.shell.command.support.RoleType;
 import org.springframework.cloud.dataflow.shell.config.DataFlowShell;
@@ -195,6 +196,7 @@ public String target(
 				httpClientConfigurer.basicAuthCredentials(targetUsername, targetPassword);
 			}
 			if (StringUtils.hasText(credentialsProviderCommand)) {
+				this.targetHolder.getTarget().setTargetCredentials(new TargetCredentials(true));
 				final Resource credentialsResource = new ProcessOutputResource(credentialsProviderCommand.split("\\s+"));
 				httpClientConfigurer.addInterceptor(new ResourceBasedAuthorizationInterceptor(credentialsResource));
 			}

spring-cloud-dataflow-shell-core/src/main/resources/usage.txt

@@ -1,8 +1,9 @@
 Data Flow Options:
-  --dataflow.uri=<uri>                          Address of the Data Flow Server [default: http://localhost:9393].
-  --dataflow.username=<USER>                    Username of the Data Flow Server [no default].
-  --dataflow.password=<PASSWORD>                Password of the Data Flow Server [no default].
-  --dataflow.skip-ssl-validation=<true|false>   Accept any SSL certificate (even self-signed) [default: no].
-  --spring.shell.historySize=<SIZE>             Default size of the shell log file [default: 3000].
-  --spring.shell.commandFile=<FILE>             Data Flow Shell executes commands read from the file(s) and then exits.
-  --help                                        This message.
+  --dataflow.uri=<uri>                              Address of the Data Flow Server [default: http://localhost:9393].
+  --dataflow.username=<USER>                        Username of the Data Flow Server [no default].
+  --dataflow.password=<PASSWORD>                    Password of the Data Flow Server [no default].
+  --dataflow.credentials-provider-command=<COMMAND> Executes an external command which must return an OAuth Access Token [no default].
+  --dataflow.skip-ssl-validation=<true|false>       Accept any SSL certificate (even self-signed) [default: no].
+  --spring.shell.historySize=<SIZE>                 Default size of the shell log file [default: 3000].
+  --spring.shell.commandFile=<FILE>                 Data Flow Shell executes commands read from the file(s) and then exits.
+  --help                                            This message.