Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ private ApplicationManagementConstants() {
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 ORGANIZATION_CUSTOM_ROLES_ENABLED = "organizationCustomRolesEnabled";
public static final String TEMPLATE_ID = "templateId";
public static final String TEMPLATE_VERSION = "templateVersion";
public static final String NAME = "name";
Expand Down Expand Up @@ -203,6 +204,18 @@ public enum ErrorMessage {
UNSUPPORTED_ENHANCED_ORGANIZATION_AUTHENTICATION_ENABLED_CONFIGURATION("60521",
"Enhanced organization authentication enabled property is not supported.",
"The 'enhancedOrgAuthenticationEnabled' property is not yet supported."),
UNSUPPORTED_ORGANIZATION_CUSTOM_ROLES_CONFIGURATION("60522",
"Organization custom roles property is not supported.",
"The 'organizationCustomRolesEnabled' property requires enhanced organization authentication " +
"to be supported."),
ORGANIZATION_CUSTOM_ROLES_READ_ONLY_FOR_SHARED_APP("60523",
"Organization custom roles property cannot be updated.",
"The 'organizationCustomRolesEnabled' property is read-only for shared applications. Update it " +
"on the main application."),
ORGANIZATION_CUSTOM_ROLES_FEATURE_DISABLED("60524",
"Organization custom roles property is not supported.",
"The 'organizationCustomRolesEnabled' property cannot be enabled as the organization custom roles " +
"feature is disabled in the server."),

// Server Errors.
ERROR_RETRIEVING_SAML_METADATA("65001",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
* Copyright (c) 2023-2026, 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
Expand Down Expand Up @@ -83,6 +83,7 @@ public static AccessEnum fromValue(String value) {
private String templateVersion;
private AssociatedRolesConfig associatedRoles;
private Boolean enhancedOrgAuthenticationEnabled;
private Boolean organizationCustomRolesEnabled;
private Boolean applicationEnabled;

/**
Expand Down Expand Up @@ -374,6 +375,24 @@ public void setEnhancedOrgAuthenticationEnabled(Boolean enhancedOrgAuthenticatio
this.enhancedOrgAuthenticationEnabled = enhancedOrgAuthenticationEnabled;
}

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

this.organizationCustomRolesEnabled = organizationCustomRolesEnabled;
return this;
}

@ApiModelProperty(example = "false", value = "")
@JsonProperty("organizationCustomRolesEnabled")
@Valid
public Boolean getOrganizationCustomRolesEnabled() {
return organizationCustomRolesEnabled;
}
public void setOrganizationCustomRolesEnabled(Boolean organizationCustomRolesEnabled) {
this.organizationCustomRolesEnabled = organizationCustomRolesEnabled;
}

/**
**/
public ApplicationListItem applicationEnabled(Boolean applicationEnabled) {
Expand Down Expand Up @@ -420,12 +439,13 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.templateVersion, applicationListItem.templateVersion) &&
Objects.equals(this.associatedRoles, applicationListItem.associatedRoles) &&
Objects.equals(this.enhancedOrgAuthenticationEnabled, applicationListItem.enhancedOrgAuthenticationEnabled) &&
Objects.equals(this.organizationCustomRolesEnabled, applicationListItem.organizationCustomRolesEnabled) &&
Objects.equals(this.applicationEnabled, applicationListItem.applicationEnabled);
}

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

@Override
Expand All @@ -450,6 +470,7 @@ public String toString() {
sb.append(" templateVersion: ").append(toIndentedString(templateVersion)).append("\n");
sb.append(" associatedRoles: ").append(toIndentedString(associatedRoles)).append("\n");
sb.append(" enhancedOrgAuthenticationEnabled: ").append(toIndentedString(enhancedOrgAuthenticationEnabled)).append("\n");
sb.append(" organizationCustomRolesEnabled: ").append(toIndentedString(organizationCustomRolesEnabled)).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
Expand Up @@ -49,6 +49,7 @@ public class ApplicationModel {
private Boolean isManagementApp = false;
private Boolean isB2BSelfServiceApp = false;
private Boolean enhancedOrgAuthenticationEnabled;
private Boolean organizationCustomRolesEnabled;
private Boolean applicationEnabled = true;
private AssociatedRolesConfig associatedRoles;
private ClaimConfiguration claimConfiguration;
Expand Down Expand Up @@ -261,6 +262,25 @@ public void setEnhancedOrgAuthenticationEnabled(Boolean enhancedOrgAuthenticatio
this.enhancedOrgAuthenticationEnabled = enhancedOrgAuthenticationEnabled;
}

/**
* For a main application, decides whether organizations can create custom roles for its shared applications.
**/
public ApplicationModel organizationCustomRolesEnabled(Boolean organizationCustomRolesEnabled) {

this.organizationCustomRolesEnabled = organizationCustomRolesEnabled;
return this;
}

@ApiModelProperty(example = "false", value = "For a main application, decides whether organizations can create custom roles for its shared applications.")
@JsonProperty("organizationCustomRolesEnabled")
@Valid
public Boolean getOrganizationCustomRolesEnabled() {
return organizationCustomRolesEnabled;
}
public void setOrganizationCustomRolesEnabled(Boolean organizationCustomRolesEnabled) {
this.organizationCustomRolesEnabled = organizationCustomRolesEnabled;
}

/**
* Decides whether the application is enabled.
**/
Expand Down Expand Up @@ -411,6 +431,7 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.isManagementApp, applicationModel.isManagementApp) &&
Objects.equals(this.isB2BSelfServiceApp, applicationModel.isB2BSelfServiceApp) &&
Objects.equals(this.enhancedOrgAuthenticationEnabled, applicationModel.enhancedOrgAuthenticationEnabled) &&
Objects.equals(this.organizationCustomRolesEnabled, applicationModel.organizationCustomRolesEnabled) &&
Objects.equals(this.applicationEnabled, applicationModel.applicationEnabled) &&
Objects.equals(this.associatedRoles, applicationModel.associatedRoles) &&
Objects.equals(this.claimConfiguration, applicationModel.claimConfiguration) &&
Expand All @@ -422,7 +443,7 @@ public boolean equals(java.lang.Object o) {

@Override
public int hashCode() {
return Objects.hash(id, name, description, imageUrl, accessUrl, logoutReturnUrl, templateId, templateVersion, isManagementApp, isB2BSelfServiceApp, enhancedOrgAuthenticationEnabled, applicationEnabled, associatedRoles, claimConfiguration, inboundProtocolConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
return Objects.hash(id, name, description, imageUrl, accessUrl, logoutReturnUrl, templateId, templateVersion, isManagementApp, isB2BSelfServiceApp, enhancedOrgAuthenticationEnabled, organizationCustomRolesEnabled, applicationEnabled, associatedRoles, claimConfiguration, inboundProtocolConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
}

@Override
Expand All @@ -442,6 +463,7 @@ public String toString() {
sb.append(" isManagementApp: ").append(toIndentedString(isManagementApp)).append("\n");
sb.append(" isB2BSelfServiceApp: ").append(toIndentedString(isB2BSelfServiceApp)).append("\n");
sb.append(" enhancedOrgAuthenticationEnabled: ").append(toIndentedString(enhancedOrgAuthenticationEnabled)).append("\n");
sb.append(" organizationCustomRolesEnabled: ").append(toIndentedString(organizationCustomRolesEnabled)).append("\n");
sb.append(" applicationEnabled: ").append(toIndentedString(applicationEnabled)).append("\n");
sb.append(" associatedRoles: ").append(toIndentedString(associatedRoles)).append("\n");
sb.append(" claimConfiguration: ").append(toIndentedString(claimConfiguration)).append("\n");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
* Copyright (c) 2023-2026, 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
Expand Down Expand Up @@ -46,6 +46,7 @@ public class ApplicationPatchModel {
private String templateId;
private String templateVersion;
private Boolean enhancedOrgAuthenticationEnabled;
private Boolean organizationCustomRolesEnabled;
private Boolean applicationEnabled;
private AssociatedRolesConfig associatedRoles;
private ClaimConfiguration claimConfiguration;
Expand Down Expand Up @@ -217,6 +218,25 @@ public void setEnhancedOrgAuthenticationEnabled(Boolean enhancedOrgAuthenticatio
this.enhancedOrgAuthenticationEnabled = enhancedOrgAuthenticationEnabled;
}

/**
* For a main application, decides whether organizations can create custom roles for its shared applications.
**/
public ApplicationPatchModel organizationCustomRolesEnabled(Boolean organizationCustomRolesEnabled) {

this.organizationCustomRolesEnabled = organizationCustomRolesEnabled;
return this;
}

@ApiModelProperty(example = "false", value = "For a main application, decides whether organizations can create custom roles for its shared applications.")
@JsonProperty("organizationCustomRolesEnabled")
@Valid
public Boolean getOrganizationCustomRolesEnabled() {
return organizationCustomRolesEnabled;
}
public void setOrganizationCustomRolesEnabled(Boolean organizationCustomRolesEnabled) {
this.organizationCustomRolesEnabled = organizationCustomRolesEnabled;
}

/**
* Decides whether the application is enabled.
**/
Expand Down Expand Up @@ -340,12 +360,14 @@ public boolean equals(java.lang.Object o) {
ApplicationPatchModel applicationPatchModel = (ApplicationPatchModel) o;
return Objects.equals(this.name, applicationPatchModel.name) &&
Objects.equals(this.description, applicationPatchModel.description) &&
Objects.equals(this.applicationVersion, applicationPatchModel.applicationVersion) &&
Objects.equals(this.imageUrl, applicationPatchModel.imageUrl) &&
Objects.equals(this.accessUrl, applicationPatchModel.accessUrl) &&
Objects.equals(this.logoutReturnUrl, applicationPatchModel.logoutReturnUrl) &&
Objects.equals(this.templateId, applicationPatchModel.templateId) &&
Objects.equals(this.templateVersion, applicationPatchModel.templateVersion) &&
Objects.equals(this.enhancedOrgAuthenticationEnabled, applicationPatchModel.enhancedOrgAuthenticationEnabled) &&
Objects.equals(this.organizationCustomRolesEnabled, applicationPatchModel.organizationCustomRolesEnabled) &&
Objects.equals(this.applicationEnabled, applicationPatchModel.applicationEnabled) &&
Objects.equals(this.associatedRoles, applicationPatchModel.associatedRoles) &&
Objects.equals(this.claimConfiguration, applicationPatchModel.claimConfiguration) &&
Expand All @@ -356,7 +378,7 @@ public boolean equals(java.lang.Object o) {

@Override
public int hashCode() {
return Objects.hash(name, description, imageUrl, accessUrl, logoutReturnUrl, templateId, templateVersion, enhancedOrgAuthenticationEnabled, applicationEnabled, associatedRoles, claimConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
return Objects.hash(name, description, applicationVersion, imageUrl, accessUrl, logoutReturnUrl, templateId, templateVersion, enhancedOrgAuthenticationEnabled, organizationCustomRolesEnabled, applicationEnabled, associatedRoles, claimConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
}

@Override
Expand All @@ -367,12 +389,14 @@ public String toString() {

sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" description: ").append(toIndentedString(description)).append("\n");
sb.append(" applicationVersion: ").append(toIndentedString(applicationVersion)).append("\n");
sb.append(" imageUrl: ").append(toIndentedString(imageUrl)).append("\n");
sb.append(" accessUrl: ").append(toIndentedString(accessUrl)).append("\n");
sb.append(" logoutReturnUrl: ").append(toIndentedString(logoutReturnUrl)).append("\n");
sb.append(" templateId: ").append(toIndentedString(templateId)).append("\n");
sb.append(" templateVersion: ").append(toIndentedString(templateVersion)).append("\n");
sb.append(" enhancedOrgAuthenticationEnabled: ").append(toIndentedString(enhancedOrgAuthenticationEnabled)).append("\n");
sb.append(" organizationCustomRolesEnabled: ").append(toIndentedString(organizationCustomRolesEnabled)).append("\n");
sb.append(" applicationEnabled: ").append(toIndentedString(applicationEnabled)).append("\n");
sb.append(" associatedRoles: ").append(toIndentedString(associatedRoles)).append("\n");
sb.append(" claimConfiguration: ").append(toIndentedString(claimConfiguration)).append("\n");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
* Copyright (c) 2023-2026, 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
Expand Down Expand Up @@ -55,6 +55,7 @@ public class ApplicationResponseModel {
private Boolean isManagementApp;
private Boolean isB2BSelfServiceApp;
private Boolean enhancedOrgAuthenticationEnabled;
private Boolean organizationCustomRolesEnabled;
private Boolean applicationEnabled;
private AssociatedRolesConfig associatedRoles;
private ClaimConfiguration claimConfiguration;
Expand Down Expand Up @@ -374,6 +375,25 @@ public void setEnhancedOrgAuthenticationEnabled(Boolean enhancedOrgAuthenticatio
this.enhancedOrgAuthenticationEnabled = enhancedOrgAuthenticationEnabled;
}

/**
* For a main application, decides whether organizations can create custom roles for its shared applications.
**/
public ApplicationResponseModel organizationCustomRolesEnabled(Boolean organizationCustomRolesEnabled) {

this.organizationCustomRolesEnabled = organizationCustomRolesEnabled;
return this;
}

@ApiModelProperty(example = "false", value = "For a main application, decides whether organizations can create custom roles for its shared applications.")
@JsonProperty("organizationCustomRolesEnabled")
@Valid
public Boolean getOrganizationCustomRolesEnabled() {
return organizationCustomRolesEnabled;
}
public void setOrganizationCustomRolesEnabled(Boolean organizationCustomRolesEnabled) {
this.organizationCustomRolesEnabled = organizationCustomRolesEnabled;
}

/**
* Decides whether the application is enabled.
**/
Expand Down Expand Up @@ -554,6 +574,7 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.isManagementApp, applicationResponseModel.isManagementApp) &&
Objects.equals(this.isB2BSelfServiceApp, applicationResponseModel.isB2BSelfServiceApp) &&
Objects.equals(this.enhancedOrgAuthenticationEnabled, applicationResponseModel.enhancedOrgAuthenticationEnabled) &&
Objects.equals(this.organizationCustomRolesEnabled, applicationResponseModel.organizationCustomRolesEnabled) &&
Objects.equals(this.applicationEnabled, applicationResponseModel.applicationEnabled) &&
Objects.equals(this.associatedRoles, applicationResponseModel.associatedRoles) &&
Objects.equals(this.claimConfiguration, applicationResponseModel.claimConfiguration) &&
Expand All @@ -566,7 +587,7 @@ public boolean equals(java.lang.Object o) {

@Override
public int hashCode() {
return Objects.hash(id, name, description, applicationVersion, imageUrl, accessUrl, logoutReturnUrl, clientId, issuer, realm, templateId, templateVersion, isManagementApp, isB2BSelfServiceApp, enhancedOrgAuthenticationEnabled, applicationEnabled, associatedRoles, claimConfiguration, inboundProtocols, authenticationSequence, advancedConfigurations, provisioningConfigurations, access);
return Objects.hash(id, name, description, applicationVersion, imageUrl, accessUrl, logoutReturnUrl, clientId, issuer, realm, templateId, templateVersion, isManagementApp, isB2BSelfServiceApp, enhancedOrgAuthenticationEnabled, organizationCustomRolesEnabled, applicationEnabled, associatedRoles, claimConfiguration, inboundProtocols, authenticationSequence, advancedConfigurations, provisioningConfigurations, access);
}

@Override
Expand All @@ -590,6 +611,7 @@ public String toString() {
sb.append(" isManagementApp: ").append(toIndentedString(isManagementApp)).append("\n");
sb.append(" isB2BSelfServiceApp: ").append(toIndentedString(isB2BSelfServiceApp)).append("\n");
sb.append(" enhancedOrgAuthenticationEnabled: ").append(toIndentedString(enhancedOrgAuthenticationEnabled)).append("\n");
sb.append(" organizationCustomRolesEnabled: ").append(toIndentedString(organizationCustomRolesEnabled)).append("\n");
sb.append(" applicationEnabled: ").append(toIndentedString(applicationEnabled)).append("\n");
sb.append(" associatedRoles: ").append(toIndentedString(associatedRoles)).append("\n");
sb.append(" claimConfiguration: ").append(toIndentedString(claimConfiguration)).append("\n");
Expand Down
Loading