bump to master

wso2-extensions · Jan 23, 2025 · f87aee7 · f87aee7
1 parent c1392c1
commit f87aee7
Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/...2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java b/...2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java
@@ -2013,7 +2013,7 @@ private void setSpOIDCProperties(Map<String, List<String>> spOIDCProperties, OAu
             } else {
                 // Enable hybrid flow with all configured response types
                 oauthApp.setHybridFlowEnabled(true);
-                String hybridFlowResponseType = String.join(", ", configuredHybridResponseTypes);
+                String hybridFlowResponseType = String.join(",", configuredHybridResponseTypes);
                 oauthApp.setHybridFlowResponseType(hybridFlowResponseType);
             }
         } else {

diff --git a/...rg/wso2/carbon/identity/oauth2/authz/validators/AbstractResponseTypeRequestValidator.java b/...rg/wso2/carbon/identity/oauth2/authz/validators/AbstractResponseTypeRequestValidator.java
@@ -38,9 +38,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 

diff --git a/...arbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/OAuth2ServiceTest.java b/...arbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/OAuth2ServiceTest.java
@@ -374,12 +374,10 @@ public Object[][] hybridFlowValidationDataProvider() {
 
                 // Hybrid flow enabled but configured response type is different than requested.
                 {true, "code id_token token", "code token",
-                        false, OAuth2ErrorCodes.INVALID_CLIENT, "Requested response type code token is not " +
-                        "configured for the hybrid flow for the application."},
+                        false, OAuth2ErrorCodes.INVALID_CLIENT, "invalid.response.type.for.hybrid.flow"},
 
                 {true, "code id_token token, code id_token", "code token",
-                        false, OAuth2ErrorCodes.INVALID_CLIENT, "Requested response type code token is not " +
-                        "configured for the hybrid flow for the application."}
+                        false, OAuth2ErrorCodes.INVALID_CLIENT, "invalid.response.type.for.hybrid.flow"}
         };
     }