diff --git a/client.yml b/client.yml index 08a5f724..e6c58d7b 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.21 + version: 0.26.22 host: demo.ziti.dev basePath: /edge/client/v1 paths: @@ -2272,10 +2272,6 @@ paths: $ref: '#/definitions/listEnumeratedCapabilitiesEnvelope' /external-jwt-signers: get: - security: - - ztSession: [] - - oauth2: - - openid description: Retrieves a list of external JWT signers for authentication tags: - External JWT Signer diff --git a/management.yml b/management.yml index 915b60b9..146a9c23 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.21 + version: 0.26.22 host: demo.ziti.dev basePath: /edge/management/v1 paths: diff --git a/rest_client_api_client/external_jwt_signer/external_jwt_signer_client.go b/rest_client_api_client/external_jwt_signer/external_jwt_signer_client.go index f3c7b7e9..ec835add 100644 --- a/rest_client_api_client/external_jwt_signer/external_jwt_signer_client.go +++ b/rest_client_api_client/external_jwt_signer/external_jwt_signer_client.go @@ -54,7 +54,7 @@ type ClientOption func(*runtime.ClientOperation) // ClientService is the interface for Client methods type ClientService interface { - ListExternalJWTSigners(params *ListExternalJWTSignersParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*ListExternalJWTSignersOK, error) + ListExternalJWTSigners(params *ListExternalJWTSignersParams, opts ...ClientOption) (*ListExternalJWTSignersOK, error) SetTransport(transport runtime.ClientTransport) } @@ -64,7 +64,7 @@ type ClientService interface { Retrieves a list of external JWT signers for authentication */ -func (a *Client) ListExternalJWTSigners(params *ListExternalJWTSignersParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*ListExternalJWTSignersOK, error) { +func (a *Client) ListExternalJWTSigners(params *ListExternalJWTSignersParams, opts ...ClientOption) (*ListExternalJWTSignersOK, error) { // TODO: Validate the params before sending if params == nil { params = NewListExternalJWTSignersParams() @@ -78,7 +78,6 @@ func (a *Client) ListExternalJWTSigners(params *ListExternalJWTSignersParams, au Schemes: []string{"https"}, Params: params, Reader: &ListExternalJWTSignersReader{formats: a.formats}, - AuthInfo: authInfo, Context: params.Context, Client: params.HTTPClient, } diff --git a/rest_client_api_server/configure_ziti_edge_client.go b/rest_client_api_server/configure_ziti_edge_client.go index 97a2f342..e1220ad0 100644 --- a/rest_client_api_server/configure_ziti_edge_client.go +++ b/rest_client_api_server/configure_ziti_edge_client.go @@ -309,7 +309,7 @@ func configureAPI(api *operations.ZitiEdgeClientAPI) http.Handler { }) } if api.ExternalJWTSignerListExternalJWTSignersHandler == nil { - api.ExternalJWTSignerListExternalJWTSignersHandler = external_jwt_signer.ListExternalJWTSignersHandlerFunc(func(params external_jwt_signer.ListExternalJWTSignersParams, principal interface{}) middleware.Responder { + api.ExternalJWTSignerListExternalJWTSignersHandler = external_jwt_signer.ListExternalJWTSignersHandlerFunc(func(params external_jwt_signer.ListExternalJWTSignersParams) middleware.Responder { return middleware.NotImplemented("operation external_jwt_signer.ListExternalJWTSigners has not yet been implemented") }) } diff --git a/rest_client_api_server/doc.go b/rest_client_api_server/doc.go index 1f16b1db..444fb32e 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.21 +// Version: 0.26.22 // 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 1bc97266..3de7ea49 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.21" + "version": "0.26.22" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -3083,16 +3083,6 @@ func init() { }, "/external-jwt-signers": { "get": { - "security": [ - { - "ztSession": [] - }, - { - "oauth2": [ - "openid" - ] - } - ], "description": "Retrieves a list of external JWT signers for authentication", "tags": [ "External JWT Signer" @@ -7665,7 +7655,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.21" + "version": "0.26.22" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -10684,16 +10674,6 @@ func init() { }, "/external-jwt-signers": { "get": { - "security": [ - { - "ztSession": [] - }, - { - "oauth2": [ - "openid" - ] - } - ], "description": "Retrieves a list of external JWT signers for authentication", "tags": [ "External JWT Signer" diff --git a/rest_client_api_server/operations/external_jwt_signer/list_external_jwt_signers.go b/rest_client_api_server/operations/external_jwt_signer/list_external_jwt_signers.go index 28f4ba06..5285dce1 100644 --- a/rest_client_api_server/operations/external_jwt_signer/list_external_jwt_signers.go +++ b/rest_client_api_server/operations/external_jwt_signer/list_external_jwt_signers.go @@ -36,16 +36,16 @@ import ( ) // ListExternalJWTSignersHandlerFunc turns a function with the right signature into a list external Jwt signers handler -type ListExternalJWTSignersHandlerFunc func(ListExternalJWTSignersParams, interface{}) middleware.Responder +type ListExternalJWTSignersHandlerFunc func(ListExternalJWTSignersParams) middleware.Responder // Handle executing the request and returning a response -func (fn ListExternalJWTSignersHandlerFunc) Handle(params ListExternalJWTSignersParams, principal interface{}) middleware.Responder { - return fn(params, principal) +func (fn ListExternalJWTSignersHandlerFunc) Handle(params ListExternalJWTSignersParams) middleware.Responder { + return fn(params) } // ListExternalJWTSignersHandler interface for that can handle valid list external Jwt signers params type ListExternalJWTSignersHandler interface { - Handle(ListExternalJWTSignersParams, interface{}) middleware.Responder + Handle(ListExternalJWTSignersParams) middleware.Responder } // NewListExternalJWTSigners creates a new http.Handler for the list external Jwt signers operation @@ -71,25 +71,12 @@ func (o *ListExternalJWTSigners) ServeHTTP(rw http.ResponseWriter, r *http.Reque *r = *rCtx } var Params = NewListExternalJWTSignersParams() - uprinc, aCtx, err := o.Context.Authorize(r, route) - if err != nil { - o.Context.Respond(rw, r, route.Produces, route, err) - return - } - if aCtx != nil { - *r = *aCtx - } - var principal interface{} - if uprinc != nil { - principal = uprinc.(interface{}) // this is really a interface{}, I promise - } - if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params o.Context.Respond(rw, r, route.Produces, route, err) return } - res := o.Handler.Handle(Params, principal) // actually handle the request + res := o.Handler.Handle(Params) // actually handle the request o.Context.Respond(rw, r, route.Produces, route, res) } diff --git a/rest_client_api_server/operations/ziti_edge_client_api.go b/rest_client_api_server/operations/ziti_edge_client_api.go index 69a2bf07..974c4dc3 100644 --- a/rest_client_api_server/operations/ziti_edge_client_api.go +++ b/rest_client_api_server/operations/ziti_edge_client_api.go @@ -216,7 +216,7 @@ func NewZitiEdgeClientAPI(spec *loads.Document) *ZitiEdgeClientAPI { InformationalListEnumeratedCapabilitiesHandler: informational.ListEnumeratedCapabilitiesHandlerFunc(func(params informational.ListEnumeratedCapabilitiesParams) middleware.Responder { return middleware.NotImplemented("operation informational.ListEnumeratedCapabilities has not yet been implemented") }), - ExternalJWTSignerListExternalJWTSignersHandler: external_jwt_signer.ListExternalJWTSignersHandlerFunc(func(params external_jwt_signer.ListExternalJWTSignersParams, principal interface{}) middleware.Responder { + ExternalJWTSignerListExternalJWTSignersHandler: external_jwt_signer.ListExternalJWTSignersHandlerFunc(func(params external_jwt_signer.ListExternalJWTSignersParams) middleware.Responder { return middleware.NotImplemented("operation external_jwt_signer.ListExternalJWTSigners has not yet been implemented") }), InformationalListProtocolsHandler: informational.ListProtocolsHandlerFunc(func(params informational.ListProtocolsParams) middleware.Responder { diff --git a/rest_management_api_server/doc.go b/rest_management_api_server/doc.go index 044118b1..461099e2 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.21 +// Version: 0.26.22 // 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 5d94c0b8..5a020031 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.21" + "version": "0.26.22" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", @@ -28026,7 +28026,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.21" + "version": "0.26.22" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", diff --git a/source/client.yml b/source/client.yml index e7af6729..a0f22acb 100644 --- a/source/client.yml +++ b/source/client.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.21 + version: 0.26.22 title: Ziti Edge Client description: OpenZiti Edge Client API contact: diff --git a/source/client/ext-jwt-signers.yml b/source/client/ext-jwt-signers.yml index ffcdd62a..bd348e07 100644 --- a/source/client/ext-jwt-signers.yml +++ b/source/client/ext-jwt-signers.yml @@ -4,9 +4,6 @@ paths: get: summary: List Client Authentication External JWT description: Retrieves a list of external JWT signers for authentication - security: - - ztSession: [ ] - - oauth2: [ openid ] tags: - External JWT Signer operationId: listExternalJwtSigners diff --git a/source/management.yml b/source/management.yml index bc386ad3..d683064b 100644 --- a/source/management.yml +++ b/source/management.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.21 + version: 0.26.22 title: Ziti Edge Management description: OpenZiti Edge Management API contact: