Skip to content
This repository has been archived by the owner on Mar 21, 2022. It is now read-only.

Commit

Permalink
RegistryAuth: add method for building from auth token
Browse files Browse the repository at this point in the history
  • Loading branch information
mattnworb committed May 23, 2017
1 parent 246f6a1 commit 073ad23
Showing 1 changed file with 19 additions and 9 deletions.
28 changes: 19 additions & 9 deletions src/main/java/com/spotify/docker/client/messages/RegistryAuth.java
Original file line number Diff line number Diff line change
Expand Up @@ -144,23 +144,33 @@ public static RegistryAuth create(@JsonProperty("username") String username,
@JsonProperty("identityToken") final String identityToken,
@JsonProperty("auth") final String auth) {

final Builder builder;
if (auth != null) {
final String[] authParams = Base64.decodeAsString(auth).split(":");

if (authParams.length == 2) {
username = authParams[0].trim();
password = authParams[1].trim();
}
builder = forAuthToken(auth);
} else {
builder = builder()
.username(username)
.password(password);
}
return builder()
.username(username)
.password(password)
return builder
.email(email)
.serverAddress(serverAddress)
.identityToken(identityToken)
.build();
}

/** Construct a Builder based upon the "auth" field of the docker client config file. */
public static Builder forAuthToken(String auth) {
final String[] authParams = Base64.decodeAsString(auth).split(":");

if (authParams.length != 2) {
return builder();
}
return builder()
.username(authParams[0].trim())
.password(authParams[1].trim());
}

public static Builder builder() {
return new AutoValue_RegistryAuth.Builder();
}
Expand Down

0 comments on commit 073ad23

Please sign in to comment.