Merge pull request #13380 from dushaniw/master-4.3.0

Add token persistence feature to product.
wso2 · Feb 19, 2024 · 5254ffc · 5254ffc
2 parents 389c473 + 74e87e7
commit 5254ffc
Show file tree

Hide file tree

Showing 15 changed files with 1,940 additions and 525 deletions.
diff --git a/modules/distribution/apim-is-plugin/pom.xml b/modules/distribution/apim-is-plugin/pom.xml
@@ -78,6 +78,14 @@
                                     <outputDirectory>target/apim-is-plugin-resources/webapps</outputDirectory>
                                     <destFileName>keymanager-operations.war</destFileName>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.wso2.km.ext.wso2is</groupId>
+                                    <artifactId>wso2is.key.manager.tokenpersistence</artifactId>
+                                    <version>${wso2is.km.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>target/apim-is-plugin-resources/dropins</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

diff --git a/modules/integration/tests-common/clients/admin/.openapi-generator/admin-api.yaml.sha256 b/modules/integration/tests-common/clients/admin/.openapi-generator/admin-api.yaml.sha256
@@ -1 +1 @@
-79b51370beba8f507666fe239fea0c86a211fc9f1f8dbf97264d13f09f0c147a
+bb1dfa25be85dbb2ad54e636613ddd876c0e34ee734cb5b209bdf78402df0fa8
diff --git a/modules/integration/tests-common/clients/admin/api/openapi.yaml b/modules/integration/tests-common/clients/admin/api/openapi.yaml
@@ -7120,6 +7120,178 @@ paths:
           -F "type=WSO2-IS" "https://127.0.0.1:9443/api/am/admin/v4/key-managers/discover"'
       x-contentType: multipart/form-data
       x-accepts: application/json
+  /apis:
+    get:
+      description: |
+        This operation provides you a list of available APIs qualifying under a given search condition.
+        Each retrieved API is represented with a minimal amount of attributes. If you want to get complete details of an API, you need to use **Get details of an API** operation.
+      operationId: getAllAPIs
+      parameters:
+      - description: |
+          Maximum size of resource array to return.
+        explode: true
+        in: query
+        name: limit
+        required: false
+        schema:
+          default: 25
+          type: integer
+        style: form
+      - description: |
+          Starting point within the complete list of items qualified.
+        explode: true
+        in: query
+        name: offset
+        required: false
+        schema:
+          default: 0
+          type: integer
+        style: form
+      - description: |
+          **Search and get all apis in admin portal**.
+
+          You can search by proving a keyword.
+        explode: true
+        in: query
+        name: query
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: |
+          Validator for conditional requests; based on the ETag of the formerly retrieved
+          variant of the resource (Will be supported in future).
+        explode: false
+        in: header
+        name: If-None-Match
+        required: false
+        schema:
+          type: string
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SearchResultList'
+          description: |
+            OK.
+            List of qualifying APIs is returned.
+          headers:
+            ETag:
+              description: |
+                Entity Tag of the response resource. Used by caches, or in conditional requests (Will be supported in future).
+              explode: false
+              schema:
+                type: string
+              style: simple
+            Content-Type:
+              description: The content type of the body.
+              explode: false
+              schema:
+                type: string
+              style: simple
+        "304":
+          content: {}
+          description: |
+            Not Modified.
+            Empty body because the client has already the latest version of the requested resource (Will be supported in future).
+        "406":
+          content:
+            application/json:
+              example:
+                code: 406
+                message: Not Acceptable
+                description: The requested media type is not supported
+                moreInfo: ""
+                error: []
+              schema:
+                $ref: '#/components/schemas/Error'
+          description: Not Acceptable. The requested media type is not supported.
+      security:
+      - OAuth2Security:
+        - apim:admin
+        - apim:api_provider_change
+      summary: |
+        Retrieve/Search APIs
+      tags:
+      - APIs
+      x-code-samples:
+      - lang: Curl
+        source: 'curl -k -H "Authorization: Bearer ae4eae22-3f65-387b-a171-d37eaa366fa8"
+          "https://127.0.0.1:9443/api/am/publisher/v4/apis"'
+      x-accepts: application/json
+  /apis/{apiId}/change-provider:
+    post:
+      description: |
+        Update the api provider
+      operationId: providerNamePost
+      parameters:
+      - explode: true
+        in: query
+        name: provider
+        required: true
+        schema:
+          type: string
+        style: form
+      - description: |
+          **API ID** consisting of the **UUID** of the API.
+        explode: false
+        in: path
+        name: apiId
+        required: true
+        schema:
+          type: string
+        style: simple
+      responses:
+        "200":
+          description: |
+            OK.
+            Api Provider updated.
+          headers:
+            Content-Type:
+              description: |
+                The content type of the body.
+              explode: false
+              schema:
+                type: string
+              style: simple
+        "400":
+          content:
+            application/json:
+              example:
+                code: 400
+                message: Bad Request
+                description: Invalid request or validation error
+                moreInfo: ""
+                error: []
+              schema:
+                $ref: '#/components/schemas/Error'
+          description: Bad Request. Invalid request or validation error.
+        "404":
+          content:
+            application/json:
+              example:
+                code: 404
+                message: Not Found
+                description: The specified resource does not exist
+                moreInfo: ""
+                error: []
+              schema:
+                $ref: '#/components/schemas/Error'
+          description: Not Found. The specified resource does not exist.
+      security:
+      - OAuth2Security:
+        - apim:admin
+        - apim:api_provider_change
+      summary: Update the api provider
+      tags:
+      - Api Provider Change
+      x-code-samples:
+      - lang: Curl
+        source: 'curl -k -X PUT -H "Authorization: Bearer ae4eae22-3f65-387b-a171-d37eaa366fa8"
+          -H "Content-Type: application/json" "https://127.0.0.1:9443/api/am/admin/v4/provider/admin/apis/33662a62-8db1-4d75-af08-afd63c6bd0b4"'
+      x-accepts: application/json
 components:
   parameters:
     username:
@@ -7338,6 +7510,16 @@ components:
       schema:
         type: string
       style: simple
+    apiId:
+      description: |
+        **API ID** consisting of the **UUID** of the API.
+      explode: false
+      in: path
+      name: apiId
+      required: true
+      schema:
+        type: string
+      style: simple
   responses:
     BadRequest:
       content:
@@ -9646,6 +9828,85 @@ components:
           type: array
       title: Role alias
       type: object
+    SearchResultList:
+      example:
+        pagination:
+          next: next
+          total: 10
+          offset: 0
+          previous: previous
+          limit: 1
+        apis:
+        - provider: provider
+          name: name
+          id: id
+          version: version
+        - provider: provider
+          name: name
+          id: id
+          version: version
+        count: 1
+      properties:
+        apis:
+          items:
+            $ref: '#/components/schemas/ApiResult'
+          type: array
+        count:
+          description: |
+            Number of results returned.
+          example: 1
+          type: integer
+        pagination:
+          $ref: '#/components/schemas/Pagination'
+      title: Unified Search Result List
+      type: object
+    ApiResult:
+      example:
+        provider: provider
+        name: name
+        id: id
+        version: version
+      properties:
+        provider:
+          type: string
+        name:
+          type: string
+        version:
+          type: string
+        id:
+          type: string
+      type: object
+    Pagination:
+      example:
+        next: next
+        total: 10
+        offset: 0
+        previous: previous
+        limit: 1
+      properties:
+        offset:
+          example: 0
+          type: integer
+        limit:
+          example: 1
+          type: integer
+        total:
+          example: 10
+          type: integer
+        next:
+          description: |
+            Link to the next subset of resources qualified.
+            Empty if no more resources are to be returned.
+            example: ""
+          type: string
+        previous:
+          description: |
+            Link to the previous subset of resources qualified.
+            Empty if current subset is the first subset returned.
+            example: ""
+          type: string
+      title: Pagination
+      type: object
     AdvancedThrottlePolicyInfo_allOf:
       properties:
         defaultLimit: