Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into ft_template_api
Browse files Browse the repository at this point in the history
  • Loading branch information
RushanNanayakkara committed Sep 24, 2024
2 parents f9ab533 + a76694f commit 7978df6
Show file tree
Hide file tree
Showing 97 changed files with 99 additions and 159 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>identity-api-server</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<name>WSO2 Identity Server - Applications Rest API</name>
<description>WSO2 Identity Server - Applications Rest API</description>
<artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ public static StateEnum fromValue(String value) {
private RefreshTokenConfiguration refreshToken;
private SubjectTokenConfiguration subjectToken;
private IdTokenConfiguration idToken;
private Boolean useClientIdAsSubClaimForAppTokens;
private Boolean omitUsernameInIntrospectionRespForAppTokens;
private OIDCLogoutConfiguration logout;
private Boolean validateRequestObjectSignature = false;
private List<String> scopeValidators = null;
Expand Down Expand Up @@ -360,45 +358,6 @@ public void setIdToken(IdTokenConfiguration idToken) {
this.idToken = idToken;
}

/**
* If enabled, client_id will be sent as the subject claim value for app tokens.
*/
public OpenIDConnectConfiguration useClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {

this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
return this;
}

@ApiModelProperty("If enable, client_id will be sent as the sub claim value for app tokens.")
@JsonProperty("useClientIdAsSubClaimForAppTokens")
@Valid
public Boolean getUseClientIdAsSubClaimForAppTokens() {
return useClientIdAsSubClaimForAppTokens;
}
public void setUseClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {
this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
}

/**
* If enabled, username will not be sent in the introspection response for app tokens.
*/
public OpenIDConnectConfiguration omitUsernameInIntrospectionRespForAppTokens(
Boolean omitUsernameInIntrospectionRespForAppTokens) {

this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
return this;
}

@ApiModelProperty("If enabled, username will not be sent in the introspection response for app tokens.")
@JsonProperty("omitUsernameInIntrospectionRespForAppTokens")
@Valid
public Boolean getOmitUsernameInIntrospectionRespForAppTokens() {
return omitUsernameInIntrospectionRespForAppTokens;
}
public void setOmitUsernameInIntrospectionRespForAppTokens(Boolean omitUsernameInIntrospectionRespForAppTokens) {
this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
}

/**
**/
public OpenIDConnectConfiguration logout(OIDCLogoutConfiguration logout) {
Expand Down Expand Up @@ -593,10 +552,6 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.refreshToken, openIDConnectConfiguration.refreshToken) &&
Objects.equals(this.subjectToken, openIDConnectConfiguration.subjectToken) &&
Objects.equals(this.idToken, openIDConnectConfiguration.idToken) &&
Objects.equals(this.useClientIdAsSubClaimForAppTokens,
openIDConnectConfiguration.useClientIdAsSubClaimForAppTokens) &&
Objects.equals(this.omitUsernameInIntrospectionRespForAppTokens,
openIDConnectConfiguration.omitUsernameInIntrospectionRespForAppTokens) &&
Objects.equals(this.logout, openIDConnectConfiguration.logout) &&
Objects.equals(this.validateRequestObjectSignature, openIDConnectConfiguration.validateRequestObjectSignature) &&
Objects.equals(this.scopeValidators, openIDConnectConfiguration.scopeValidators) &&
Expand All @@ -611,7 +566,7 @@ public boolean equals(java.lang.Object o) {
@Override
public int hashCode() {

return Objects.hash(clientId, clientSecret, state, grantTypes, callbackURLs, allowedOrigins, publicClient, pkce, hybridFlow, accessToken, refreshToken, subjectToken, idToken, useClientIdAsSubClaimForAppTokens, omitUsernameInIntrospectionRespForAppTokens, logout, validateRequestObjectSignature, scopeValidators, clientAuthentication, requestObject, pushAuthorizationRequest, subject, isFAPIApplication, fapiMetadata);
return Objects.hash(clientId, clientSecret, state, grantTypes, callbackURLs, allowedOrigins, publicClient, pkce, hybridFlow, accessToken, refreshToken, subjectToken, idToken, logout, validateRequestObjectSignature, scopeValidators, clientAuthentication, requestObject, pushAuthorizationRequest, subject, isFAPIApplication, fapiMetadata);
}

@Override
Expand All @@ -633,8 +588,6 @@ public String toString() {
sb.append(" refreshToken: ").append(toIndentedString(refreshToken)).append("\n");
sb.append(" subjectToken: ").append(toIndentedString(subjectToken)).append("\n");
sb.append(" idToken: ").append(toIndentedString(idToken)).append("\n");
sb.append(" useClientIdAsSubClaimForAppTokens: ").append(toIndentedString(useClientIdAsSubClaimForAppTokens)).append("\n");
sb.append(" omitUsernameInIntrospectionRespForAppTokens: ").append(toIndentedString(omitUsernameInIntrospectionRespForAppTokens)).append("\n");
sb.append(" logout: ").append(toIndentedString(logout)).append("\n");
sb.append(" validateRequestObjectSignature: ").append(toIndentedString(validateRequestObjectSignature)).append("\n");
sb.append(" scopeValidators: ").append(toIndentedString(scopeValidators)).append("\n");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ public OAuthConsumerAppDTO apply(String appName, OpenIDConnectConfiguration oidc
consumerAppDTO.setBypassClientCredentials(oidcModel.getPublicClient());
consumerAppDTO.setRequestObjectSignatureValidationEnabled(oidcModel.getValidateRequestObjectSignature());

consumerAppDTO.setUseClientIdAsSubClaimForAppTokens(oidcModel.getUseClientIdAsSubClaimForAppTokens());
consumerAppDTO.setOmitUsernameInIntrospectionRespForAppTokens(
oidcModel.getOmitUsernameInIntrospectionRespForAppTokens());

updateAllowedOrigins(consumerAppDTO, oidcModel.getAllowedOrigins());
updatePkceConfigurations(consumerAppDTO, oidcModel.getPkce());
updateHybridFlowConfigurations(consumerAppDTO, oidcModel.getHybridFlow());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ public OpenIDConnectConfiguration apply(OAuthConsumerAppDTO oauthAppDTO) {
.accessToken(buildTokenConfiguration(oauthAppDTO))
.refreshToken(buildRefreshTokenConfiguration(oauthAppDTO))
.idToken(buildIdTokenConfiguration(oauthAppDTO))
.useClientIdAsSubClaimForAppTokens(oauthAppDTO.isUseClientIdAsSubClaimForAppTokens())
.omitUsernameInIntrospectionRespForAppTokens(
oauthAppDTO.isOmitUsernameInIntrospectionRespForAppTokens())
.logout(buildLogoutConfiguration(oauthAppDTO))
.scopeValidators(getScopeValidators(oauthAppDTO))
.validateRequestObjectSignature(oauthAppDTO.isRequestObjectSignatureValidationEnabled())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3603,12 +3603,6 @@ components:
Enabling this option will allow the client to authenticate without a
client secret.
example: false
useClientIdAsSubClaimForAppTokens:
type: boolean
description: If enabled, client_id will be sent as the sub claim value for app tokens.
omitUsernameInIntrospectionRespForAppTokens:
type: boolean
description: If enabled, username will not be sent in the introspection response for app tokens.
pkce:
$ref: '#/components/schemas/OAuth2PKCEConfiguration'
accessToken:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
</parent>

<artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
</parent>

<artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
</parent>

<groupId>org.wso2.carbon.identity.server.api</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<relativePath>../pom.xml</relativePath>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<relativePath>../pom.xml</relativePath>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
<version>1.2.227-SNAPSHOT</version>
<version>1.2.228-SNAPSHOT</version>
</parent>

<artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
Expand Down
Loading

0 comments on commit 7978df6

Please sign in to comment.