Merge branch 'wso2:master' into thamindu-config

wso2 · Oct 11, 2023 · 2a84724 · 2a84724
2 parents 4c9acbd + 65457d1
commit 2a84724
Show file tree

Hide file tree

Showing 119 changed files with 3,427 additions and 120 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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+        <version>1.2.88-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.86-SNAPSHOT</version>
+    <version>1.2.88-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

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.86-SNAPSHOT</version>
+        <version>1.2.88-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.86-SNAPSHOT</version>
+    <version>1.2.88-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.86-SNAPSHOT</version>
+        <version>1.2.88-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.2.86-SNAPSHOT</version>
+    <version>1.2.88-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/...i.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/...i.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.86-SNAPSHOT</version>
+        <version>1.2.88-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>

diff --git a/...y.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/...y.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.86-SNAPSHOT</version>
+        <version>1.2.88-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>

diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.86-SNAPSHOT</version>
+        <version>1.2.88-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...agement/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/...agement/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.86-SNAPSHOT</version>
+        <version>1.2.88-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>

diff --git a/...i/server/branding/preference/management/common/BrandingPreferenceManagementConstants.java b/...i/server/branding/preference/management/common/BrandingPreferenceManagementConstants.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * Copyright (c) 2021-2023, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * 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
@@ -25,8 +25,10 @@ public class BrandingPreferenceManagementConstants {
 
     public static final String BRANDING_PREFERENCE_ERROR_PREFIX = "BPM-";
     public static final String BRANDING_PREFERENCE_CONTEXT_PATH = "/branding-preference";
+    public static final String CUSTOM_TEXT_PREFERENCE_CONTEXT_PATH = "/branding-preference/text";
     public static final String QUERY_PARAM_INDICATOR = "?";
     public static final String GET_PREFERENCE_COMPONENT_WITH_QUERY_PARAM = "type=%s&name=%s&locale=%s";
+    public static final String GET_CUSTOM_TEXT_COMPONENT_WITH_QUERY_PARAM = "type=%s&name=%s&screen=%s&locale=%s";
     public static final String ORGANIZATION_TYPE = "ORG";
     public static final String APPLICATION_TYPE = "APP";
     public static final String CUSTOM_TYPE = "CUSTOM";
@@ -36,6 +38,8 @@ public class BrandingPreferenceManagementConstants {
     public static final String BRANDING_PREFERENCE_NOT_EXISTS_ERROR_CODE = "BRANDINGM_00002";
     public static final String BRANDING_PREFERENCE_ALREADY_EXISTS_ERROR_CODE = "BRANDINGM_00003";
     public static final String BRANDING_PREFERENCE_NOT_ALLOWED_ERROR_CODE = "BRANDINGM_00011";
+    public static final String CUSTOM_TEXT_PREFERENCE_NOT_EXISTS_ERROR_CODE = "BRANDINGM_00023";
+    public static final String CUSTOM_TEXT_PREFERENCE_ALREADY_EXISTS_ERROR_CODE = "BRANDINGM_00024";
 
     /**
      * Enums for error messages.
@@ -54,6 +58,14 @@ public enum ErrorMessage {
         ERROR_CODE_NOT_ALLOWED_BRANDING_PREFERENCE_CONFIGURATIONS("60004",
                 "Not allowed branding preference configurations.",
                 "Requested branding preference configuration: %s is not allowed for the organization."),
+        ERROR_CODE_INVALID_CUSTOM_TEXT_PREFERENCE("60005",
+                "Invalid custom text preference configurations.",
+                "Invalid custom text preference configurations in request"),
+        ERROR_CODE_CUSTOM_TEXT_PREFERENCE_NOT_EXISTS("60006",
+                "Custom text preferences are not configured.",
+                "Custom text preferences are not configured for organization: %s."),
+        ERROR_CODE_CONFLICT_CUSTOM_TEXT_PREFERENCE("60007", "Custom Text preference already exists.",
+                "There exists a custom text preference configurations in the organization: %s."),
 
         // Server errors 650xx.
         ERROR_CODE_ERROR_GETTING_BRANDING_PREFERENCE("65001",
@@ -67,7 +79,20 @@ public enum ErrorMessage {
                 "Server encountered an error while deleting branding preference configurations for organization: %s"),
         ERROR_CODE_ERROR_UPDATING_BRANDING_PREFERENCE("65004",
                 "Unable to update branding preference configurations.",
-                "Error while updating branding preference configurations for organization: %s.");
+                "Error while updating branding preference configurations for organization: %s."),
+        ERROR_CODE_ERROR_GETTING_CUSTOM_TEXT_PREFERENCE("65005",
+                "Error while getting custom text preference configurations.",
+                "Error while retrieving custom text preference configurations for organization: %s."),
+        ERROR_CODE_ERROR_ADDING_CUSTOM_TEXT_PREFERENCE("65006",
+                "Unable to add custom text preference configurations.",
+                "Server encountered an error while adding the custom text configurations for organization: %s"),
+        ERROR_CODE_ERROR_DELETING_CUSTOM_TEXT_PREFERENCE("65007",
+                "Unable to delete custom text preference configurations.",
+                "Server encountered an error while deleting custom text configurations for organization: %s"),
+        ERROR_CODE_ERROR_UPDATING_CUSTOM_TEXT_PREFERENCE("65008",
+                "Unable to update custom text preference configurations.",
+                "Error while updating custom text preference configurations for organization: %s.");
+
 
         private final String code;
         private final String message;

diff --git a/....management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/....management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.86-SNAPSHOT</version>
+        <version>1.2.88-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>