Merge branch 'wso2:master' into fix-custom-auth-issues

wso2 · Jan 25, 2025 · 8e2252f · 8e2252f
2 parents adba205 + 6dec037
commit 8e2252f
Show file tree

Hide file tree

Showing 171 changed files with 1,210 additions and 1,447 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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.50-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
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...er.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/...er.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/...server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.46-SNAPSHOT</version>
+    <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+    <version>1.3.50-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...n/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java b/...n/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java
@@ -758,7 +758,7 @@ public Response getInboundSAMLConfiguration(@ApiParam(value = "ID of the applica
 
     @Valid
     @GET
-    @Path("/loginflow/result/{operationId}")
+    @Path("/loginflow/result/{operation_id}")
 
     @Produces({ "application/json" })
     @ApiOperation(value = "Get the final login flow result", notes = "This API provides the capability to retrieve the final login flow result. <br> <b>Scope required:</b> * internal_application_mgt_update ", response = LoginFlowResultResponse.class, authorizations = {
@@ -774,14 +774,14 @@ public Response getInboundSAMLConfiguration(@ApiParam(value = "ID of the applica
         @ApiResponse(code = 403, message = "Forbidden", response = Error.class),
         @ApiResponse(code = 404, message = "Not Found", response = Error.class)
     })
-    public Response getLoginFlowGenerationResult(@ApiParam(value = "",required=true) @PathParam("operationId") String operationId) {
+    public Response getLoginFlowGenerationResult(@ApiParam(value = "",required=true) @PathParam("operation_id") String operationId) {
 
         return delegate.getLoginFlowGenerationResult(operationId );
     }
 
     @Valid
     @GET
-    @Path("/loginflow/status/{operationId}")
+    @Path("/loginflow/status/{operation_id}")
 
     @Produces({ "application/json" })
     @ApiOperation(value = "Get the status of the login flow generation process", notes = "This API provides the capability to retrieve the status of the login flow generation process. <br> <b>Scope required:</b> * internal_application_mgt_update ", response = LoginFlowStatusResponse.class, authorizations = {
@@ -797,7 +797,7 @@ public Response getLoginFlowGenerationResult(@ApiParam(value = "",required=true)
         @ApiResponse(code = 403, message = "Forbidden", response = Error.class),
         @ApiResponse(code = 404, message = "Not Found", response = Error.class)
     })
-    public Response getLoginFlowGenerationStatus(@ApiParam(value = "",required=true) @PathParam("operationId") String operationId) {
+    public Response getLoginFlowGenerationStatus(@ApiParam(value = "",required=true) @PathParam("operation_id") String operationId) {
 
         return delegate.getLoginFlowGenerationStatus(operationId );
     }

diff --git a/...g/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateRequest.java b/...g/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateRequest.java
@@ -43,7 +43,7 @@ public class LoginFlowGenerateRequest  {
     private String userQuery;
 
     /**
-    * Available authenticators of the organization. It&#39;s expected to provide the authenticator name, description, and the IDP.
+    * Available authenticators of the organization. It&#39;s expected to provide the authenticator name, description, and the IDP. 
     **/
     public LoginFlowGenerateRequest availableAuthenticators(Map<String, Object> availableAuthenticators) {
 
@@ -52,7 +52,7 @@ public LoginFlowGenerateRequest availableAuthenticators(Map<String, Object> avai
     }
 
     @ApiModelProperty(value = "Available authenticators of the organization. It's expected to provide the authenticator name, description, and the IDP. ")
-    @JsonProperty("availableAuthenticators")
+    @JsonProperty("available_authenticators")
     @Valid
     public Map<String, Object> getAvailableAuthenticators() {
         return availableAuthenticators;
@@ -80,7 +80,7 @@ public LoginFlowGenerateRequest userClaims(List<Map<String, Object>> userClaims)
     }
 
     @ApiModelProperty(value = "Metadata of the available user claims for the organization.  Provide the claim URI and a human-readable description of the claim. ")
-    @JsonProperty("userClaims")
+    @JsonProperty("user_claims")
     @Valid
     public List<Map<String, Object>> getUserClaims() {
         return userClaims;
@@ -106,7 +106,7 @@ public LoginFlowGenerateRequest userQuery(String userQuery) {
     }
 
     @ApiModelProperty(value = "")
-    @JsonProperty("userQuery")
+    @JsonProperty("user_query")
     @Valid
     public String getUserQuery() {
         return userQuery;

diff --git a/.../wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateResponse.java b/.../wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateResponse.java
@@ -43,7 +43,7 @@ public LoginFlowGenerateResponse operationId(String operationId) {
     }
 
     @ApiModelProperty(value = "")
-    @JsonProperty("operationId")
+    @JsonProperty("operation_id")
     @Valid
     public String getOperationId() {
         return operationId;

diff --git a/...rg/wso2/carbon/identity/api/server/application/management/v1/LoginFlowStatusResponse.java b/...rg/wso2/carbon/identity/api/server/application/management/v1/LoginFlowStatusResponse.java
@@ -44,7 +44,7 @@ public LoginFlowStatusResponse operationId(String operationId) {
     }
 
     @ApiModelProperty(value = "")
-    @JsonProperty("operationId")
+    @JsonProperty("operation_id")
     @Valid
     public String getOperationId() {
         return operationId;

diff --git a/...carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml b/...carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml
@@ -2671,7 +2671,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
 
-  /applications/loginflow/status/{operationId}:
+  /applications/loginflow/status/{operation_id}:
     get:
       tags:
         - LoginFlow
@@ -2683,7 +2683,7 @@ paths:
         * internal_application_mgt_update
       operationId: getLoginFlowGenerationStatus
       parameters:
-        - name: operationId
+        - name: operation_id
           in: path
           required: true
           schema:
@@ -2720,7 +2720,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
 
-  /applications/loginflow/result/{operationId}:
+  /applications/loginflow/result/{operation_id}:
     get:
       tags:
         - LoginFlow
@@ -2732,7 +2732,7 @@ paths:
         * internal_application_mgt_update
       operationId: getLoginFlowGenerationResult
       parameters:
-        - name: operationId
+        - name: operation_id
           in: path
           required: true
           schema:
@@ -4503,24 +4503,24 @@ components:
     LoginFlowGenerateRequest:
       type: object
       properties:
-        availableAuthenticators:
+        available_authenticators:
           type: object
           additionalProperties: true
           description: |
             Available authenticators of the organization.
             It's expected to provide the authenticator name, description, and the IDP.
-        userClaims:
+        user_claims:
           type: array
           items:
             type: object
             additionalProperties: true
           description: |
             Metadata of the available user claims for the organization. 
             Provide the claim URI and a human-readable description of the claim.
-        userQuery:
+        user_query:
           type: string
       example: {
-        "availableAuthenticators": {
+        "available_authenticators": {
           "local": [
             {
               "description": "Login users with username and password credentials.",
@@ -4541,7 +4541,7 @@ components:
             }
           ]
         },
-        "userClaims": [
+        "user_claims": [
           {
             "claimURI": "http://example.com/claims/email",
             "description": "Email address of the user."
@@ -4551,12 +4551,12 @@ components:
             "description": "Role of the user in the application."
           }
         ],
-        "userQuery": "GoogleOIDCAuthenticator followed by SMS-OTP if user has admin role."
+        "user_query": "GoogleOIDCAuthenticator followed by SMS-OTP if user has admin role."
       }
     LoginFlowGenerateResponse:
       type: object
       properties:
-        operationId:
+        operation_id:
           type: string
     StatusEnum:
       type: string
@@ -4567,7 +4567,7 @@ components:
     LoginFlowStatusResponse:
       type: object
       properties:
-        operationId:
+        operation_id:
           type: string
         status:
           type: object

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.3.46-SNAPSHOT</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.3.46-SNAPSHOT</version>
+    <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-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.3.46-SNAPSHOT</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>