Alias ID and Alias ZID for Identity Providers

model/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProvider.java

@@ -56,7 +56,10 @@ public class IdentityProvider<T extends AbstractIdentityProviderDefinition> {
     public static final String FIELD_IDENTITY_ZONE_ID = "identityZoneId";
     public static final String FIELD_CONFIG = "config";
     public static final String FIELD_TYPE = "type";
+    public static final String FIELD_ALIAS_ID = "aliasId";
+    public static final String FIELD_ALIAS_ZID = "aliasZid";
     //see deserializer at the bottom
+
     private String id;
     @NotNull
     private String originKey;
@@ -71,7 +74,8 @@ public class IdentityProvider<T extends AbstractIdentityProviderDefinition> {
     private Date lastModified = new Date();
     private boolean active = true;
     private String identityZoneId;
-
+    private String aliasId;
+    private String aliasZid;
     public Date getCreated() {
         return created;
     }
@@ -197,6 +201,24 @@ public IdentityProvider setIdentityZoneId(String identityZoneId) {
         return this;
     }
 
+    public String getAliasId() {
+        return aliasId;
+    }
+
+    public IdentityProvider<T> setAliasId(String aliasId) {
+        this.aliasId = aliasId;
+        return this;
+    }
+
+    public String getAliasZid() {
+        return aliasZid;
+    }
+
+    public IdentityProvider<T> setAliasZid(String aliasZid) {
+        this.aliasZid = aliasZid;
+        return this;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -208,6 +230,8 @@ public int hashCode() {
         result = prime * result + ((name == null) ? 0 : name.hashCode());
         result = prime * result + ((originKey == null) ? 0 : originKey.hashCode());
         result = prime * result + ((type == null) ? 0 : type.hashCode());
+        result = prime * result + ((aliasId == null) ? 0 : aliasId.hashCode());
+        result = prime * result + ((aliasZid == null) ? 0 : aliasZid.hashCode());
         result = prime * result + version;
         return result;
     }
@@ -256,6 +280,20 @@ public boolean equals(Object obj) {
                 return false;
         } else if (!type.equals(other.type))
             return false;
+        if (aliasId == null) {
+            if (other.aliasId != null) {
+                return false;
+            }
+        } else if (!aliasId.equals(other.aliasId)) {
+            return false;
+        }
+        if (aliasZid == null) {
+            if (other.aliasZid != null) {
+                return false;
+            }
+        } else if (!aliasZid.equals(other.aliasZid)) {
+            return false;
+        }
         if (version != other.version)
             return false;
         return true;
@@ -265,10 +303,33 @@ public boolean equals(Object obj) {
     public String toString() {
         final StringBuffer sb = new StringBuffer("IdentityProvider{");
         sb.append("id='").append(id).append('\'');
+
+        sb.append(", identityZoneId=");
+        if (identityZoneId != null) {
+            sb.append('\'').append(identityZoneId).append('\'');
+        } else {
+            sb.append("null");
+        }
+
         sb.append(", originKey='").append(originKey).append('\'');
         sb.append(", name='").append(name).append('\'');
         sb.append(", type='").append(type).append('\'');
         sb.append(", active=").append(active);
+
+        sb.append(", aliasId=");
+        if (aliasId != null) {
+            sb.append('\'').append(aliasId).append('\'');
+        } else {
+            sb.append("null");
+        }
+
+        sb.append(", aliasZid=");
+        if (aliasZid != null) {
+            sb.append('\'').append(aliasZid).append('\'');
+        } else {
+            sb.append("null");
+        }
+
         sb.append('}');
         return sb.toString();
     }
@@ -304,6 +365,8 @@ public void serialize(IdentityProvider value, JsonGenerator gen, SerializerProvi
             writeDateField(FIELD_LAST_MODIFIED, value.getLastModified(), gen);
             gen.writeBooleanField(FIELD_ACTIVE, value.isActive());
             gen.writeStringField(FIELD_IDENTITY_ZONE_ID, value.getIdentityZoneId());
+            gen.writeStringField(FIELD_ALIAS_ID, value.getAliasId());
+            gen.writeStringField(FIELD_ALIAS_ZID, value.getAliasZid());
             gen.writeEndObject();
         }
 
@@ -369,6 +432,8 @@ public IdentityProvider deserialize(JsonParser jp, DeserializationContext ctxt)
             result.setLastModified(getNodeAsDate(node, FIELD_LAST_MODIFIED));
             result.setActive(getNodeAsBoolean(node, FIELD_ACTIVE, true));
             result.setIdentityZoneId(getNodeAsString(node, FIELD_IDENTITY_ZONE_ID, null));
+            result.setAliasId(getNodeAsString(node, FIELD_ALIAS_ID, null));
+            result.setAliasZid(getNodeAsString(node, FIELD_ALIAS_ZID, null));
             return result;
         }
 

model/src/test/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderTest.java

@@ -0,0 +1,94 @@
+package org.cloudfoundry.identity.uaa.provider;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.cloudfoundry.identity.uaa.constants.OriginKeys.UAA;
+
+import org.junit.jupiter.api.Test;
+
+class IdentityProviderTest {
+
+    @Test
+    void testToString_ShouldContainAliasProperties() {
+        final IdentityProvider<OIDCIdentityProviderDefinition> idp = new IdentityProvider<>();
+        idp.setId("12345");
+        idp.setName("some-name");
+        idp.setOriginKey("some-origin");
+        idp.setAliasZid("custom-zone");
+        idp.setAliasId("id-of-alias-idp");
+        idp.setActive(true);
+        idp.setIdentityZoneId(UAA);
+        final OIDCIdentityProviderDefinition config = new OIDCIdentityProviderDefinition();
+        config.setIssuer("issuer");
+        idp.setConfig(config);
+
+        assertThat(idp.getAliasId()).isEqualTo("id-of-alias-idp");
+        assertThat(idp.getAliasZid()).isEqualTo("custom-zone");
+        assertThat(idp).hasToString("IdentityProvider{id='12345', identityZoneId='uaa', originKey='some-origin', name='some-name', type='oidc1.0', active=true, aliasId='id-of-alias-idp', aliasZid='custom-zone'}");
+    }
+
+    @Test
+    void testToString_AliasPropertiesAndIdzIdNull() {
+        final IdentityProvider<OIDCIdentityProviderDefinition> idp = new IdentityProvider<>();
+        idp.setId("12345");
+        idp.setName("some-name");
+        idp.setOriginKey("some-origin");
+        idp.setAliasZid(null);
+        idp.setAliasId(null);
+        idp.setActive(true);
+        idp.setIdentityZoneId(null);
+        final OIDCIdentityProviderDefinition config = new OIDCIdentityProviderDefinition();
+        config.setIssuer("issuer");
+        idp.setConfig(config);
+
+        assertThat(idp).hasToString("IdentityProvider{id='12345', identityZoneId=null, originKey='some-origin', name='some-name', type='oidc1.0', active=true, aliasId=null, aliasZid=null}");
+    }
+
+    @Test
+    void testEqualsAndHashCode() {
+        final String customZoneId = "custom-zone";
+        final String aliasIdpId = "id-of-alias-idp";
+
+        final IdentityProvider<OIDCIdentityProviderDefinition> idp1 = new IdentityProvider<>();
+        idp1.setId("12345");
+        idp1.setName("some-name");
+        idp1.setOriginKey("some-origin");
+        idp1.setAliasZid(customZoneId);
+        idp1.setAliasId(aliasIdpId);
+        idp1.setActive(true);
+        idp1.setIdentityZoneId(UAA);
+        final OIDCIdentityProviderDefinition config1 = new OIDCIdentityProviderDefinition();
+        config1.setIssuer("issuer");
+        idp1.setConfig(config1);
+
+        final IdentityProvider<OIDCIdentityProviderDefinition> idp2 = new IdentityProvider<>();
+        idp2.setId("12345");
+        idp2.setName("some-name");
+        idp2.setOriginKey("some-origin");
+        idp2.setAliasZid(customZoneId);
+        idp2.setAliasId(aliasIdpId);
+        idp2.setActive(true);
+        idp2.setIdentityZoneId(UAA);
+        final OIDCIdentityProviderDefinition config2 = new OIDCIdentityProviderDefinition();
+        config2.setIssuer("issuer");
+        idp2.setConfig(config2);
+
+        idp2.setCreated(idp1.getCreated());
+        idp2.setLastModified(idp1.getLastModified());
+
+        // initially, the tow IdPs should be equal
+        assertThat(idp1.equals(idp2)).isTrue();
+        assertThat(idp1).hasSameHashCodeAs(idp2);
+
+        // remove aliasZid
+        idp2.setAliasZid(null);
+        assertThat(idp1.equals(idp2)).isFalse();
+        assertThat(idp2.equals(idp1)).isFalse();
+        idp2.setAliasZid(customZoneId);
+
+        // remove aliasId
+        idp2.setAliasId(null);
+        assertThat(idp1.equals(idp2)).isFalse();
+        assertThat(idp2.equals(idp1)).isFalse();
+    }
+
+}