From 4dd271bdcad1fba3f1e8dfadd95b7a68ff8c769e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 17 Jan 2025 09:11:37 -0500 Subject: [PATCH 1/2] add audience to ext-jwt-signer --- client.yml | 3 +++ rest_client_api_server/embedded_spec.go | 8 ++++++++ rest_model/client_external_jwt_signer_detail.go | 11 +++++++++++ source/client/ext-jwt-signers.yml | 5 ++++- 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/client.yml b/client.yml index d6b1b823..c56514d6 100644 --- a/client.yml +++ b/client.yml @@ -4219,6 +4219,9 @@ definitions: - name - externalAuthUrl properties: + audience: + type: string + x-nullable: true clientId: type: string x-nullable: true diff --git a/rest_client_api_server/embedded_spec.go b/rest_client_api_server/embedded_spec.go index 9c9a5c05..d1bf17ad 100644 --- a/rest_client_api_server/embedded_spec.go +++ b/rest_client_api_server/embedded_spec.go @@ -5784,6 +5784,10 @@ func init() { "externalAuthUrl" ], "properties": { + "audience": { + "type": "string", + "x-nullable": true + }, "clientId": { "type": "string", "x-nullable": true @@ -13800,6 +13804,10 @@ func init() { "externalAuthUrl" ], "properties": { + "audience": { + "type": "string", + "x-nullable": true + }, "clientId": { "type": "string", "x-nullable": true diff --git a/rest_model/client_external_jwt_signer_detail.go b/rest_model/client_external_jwt_signer_detail.go index 9b04f075..89cab969 100644 --- a/rest_model/client_external_jwt_signer_detail.go +++ b/rest_model/client_external_jwt_signer_detail.go @@ -44,6 +44,9 @@ import ( type ClientExternalJWTSignerDetail struct { BaseEntity + // audience + Audience *string `json:"audience,omitempty"` + // client Id ClientID *string `json:"clientId,omitempty"` @@ -71,6 +74,8 @@ func (m *ClientExternalJWTSignerDetail) UnmarshalJSON(raw []byte) error { // AO1 var dataAO1 struct { + Audience *string `json:"audience,omitempty"` + ClientID *string `json:"clientId,omitempty"` ExternalAuthURL *string `json:"externalAuthUrl"` @@ -83,6 +88,8 @@ func (m *ClientExternalJWTSignerDetail) UnmarshalJSON(raw []byte) error { return err } + m.Audience = dataAO1.Audience + m.ClientID = dataAO1.ClientID m.ExternalAuthURL = dataAO1.ExternalAuthURL @@ -104,6 +111,8 @@ func (m ClientExternalJWTSignerDetail) MarshalJSON() ([]byte, error) { } _parts = append(_parts, aO0) var dataAO1 struct { + Audience *string `json:"audience,omitempty"` + ClientID *string `json:"clientId,omitempty"` ExternalAuthURL *string `json:"externalAuthUrl"` @@ -113,6 +122,8 @@ func (m ClientExternalJWTSignerDetail) MarshalJSON() ([]byte, error) { Scopes []string `json:"scopes"` } + dataAO1.Audience = m.Audience + dataAO1.ClientID = m.ClientID dataAO1.ExternalAuthURL = m.ExternalAuthURL diff --git a/source/client/ext-jwt-signers.yml b/source/client/ext-jwt-signers.yml index 7ca3f93b..6cd3b66c 100644 --- a/source/client/ext-jwt-signers.yml +++ b/source/client/ext-jwt-signers.yml @@ -67,4 +67,7 @@ definitions: scopes: type: array items: - type: string \ No newline at end of file + type: string + audience: + type: string + x-nullable: true \ No newline at end of file From bfe57867ec31dd75b6b5c29e0d5ef7afeb97f671 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:22:00 -0500 Subject: [PATCH 2/2] bump to .38 --- client.yml | 2 +- management.yml | 2 +- rest_client_api_server/doc.go | 2 +- rest_client_api_server/embedded_spec.go | 4 ++-- rest_management_api_server/doc.go | 2 +- rest_management_api_server/embedded_spec.go | 4 ++-- source/client.yml | 2 +- source/management.yml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client.yml b/client.yml index c56514d6..4fc0f0b2 100644 --- 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.37 + version: 0.26.38 host: demo.ziti.dev basePath: /edge/client/v1 paths: diff --git a/management.yml b/management.yml index c2ffaced..9644565a 100644 --- 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.37 + version: 0.26.38 host: demo.ziti.dev basePath: /edge/management/v1 paths: diff --git a/rest_client_api_server/doc.go b/rest_client_api_server/doc.go index 9eb12d1a..7421dacb 100644 --- a/rest_client_api_server/doc.go +++ b/rest_client_api_server/doc.go @@ -30,7 +30,7 @@ // https // Host: demo.ziti.dev // BasePath: /edge/client/v1 -// Version: 0.26.37 +// Version: 0.26.38 // License: Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0.html // Contact: OpenZiti https://openziti.discourse.group // diff --git a/rest_client_api_server/embedded_spec.go b/rest_client_api_server/embedded_spec.go index d1bf17ad..290ca8a2 100644 --- a/rest_client_api_server/embedded_spec.go +++ b/rest_client_api_server/embedded_spec.go @@ -64,7 +64,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.37" + "version": "0.26.38" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -8002,7 +8002,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.37" + "version": "0.26.38" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", diff --git a/rest_management_api_server/doc.go b/rest_management_api_server/doc.go index 0abc3b87..5909ea23 100644 --- a/rest_management_api_server/doc.go +++ b/rest_management_api_server/doc.go @@ -30,7 +30,7 @@ // https // Host: demo.ziti.dev // BasePath: /edge/management/v1 -// Version: 0.26.37 +// Version: 0.26.38 // License: Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0.html // Contact: OpenZiti https://openziti.discourse.group // diff --git a/rest_management_api_server/embedded_spec.go b/rest_management_api_server/embedded_spec.go index 04903ca9..ee651d6c 100644 --- a/rest_management_api_server/embedded_spec.go +++ b/rest_management_api_server/embedded_spec.go @@ -64,7 +64,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.37" + "version": "0.26.38" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", @@ -30025,7 +30025,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.37" + "version": "0.26.38" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", diff --git a/source/client.yml b/source/client.yml index 105388cf..dfa9644c 100644 --- a/source/client.yml +++ b/source/client.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.37 + version: 0.26.38 title: Ziti Edge Client description: OpenZiti Edge Client API contact: diff --git a/source/management.yml b/source/management.yml index bdd0bf72..4ec23fe2 100644 --- a/source/management.yml +++ b/source/management.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.37 + version: 0.26.38 title: Ziti Edge Management description: OpenZiti Edge Management API contact: