Skip to content

Commit df7d289

Browse files
SachiniSiriwardeneSachiniSiriwardene
committed
change fapi conformant property name
1 parent b48169d commit df7d289

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

‎components/org.wso2.carbon.identity.oauth.dcr/src/main/java/org/wso2/carbon/identity/oauth/dcr/service/DCRMService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ private OAuthConsumerAppDTO createOAuthApp(ApplicationRegistrationRequest regist
625625
OAuthConstants.ENABLE_DCR_FAPI_ENFORCEMENT));
626626
if (enableFAPIDCR) {
627627
// Add FAPI conformant property to Oauth application.
628-
oAuthConsumerApp.setFAPIConformant(true);
628+
oAuthConsumerApp.setFapiConformanceEnabled(true);
629629
}
630630
}
631631

‎components/org.wso2.carbon.identity.oauth.stub/src/main/resources/OAuthAdminService.wsdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,14 +401,14 @@
401401
<xs:element minOccurs="0" name="backChannelLogoutUrl" nillable="true" type="xs:string"/>
402402
<xs:element minOccurs="0" name="bypassClientCredentials" type="xs:boolean"/>
403403
<xs:element minOccurs="0" name="callbackUrl" nillable="true" type="xs:string"/>
404+
<xs:element minOccurs="0" name="fapiConformanceEnabled" type="xs:boolean"/>
404405
<xs:element minOccurs="0" name="frontchannelLogoutUrl" nillable="true" type="xs:string"/>
405406
<xs:element minOccurs="0" name="grantTypes" nillable="true" type="xs:string"/>
406407
<xs:element minOccurs="0" name="idTokenEncryptionAlgorithm" nillable="true" type="xs:string"/>
407408
<xs:element minOccurs="0" name="idTokenEncryptionEnabled" type="xs:boolean"/>
408409
<xs:element minOccurs="0" name="idTokenEncryptionMethod" nillable="true" type="xs:string"/>
409410
<xs:element minOccurs="0" name="idTokenExpiryTime" type="xs:long"/>
410411
<xs:element minOccurs="0" name="idTokenSignatureAlgorithm" nillable="true" type="xs:string"/>
411-
<xs:element minOccurs="0" name="isFAPIConformant" type="xs:boolean"/>
412412
<xs:element minOccurs="0" name="jwksURI" nillable="true" type="xs:string"/>
413413
<xs:element minOccurs="0" name="oauthConsumerKey" nillable="true" type="xs:string"/>
414414
<xs:element minOccurs="0" name="oauthConsumerSecret" nillable="true" type="xs:string"/>

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ public OAuthConsumerAppDTO registerAndRetrieveOAuthApplicationData(OAuthConsumer
449449
app.setRequirePushedAuthorizationRequests(application.getRequirePushedAuthorizationRequests());
450450
app.setTlsClientCertificateBoundAccessTokens(
451451
application.getTlsClientCertificateBoundAccessTokens());
452-
app.setFAPIConformant(application.isFAPIConformant());
452+
app.setFapiConformanceEnabled(application.isFapiConformanceEnabled());
453453
}
454454
dao.addOAuthApplication(app);
455455
AppInfoCache.getInstance().addToCache(app.getOauthConsumerKey(), app);

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ private void addServiceProviderOIDCProperties(Connection connection,
15371537
SUBJECT_TYPE, consumerAppDO.getSubjectType());
15381538

15391539
addToBatchForOIDCPropertyAdd(processedClientId, spTenantId, prepStmtAddOIDCProperty,
1540-
IS_FAPI_CONFORMANT_APP, String.valueOf(consumerAppDO.isFAPIConformant()));
1540+
IS_FAPI_CONFORMANT_APP, String.valueOf(consumerAppDO.isFapiConformanceEnabled()));
15411541

15421542
prepStmtAddOIDCProperty.executeBatch();
15431543
}

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDO.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public class OAuthAppDO extends InboundConfigurationProtocol implements Serializ
8989
private String subjectType;
9090
private String requestObjectEncryptionAlgorithm;
9191
private String requestObjectEncryptionMethod;
92-
private boolean isFAPIConformant;
92+
private boolean fapiConformanceEnabled;
9393

9494
public AuthenticatedUser getAppOwner() {
9595

@@ -462,13 +462,13 @@ public void setRequestObjectEncryptionMethod(String requestObjectEncryptionMetho
462462
this.requestObjectEncryptionMethod = requestObjectEncryptionMethod;
463463
}
464464

465-
public boolean isFAPIConformant() {
465+
public boolean isFapiConformanceEnabled() {
466466

467-
return isFAPIConformant;
467+
return fapiConformanceEnabled;
468468
}
469469

470-
public void setFAPIConformant(boolean fapiConformant) {
470+
public void setFapiConformanceEnabled(boolean fapiConformant) {
471471

472-
isFAPIConformant = fapiConformant;
472+
fapiConformanceEnabled = fapiConformant;
473473
}
474474
}

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dto/OAuthConsumerAppDTO.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class OAuthConsumerAppDTO {
6464
private String requestObjectEncryptionAlgorithm;
6565
private String requestObjectEncryptionMethod;
6666
private String jwksURI;
67-
private boolean isFAPIConformant;
67+
private boolean fapiConformanceEnabled;
6868

6969
public String getJwksURI() {
7070

@@ -430,14 +430,14 @@ public void setIdTokenSignatureAlgorithm(String idTokenSignatureAlgorithm) {
430430
this.idTokenSignatureAlgorithm = idTokenSignatureAlgorithm;
431431
}
432432

433-
public boolean isFAPIConformant() {
433+
public boolean isFapiConformanceEnabled() {
434434

435-
return isFAPIConformant;
435+
return fapiConformanceEnabled;
436436
}
437437

438-
public void setFAPIConformant(boolean fapiConformant) {
438+
public void setFapiConformanceEnabled(boolean fapiConformant) {
439439

440-
isFAPIConformant = fapiConformant;
440+
fapiConformanceEnabled = fapiConformant;
441441
}
442442
}
443443

‎components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4959,7 +4959,7 @@ public static boolean isFapiConformantApp(String clientId)
49594959
}
49604960
String tenantDomain = IdentityTenantUtil.resolveTenantDomain();
49614961
OAuthAppDO oAuthAppDO = OAuth2Util.getAppInformationByClientId(clientId, tenantDomain);
4962-
return oAuthAppDO.isFAPIConformant();
4962+
return oAuthAppDO.isFapiConformanceEnabled();
49634963
}
49644964

49654965
/**

‎components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/client/authentication/OAuthClientAuthnServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void testAuthenticateForFapiApplicationsWithInvalidAuthenticatorsRegister
199199
HttpServletRequest httpServletRequest = PowerMockito.mock(HttpServletRequest.class);
200200
OAuthAppDO oAuthAppDO = new OAuthAppDO();
201201
oAuthAppDO.setTokenEndpointAuthMethod("private_key_jwt");
202-
oAuthAppDO.setFAPIConformant(true);
202+
oAuthAppDO.setFapiConformanceEnabled(true);
203203
PowerMockito.when(OAuth2Util.getAppInformationByClientId(Mockito.anyString(), Mockito.anyString()))
204204
.thenReturn(oAuthAppDO);
205205
PowerMockito.when(OAuth2Util.isFapiConformantApp(Mockito.anyString())).thenReturn(true);
@@ -231,7 +231,7 @@ public void testAuthenticateWhenAuthMethodConfiguredInApp(boolean isFapiApp) thr
231231
HttpServletRequest httpServletRequest = PowerMockito.mock(HttpServletRequest.class);
232232
OAuthAppDO oAuthAppDO = new OAuthAppDO();
233233
oAuthAppDO.setTokenEndpointAuthMethod("private_key_jwt");
234-
oAuthAppDO.setFAPIConformant(isFapiApp);
234+
oAuthAppDO.setFapiConformanceEnabled(isFapiApp);
235235
PowerMockito.when(OAuth2Util.getAppInformationByClientId(Mockito.anyString(), Mockito.anyString()))
236236
.thenReturn(oAuthAppDO);
237237
PowerMockito.when(OAuth2Util.isFapiConformantApp(Mockito.anyString())).thenReturn(true);

‎components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/util/OAuth2UtilTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2517,15 +2517,15 @@ public void testIsFapiConformantApp(boolean isFapiConformant) throws Exception {
25172517
mockStatic(IdentityUtil.class);
25182518
if (isFapiConformant) {
25192519
OAuthAppDO oAuthAppDO = new OAuthAppDO();
2520-
oAuthAppDO.setFAPIConformant(true);
2520+
oAuthAppDO.setFapiConformanceEnabled(true);
25212521
doReturn(oAuthAppDO).when(OAuth2Util.class, "getAppInformationByClientId", anyString(), anyString());
25222522
when(IdentityUtil.getProperty(OAuthConstants.ENABLE_FAPI)).thenReturn("true");
25232523
when(IdentityTenantUtil.resolveTenantDomain()).thenReturn("carbon.super");
25242524
when(IdentityUtil.getProperty(OAuthConstants.ENABLE_FAPI)).thenReturn("true");
25252525
Assert.assertEquals(OAuth2Util.isFapiConformantApp(clientId), isFapiConformant);
25262526
} else {
25272527
OAuthAppDO oAuthAppDO = new OAuthAppDO();
2528-
oAuthAppDO.setFAPIConformant(false);
2528+
oAuthAppDO.setFapiConformanceEnabled(false);
25292529
doReturn(oAuthAppDO).when(OAuth2Util.class, "getAppInformationByClientId", anyString(), anyString());
25302530
when(IdentityTenantUtil.resolveTenantDomain()).thenReturn("carbon.super");
25312531
when(IdentityUtil.getProperty(any())).thenReturn("true");

0 commit comments

Comments
 (0)