Fix #921, make AuthConfig compatible with indentitytoken

nowheresly · nowheresly · commit fee921e8ca4c · 2018-08-14T20:18:25.000+02:00
which was introduced in DOCKER API 1.23
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -42,6 +42,12 @@ public class AuthConfig implements Serializable {
     @JsonProperty("registrytoken")
     private String registrytoken;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_23}
+     */
+    @JsonProperty("identitytoken")
+    private String identitytoken;
+
     public String getUsername() {
         return username;
     }
@@ -87,6 +93,20 @@ public AuthConfig withAuth(String auth) {
         return this;
     }
 
+    /**
+     * @see #identitytoken
+     */
+    public String getIdentitytoken() {
+        return identitytoken;
+    }
+    /**
+     * @see #identitytoken
+     */
+    public AuthConfig withIdentityToken(String identitytoken) {
+        this.identitytoken = identitytoken;
+        return this;
+    }
+
     /**
      * @see #registrytoken
      */
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -61,4 +61,21 @@ public void serderDocs2() throws IOException {
 
         assertThat(authConfig1, equalTo(authConfig));
     }
+
+    @Test
+    public void compatibleWithIdentitytoken() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+        final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_23,
+                "/other/AuthConfig/docs1.json",
+                type
+        );
+        String auth = "YWRtaW46";
+        String identitytoken = "1cba468e-8cbe-4c55-9098-2c2ed769e885";
+        assertThat(authConfig, notNullValue());
+        assertThat(authConfig.getAuth(), is(auth));
+        assertThat(authConfig.getIdentitytoken(), is(identitytoken));
+        final AuthConfig authConfig1 = new AuthConfig().withAuth(auth).withIdentityToken(identitytoken);
+        assertThat(authConfig1, equalTo(authConfig));
+    }
 }
diff --git a/src/test/resources/samples/1.23/other/AuthConfig/docs1.json b/src/test/resources/samples/1.23/other/AuthConfig/docs1.json
@@ -0,0 +1,4 @@
+{
+  "auth": "YWRtaW46",
+  "identitytoken": "1cba468e-8cbe-4c55-9098-2c2ed769e885"
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "auth": "YWRtaW46",
 +  "identitytoken": "1cba468e-8cbe-4c55-9098-2c2ed769e885"
 +}