cleanup, added revocation uri to server config
parent
ed06b14406
commit
d330bd1c9b
|
@ -172,7 +172,15 @@ public class ServerConfiguration {
|
||||||
private String userInfoUri;
|
private String userInfoUri;
|
||||||
|
|
||||||
private String introspectionEndpointUri;
|
private String introspectionEndpointUri;
|
||||||
|
|
||||||
|
private String revocationEndpointUri;
|
||||||
|
|
||||||
|
public String getRevocationEndpointUri() {
|
||||||
|
return revocationEndpointUri;
|
||||||
|
}
|
||||||
|
public void setRevocationEndpointUri(String revocationEndpointUri) {
|
||||||
|
this.revocationEndpointUri = revocationEndpointUri;
|
||||||
|
}
|
||||||
private String checkSessionIframe;
|
private String checkSessionIframe;
|
||||||
private String endSessionEndpoint;
|
private String endSessionEndpoint;
|
||||||
private List<String> scopesSupported;
|
private List<String> scopesSupported;
|
||||||
|
@ -647,328 +655,445 @@ public class ServerConfiguration {
|
||||||
public void setOpTosUri(String opTosUri) {
|
public void setOpTosUri(String opTosUri) {
|
||||||
this.opTosUri = opTosUri;
|
this.opTosUri = opTosUri;
|
||||||
}
|
}
|
||||||
/* (non-Javadoc)
|
@Override
|
||||||
* @see java.lang.Object#hashCode()
|
public int hashCode() {
|
||||||
*/
|
final int prime = 31;
|
||||||
@Override
|
int result = 1;
|
||||||
public int hashCode() {
|
result = prime
|
||||||
final int prime = 31;
|
* result
|
||||||
int result = 1;
|
+ ((acrValuesSupported == null) ? 0 : acrValuesSupported
|
||||||
result = prime * result + ((acrValuesSupported == null) ? 0 : acrValuesSupported.hashCode());
|
.hashCode());
|
||||||
result = prime * result + ((authorizationEndpointUri == null) ? 0 : authorizationEndpointUri.hashCode());
|
result = prime
|
||||||
result = prime * result + ((checkSessionIframe == null) ? 0 : checkSessionIframe.hashCode());
|
* result
|
||||||
result = prime * result + ((claimTypesSupported == null) ? 0 : claimTypesSupported.hashCode());
|
+ ((authorizationEndpointUri == null) ? 0
|
||||||
result = prime * result + ((claimsLocalesSupported == null) ? 0 : claimsLocalesSupported.hashCode());
|
: authorizationEndpointUri.hashCode());
|
||||||
result = prime * result + ((claimsParameterSupported == null) ? 0 : claimsParameterSupported.hashCode());
|
result = prime
|
||||||
result = prime * result + ((claimsSupported == null) ? 0 : claimsSupported.hashCode());
|
* result
|
||||||
result = prime * result + ((displayValuesSupported == null) ? 0 : displayValuesSupported.hashCode());
|
+ ((checkSessionIframe == null) ? 0 : checkSessionIframe
|
||||||
result = prime * result + ((endSessionEndpoint == null) ? 0 : endSessionEndpoint.hashCode());
|
.hashCode());
|
||||||
result = prime * result + ((grantTypesSupported == null) ? 0 : grantTypesSupported.hashCode());
|
result = prime
|
||||||
result = prime * result + ((idTokenEncryptionAlgValuesSupported == null) ? 0 : idTokenEncryptionAlgValuesSupported.hashCode());
|
* result
|
||||||
result = prime * result + ((idTokenEncryptionEncValuesSupported == null) ? 0 : idTokenEncryptionEncValuesSupported.hashCode());
|
+ ((claimTypesSupported == null) ? 0 : claimTypesSupported
|
||||||
result = prime * result + ((idTokenSigningAlgValuesSupported == null) ? 0 : idTokenSigningAlgValuesSupported.hashCode());
|
.hashCode());
|
||||||
result = prime * result + ((introspectionEndpointUri == null) ? 0 : introspectionEndpointUri.hashCode());
|
result = prime
|
||||||
result = prime * result + ((issuer == null) ? 0 : issuer.hashCode());
|
* result
|
||||||
result = prime * result + ((jwksUri == null) ? 0 : jwksUri.hashCode());
|
+ ((claimsLocalesSupported == null) ? 0
|
||||||
result = prime * result + ((opPolicyUri == null) ? 0 : opPolicyUri.hashCode());
|
: claimsLocalesSupported.hashCode());
|
||||||
result = prime * result + ((opTosUri == null) ? 0 : opTosUri.hashCode());
|
result = prime
|
||||||
result = prime * result + ((registrationEndpointUri == null) ? 0 : registrationEndpointUri.hashCode());
|
* result
|
||||||
result = prime * result + ((requestObjectEncryptionAlgValuesSupported == null) ? 0 : requestObjectEncryptionAlgValuesSupported.hashCode());
|
+ ((claimsParameterSupported == null) ? 0
|
||||||
result = prime * result + ((requestObjectEncryptionEncValuesSupported == null) ? 0 : requestObjectEncryptionEncValuesSupported.hashCode());
|
: claimsParameterSupported.hashCode());
|
||||||
result = prime * result + ((requestObjectSigningAlgValuesSupported == null) ? 0 : requestObjectSigningAlgValuesSupported.hashCode());
|
result = prime * result
|
||||||
result = prime * result + ((requestParameterSupported == null) ? 0 : requestParameterSupported.hashCode());
|
+ ((claimsSupported == null) ? 0 : claimsSupported.hashCode());
|
||||||
result = prime * result + ((requestUriParameterSupported == null) ? 0 : requestUriParameterSupported.hashCode());
|
result = prime
|
||||||
result = prime * result + ((requireRequestUriRegistration == null) ? 0 : requireRequestUriRegistration.hashCode());
|
* result
|
||||||
result = prime * result + ((responseTypesSupported == null) ? 0 : responseTypesSupported.hashCode());
|
+ ((displayValuesSupported == null) ? 0
|
||||||
result = prime * result + ((scopesSupported == null) ? 0 : scopesSupported.hashCode());
|
: displayValuesSupported.hashCode());
|
||||||
result = prime * result + ((serviceDocumentation == null) ? 0 : serviceDocumentation.hashCode());
|
result = prime
|
||||||
result = prime * result + ((subjectTypesSupported == null) ? 0 : subjectTypesSupported.hashCode());
|
* result
|
||||||
result = prime * result + ((tokenEndpointAuthMethodsSupported == null) ? 0 : tokenEndpointAuthMethodsSupported.hashCode());
|
+ ((endSessionEndpoint == null) ? 0 : endSessionEndpoint
|
||||||
result = prime * result + ((tokenEndpointAuthSigningAlgValuesSupported == null) ? 0 : tokenEndpointAuthSigningAlgValuesSupported.hashCode());
|
.hashCode());
|
||||||
result = prime * result + ((tokenEndpointUri == null) ? 0 : tokenEndpointUri.hashCode());
|
result = prime
|
||||||
result = prime * result + ((uiLocalesSupported == null) ? 0 : uiLocalesSupported.hashCode());
|
* result
|
||||||
result = prime * result + ((userInfoUri == null) ? 0 : userInfoUri.hashCode());
|
+ ((grantTypesSupported == null) ? 0 : grantTypesSupported
|
||||||
result = prime * result + ((userinfoEncryptionAlgValuesSupported == null) ? 0 : userinfoEncryptionAlgValuesSupported.hashCode());
|
.hashCode());
|
||||||
result = prime * result + ((userinfoEncryptionEncValuesSupported == null) ? 0 : userinfoEncryptionEncValuesSupported.hashCode());
|
result = prime
|
||||||
result = prime * result + ((userinfoSigningAlgValuesSupported == null) ? 0 : userinfoSigningAlgValuesSupported.hashCode());
|
* result
|
||||||
return result;
|
+ ((idTokenEncryptionAlgValuesSupported == null) ? 0
|
||||||
}
|
: idTokenEncryptionAlgValuesSupported.hashCode());
|
||||||
/* (non-Javadoc)
|
result = prime
|
||||||
* @see java.lang.Object#equals(java.lang.Object)
|
* result
|
||||||
*/
|
+ ((idTokenEncryptionEncValuesSupported == null) ? 0
|
||||||
@Override
|
: idTokenEncryptionEncValuesSupported.hashCode());
|
||||||
public boolean equals(Object obj) {
|
result = prime
|
||||||
if (this == obj) {
|
* result
|
||||||
return true;
|
+ ((idTokenSigningAlgValuesSupported == null) ? 0
|
||||||
}
|
: idTokenSigningAlgValuesSupported.hashCode());
|
||||||
if (obj == null) {
|
result = prime
|
||||||
return false;
|
* result
|
||||||
}
|
+ ((introspectionEndpointUri == null) ? 0
|
||||||
if (!(obj instanceof ServerConfiguration)) {
|
: introspectionEndpointUri.hashCode());
|
||||||
return false;
|
result = prime * result + ((issuer == null) ? 0 : issuer.hashCode());
|
||||||
}
|
result = prime * result + ((jwksUri == null) ? 0 : jwksUri.hashCode());
|
||||||
ServerConfiguration other = (ServerConfiguration) obj;
|
result = prime * result
|
||||||
if (acrValuesSupported == null) {
|
+ ((opPolicyUri == null) ? 0 : opPolicyUri.hashCode());
|
||||||
if (other.acrValuesSupported != null) {
|
result = prime * result
|
||||||
return false;
|
+ ((opTosUri == null) ? 0 : opTosUri.hashCode());
|
||||||
}
|
result = prime
|
||||||
} else if (!acrValuesSupported.equals(other.acrValuesSupported)) {
|
* result
|
||||||
return false;
|
+ ((registrationEndpointUri == null) ? 0
|
||||||
}
|
: registrationEndpointUri.hashCode());
|
||||||
if (authorizationEndpointUri == null) {
|
result = prime
|
||||||
if (other.authorizationEndpointUri != null) {
|
* result
|
||||||
return false;
|
+ ((requestObjectEncryptionAlgValuesSupported == null) ? 0
|
||||||
}
|
: requestObjectEncryptionAlgValuesSupported.hashCode());
|
||||||
} else if (!authorizationEndpointUri.equals(other.authorizationEndpointUri)) {
|
result = prime
|
||||||
return false;
|
* result
|
||||||
}
|
+ ((requestObjectEncryptionEncValuesSupported == null) ? 0
|
||||||
if (checkSessionIframe == null) {
|
: requestObjectEncryptionEncValuesSupported.hashCode());
|
||||||
if (other.checkSessionIframe != null) {
|
result = prime
|
||||||
return false;
|
* result
|
||||||
}
|
+ ((requestObjectSigningAlgValuesSupported == null) ? 0
|
||||||
} else if (!checkSessionIframe.equals(other.checkSessionIframe)) {
|
: requestObjectSigningAlgValuesSupported.hashCode());
|
||||||
return false;
|
result = prime
|
||||||
}
|
* result
|
||||||
if (claimTypesSupported == null) {
|
+ ((requestParameterSupported == null) ? 0
|
||||||
if (other.claimTypesSupported != null) {
|
: requestParameterSupported.hashCode());
|
||||||
return false;
|
result = prime
|
||||||
}
|
* result
|
||||||
} else if (!claimTypesSupported.equals(other.claimTypesSupported)) {
|
+ ((requestUriParameterSupported == null) ? 0
|
||||||
return false;
|
: requestUriParameterSupported.hashCode());
|
||||||
}
|
result = prime
|
||||||
if (claimsLocalesSupported == null) {
|
* result
|
||||||
if (other.claimsLocalesSupported != null) {
|
+ ((requireRequestUriRegistration == null) ? 0
|
||||||
return false;
|
: requireRequestUriRegistration.hashCode());
|
||||||
}
|
result = prime
|
||||||
} else if (!claimsLocalesSupported.equals(other.claimsLocalesSupported)) {
|
* result
|
||||||
return false;
|
+ ((responseTypesSupported == null) ? 0
|
||||||
}
|
: responseTypesSupported.hashCode());
|
||||||
if (claimsParameterSupported == null) {
|
result = prime
|
||||||
if (other.claimsParameterSupported != null) {
|
* result
|
||||||
return false;
|
+ ((revocationEndpointUri == null) ? 0 : revocationEndpointUri
|
||||||
}
|
.hashCode());
|
||||||
} else if (!claimsParameterSupported.equals(other.claimsParameterSupported)) {
|
result = prime * result
|
||||||
return false;
|
+ ((scopesSupported == null) ? 0 : scopesSupported.hashCode());
|
||||||
}
|
result = prime
|
||||||
if (claimsSupported == null) {
|
* result
|
||||||
if (other.claimsSupported != null) {
|
+ ((serviceDocumentation == null) ? 0 : serviceDocumentation
|
||||||
return false;
|
.hashCode());
|
||||||
}
|
result = prime
|
||||||
} else if (!claimsSupported.equals(other.claimsSupported)) {
|
* result
|
||||||
return false;
|
+ ((subjectTypesSupported == null) ? 0 : subjectTypesSupported
|
||||||
}
|
.hashCode());
|
||||||
if (displayValuesSupported == null) {
|
result = prime
|
||||||
if (other.displayValuesSupported != null) {
|
* result
|
||||||
return false;
|
+ ((tokenEndpointAuthMethodsSupported == null) ? 0
|
||||||
}
|
: tokenEndpointAuthMethodsSupported.hashCode());
|
||||||
} else if (!displayValuesSupported.equals(other.displayValuesSupported)) {
|
result = prime
|
||||||
return false;
|
* result
|
||||||
}
|
+ ((tokenEndpointAuthSigningAlgValuesSupported == null) ? 0
|
||||||
if (endSessionEndpoint == null) {
|
: tokenEndpointAuthSigningAlgValuesSupported.hashCode());
|
||||||
if (other.endSessionEndpoint != null) {
|
result = prime
|
||||||
return false;
|
* result
|
||||||
}
|
+ ((tokenEndpointUri == null) ? 0 : tokenEndpointUri.hashCode());
|
||||||
} else if (!endSessionEndpoint.equals(other.endSessionEndpoint)) {
|
result = prime
|
||||||
return false;
|
* result
|
||||||
}
|
+ ((uiLocalesSupported == null) ? 0 : uiLocalesSupported
|
||||||
if (grantTypesSupported == null) {
|
.hashCode());
|
||||||
if (other.grantTypesSupported != null) {
|
result = prime * result
|
||||||
return false;
|
+ ((userInfoUri == null) ? 0 : userInfoUri.hashCode());
|
||||||
}
|
result = prime
|
||||||
} else if (!grantTypesSupported.equals(other.grantTypesSupported)) {
|
* result
|
||||||
return false;
|
+ ((userinfoEncryptionAlgValuesSupported == null) ? 0
|
||||||
}
|
: userinfoEncryptionAlgValuesSupported.hashCode());
|
||||||
if (idTokenEncryptionAlgValuesSupported == null) {
|
result = prime
|
||||||
if (other.idTokenEncryptionAlgValuesSupported != null) {
|
* result
|
||||||
return false;
|
+ ((userinfoEncryptionEncValuesSupported == null) ? 0
|
||||||
}
|
: userinfoEncryptionEncValuesSupported.hashCode());
|
||||||
} else if (!idTokenEncryptionAlgValuesSupported.equals(other.idTokenEncryptionAlgValuesSupported)) {
|
result = prime
|
||||||
return false;
|
* result
|
||||||
}
|
+ ((userinfoSigningAlgValuesSupported == null) ? 0
|
||||||
if (idTokenEncryptionEncValuesSupported == null) {
|
: userinfoSigningAlgValuesSupported.hashCode());
|
||||||
if (other.idTokenEncryptionEncValuesSupported != null) {
|
return result;
|
||||||
return false;
|
}
|
||||||
}
|
@Override
|
||||||
} else if (!idTokenEncryptionEncValuesSupported.equals(other.idTokenEncryptionEncValuesSupported)) {
|
public boolean equals(Object obj) {
|
||||||
return false;
|
if (this == obj) {
|
||||||
}
|
return true;
|
||||||
if (idTokenSigningAlgValuesSupported == null) {
|
}
|
||||||
if (other.idTokenSigningAlgValuesSupported != null) {
|
if (obj == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!idTokenSigningAlgValuesSupported.equals(other.idTokenSigningAlgValuesSupported)) {
|
if (getClass() != obj.getClass()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (introspectionEndpointUri == null) {
|
ServerConfiguration other = (ServerConfiguration) obj;
|
||||||
if (other.introspectionEndpointUri != null) {
|
if (acrValuesSupported == null) {
|
||||||
return false;
|
if (other.acrValuesSupported != null) {
|
||||||
}
|
return false;
|
||||||
} else if (!introspectionEndpointUri.equals(other.introspectionEndpointUri)) {
|
}
|
||||||
return false;
|
} else if (!acrValuesSupported.equals(other.acrValuesSupported)) {
|
||||||
}
|
return false;
|
||||||
if (issuer == null) {
|
}
|
||||||
if (other.issuer != null) {
|
if (authorizationEndpointUri == null) {
|
||||||
return false;
|
if (other.authorizationEndpointUri != null) {
|
||||||
}
|
return false;
|
||||||
} else if (!issuer.equals(other.issuer)) {
|
}
|
||||||
return false;
|
} else if (!authorizationEndpointUri
|
||||||
}
|
.equals(other.authorizationEndpointUri)) {
|
||||||
if (jwksUri == null) {
|
return false;
|
||||||
if (other.jwksUri != null) {
|
}
|
||||||
return false;
|
if (checkSessionIframe == null) {
|
||||||
}
|
if (other.checkSessionIframe != null) {
|
||||||
} else if (!jwksUri.equals(other.jwksUri)) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
} else if (!checkSessionIframe.equals(other.checkSessionIframe)) {
|
||||||
if (opPolicyUri == null) {
|
return false;
|
||||||
if (other.opPolicyUri != null) {
|
}
|
||||||
return false;
|
if (claimTypesSupported == null) {
|
||||||
}
|
if (other.claimTypesSupported != null) {
|
||||||
} else if (!opPolicyUri.equals(other.opPolicyUri)) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
} else if (!claimTypesSupported.equals(other.claimTypesSupported)) {
|
||||||
if (opTosUri == null) {
|
return false;
|
||||||
if (other.opTosUri != null) {
|
}
|
||||||
return false;
|
if (claimsLocalesSupported == null) {
|
||||||
}
|
if (other.claimsLocalesSupported != null) {
|
||||||
} else if (!opTosUri.equals(other.opTosUri)) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
} else if (!claimsLocalesSupported.equals(other.claimsLocalesSupported)) {
|
||||||
if (registrationEndpointUri == null) {
|
return false;
|
||||||
if (other.registrationEndpointUri != null) {
|
}
|
||||||
return false;
|
if (claimsParameterSupported == null) {
|
||||||
}
|
if (other.claimsParameterSupported != null) {
|
||||||
} else if (!registrationEndpointUri.equals(other.registrationEndpointUri)) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
} else if (!claimsParameterSupported
|
||||||
if (requestObjectEncryptionAlgValuesSupported == null) {
|
.equals(other.claimsParameterSupported)) {
|
||||||
if (other.requestObjectEncryptionAlgValuesSupported != null) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
if (claimsSupported == null) {
|
||||||
} else if (!requestObjectEncryptionAlgValuesSupported.equals(other.requestObjectEncryptionAlgValuesSupported)) {
|
if (other.claimsSupported != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (requestObjectEncryptionEncValuesSupported == null) {
|
} else if (!claimsSupported.equals(other.claimsSupported)) {
|
||||||
if (other.requestObjectEncryptionEncValuesSupported != null) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
if (displayValuesSupported == null) {
|
||||||
} else if (!requestObjectEncryptionEncValuesSupported.equals(other.requestObjectEncryptionEncValuesSupported)) {
|
if (other.displayValuesSupported != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (requestObjectSigningAlgValuesSupported == null) {
|
} else if (!displayValuesSupported.equals(other.displayValuesSupported)) {
|
||||||
if (other.requestObjectSigningAlgValuesSupported != null) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
if (endSessionEndpoint == null) {
|
||||||
} else if (!requestObjectSigningAlgValuesSupported.equals(other.requestObjectSigningAlgValuesSupported)) {
|
if (other.endSessionEndpoint != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (requestParameterSupported == null) {
|
} else if (!endSessionEndpoint.equals(other.endSessionEndpoint)) {
|
||||||
if (other.requestParameterSupported != null) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
if (grantTypesSupported == null) {
|
||||||
} else if (!requestParameterSupported.equals(other.requestParameterSupported)) {
|
if (other.grantTypesSupported != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (requestUriParameterSupported == null) {
|
} else if (!grantTypesSupported.equals(other.grantTypesSupported)) {
|
||||||
if (other.requestUriParameterSupported != null) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
if (idTokenEncryptionAlgValuesSupported == null) {
|
||||||
} else if (!requestUriParameterSupported.equals(other.requestUriParameterSupported)) {
|
if (other.idTokenEncryptionAlgValuesSupported != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (requireRequestUriRegistration == null) {
|
} else if (!idTokenEncryptionAlgValuesSupported
|
||||||
if (other.requireRequestUriRegistration != null) {
|
.equals(other.idTokenEncryptionAlgValuesSupported)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!requireRequestUriRegistration.equals(other.requireRequestUriRegistration)) {
|
if (idTokenEncryptionEncValuesSupported == null) {
|
||||||
return false;
|
if (other.idTokenEncryptionEncValuesSupported != null) {
|
||||||
}
|
return false;
|
||||||
if (responseTypesSupported == null) {
|
}
|
||||||
if (other.responseTypesSupported != null) {
|
} else if (!idTokenEncryptionEncValuesSupported
|
||||||
return false;
|
.equals(other.idTokenEncryptionEncValuesSupported)) {
|
||||||
}
|
return false;
|
||||||
} else if (!responseTypesSupported.equals(other.responseTypesSupported)) {
|
}
|
||||||
return false;
|
if (idTokenSigningAlgValuesSupported == null) {
|
||||||
}
|
if (other.idTokenSigningAlgValuesSupported != null) {
|
||||||
if (scopesSupported == null) {
|
return false;
|
||||||
if (other.scopesSupported != null) {
|
}
|
||||||
return false;
|
} else if (!idTokenSigningAlgValuesSupported
|
||||||
}
|
.equals(other.idTokenSigningAlgValuesSupported)) {
|
||||||
} else if (!scopesSupported.equals(other.scopesSupported)) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
if (introspectionEndpointUri == null) {
|
||||||
if (serviceDocumentation == null) {
|
if (other.introspectionEndpointUri != null) {
|
||||||
if (other.serviceDocumentation != null) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
} else if (!introspectionEndpointUri
|
||||||
} else if (!serviceDocumentation.equals(other.serviceDocumentation)) {
|
.equals(other.introspectionEndpointUri)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (subjectTypesSupported == null) {
|
if (issuer == null) {
|
||||||
if (other.subjectTypesSupported != null) {
|
if (other.issuer != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!subjectTypesSupported.equals(other.subjectTypesSupported)) {
|
} else if (!issuer.equals(other.issuer)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (tokenEndpointAuthMethodsSupported == null) {
|
if (jwksUri == null) {
|
||||||
if (other.tokenEndpointAuthMethodsSupported != null) {
|
if (other.jwksUri != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!tokenEndpointAuthMethodsSupported.equals(other.tokenEndpointAuthMethodsSupported)) {
|
} else if (!jwksUri.equals(other.jwksUri)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (tokenEndpointAuthSigningAlgValuesSupported == null) {
|
if (opPolicyUri == null) {
|
||||||
if (other.tokenEndpointAuthSigningAlgValuesSupported != null) {
|
if (other.opPolicyUri != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!tokenEndpointAuthSigningAlgValuesSupported.equals(other.tokenEndpointAuthSigningAlgValuesSupported)) {
|
} else if (!opPolicyUri.equals(other.opPolicyUri)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (tokenEndpointUri == null) {
|
if (opTosUri == null) {
|
||||||
if (other.tokenEndpointUri != null) {
|
if (other.opTosUri != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!tokenEndpointUri.equals(other.tokenEndpointUri)) {
|
} else if (!opTosUri.equals(other.opTosUri)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (uiLocalesSupported == null) {
|
if (registrationEndpointUri == null) {
|
||||||
if (other.uiLocalesSupported != null) {
|
if (other.registrationEndpointUri != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!uiLocalesSupported.equals(other.uiLocalesSupported)) {
|
} else if (!registrationEndpointUri
|
||||||
return false;
|
.equals(other.registrationEndpointUri)) {
|
||||||
}
|
return false;
|
||||||
if (userInfoUri == null) {
|
}
|
||||||
if (other.userInfoUri != null) {
|
if (requestObjectEncryptionAlgValuesSupported == null) {
|
||||||
return false;
|
if (other.requestObjectEncryptionAlgValuesSupported != null) {
|
||||||
}
|
return false;
|
||||||
} else if (!userInfoUri.equals(other.userInfoUri)) {
|
}
|
||||||
return false;
|
} else if (!requestObjectEncryptionAlgValuesSupported
|
||||||
}
|
.equals(other.requestObjectEncryptionAlgValuesSupported)) {
|
||||||
if (userinfoEncryptionAlgValuesSupported == null) {
|
return false;
|
||||||
if (other.userinfoEncryptionAlgValuesSupported != null) {
|
}
|
||||||
return false;
|
if (requestObjectEncryptionEncValuesSupported == null) {
|
||||||
}
|
if (other.requestObjectEncryptionEncValuesSupported != null) {
|
||||||
} else if (!userinfoEncryptionAlgValuesSupported.equals(other.userinfoEncryptionAlgValuesSupported)) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
} else if (!requestObjectEncryptionEncValuesSupported
|
||||||
if (userinfoEncryptionEncValuesSupported == null) {
|
.equals(other.requestObjectEncryptionEncValuesSupported)) {
|
||||||
if (other.userinfoEncryptionEncValuesSupported != null) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
if (requestObjectSigningAlgValuesSupported == null) {
|
||||||
} else if (!userinfoEncryptionEncValuesSupported.equals(other.userinfoEncryptionEncValuesSupported)) {
|
if (other.requestObjectSigningAlgValuesSupported != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (userinfoSigningAlgValuesSupported == null) {
|
} else if (!requestObjectSigningAlgValuesSupported
|
||||||
if (other.userinfoSigningAlgValuesSupported != null) {
|
.equals(other.requestObjectSigningAlgValuesSupported)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!userinfoSigningAlgValuesSupported.equals(other.userinfoSigningAlgValuesSupported)) {
|
if (requestParameterSupported == null) {
|
||||||
return false;
|
if (other.requestParameterSupported != null) {
|
||||||
}
|
return false;
|
||||||
return true;
|
}
|
||||||
}
|
} else if (!requestParameterSupported
|
||||||
|
.equals(other.requestParameterSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (requestUriParameterSupported == null) {
|
||||||
|
if (other.requestUriParameterSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!requestUriParameterSupported
|
||||||
|
.equals(other.requestUriParameterSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (requireRequestUriRegistration == null) {
|
||||||
|
if (other.requireRequestUriRegistration != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!requireRequestUriRegistration
|
||||||
|
.equals(other.requireRequestUriRegistration)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (responseTypesSupported == null) {
|
||||||
|
if (other.responseTypesSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!responseTypesSupported.equals(other.responseTypesSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (revocationEndpointUri == null) {
|
||||||
|
if (other.revocationEndpointUri != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!revocationEndpointUri.equals(other.revocationEndpointUri)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (scopesSupported == null) {
|
||||||
|
if (other.scopesSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!scopesSupported.equals(other.scopesSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (serviceDocumentation == null) {
|
||||||
|
if (other.serviceDocumentation != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!serviceDocumentation.equals(other.serviceDocumentation)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (subjectTypesSupported == null) {
|
||||||
|
if (other.subjectTypesSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!subjectTypesSupported.equals(other.subjectTypesSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (tokenEndpointAuthMethodsSupported == null) {
|
||||||
|
if (other.tokenEndpointAuthMethodsSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!tokenEndpointAuthMethodsSupported
|
||||||
|
.equals(other.tokenEndpointAuthMethodsSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (tokenEndpointAuthSigningAlgValuesSupported == null) {
|
||||||
|
if (other.tokenEndpointAuthSigningAlgValuesSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!tokenEndpointAuthSigningAlgValuesSupported
|
||||||
|
.equals(other.tokenEndpointAuthSigningAlgValuesSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (tokenEndpointUri == null) {
|
||||||
|
if (other.tokenEndpointUri != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!tokenEndpointUri.equals(other.tokenEndpointUri)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (uiLocalesSupported == null) {
|
||||||
|
if (other.uiLocalesSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!uiLocalesSupported.equals(other.uiLocalesSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (userInfoUri == null) {
|
||||||
|
if (other.userInfoUri != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!userInfoUri.equals(other.userInfoUri)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (userinfoEncryptionAlgValuesSupported == null) {
|
||||||
|
if (other.userinfoEncryptionAlgValuesSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!userinfoEncryptionAlgValuesSupported
|
||||||
|
.equals(other.userinfoEncryptionAlgValuesSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (userinfoEncryptionEncValuesSupported == null) {
|
||||||
|
if (other.userinfoEncryptionEncValuesSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!userinfoEncryptionEncValuesSupported
|
||||||
|
.equals(other.userinfoEncryptionEncValuesSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (userinfoSigningAlgValuesSupported == null) {
|
||||||
|
if (other.userinfoSigningAlgValuesSupported != null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (!userinfoSigningAlgValuesSupported
|
||||||
|
.equals(other.userinfoSigningAlgValuesSupported)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,8 +94,7 @@ public class DiscoveryEndpoint {
|
||||||
&& resourceUri.getScheme().equals("acct")) {
|
&& resourceUri.getScheme().equals("acct")) {
|
||||||
// acct: URI
|
// acct: URI
|
||||||
|
|
||||||
UserInfo user = null;
|
UserInfo user = userService.getByUsername(resourceUri.getUserInfo()); // first part is the username
|
||||||
user = userService.getByUsername(resourceUri.getUserInfo()); // first part is the username
|
|
||||||
|
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
logger.info("User not found: " + resource);
|
logger.info("User not found: " + resource);
|
||||||
|
|
Loading…
Reference in New Issue