Merge pull request #156 from dhaura/DP-fix-native-sdk-based-auth-flow

Improve "canHandle" Method to Support Native SDK based Federation

Author: DMHP

components/org.wso2.carbon.identity.application.authenticator.oidc/src/main/java/org/wso2/carbon/identity/application/authenticator/oidc/OpenIDConnectAuthenticator.java

@@ -115,11 +115,8 @@
 import static org.wso2.carbon.identity.application.authenticator.oidc.OIDCAuthenticatorConstants.LogConstants.ActionIDs.PROCESS_AUTHENTICATION_RESPONSE;
 import static org.wso2.carbon.identity.application.authenticator.oidc.OIDCAuthenticatorConstants.LogConstants.OUTBOUND_AUTH_OIDC_SERVICE;
 import static org.wso2.carbon.identity.application.authenticator.oidc.OIDCAuthenticatorConstants.OIDC_FEDERATION_NONCE;
-import static org.wso2.carbon.identity.application.authenticator.oidc.OIDCAuthenticatorConstants.PROMPT_TYPE;
 import static org.wso2.carbon.identity.application.authenticator.oidc.OIDCAuthenticatorConstants.REDIRECTION_PROMPT;
-import static org.wso2.carbon.identity.application.authenticator.oidc.OIDCAuthenticatorConstants.REDIRECT_URL;
 import static org.wso2.carbon.identity.application.authenticator.oidc.OIDCAuthenticatorConstants.REDIRECT_URL_SUFFIX;
-import static org.wso2.carbon.identity.application.authenticator.oidc.OIDCAuthenticatorConstants.REQUIRED_PARAMS;
 import static org.wso2.carbon.identity.base.IdentityConstants.FEDERATED_IDP_SESSION_ID;
 
 /**
@@ -197,7 +194,13 @@ public boolean canHandle(HttpServletRequest request) {
         if (LOG.isTraceEnabled()) {
             LOG.trace("Inside OpenIDConnectAuthenticator.canHandle()");
         }
-        boolean canHandle = OIDCAuthenticatorConstants.LOGIN_TYPE.equals(getLoginType(request));
+
+        boolean canHandle;
+        if (isNativeSDKBasedFederationCall(request)) {
+            canHandle = true;
+        } else {
+            canHandle = OIDCAuthenticatorConstants.LOGIN_TYPE.equals(getLoginType(request));
+        }
         if (canHandle && LoggerUtils.isDiagnosticLogsEnabled()) {
             DiagnosticLog.DiagnosticLogBuilder diagnosticLogBuilder = new DiagnosticLog.DiagnosticLogBuilder(
                     getComponentId(), FrameworkConstants.LogConstants.ActionIDs.HANDLE_AUTH_STEP);

components/org.wso2.carbon.identity.application.authenticator.oidc/src/test/java/org/wso2/carbon/identity/application/authenticator/oidc/OpenIDConnectAuthenticatorTest.java

@@ -256,6 +256,20 @@ public void testCanHandle(String grantType, String state, String loginType, Stri
 
     }
 
+    @Test
+    public void testCanHandleForNativeSDKBasedFederation() throws Exception {
+
+        mockStatic(LoggerUtils.class);
+        when(LoggerUtils.isDiagnosticLogsEnabled()).thenReturn(true);
+        when(mockServletRequest.getParameter(OIDCAuthenticatorConstants.ACCESS_TOKEN_PARAM)).thenReturn(accessToken);
+        when(mockServletRequest.getParameter(OIDCAuthenticatorConstants.ID_TOKEN_PARAM)).thenReturn(idToken);
+        when(mockServletRequest.getParameter(OIDCAuthenticatorConstants.SESSION_DATA_KEY_PARAM))
+                .thenReturn(sessionDataKey);
+
+        assertTrue(openIDConnectAuthenticator.canHandle(mockServletRequest));
+        assertEquals(openIDConnectAuthenticator.getContextIdentifier(mockServletRequest), sessionDataKey);
+    }
+
     @Test
     public void testGetAuthorizationServerEndpoint() throws IOException {