Merge pull request #146 from openziti/fix.ziti.2681.ext.jwt.target.token

Fix.ziti.2681.ext.jwt.target.token
openziti · Jan 23, 2025 · 3340270 · 3340270
2 parents 5a80d2c + d44c9ec
commit 3340270
Show file tree

Hide file tree

Showing 17 changed files with 481 additions and 13 deletions.
diff --git a/client.yml b/client.yml
@@ -15,7 +15,7 @@ info:
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
-  version: 0.26.38
+  version: 0.26.39
 host: demo.ziti.dev
 basePath: /edge/client/v1
 paths:
@@ -4235,6 +4235,8 @@ definitions:
           type: array
           items:
             type: string
+        targetToken:
+          $ref: '#/definitions/targetToken'
   clientExternalJwtSignerList:
     description: An array of External JWT Signers resources
     type: array
@@ -5596,6 +5598,13 @@ definitions:
     allOf:
     - $ref: '#/definitions/subTags'
     x-nullable: true
+  targetToken:
+    description: Defines the target token type
+    type: string
+    enum:
+    - ACCESS
+    - ID
+    x-nullable: true
   terminatorClientDetail:
     type: object
     allOf:

diff --git a/management.yml b/management.yml
@@ -15,7 +15,7 @@ info:
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
-  version: 0.26.38
+  version: 0.26.39
 host: demo.ziti.dev
 basePath: /edge/management/v1
 paths:
@@ -18916,6 +18916,8 @@ definitions:
         x-nullable: true
       tags:
         $ref: '#/definitions/tags'
+      targetToken:
+        $ref: '#/definitions/targetToken'
       useExternalId:
         type: boolean
         x-nullable: true
@@ -18942,6 +18944,7 @@ definitions:
       - audience
       - clientId
       - scopes
+      - targetToken
       properties:
         audience:
           type: string
@@ -18982,6 +18985,8 @@ definitions:
           type: array
           items:
             type: string
+        targetToken:
+          $ref: '#/definitions/targetToken'
         useExternalId:
           type: boolean
   externalJwtSignerList:
@@ -19031,6 +19036,8 @@ definitions:
           type: string
       tags:
         $ref: '#/definitions/tags'
+      targetToken:
+        $ref: '#/definitions/targetToken'
       useExternalId:
         type: boolean
         x-nullable: true
@@ -19079,6 +19086,8 @@ definitions:
         x-nullable: true
       tags:
         $ref: '#/definitions/tags'
+      targetToken:
+        $ref: '#/definitions/targetToken'
       useExternalId:
         type: boolean
         x-nullable: true
@@ -21282,6 +21291,13 @@ definitions:
     allOf:
     - $ref: '#/definitions/subTags'
     x-nullable: true
+  targetToken:
+    description: Defines the target token type
+    type: string
+    enum:
+    - ACCESS
+    - ID
+    x-nullable: true
   terminatorCost:
     type: integer
     maximum: 65535

diff --git a/rest_client_api_server/doc.go b/rest_client_api_server/doc.go
diff --git a/rest_client_api_server/embedded_spec.go b/rest_client_api_server/embedded_spec.go
diff --git a/rest_management_api_server/doc.go b/rest_management_api_server/doc.go
diff --git a/rest_management_api_server/embedded_spec.go b/rest_management_api_server/embedded_spec.go