Skip to content

Commit

Permalink
Merge tag 'v1.2.203' into meta-attribute-get
Browse files Browse the repository at this point in the history
[WSO2 Release] [Jenkins #1063] [Release 1.2.203] copy for tag v1.2.203
  • Loading branch information
HasiniSama committed Jul 10, 2024
2 parents 90e3eb3 + 30d753b commit 80f0063
Show file tree
Hide file tree
Showing 118 changed files with 1,240 additions and 123 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.196</version>
<version>1.2.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ private ApplicationManagementConstants() {
public static final String DEFAULT_NAME_ID_FORMAT = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
public static final String DEFAULT_CERTIFICATE_ALIAS = "wso2carbon";
public static final String ADVANCED_CONFIGURATIONS = "advancedConfigurations";
public static final String APPLICATION_ENABLED = "applicationEnabled";
public static final String TEMPLATE_ID = "templateId";
public static final String NAME = "name";
public static final String CLIENT_ID = "clientId";
Expand Down Expand Up @@ -79,7 +80,9 @@ private ApplicationManagementConstants() {
public static final String NON_EXISTING_USER_CODE = "30007 - ";
public static final String APPLICATION_BASED_OUTBOUND_PROVISIONING_ENABLED =
"OutboundProvisioning.enableApplicationBasedOutboundProvisioning";

public static final String CODE_TOKEN = "code token";
public static final String CODE_IDTOKEN = "code id_token";
public static final String CODE_IDTOKEN_TOKEN = "code id_token token";

/**
* Enums for error messages.
Expand Down Expand Up @@ -160,6 +163,13 @@ public enum ErrorMessage {
BLOCK_RENAME_APP_NAME_TO_RESERVED_APP_NAME("60516",
"Renaming application name to a system reserved name is blocked",
"The application name %s is marked as systems reserved application name."),
Hybrid_FLOW_RESPONSE_TYPE_NOT_FOUND("60517",
"Hybrid flow response type not found.",
"Hybrid flow response type cannot be found for the application"),
Hybrid_FLOW_RESPONSE_TYPE_INCORRECT("60518",
"Hybrid flow response type is incorrect.",
"The response type for the hybrid flow should be either 'code token' or 'code id_token' or " +
"'code id_token token'"),

// Server Errors.
ERROR_RETRIEVING_SAML_METADATA("65001",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<relativePath>../pom.xml</relativePath>
</parent>

<name>WSO2 Identity Server - Applications Rest API</name>
<description>WSO2 Identity Server - Applications Rest API</description>
<artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
<version>1.2.196</version>
<version>1.2.203</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public static AccessEnum fromValue(String value) {
private AdvancedApplicationConfiguration advancedConfigurations;
private String templateId;
private AssociatedRolesConfig associatedRoles;
private Boolean applicationEnabled;

/**
**/
Expand Down Expand Up @@ -315,6 +316,24 @@ public void setAssociatedRoles(AssociatedRolesConfig associatedRoles) {
this.associatedRoles = associatedRoles;
}

/**
**/
public ApplicationListItem applicationEnabled(Boolean applicationEnabled) {

this.applicationEnabled = applicationEnabled;
return this;
}

@ApiModelProperty(example = "true", value = "")
@JsonProperty("applicationEnabled")
@Valid
public Boolean getApplicationEnabled() {
return applicationEnabled;
}
public void setApplicationEnabled(Boolean applicationEnabled) {
this.applicationEnabled = applicationEnabled;
}



@Override
Expand All @@ -339,12 +358,13 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.self, applicationListItem.self) &&
Objects.equals(this.advancedConfigurations, applicationListItem.advancedConfigurations) &&
Objects.equals(this.templateId, applicationListItem.templateId) &&
Objects.equals(this.associatedRoles, applicationListItem.associatedRoles);
Objects.equals(this.associatedRoles, applicationListItem.associatedRoles) &&
Objects.equals(this.applicationEnabled, applicationListItem.applicationEnabled);
}

@Override
public int hashCode() {
return Objects.hash(id, name, description, image, accessUrl, clientId, issuer, realm, access, self, advancedConfigurations, templateId, associatedRoles);
return Objects.hash(id, name, description, image, accessUrl, clientId, issuer, realm, access, self, advancedConfigurations, templateId, associatedRoles, applicationEnabled);
}

@Override
Expand All @@ -366,6 +386,7 @@ public String toString() {
sb.append(" advancedConfigurations: ").append(toIndentedString(advancedConfigurations)).append("\n");
sb.append(" templateId: ").append(toIndentedString(templateId)).append("\n");
sb.append(" associatedRoles: ").append(toIndentedString(associatedRoles)).append("\n");
sb.append(" applicationEnabled: ").append(toIndentedString(applicationEnabled)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
/*
* Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.wso2.carbon.identity.api.server.application.management.v1;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;


import io.swagger.annotations.*;
import java.util.Objects;
import javax.validation.Valid;
import javax.xml.bind.annotation.*;

public class HybridFlowConfiguration {

private Boolean enable;
private String responseType;

/**
**/
public HybridFlowConfiguration enable(Boolean enable) {

this.enable = enable;
return this;
}

@ApiModelProperty(example = "true", value = "")
@JsonProperty("enable")
@Valid
public Boolean getEnable() {
return enable;
}
public void setEnable(Boolean enable) {
this.enable = enable;
}

/**
**/
public HybridFlowConfiguration responseType(String responseType) {

this.responseType = responseType;
return this;
}

@ApiModelProperty(example = "code id_token", value = "")
@JsonProperty("responseType")
@Valid
public String getResponseType() {
return responseType;
}
public void setResponseType(String responseType) {
this.responseType = responseType;
}



@Override
public boolean equals(java.lang.Object o) {

if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
HybridFlowConfiguration hybridFlowConfiguration = (HybridFlowConfiguration) o;
return Objects.equals(this.enable, hybridFlowConfiguration.enable) &&
Objects.equals(this.responseType, hybridFlowConfiguration.responseType);
}

@Override
public int hashCode() {
return Objects.hash(enable, responseType);
}

@Override
public String toString() {

StringBuilder sb = new StringBuilder();
sb.append("class HybridFlowConfiguration {\n");

sb.append(" enable: ").append(toIndentedString(enable)).append("\n");
sb.append(" responseType: ").append(toIndentedString(responseType)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {

if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n");
}
}

Loading

0 comments on commit 80f0063

Please sign in to comment.