Skip to content

Commit

Permalink
Update IdentityZone related classes and tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Duane May <[email protected]>
  • Loading branch information
@duanemay @peterhaochen47
duanemay authored and peterhaochen47 committed Jul 10, 2024
1 parent 2476b7d commit 55b998d
Show file tree
Hide file tree
Showing 9 changed files with 416 additions and 720 deletions.
134 changes: 23 additions & 111 deletions model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZone.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,21 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.cloudfoundry.identity.uaa.constants.OriginKeys;

import javax.validation.constraints.NotNull;
import java.util.Calendar;
import java.util.Date;

@Data
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class IdentityZone {
public static IdentityZone getUaa() {
Calendar calendar = Calendar.getInstance();
calendar.clear();
calendar.set(Calendar.YEAR, 2000);
IdentityZone uaa = new IdentityZone();
uaa.setCreated(calendar.getTime());
uaa.setLastModified(calendar.getTime());
uaa.setVersion(0);
uaa.setId(OriginKeys.UAA);
uaa.setName(OriginKeys.UAA);
uaa.setDescription("The system zone for backwards compatibility");
uaa.setSubdomain("");
return uaa;
}

public static String getUaaZoneId() {
return getUaa().getId();
}

@JsonIgnore
public boolean isUaa() {
return this.equals(getUaa());
}

@EqualsAndHashCode.Include
private String id;

@NotNull
Expand All @@ -58,97 +40,27 @@ public boolean isUaa() {

private boolean active = true;

public Date getCreated() {
return created;
}

public void setCreated(Date created) {
this.created = created;
}

public Date getLastModified() {
return lastModified;
}

public void setLastModified(Date lastModified) {
this.lastModified = lastModified;
}

public void setVersion(int version) {
this.version = version;
}

public int getVersion() {
return version;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getSubdomain() {
return subdomain;
}

public void setSubdomain(String subdomain) {
this.subdomain = subdomain;
}

public String getId() {
return id;
}

public void setId(String id) {
this.id = id;
}

public String getDescription() {
return description;
}

public void setDescription(String description) {
this.description = description;
}

public boolean isActive() {
return active;
}

public void setActive(boolean active) {
this.active = active;
}

public IdentityZoneConfiguration getConfig() {
return config;
}

public void setConfig(IdentityZoneConfiguration config) {
this.config = config;
public static IdentityZone getUaa() {
Calendar calendar = Calendar.getInstance();
calendar.clear();
calendar.set(Calendar.YEAR, 2000);
IdentityZone uaa = new IdentityZone();
uaa.setCreated(calendar.getTime());
uaa.setLastModified(calendar.getTime());
uaa.setVersion(0);
uaa.setId(OriginKeys.UAA);
uaa.setName(OriginKeys.UAA);
uaa.setDescription("The system zone for backwards compatibility");
uaa.setSubdomain("");
return uaa;
}

@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
return result;
public static String getUaaZoneId() {
return getUaa().getId();
}

@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
IdentityZone other = (IdentityZone) obj;
if (id == null) {
return other.id == null;
} else return id.equals(other.id);
@JsonIgnore
public boolean isUaa() {
return this.equals(getUaa());
}
}
88 changes: 8 additions & 80 deletions model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import org.cloudfoundry.identity.uaa.login.Prompt;

import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
import java.util.List;

@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class IdentityZoneConfiguration {
Expand All @@ -32,118 +34,44 @@ public class IdentityZoneConfiguration {
private CorsPolicy corsPolicy = new CorsPolicy();
private Links links = new Links();
private List<Prompt> prompts = Arrays.asList(
new Prompt("username", "text", "Email"),
new Prompt("password", "password", "Password"),
new Prompt("passcode", "password", "Temporary Authentication Code (Get on at /passcode)")
new Prompt("username", "text", "Email"),
new Prompt("password", "password", "Password"),
new Prompt("passcode", "password", "Temporary Authentication Code (Get on at /passcode)")
);
private boolean idpDiscoveryEnabled = false;
private BrandingInformation branding;
private boolean accountChooserEnabled;
private UserConfig userConfig = new UserConfig();
@JsonInclude(JsonInclude.Include.NON_NULL)
private String issuer;
private String defaultIdentityProvider;

public IdentityZoneConfiguration() {}

public IdentityZoneConfiguration(TokenPolicy tokenPolicy) {
this.tokenPolicy = tokenPolicy;
}

public ClientSecretPolicy getClientSecretPolicy() {
return clientSecretPolicy;
public IdentityZoneConfiguration() {
}

public void setClientSecretPolicy(ClientSecretPolicy clientSecretPolicy) {
this.clientSecretPolicy = clientSecretPolicy;
}

public TokenPolicy getTokenPolicy() {
return tokenPolicy;
}

public void setTokenPolicy(TokenPolicy tokenPolicy) {
public IdentityZoneConfiguration(TokenPolicy tokenPolicy) {
this.tokenPolicy = tokenPolicy;
}

public SamlConfig getSamlConfig() {
return samlConfig;
}

public IdentityZoneConfiguration setSamlConfig(SamlConfig samlConfig) {
this.samlConfig = samlConfig;
return this;
}

public Links getLinks() {
return links;
}

public IdentityZoneConfiguration setLinks(Links links) {
this.links = links;
return this;
}

public List<Prompt> getPrompts() {
return prompts;
}

public IdentityZoneConfiguration setPrompts(List<Prompt> prompts) {
this.prompts = prompts;
return this;
}

public boolean isIdpDiscoveryEnabled() {
return idpDiscoveryEnabled;
}

public void setIdpDiscoveryEnabled(boolean idpDiscoveryEnabled) {
this.idpDiscoveryEnabled = idpDiscoveryEnabled;
}

public BrandingInformation getBranding() {
return branding;
}

public void setBranding(BrandingInformation branding) {
this.branding = branding;
}

public void setAccountChooserEnabled(boolean accountChooserEnabled) {
this.accountChooserEnabled = accountChooserEnabled;
}

public CorsPolicy getCorsPolicy() {
return corsPolicy;
}

public IdentityZoneConfiguration setCorsPolicy(CorsPolicy corsPolicy) {
this.corsPolicy = corsPolicy;
return this;
}
public boolean isAccountChooserEnabled() {
return accountChooserEnabled;
}

public UserConfig getUserConfig() {
return userConfig;
}

public void setUserConfig(UserConfig userConfig) {
this.userConfig = userConfig;
}

public String getDefaultIdentityProvider() {
return defaultIdentityProvider;
}

public void setDefaultIdentityProvider(String defaultIdentityProvider) {
this.defaultIdentityProvider = defaultIdentityProvider;
}

@JsonInclude(JsonInclude.Include.NON_NULL)
public String getIssuer() {
return issuer;
}

@JsonInclude(JsonInclude.Include.NON_NULL)
public void setIssuer(String issuer) {
Expand Down
Loading

0 comments on commit 55b998d

Please sign in to comment.