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

Apply Framework Authentication Service Changes
wso2-extensions · Oct 24, 2023 · 0ded746 · 0ded746
2 parents a6e792f + 3d7b5fb
commit 0ded746
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/...a/org/wso2/carbon/identity/application/authenticator/oidc/OIDCAuthenticatorConstants.java b/...a/org/wso2/carbon/identity/application/authenticator/oidc/OIDCAuthenticatorConstants.java
@@ -69,10 +69,7 @@ private OIDCAuthenticatorConstants() {
             "/slo(.*)");
     public static final String OIDC_FEDERATION_NONCE = "oidc_federation_nonce";
     public static final String AUTHENTICATOR_OIDC = "authenticator.oidc";
-    public static final String REQUIRED_PARAMS = "required_params";
-    public static final String REDIRECT_URL = "redirect_url";
     public static final String REDIRECT_URL_SUFFIX = "_redirect_url";
-    public static final String PROMPT_TYPE = "prompt_type";
     public static final String REDIRECTION_PROMPT = "REDIRECTION_PROMPT";
 
     /**

diff --git a/...a/org/wso2/carbon/identity/application/authenticator/oidc/OpenIDConnectAuthenticator.java b/...a/org/wso2/carbon/identity/application/authenticator/oidc/OpenIDConnectAuthenticator.java
@@ -115,7 +115,6 @@
 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.REDIRECTION_PROMPT;
 import static org.wso2.carbon.identity.application.authenticator.oidc.OIDCAuthenticatorConstants.REDIRECT_URL_SUFFIX;
 import static org.wso2.carbon.identity.base.IdentityConstants.FEDERATED_IDP_SESSION_ID;
 
@@ -1294,19 +1293,18 @@ public Optional<AuthenticatorData> getAuthInitiationData(AuthenticationContext c
         requiredParameterList.add(OIDCAuthenticatorConstants.OAUTH2_GRANT_TYPE_CODE);
         requiredParameterList.add(OIDCAuthenticatorConstants.OAUTH2_PARAM_STATE);
 
-        AdditionalData additionalData = getAdditionalData(context, requiredParameterList);
-        authenticatorData.setAdditionalData(additionalData);
+        authenticatorData.setRequiredParams(requiredParameterList);
+        authenticatorData.setPromptType(FrameworkConstants.AuthenticatorPromptType.REDIRECTION_PROMPT);
+        authenticatorData.setAdditionalData(getAdditionalData(context));
 
         return Optional.of(authenticatorData);
     }
 
-    private static AdditionalData getAdditionalData(AuthenticationContext context, List<String> requiredParameterList) {
+    private static AdditionalData getAdditionalData(AuthenticationContext context) {
 
         AdditionalData additionalData = new AdditionalData();
-        additionalData.setRequiredParams(requiredParameterList);
         additionalData.setRedirectUrl((String) context.getProperty(OIDCAuthenticatorConstants.AUTHENTICATOR_NAME +
                 REDIRECT_URL_SUFFIX));
-        additionalData.setPromptType(REDIRECTION_PROMPT);
         return additionalData;
     }
 

diff --git a/...g/wso2/carbon/identity/application/authenticator/oidc/OpenIDConnectAuthenticatorTest.java b/...g/wso2/carbon/identity/application/authenticator/oidc/OpenIDConnectAuthenticatorTest.java
@@ -836,10 +836,10 @@ public void testGetAuthInitiationData() {
         Assert.assertEquals(authenticatorDataObj.getName(), AUTHENTICATOR_NAME);
         Assert.assertEquals(authenticatorDataObj.getI18nKey(), AUTHENTICATOR_OIDC);
         Assert.assertEquals(authenticatorDataObj.getDisplayName(), AUTHENTICATOR_FRIENDLY_NAME);
-        Assert.assertEquals(authenticatorDataObj.getAdditionalDataObj().getRequiredParams().size(),
+        Assert.assertEquals(authenticatorDataObj.getRequiredParams().size(),
                 2);
-        Assert.assertEquals(authenticatorDataObj.getAdditionalDataObj().getPromptType(),
-                REDIRECTION_PROMPT);
+        Assert.assertEquals(authenticatorDataObj.getPromptType(),
+                FrameworkConstants.AuthenticatorPromptType.REDIRECTION_PROMPT);
 
     }
 

diff --git a/pom.xml b/pom.xml
@@ -304,7 +304,7 @@
         <identity.application.auth.oidc.package.export.version>${project.version}
         </identity.application.auth.oidc.package.export.version>
 
-        <carbon.identity.framework.version>5.25.400</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.431</carbon.identity.framework.version>
         <oltu.version>1.0.0.wso2v3</oltu.version>
         <json-smart.version>2.4.7</json-smart.version>
         <json.wso2.version>3.0.0.wso2v2</json.wso2.version>