Merge branch 'wso2:master' into master

wso2 · Jan 29, 2024 · 9aa4a85 · 9aa4a85
2 parents 478ac3c + 98b4d94
commit 9aa4a85
Show file tree

Hide file tree

Showing 100 changed files with 277 additions and 108 deletions.
diff --git a/...dentification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/...dentification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...rd.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/...rd.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...nt.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/...nt.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...ccount.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/...ccount.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...y.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/...y.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...isory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/...isory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...y.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/...y.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...ntity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/...ntity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...dentity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.java b/...dentity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.java
@@ -34,6 +34,7 @@
 import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeGetModel;
 import org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants;
 import org.wso2.carbon.identity.api.server.api.resource.v1.util.APIResourceMgtEndpointUtil;
+import org.wso2.carbon.identity.api.server.common.ContextLoader;
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.application.common.model.APIResource;
 import org.wso2.carbon.identity.application.common.model.Scope;
@@ -136,9 +137,9 @@ private APIResourceCollectionListItem buildAPIResourceCollectionListItem(
                 .name(apiResourceCollection.getName())
                 .displayName(apiResourceCollection.getDisplayName())
                 .type(apiResourceCollection.getType())
-                .self(V1_API_PATH_COMPONENT + APIResourceMgtEndpointConstants.API_RESOURCE_COLLECTION_PATH_COMPONENT +
-                        "/" + apiResourceCollection.getId());
-
+                .self(ContextLoader.buildURIForBody(V1_API_PATH_COMPONENT +
+                        APIResourceMgtEndpointConstants.API_RESOURCE_COLLECTION_PATH_COMPONENT + "/" +
+                        apiResourceCollection.getId()).toString());
         if (includeAPIResources) {
             item.setApiResources(buildAPIResourceMap(apiResourceCollection));
         }
@@ -196,8 +197,9 @@ private APIResourceCollectionItem buildAPIResourceCollectionItem(APIResource api
                 .description(apiResource.getDescription())
                 .type(apiResource.getType())
                 .scopes(scopesList)
-                .self(V1_API_PATH_COMPONENT + APIResourceMgtEndpointConstants.API_RESOURCE_PATH_COMPONENT
-                        + "/" + apiResource.getId());
+                .self(ContextLoader.buildURIForBody(V1_API_PATH_COMPONENT +
+                                APIResourceMgtEndpointConstants.API_RESOURCE_PATH_COMPONENT + "/" + apiResource.getId())
+                        .toString());
     }
 
     /**

diff --git a/...2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java b/...2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
@@ -477,8 +477,9 @@ private APIResourceListItem buildAPIResourceListItem(APIResource apiResource) {
                 .type(apiResource.getType())
                 .requiresAuthorization(apiResource.isAuthorizationRequired())
                 .properties(properties)
-                .self(V1_API_PATH_COMPONENT + APIResourceMgtEndpointConstants.API_RESOURCE_PATH_COMPONENT + "/"
-                        + apiResource.getId());
+                .self(ContextLoader.buildURIForBody(V1_API_PATH_COMPONENT +
+                                APIResourceMgtEndpointConstants.API_RESOURCE_PATH_COMPONENT + "/" + apiResource.getId())
+                        .toString());
     }
 
     /**

diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...tion.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/...tion.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.162-SNAPSHOT</version>
+    <version>1.2.166-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...bon/identity/api/server/application/management/common/ApplicationManagementConstants.java b/...bon/identity/api/server/application/management/common/ApplicationManagementConstants.java
@@ -70,6 +70,9 @@ private ApplicationManagementConstants() {
     public static final String FAPI_ALLOWED_CLIENT_AUTHENTICATION_METHODS = "OAuth.OpenIDConnect.FAPI." +
             "AllowedClientAuthenticationMethods.AllowedClientAuthenticationMethod";
     public static final String RSA1_5 = "RSA1_5";
+    public static final String PROP_LOGOUT_RETURN_URL = "logoutReturnUrl";
+    public static final String DEFAULT_LOGOUT_RETURN_URL_VALUE = ".*";
+    public static final String LOGOUT_RETURN_URL_DISPLAY_NAME = "Logout Return URL";
 
     public static final String NON_EXISTING_USER_CODE = "30007 - ";
 

diff --git a/...lication.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/...lication.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -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.162-SNAPSHOT</version>
+        <version>1.2.166-SNAPSHOT</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.162-SNAPSHOT</version>
+    <version>1.2.166-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/.../java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationModel.java b/.../java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationModel.java
@@ -43,6 +43,7 @@ public class ApplicationModel  {
     private String description;
     private String imageUrl;
     private String accessUrl;
+    private String logoutReturnUrl;
     private String templateId;
     private Boolean isManagementApp = false;
     private Boolean isB2BSelfServiceApp = false;
@@ -145,6 +146,24 @@ public void setAccessUrl(String accessUrl) {
         this.accessUrl = accessUrl;
     }
 
+    /**
+    **/
+    public ApplicationModel logoutReturnUrl(String logoutReturnUrl) {
+
+        this.logoutReturnUrl = logoutReturnUrl;
+        return this;
+    }
+
+    @ApiModelProperty(example = "https://example.com/app/logout", value = "")
+    @JsonProperty("logoutReturnUrl")
+    @Valid
+    public String getLogoutReturnUrl() {
+        return logoutReturnUrl;
+    }
+    public void setLogoutReturnUrl(String logoutReturnUrl) {
+        this.logoutReturnUrl = logoutReturnUrl;
+    }
+
     /**
     **/
     public ApplicationModel templateId(String templateId) {
@@ -171,7 +190,7 @@ public ApplicationModel isManagementApp(Boolean isManagementApp) {
         this.isManagementApp = isManagementApp;
         return this;
     }
-
+    
     @ApiModelProperty(example = "false", value = "Decides whether the application used to access System APIs")
     @JsonProperty("isManagementApp")
     @Valid
@@ -190,12 +209,11 @@ public ApplicationModel isB2BSelfServiceApp(Boolean isB2BSelfServiceApp) {
         this.isB2BSelfServiceApp = isB2BSelfServiceApp;
         return this;
     }
-
+    
     @ApiModelProperty(example = "false", value = "Decides whether the application used to for B2B self service")
     @JsonProperty("isB2BSelfServiceApp")
     @Valid
     public Boolean getIsB2BSelfServiceApp() {
-
         return isB2BSelfServiceApp;
     }
     public void setIsB2BSelfServiceApp(Boolean isB2BSelfServiceApp) {
@@ -327,6 +345,7 @@ public boolean equals(java.lang.Object o) {
             Objects.equals(this.description, applicationModel.description) &&
             Objects.equals(this.imageUrl, applicationModel.imageUrl) &&
             Objects.equals(this.accessUrl, applicationModel.accessUrl) &&
+            Objects.equals(this.logoutReturnUrl, applicationModel.logoutReturnUrl) &&
             Objects.equals(this.templateId, applicationModel.templateId) &&
             Objects.equals(this.isManagementApp, applicationModel.isManagementApp) &&
             Objects.equals(this.isB2BSelfServiceApp, applicationModel.isB2BSelfServiceApp) &&
@@ -340,7 +359,7 @@ public boolean equals(java.lang.Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, name, description, imageUrl, accessUrl, templateId, isManagementApp, isB2BSelfServiceApp, associatedRoles, claimConfiguration, inboundProtocolConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
+        return Objects.hash(id, name, description, imageUrl, accessUrl, logoutReturnUrl, templateId, isManagementApp, isB2BSelfServiceApp, associatedRoles, claimConfiguration, inboundProtocolConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
     }
 
     @Override
@@ -354,6 +373,7 @@ public String toString() {
         sb.append("    description: ").append(toIndentedString(description)).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("    isManagementApp: ").append(toIndentedString(isManagementApp)).append("\n");
         sb.append("    isB2BSelfServiceApp: ").append(toIndentedString(isB2BSelfServiceApp)).append("\n");

diff --git a/.../org/wso2/carbon/identity/api/server/application/management/v1/ApplicationPatchModel.java b/.../org/wso2/carbon/identity/api/server/application/management/v1/ApplicationPatchModel.java
@@ -41,6 +41,7 @@ public class ApplicationPatchModel  {
     private String description;
     private String imageUrl;
     private String accessUrl;
+    private String logoutReturnUrl;
     private String templateId;
     private AssociatedRolesConfig associatedRoles;
     private ClaimConfiguration claimConfiguration;
@@ -120,6 +121,24 @@ public void setAccessUrl(String accessUrl) {
         this.accessUrl = accessUrl;
     }
 
+    /**
+    **/
+    public ApplicationPatchModel logoutReturnUrl(String logoutReturnUrl) {
+
+        this.logoutReturnUrl = logoutReturnUrl;
+        return this;
+    }
+
+    @ApiModelProperty(example = "https://example.com/app/logout", value = "")
+    @JsonProperty("logoutReturnUrl")
+    @Valid
+    public String getLogoutReturnUrl() {
+        return logoutReturnUrl;
+    }
+    public void setLogoutReturnUrl(String logoutReturnUrl) {
+        this.logoutReturnUrl = logoutReturnUrl;
+    }
+
     /**
     **/
     public ApplicationPatchModel templateId(String templateId) {
@@ -244,6 +263,7 @@ public boolean equals(java.lang.Object o) {
             Objects.equals(this.description, applicationPatchModel.description) &&
             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.associatedRoles, applicationPatchModel.associatedRoles) &&
             Objects.equals(this.claimConfiguration, applicationPatchModel.claimConfiguration) &&
@@ -254,7 +274,7 @@ public boolean equals(java.lang.Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, description, imageUrl, accessUrl, templateId, associatedRoles, claimConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
+        return Objects.hash(name, description, imageUrl, accessUrl, logoutReturnUrl, templateId, associatedRoles, claimConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
     }
 
     @Override
@@ -267,6 +287,7 @@ public String toString() {
         sb.append("    description: ").append(toIndentedString(description)).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("    associatedRoles: ").append(toIndentedString(associatedRoles)).append("\n");
         sb.append("    claimConfiguration: ").append(toIndentedString(claimConfiguration)).append("\n");

diff --git a/...g/wso2/carbon/identity/api/server/application/management/v1/ApplicationResponseModel.java b/...g/wso2/carbon/identity/api/server/application/management/v1/ApplicationResponseModel.java
@@ -45,6 +45,7 @@ public class ApplicationResponseModel  {
     private String description;
     private String imageUrl;
     private String accessUrl;
+    private String logoutReturnUrl;
     private String clientId;
     private String issuer;
     private String realm;
@@ -185,6 +186,24 @@ public void setAccessUrl(String accessUrl) {
         this.accessUrl = accessUrl;
     }
 
+    /**
+    **/
+    public ApplicationResponseModel logoutReturnUrl(String logoutReturnUrl) {
+
+        this.logoutReturnUrl = logoutReturnUrl;
+        return this;
+    }
+
+    @ApiModelProperty(example = "https://example.com/app/logout", value = "")
+    @JsonProperty("logoutReturnUrl")
+    @Valid
+    public String getLogoutReturnUrl() {
+        return logoutReturnUrl;
+    }
+    public void setLogoutReturnUrl(String logoutReturnUrl) {
+        this.logoutReturnUrl = logoutReturnUrl;
+    }
+
     /**
     **/
     public ApplicationResponseModel clientId(String clientId) {
@@ -446,6 +465,7 @@ public boolean equals(java.lang.Object o) {
             Objects.equals(this.description, applicationResponseModel.description) &&
             Objects.equals(this.imageUrl, applicationResponseModel.imageUrl) &&
             Objects.equals(this.accessUrl, applicationResponseModel.accessUrl) &&
+            Objects.equals(this.logoutReturnUrl, applicationResponseModel.logoutReturnUrl) &&
             Objects.equals(this.clientId, applicationResponseModel.clientId) &&
             Objects.equals(this.issuer, applicationResponseModel.issuer) &&
             Objects.equals(this.realm, applicationResponseModel.realm) &&
@@ -463,7 +483,7 @@ public boolean equals(java.lang.Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, name, description, imageUrl, accessUrl, clientId, issuer, realm, templateId, isManagementApp, isB2BSelfServiceApp, associatedRoles, claimConfiguration, inboundProtocols, authenticationSequence, advancedConfigurations, provisioningConfigurations, access);
+        return Objects.hash(id, name, description, imageUrl, accessUrl, logoutReturnUrl, clientId, issuer, realm, templateId, isManagementApp, isB2BSelfServiceApp, associatedRoles, claimConfiguration, inboundProtocols, authenticationSequence, advancedConfigurations, provisioningConfigurations, access);
     }
 
     @Override
@@ -477,6 +497,7 @@ public String toString() {
         sb.append("    description: ").append(toIndentedString(description)).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("    clientId: ").append(toIndentedString(clientId)).append("\n");
         sb.append("    issuer: ").append(toIndentedString(issuer)).append("\n");
         sb.append("    realm: ").append(toIndentedString(realm)).append("\n");