Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve hybrid flow to handle multiple values #781

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Improve hybrid flow to handle multiple values #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions ...n/management/v1/core/functions/application/inbound/oauth2/ApiModelToOAuthConsumerApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package org.wso2.carbon.identity.api.server.application.management.v1.core.functions.application.inbound.oauth2;

import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementConstants;
import org.wso2.carbon.identity.api.server.application.management.v1.AccessTokenConfiguration;
Expand All @@ -37,8 +36,12 @@
import org.wso2.carbon.identity.oauth.common.OAuthConstants;
import org.wso2.carbon.identity.oauth.dto.OAuthConsumerAppDTO;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;

import javax.ws.rs.core.Response;

Expand Down Expand Up @@ -201,9 +204,11 @@ private void updateHybridFlowConfigurations(OAuthConsumerAppDTO consumerAppDTO,
private void validateHybridFlowResponseType(OAuthConsumerAppDTO consumerAppDTO,
HybridFlowConfiguration hybridFlowResponseType) {

String[] allowedResponseTypes = {ApplicationManagementConstants.CODE_TOKEN,
ApplicationManagementConstants.CODE_IDTOKEN,
ApplicationManagementConstants.CODE_IDTOKEN_TOKEN};
Set<String> allowedResponseTypesSet = new HashSet<>(Arrays.asList(
ApplicationManagementConstants.CODE_TOKEN,
ApplicationManagementConstants.CODE_IDTOKEN,
ApplicationManagementConstants.CODE_IDTOKEN_TOKEN
));

if (StringUtils.isBlank(hybridFlowResponseType.getResponseType())) {
throw new APIError(Response.Status.BAD_REQUEST,
Expand All @@ -215,7 +220,10 @@ private void validateHybridFlowResponseType(OAuthConsumerAppDTO consumerAppDTO,
.Hybrid_FLOW_RESPONSE_TYPE_NOT_FOUND.getDescription()).build());
}

if (!ArrayUtils.contains(allowedResponseTypes, hybridFlowResponseType.getResponseType())) {
List<String> hybridFlowResponseTypes =
new ArrayList<>(Arrays.asList(hybridFlowResponseType.getResponseType().split(",")));

if (!allowedResponseTypesSet.containsAll(hybridFlowResponseTypes)) {
throw new APIError(Response.Status.BAD_REQUEST,
new ErrorResponse.Builder().withCode(ApplicationManagementConstants.ErrorMessage
.Hybrid_FLOW_RESPONSE_TYPE_INCORRECT.getCode())
Expand Down
5 changes: 4 additions & 1 deletion ...carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3676,10 +3676,13 @@ components:
properties:
enable:
type: boolean
description: "Indicates whether the hybrid flow is enabled."
example: true
responseType:
type: string
example: code id_token
description: "Specifies the allowed response types for the hybrid flow, provided as a comma-separated string.
The supported combinations are: 'code token', 'code id_token token', and 'code id_token'."
example: code id_token,code token
AccessTokenConfiguration:
type: object
properties:
Expand Down
Loading