Skip to content

Commit

Permalink
Merge pull request #2573 from mpmadhavig/remove-use-client-id-config
Browse files Browse the repository at this point in the history 
Revert "Add useClientIdAsSubClaimForAppTokens and omitUsernameInIntrospectionRespForAppTokens configs to app"
  • Loading branch information
@mpmadhavig
mpmadhavig committed Sep 24, 2024
2 parents a131935 + 5605916 commit 3e4c265
Show file tree
Hide file tree
Showing 18 changed files with 35 additions and 380 deletions.
29 changes: 0 additions & 29 deletions ...ver.dcr/src/gen/java/org/wso2/carbon/identity/oauth2/dcr/endpoint/dto/ApplicationDTO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ public class ApplicationDTO {


private String jwksUri = null;
private Boolean useClientIdAsSubClaimForAppTokens;
private Boolean omitUsernameInIntrospectionRespForAppTokens;
private String tokenEndpointAuthMethod = null;
private Boolean tokenEndpointAllowReusePvtKeyJwt = null;
private String tokenEndpointAuthSigningAlg = null;
Expand Down Expand Up @@ -287,30 +285,6 @@ public void setJwksUri(String jwksUri) {
this.jwksUri = jwksUri;
}

@ApiModelProperty(value = "")
@JsonProperty("use_client_id_as_sub_claim_for_app_tokens")
public Boolean isUseClientIdAsSubClaimForAppTokens() {

return useClientIdAsSubClaimForAppTokens;
}

public void setUseClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {

this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
}

@ApiModelProperty(value = "")
@JsonProperty("omit_username_in_introspection_resp_for_app_tokens")
public Boolean isOmitUsernameInIntrospectionRespForAppTokens() {

return omitUsernameInIntrospectionRespForAppTokens;
}

public void setOmitUsernameInIntrospectionRespForAppTokens(Boolean omitUsernameInIntrospectionRespForAppTokens) {

this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
}

@ApiModelProperty(value = "")
@JsonProperty("token_endpoint_auth_method")
public String getTokenEndpointAuthMethod() {
Expand Down Expand Up @@ -503,9 +477,6 @@ public String toString() {
sb.append(" extPkceSupportPlain: ").append(extPkceSupportPlain).append("\n");
sb.append(" extPublicClient: ").append(extPublicClient).append("\n");
sb.append(" jwksUri: ").append(jwksUri).append("\n");
sb.append(" useClientIdAsSubClaimForAppTokens: ").append(useClientIdAsSubClaimForAppTokens).append("\n");
sb.append(" omitUsernameInIntrospectionRespForAppTokens: ")
.append(omitUsernameInIntrospectionRespForAppTokens).append("\n");
sb.append(" tokenEndpointAuthMethod: ").append(tokenEndpointAuthMethod).append("\n");
sb.append(" tokenEndpointAuthSigningAlg: ").append(tokenEndpointAuthSigningAlg).append("\n");
sb.append(" sectorIdentifierUri: ").append(sectorIdentifierUri).append("\n");
Expand Down
23 changes: 0 additions & 23 deletions ...src/gen/java/org/wso2/carbon/identity/oauth2/dcr/endpoint/dto/RegistrationRequestDTO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ public class RegistrationRequestDTO {
private boolean extPkceSupportPlain;
private boolean extPublicClient;
private String extTokenType = null;
private Boolean useClientIdAsSubClaimForAppTokens;
private Boolean omitUsernameInIntrospectionRespForAppTokens;
private String tokenEndpointAuthMethod = null;
private String tokenEndpointAuthSigningAlg = null;
private Boolean tokenEndpointAllowReusePvtKeyJwt;
Expand Down Expand Up @@ -327,24 +325,6 @@ public void setExtPublicClient(boolean extPublicClient) {
this.extPublicClient = extPublicClient;
}

@ApiModelProperty(value = "")
@JsonProperty("use_client_id_as_sub_claim_for_app_tokens")
public Boolean isUseClientIdAsSubClaimForAppTokens() {
return useClientIdAsSubClaimForAppTokens;
}
public void setUseClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {
this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
}

@ApiModelProperty(value = "")
@JsonProperty("omit_username_in_introspection_resp_for_app_tokens")
public Boolean isOmitUsernameInIntrospectionRespForAppTokens() {
return omitUsernameInIntrospectionRespForAppTokens;
}
public void setOmitUsernameInIntrospectionRespForAppTokens(Boolean omitUsernameInIntrospectionRespForAppTokens) {
this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
}

@ApiModelProperty(value = "")
@JsonProperty("token_endpoint_auth_method")
public String getTokenEndpointAuthMethod() {
Expand Down Expand Up @@ -548,9 +528,6 @@ public String toString() {
sb.append(" ext_pkce_mandatory: ").append(extPkceMandatory).append("\n");
sb.append(" ext_pkce_support_plain: ").append(extPkceSupportPlain).append("\n");
sb.append(" ext_public_client: ").append(extPublicClient).append("\n");
sb.append(" use_client_id_as_sub_claim_for_app_tokens: ").append(useClientIdAsSubClaimForAppTokens).append("\n");
sb.append(" omit_username_in_introspection_resp_for_app_tokens: ")
.append(omitUsernameInIntrospectionRespForAppTokens).append("\n");
sb.append(" token_endpoint_auth_method: ").append(tokenEndpointAuthMethod).append("\n");
sb.append(" token_endpoint_auth_signing_alg: ").append(tokenEndpointAuthSigningAlg).append("\n");
sb.append(" sector_identifier_uri: ").append(sectorIdentifierUri).append("\n");
Expand Down
23 changes: 0 additions & 23 deletions ...r.dcr/src/gen/java/org/wso2/carbon/identity/oauth2/dcr/endpoint/dto/UpdateRequestDTO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ public class UpdateRequestDTO {
private String requestObjectEncryptionAlgorithm = null;
private String requestObjectEncryptionMethod = null;
private String softwareStatement = null;
private Boolean useClientIdAsSubClaimForAppTokens;
private Boolean omitUsernameInIntrospectionRespForAppTokens;
private final Map<String, Object> additionalAttributes = new HashMap<>();
private String extAllowedAudience;

Expand Down Expand Up @@ -267,24 +265,6 @@ public void setTokenEndpointAuthSigningAlg(String tokenEndpointAuthSigningAlg) {
this.tokenEndpointAuthSigningAlg = tokenEndpointAuthSigningAlg;
}

@ApiModelProperty(value = "")
@JsonProperty("use_client_id_as_sub_claim_for_app_tokens")
public Boolean isUseClientIdAsSubClaimForAppTokens() {
return useClientIdAsSubClaimForAppTokens;
}
public void setUseClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {
this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
}

@ApiModelProperty(value = "")
@JsonProperty("omit_username_in_introspection_resp_for_app_tokens")
public Boolean isOmitUsernameInIntrospectionRespForAppTokens() {
return omitUsernameInIntrospectionRespForAppTokens;
}
public void setOmitUsernameInIntrospectionRespForAppTokens(Boolean omitUsernameInIntrospectionRespForAppTokens) {
this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
}

@ApiModelProperty(value = "")
@JsonProperty("sector_identifier_uri")
public String getSectorIdentifierUri() {
Expand Down Expand Up @@ -464,9 +444,6 @@ public String toString() {
sb.append(" ext_pkce_mandatory: ").append(extPkceMandatory).append("\n");
sb.append(" ext_pkce_support_plain: ").append(extPkceSupportPlain).append("\n");
sb.append(" ext_public_client: ").append(extPublicClient).append("\n");
sb.append(" use_client_id_as_sub_claim_for_app_tokens: ").append(useClientIdAsSubClaimForAppTokens).append("\n");
sb.append(" omit_username_in_introspection_resp_for_app_tokens: ")
.append(omitUsernameInIntrospectionRespForAppTokens).append("\n");
sb.append(" token_endpoint_auth_method: ").append(tokenEndpointAuthMethod).append("\n");
sb.append(" token_endpoint_auth_signing_alg: ").append(tokenEndpointAuthSigningAlg).append("\n");
sb.append(" sector_identifier_uri: ").append(sectorIdentifierUri).append("\n");
Expand Down
11 changes: 0 additions & 11 deletions ...server.dcr/src/main/java/org/wso2/carbon/identity/oauth2/dcr/endpoint/util/DCRMUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ public static ApplicationRegistrationRequest getApplicationRegistrationRequest(
appRegistrationRequest.setExtPkceMandatory(registrationRequestDTO.getExtPkceMandatory());
appRegistrationRequest.setExtPkceSupportPlain(registrationRequestDTO.getExtPkceSupportPlain());
appRegistrationRequest.setExtPublicClient(registrationRequestDTO.getExtPublicClient());
appRegistrationRequest.setUseClientIdAsSubClaimForAppTokens(
registrationRequestDTO.isUseClientIdAsSubClaimForAppTokens());
appRegistrationRequest.setOmitUsernameInIntrospectionRespForAppTokens(
registrationRequestDTO.isOmitUsernameInIntrospectionRespForAppTokens());
appRegistrationRequest.setExtTokenType(registrationRequestDTO.getExtTokenType());
appRegistrationRequest.setJwksURI(registrationRequestDTO.getJwksUri());
appRegistrationRequest.setTokenEndpointAuthMethod(registrationRequestDTO.getTokenEndpointAuthMethod());
Expand Down Expand Up @@ -131,10 +127,6 @@ public static ApplicationUpdateRequest getApplicationUpdateRequest(UpdateRequest
applicationUpdateRequest.setExtPublicClient(updateRequestDTO.getExtPublicClient());
applicationUpdateRequest.setExtTokenType(updateRequestDTO.getExtTokenType());
applicationUpdateRequest.setJwksURI(updateRequestDTO.getJwksUri());
applicationUpdateRequest.setUseClientIdAsSubClaimForAppTokens(
updateRequestDTO.isUseClientIdAsSubClaimForAppTokens());
applicationUpdateRequest.setOmitUsernameInIntrospectionRespForAppTokens(
updateRequestDTO.isOmitUsernameInIntrospectionRespForAppTokens());
applicationUpdateRequest.setTokenEndpointAuthMethod(updateRequestDTO.getTokenEndpointAuthMethod());
applicationUpdateRequest.setTokenEndpointAllowReusePvtKeyJwt(
updateRequestDTO.isTokenEndpointAllowReusePvtKeyJwt());
Expand Down Expand Up @@ -255,9 +247,6 @@ public static ApplicationDTO getApplicationDTOFromApplication(Application applic
applicationDTO.setIdTokenSignedResponseAlg(application.getIdTokenSignatureAlgorithm());
applicationDTO.setIdTokenEncryptedResponseAlg(application.getIdTokenEncryptionAlgorithm());
applicationDTO.setIdTokenEncryptedResponseEnc(application.getIdTokenEncryptionMethod());
applicationDTO.setUseClientIdAsSubClaimForAppTokens(application.getUseClientIdAsSubClaimForAppTokens());
applicationDTO.setOmitUsernameInIntrospectionRespForAppTokens(
application.getOmitUsernameInIntrospectionRespForAppTokens());
applicationDTO.setRequireSignedRequestObject(application.isRequestObjectSignatureValidationEnabled());
applicationDTO.setRequestObjectSigningAlg(application.getRequestObjectSignatureAlgorithm());
applicationDTO.setTlsClientAuthSubjectDn(application.getTlsClientAuthSubjectDN());
Expand Down
6 changes: 0 additions & 6 deletions ...tity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,12 +626,6 @@ public static class OIDCConfigProperties {
public static final String TOKEN_REVOCATION_WITH_IDP_SESSION_TERMINATION =
"tokenRevocationWithIDPSessionTermination";
public static final String TOKEN_BINDING_VALIDATION = "tokenBindingValidation";
public static final String USE_CLIENT_ID_AS_SUB_CLAIM_FOR_APP_TOKENS = "useClientIdAsSubClaimForAppTokens";
public static final boolean USE_CLIENT_ID_AS_SUB_CLAIM_FOR_APP_TOKENS_NEW_APP_DEFAULT_VALUE = true;
public static final String OMIT_USERNAME_IN_INTROSPECTION_RESP_FOR_APP_TOKEN =
"omitUsernameInIntrospectionRespForAppTokens";
public static final boolean OMIT_USERNAME_IN_INTROSPECTION_RESP_FOR_APP_TOKEN_NEW_APP_DEFAULT_VALUE =
true;
public static final String TOKEN_BINDING_TYPE_NONE = "None";
public static final String TOKEN_AUTH_METHOD = "tokenEndpointAuthMethod";
public static final String TOKEN_EP_ALLOW_REUSE_PVT_KEY_JWT = "tokenEndpointAllowReusePvtKeyJwt";
Expand Down
23 changes: 0 additions & 23 deletions ...identity.oauth.dcr/src/main/java/org/wso2/carbon/identity/oauth/dcr/bean/Application.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ public class Application implements Serializable {
private String idTokenEncryptionAlgorithm = null;
private String idTokenEncryptionMethod = null;
private String softwareStatement = null;
private Boolean useClientIdAsSubClaimForAppTokens;
private Boolean omitUsernameInIntrospectionRespForAppTokens;

private Map<String, Object> additionalAttributes;
private String extAllowedAudience;
Expand Down Expand Up @@ -404,27 +402,6 @@ public void setIdTokenEncryptionMethod(String idTokenEncryptionMethod) {

this.idTokenEncryptionMethod = idTokenEncryptionMethod;
}

public Boolean getUseClientIdAsSubClaimForAppTokens() {

return useClientIdAsSubClaimForAppTokens;
}

public void setUseClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {

this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
}

public Boolean getOmitUsernameInIntrospectionRespForAppTokens() {

return omitUsernameInIntrospectionRespForAppTokens;
}

public void setOmitUsernameInIntrospectionRespForAppTokens(Boolean omitUsernameInIntrospectionRespForAppTokens) {

this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
}

@Override
public String toString() {

Expand Down
21 changes: 0 additions & 21 deletions ...src/main/java/org/wso2/carbon/identity/oauth/dcr/bean/ApplicationRegistrationRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ public class ApplicationRegistrationRequest implements Serializable {
private String requestObjectEncryptionAlgorithm;
private String requestObjectEncryptionMethod;
private Map<String, Object> additionalAttributes;
private Boolean useClientIdAsSubClaimForAppTokens;
private Boolean omitUsernameInIntrospectionRespForAppTokens;
private String extAllowedAudience;

public void setAdditionalAttributes(Map<String, Object> additionalAttributes) {
Expand Down Expand Up @@ -543,24 +541,5 @@ public void setSoftwareStatement(String softwareStatement) {
this.softwareStatement = softwareStatement;
}

public Boolean getUseClientIdAsSubClaimForAppTokens() {

return useClientIdAsSubClaimForAppTokens;
}

public void setUseClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {

this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
}

public Boolean getOmitUsernameInIntrospectionRespForAppTokens() {

return omitUsernameInIntrospectionRespForAppTokens;
}

public void setOmitUsernameInIntrospectionRespForAppTokens(Boolean omitUsernameInIntrospectionRespForAppTokens) {

this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
}

}
20 changes: 0 additions & 20 deletions ...h.dcr/src/main/java/org/wso2/carbon/identity/oauth/dcr/bean/ApplicationUpdateRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,26 +77,6 @@ public Map<String, Object> getAdditionalAttributes() {
return additionalAttributes;
}

public Boolean getUseClientIdAsSubClaimForAppTokens() {

return useClientIdAsSubClaimForAppTokens;
}

public void setUseClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {

this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
}

public Boolean getOmitUsernameInIntrospectionRespForAppTokens() {

return omitUsernameInIntrospectionRespForAppTokens;
}

public void setOmitUsernameInIntrospectionRespForAppTokens(Boolean omitUsernameInIntrospectionRespForAppTokens) {

this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
}

public String getExtAllowedAudience() {

return extAllowedAudience;
Expand Down
18 changes: 0 additions & 18 deletions ...ntity.oauth.dcr/src/main/java/org/wso2/carbon/identity/oauth/dcr/service/DCRMService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,6 @@ public Application updateApplication(ApplicationUpdateRequest updateRequest, Str
if (updateRequest.getExtIdTokenLifetime() != null) {
appDTO.setIdTokenExpiryTime(updateRequest.getExtIdTokenLifetime());
}
if (updateRequest.getUseClientIdAsSubClaimForAppTokens() != null) {
appDTO.setUseClientIdAsSubClaimForAppTokens(updateRequest.getUseClientIdAsSubClaimForAppTokens());
}
if (updateRequest.getOmitUsernameInIntrospectionRespForAppTokens() != null) {
appDTO.setOmitUsernameInIntrospectionRespForAppTokens(
updateRequest.getOmitUsernameInIntrospectionRespForAppTokens());
}
if (updateRequest.getTokenEndpointAuthMethod() != null) {
appDTO.setTokenEndpointAuthMethod(updateRequest.getTokenEndpointAuthMethod());
}
Expand Down Expand Up @@ -701,9 +694,6 @@ private Application buildResponse(OAuthConsumerAppDTO createdApp, String tenantD
application.setExtTokenType(createdApp.getTokenType());
application.setJwksURI(createdApp.getJwksURI());
application.setTokenEndpointAuthMethod(createdApp.getTokenEndpointAuthMethod());
application.setUseClientIdAsSubClaimForAppTokens(createdApp.isUseClientIdAsSubClaimForAppTokens());
application.setOmitUsernameInIntrospectionRespForAppTokens(
createdApp.isOmitUsernameInIntrospectionRespForAppTokens());
application.setTokenEndpointAllowReusePvtKeyJwt(createdApp.isTokenEndpointAllowReusePvtKeyJwt());
application.setTokenEndpointAuthSignatureAlgorithm(createdApp.getTokenEndpointAuthSignatureAlgorithm());
application.setSectorIdentifierURI(createdApp.getSectorIdentifierURI());
Expand Down Expand Up @@ -796,14 +786,6 @@ private OAuthConsumerAppDTO createOAuthApp(ApplicationRegistrationRequest regist
if (registrationRequest.getExtIdTokenLifetime() != null) {
oAuthConsumerApp.setIdTokenExpiryTime(registrationRequest.getExtIdTokenLifetime());
}
if (registrationRequest.getUseClientIdAsSubClaimForAppTokens() != null) {
oAuthConsumerApp.setUseClientIdAsSubClaimForAppTokens(
registrationRequest.getUseClientIdAsSubClaimForAppTokens());
}
if (registrationRequest.getOmitUsernameInIntrospectionRespForAppTokens() != null) {
oAuthConsumerApp.setOmitUsernameInIntrospectionRespForAppTokens(
registrationRequest.getOmitUsernameInIntrospectionRespForAppTokens());
}
if (registrationRequest.getTokenEndpointAuthMethod() != null) {
oAuthConsumerApp.setTokenEndpointAuthMethod(registrationRequest.getTokenEndpointAuthMethod());
}
Expand Down
2 changes: 0 additions & 2 deletions components/org.wso2.carbon.identity.oauth.stub/src/main/resources/OAuthAdminService.wsdl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,6 @@
<xs:element minOccurs="0" name="jwksURI" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="oauthConsumerKey" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="oauthConsumerSecret" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="omitUsernameInIntrospectionRespForAppTokens" nillable="true" type="xs:boolean"/>
<xs:element minOccurs="0" name="pkceMandatory" type="xs:boolean"/>
<xs:element minOccurs="0" name="pkceSupportPlain" type="xs:boolean"/>
<xs:element minOccurs="0" name="refreshTokenExpiryTime" type="xs:long"/>
Expand All @@ -440,7 +439,6 @@
<xs:element minOccurs="0" name="tokenEndpointAuthSignatureAlgorithm" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="tokenRevocationWithIDPSessionTerminationEnabled" type="xs:boolean"/>
<xs:element minOccurs="0" name="tokenType" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="useClientIdAsSubClaimForAppTokens" nillable="true" type="xs:boolean"/>
<xs:element minOccurs="0" name="userAccessTokenExpiryTime" type="xs:long"/>
<xs:element minOccurs="0" name="username" nillable="true" type="xs:string"/>
</xs:sequence>
Expand Down
Loading

0 comments on commit 3e4c265

Please sign in to comment.