address pr comments

Author: SachiniSiriwardene

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

@@ -619,13 +619,12 @@ private OAuthConsumerAppDTO createOAuthApp(ApplicationRegistrationRequest regist
         oAuthConsumerApp.setPkceMandatory(registrationRequest.isExtPkceMandatory());
         oAuthConsumerApp.setPkceSupportPlain(registrationRequest.isExtPkceSupportPlain());
         oAuthConsumerApp.setBypassClientCredentials(registrationRequest.isExtPublicClient());
-
         boolean enableFAPI = Boolean.parseBoolean(IdentityUtil.getProperty(OAuthConstants.ENABLE_FAPI));
         if (enableFAPI) {
             boolean enableFAPIDCR = Boolean.parseBoolean(IdentityUtil.getProperty(
                     OAuthConstants.ENABLE_DCR_FAPI_ENFORCEMENT));
             if (enableFAPIDCR) {
-                // Add FAPI conformant application nad isThirdParty property to the service provider.
+                // Add FAPI conformant property to Oauth application.
                 oAuthConsumerApp.setFAPIConformant(true);
             }
         }

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

@@ -408,6 +408,7 @@
                     <xs:element minOccurs="0" name="idTokenEncryptionMethod" nillable="true" type="xs:string"/>
                     <xs:element minOccurs="0" name="idTokenExpiryTime" type="xs:long"/>
                     <xs:element minOccurs="0" name="idTokenSignatureAlgorithm" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="isFAPIConformant" type="xs:boolean"/>
                     <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"/>

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

@@ -1537,7 +1537,7 @@ private void addServiceProviderOIDCProperties(Connection connection,
                     SUBJECT_TYPE, consumerAppDO.getSubjectType());
 
             addToBatchForOIDCPropertyAdd(processedClientId, spTenantId, prepStmtAddOIDCProperty,
-                    IS_FAPI_CONFORMANT_APP, consumerAppDO.getSubjectType());
+                    IS_FAPI_CONFORMANT_APP, String.valueOf(consumerAppDO.isFAPIConformant()));
 
             prepStmtAddOIDCProperty.executeBatch();
         }

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

@@ -463,10 +463,12 @@ public void setRequestObjectEncryptionMethod(String requestObjectEncryptionMetho
     }
 
     public boolean isFAPIConformant() {
+
         return isFAPIConformant;
     }
 
     public void setFAPIConformant(boolean fapiConformant) {
+
         isFAPIConformant = fapiConformant;
     }
 }

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

@@ -429,11 +429,14 @@ public void setIdTokenSignatureAlgorithm(String idTokenSignatureAlgorithm) {
 
         this.idTokenSignatureAlgorithm = idTokenSignatureAlgorithm;
     }
+
     public boolean isFAPIConformant() {
+
         return isFAPIConformant;
     }
 
     public void setFAPIConformant(boolean fapiConformant) {
+
         isFAPIConformant = fapiConformant;
     }
 }

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

@@ -4948,7 +4948,7 @@ public static String resolveExternalConsentPageUrl(String tenantDomain) throws I
      *
      * @param clientId       Client ID of the application.
      * @return Whether the application should be FAPI conformant.
-     * @throws IdentityOAuth2Exception
+     * @throws IdentityOAuth2Exception InvalidOAuthClientException
      */
     public static boolean isFapiConformantApp(String clientId)
             throws IdentityOAuth2Exception, InvalidOAuthClientException {

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

@@ -197,15 +197,9 @@ public void testAuthenticateForFapiApplicationsWithInvalidAuthenticatorsRegister
         bodyParams.put(OAuth.OAUTH_CLIENT_ID, Arrays.asList(CLIENT_ID));
         PowerMockito.mockStatic(OAuth2Util.class);
         HttpServletRequest httpServletRequest = PowerMockito.mock(HttpServletRequest.class);
-        /*ServiceProvider serviceProvider = new ServiceProvider();
-        ServiceProviderProperty fapiAppSpProperty = new ServiceProviderProperty();
-        fapiAppSpProperty.setName(OAuthConstants.IS_FAPI_CONFORMANT_APP);
-        fapiAppSpProperty.setValue("true");
-        serviceProvider.setSpProperties(new ServiceProviderProperty[]{fapiAppSpProperty});*/
         OAuthAppDO oAuthAppDO = new OAuthAppDO();
         oAuthAppDO.setTokenEndpointAuthMethod("private_key_jwt");
         oAuthAppDO.setFAPIConformant(true);
-        //PowerMockito.when(OAuth2Util.getServiceProvider(Mockito.anyString())).thenReturn(serviceProvider);
         PowerMockito.when(OAuth2Util.getAppInformationByClientId(Mockito.anyString(), Mockito.anyString()))
                 .thenReturn(oAuthAppDO);
         PowerMockito.when(OAuth2Util.isFapiConformantApp(Mockito.anyString())).thenReturn(true);
@@ -235,14 +229,9 @@ public void testAuthenticateWhenAuthMethodConfiguredInApp(boolean isFapiApp) thr
         bodyParams.put(OAuth.OAUTH_CLIENT_ID, Arrays.asList(CLIENT_ID));
         PowerMockito.mockStatic(OAuth2Util.class);
         HttpServletRequest httpServletRequest = PowerMockito.mock(HttpServletRequest.class);
-        /*ServiceProvider serviceProvider = new ServiceProvider();
-        ServiceProviderProperty fapiAppSpProperty = new ServiceProviderProperty();
-        fapiAppSpProperty.setName(OAuthConstants.IS_FAPI_CONFORMANT_APP);
-        fapiAppSpProperty.setValue(String.valueOf(isFapiApp));
-        serviceProvider.setSpProperties(new ServiceProviderProperty[]{fapiAppSpProperty});*/
         OAuthAppDO oAuthAppDO = new OAuthAppDO();
         oAuthAppDO.setTokenEndpointAuthMethod("private_key_jwt");
-        //PowerMockito.when(OAuth2Util.getServiceProvider(Mockito.anyString())).thenReturn(serviceProvider);
+        oAuthAppDO.setFAPIConformant(isFapiApp);
         PowerMockito.when(OAuth2Util.getAppInformationByClientId(Mockito.anyString(), Mockito.anyString()))
                 .thenReturn(oAuthAppDO);
         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

@@ -118,7 +118,12 @@
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
-import static org.powermock.api.mockito.PowerMockito.*;
+import static org.powermock.api.mockito.PowerMockito.doReturn;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.spy;
+import static org.powermock.api.mockito.PowerMockito.when;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;