From 8626d00bddb362dde5886a4934a26490c37db3ab Mon Sep 17 00:00:00 2001 From: aeneasr Date: Sun, 2 Feb 2020 22:49:09 +0000 Subject: [PATCH] chore: Regenerate swagger spec and internal client --- docs/api.swagger.json | 5 +- .../accept_consent_request_parameters.go | 2 +- .../admin/accept_consent_request_responses.go | 2 +- .../admin/accept_login_request_parameters.go | 2 +- .../admin/accept_login_request_responses.go | 2 +- .../admin/accept_logout_request_responses.go | 2 +- .../httpclient/client/admin/admin_client.go | 184 ++++++++++++------ .../create_json_web_key_set_parameters.go | 2 +- .../create_json_web_key_set_responses.go | 2 +- .../admin/create_o_auth2_client_parameters.go | 2 +- .../admin/create_o_auth2_client_responses.go | 2 +- .../admin/delete_json_web_key_responses.go | 2 +- .../delete_json_web_key_set_responses.go | 2 +- .../admin/delete_o_auth2_client_responses.go | 2 +- ...lush_inactive_o_auth2_tokens_parameters.go | 2 +- ...flush_inactive_o_auth2_tokens_responses.go | 2 +- .../admin/get_consent_request_responses.go | 2 +- .../admin/get_json_web_key_responses.go | 2 +- .../admin/get_json_web_key_set_responses.go | 2 +- .../admin/get_login_request_responses.go | 2 +- .../admin/get_logout_request_responses.go | 2 +- .../admin/get_o_auth2_client_responses.go | 2 +- .../client/admin/get_version_responses.go | 2 +- .../introspect_o_auth2_token_responses.go | 2 +- .../admin/is_instance_alive_responses.go | 2 +- .../admin/list_o_auth2_clients_responses.go | 2 +- ...list_subject_consent_sessions_responses.go | 2 +- .../reject_consent_request_parameters.go | 2 +- .../admin/reject_consent_request_responses.go | 2 +- .../admin/reject_login_request_parameters.go | 2 +- .../admin/reject_login_request_responses.go | 2 +- .../admin/reject_logout_request_parameters.go | 2 +- .../admin/reject_logout_request_responses.go | 2 +- ...revoke_authentication_session_responses.go | 2 +- .../revoke_consent_sessions_responses.go | 2 +- .../admin/update_json_web_key_parameters.go | 2 +- .../admin/update_json_web_key_responses.go | 2 +- .../update_json_web_key_set_parameters.go | 2 +- .../update_json_web_key_set_responses.go | 2 +- .../admin/update_o_auth2_client_parameters.go | 2 +- .../admin/update_o_auth2_client_responses.go | 2 +- .../httpclient/client/ory_hydra_client.go | 14 +- ...iscover_open_id_configuration_responses.go | 2 +- .../public/is_instance_ready_responses.go | 2 +- .../client/public/oauth2_token_responses.go | 2 +- .../client/public/oauth_auth_responses.go | 2 +- .../httpclient/client/public/public_client.go | 58 ++++-- .../public/revoke_o_auth2_token_responses.go | 2 +- .../client/public/userinfo_responses.go | 2 +- .../client/public/well_known_responses.go | 2 +- .../models/accept_consent_request.go | 3 +- .../httpclient/models/accept_login_request.go | 3 +- .../httpclient/models/completed_request.go | 1 - internal/httpclient/models/consent_request.go | 3 +- .../models/consent_request_session.go | 1 - .../flush_inactive_o_auth2_tokens_request.go | 3 +- internal/httpclient/models/generic_error.go | 3 +- .../models/health_not_ready_status.go | 1 - internal/httpclient/models/health_status.go | 1 - internal/httpclient/models/json_web_key.go | 3 +- .../httpclient/models/json_web_key_set.go | 5 +- .../json_web_key_set_generator_request.go | 3 +- internal/httpclient/models/login_request.go | 3 +- internal/httpclient/models/logout_request.go | 1 - internal/httpclient/models/o_auth2_client.go | 3 +- .../models/o_auth2_token_introspection.go | 3 +- .../models/oauth2_token_response.go | 1 - .../models/open_id_connect_context.go | 1 - .../models/previous_consent_session.go | 3 +- internal/httpclient/models/reject_request.go | 1 - .../httpclient/models/userinfo_response.go | 1 - internal/httpclient/models/uuid.go | 30 +++ internal/httpclient/models/version.go | 1 - internal/httpclient/models/well_known.go | 3 +- 74 files changed, 258 insertions(+), 176 deletions(-) create mode 100644 internal/httpclient/models/uuid.go diff --git a/docs/api.swagger.json b/docs/api.swagger.json index cf7bae3dc9a..7620fcd30b0 100755 --- a/docs/api.swagger.json +++ b/docs/api.swagger.json @@ -1820,7 +1820,7 @@ } } }, - "definitions": { + "definitions": {"UUID":{"type": "string", "format": "uuid4"}, "JSONWebKey": { "type": "object", "required": [ @@ -1909,7 +1909,6 @@ }, "JSONWebKeySet": { "type": "object", - "title": "JSONWebKeySet represents a JWK Set object.", "properties": { "keys": { "description": "The value of the \"keys\" parameter is an array of JWK values. By\ndefault, the order of the JWK values within the array does not imply\nan order of preference among them, although applications of JWK Sets\ncan choose to assign a meaning to the order for their purposes, if\ndesired.", @@ -2843,4 +2842,4 @@ }, "x-forwarded-proto": "string", "x-request-id": "string" -} +} \ No newline at end of file diff --git a/internal/httpclient/client/admin/accept_consent_request_parameters.go b/internal/httpclient/client/admin/accept_consent_request_parameters.go index 7b39be31d83..9d238d6d4ea 100644 --- a/internal/httpclient/client/admin/accept_consent_request_parameters.go +++ b/internal/httpclient/client/admin/accept_consent_request_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewAcceptConsentRequestParams creates a new AcceptConsentRequestParams object diff --git a/internal/httpclient/client/admin/accept_consent_request_responses.go b/internal/httpclient/client/admin/accept_consent_request_responses.go index 08c68593e06..89d16e6e265 100644 --- a/internal/httpclient/client/admin/accept_consent_request_responses.go +++ b/internal/httpclient/client/admin/accept_consent_request_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // AcceptConsentRequestReader is a Reader for the AcceptConsentRequest structure. diff --git a/internal/httpclient/client/admin/accept_login_request_parameters.go b/internal/httpclient/client/admin/accept_login_request_parameters.go index bf3e2b7f2a4..8df7e7b017d 100644 --- a/internal/httpclient/client/admin/accept_login_request_parameters.go +++ b/internal/httpclient/client/admin/accept_login_request_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewAcceptLoginRequestParams creates a new AcceptLoginRequestParams object diff --git a/internal/httpclient/client/admin/accept_login_request_responses.go b/internal/httpclient/client/admin/accept_login_request_responses.go index 5a01812f4ae..4b66b93fef3 100644 --- a/internal/httpclient/client/admin/accept_login_request_responses.go +++ b/internal/httpclient/client/admin/accept_login_request_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // AcceptLoginRequestReader is a Reader for the AcceptLoginRequest structure. diff --git a/internal/httpclient/client/admin/accept_logout_request_responses.go b/internal/httpclient/client/admin/accept_logout_request_responses.go index e6f534decae..926c548056b 100644 --- a/internal/httpclient/client/admin/accept_logout_request_responses.go +++ b/internal/httpclient/client/admin/accept_logout_request_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // AcceptLogoutRequestReader is a Reader for the AcceptLogoutRequest structure. diff --git a/internal/httpclient/client/admin/admin_client.go b/internal/httpclient/client/admin/admin_client.go index 7c6409b3936..b9f2fc9b150 100644 --- a/internal/httpclient/client/admin/admin_client.go +++ b/internal/httpclient/client/admin/admin_client.go @@ -9,12 +9,11 @@ import ( "fmt" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" ) // New creates a new admin API client. -func New(transport runtime.ClientTransport, formats strfmt.Registry) *Client { +func New(transport runtime.ClientTransport, formats strfmt.Registry) ClientService { return &Client{transport: transport, formats: formats} } @@ -26,10 +25,73 @@ type Client struct { formats strfmt.Registry } +// ClientService is the interface for Client methods +type ClientService interface { + AcceptConsentRequest(params *AcceptConsentRequestParams) (*AcceptConsentRequestOK, error) + + AcceptLoginRequest(params *AcceptLoginRequestParams) (*AcceptLoginRequestOK, error) + + AcceptLogoutRequest(params *AcceptLogoutRequestParams) (*AcceptLogoutRequestOK, error) + + CreateJSONWebKeySet(params *CreateJSONWebKeySetParams) (*CreateJSONWebKeySetCreated, error) + + CreateOAuth2Client(params *CreateOAuth2ClientParams) (*CreateOAuth2ClientCreated, error) + + DeleteJSONWebKey(params *DeleteJSONWebKeyParams) (*DeleteJSONWebKeyNoContent, error) + + DeleteJSONWebKeySet(params *DeleteJSONWebKeySetParams) (*DeleteJSONWebKeySetNoContent, error) + + DeleteOAuth2Client(params *DeleteOAuth2ClientParams) (*DeleteOAuth2ClientNoContent, error) + + FlushInactiveOAuth2Tokens(params *FlushInactiveOAuth2TokensParams) (*FlushInactiveOAuth2TokensNoContent, error) + + GetConsentRequest(params *GetConsentRequestParams) (*GetConsentRequestOK, error) + + GetJSONWebKey(params *GetJSONWebKeyParams) (*GetJSONWebKeyOK, error) + + GetJSONWebKeySet(params *GetJSONWebKeySetParams) (*GetJSONWebKeySetOK, error) + + GetLoginRequest(params *GetLoginRequestParams) (*GetLoginRequestOK, error) + + GetLogoutRequest(params *GetLogoutRequestParams) (*GetLogoutRequestOK, error) + + GetOAuth2Client(params *GetOAuth2ClientParams) (*GetOAuth2ClientOK, error) + + GetVersion(params *GetVersionParams) (*GetVersionOK, error) + + IntrospectOAuth2Token(params *IntrospectOAuth2TokenParams, authInfo runtime.ClientAuthInfoWriter) (*IntrospectOAuth2TokenOK, error) + + IsInstanceAlive(params *IsInstanceAliveParams) (*IsInstanceAliveOK, error) + + ListOAuth2Clients(params *ListOAuth2ClientsParams) (*ListOAuth2ClientsOK, error) + + ListSubjectConsentSessions(params *ListSubjectConsentSessionsParams) (*ListSubjectConsentSessionsOK, error) + + Prometheus(params *PrometheusParams) (*PrometheusOK, error) + + RejectConsentRequest(params *RejectConsentRequestParams) (*RejectConsentRequestOK, error) + + RejectLoginRequest(params *RejectLoginRequestParams) (*RejectLoginRequestOK, error) + + RejectLogoutRequest(params *RejectLogoutRequestParams) (*RejectLogoutRequestNoContent, error) + + RevokeAuthenticationSession(params *RevokeAuthenticationSessionParams) (*RevokeAuthenticationSessionNoContent, error) + + RevokeConsentSessions(params *RevokeConsentSessionsParams) (*RevokeConsentSessionsNoContent, error) + + UpdateJSONWebKey(params *UpdateJSONWebKeyParams) (*UpdateJSONWebKeyOK, error) + + UpdateJSONWebKeySet(params *UpdateJSONWebKeySetParams) (*UpdateJSONWebKeySetOK, error) + + UpdateOAuth2Client(params *UpdateOAuth2ClientParams) (*UpdateOAuth2ClientOK, error) + + SetTransport(transport runtime.ClientTransport) +} + /* -AcceptConsentRequest accepts a consent request + AcceptConsentRequest accepts a consent request -When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider + When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider to authenticate the subject and then tell ORY Hydra now about it. If the subject authenticated, he/she must now be asked if the OAuth 2.0 Client which initiated the flow should be allowed to access the resources on the subject's behalf. @@ -78,9 +140,9 @@ func (a *Client) AcceptConsentRequest(params *AcceptConsentRequestParams) (*Acce } /* -AcceptLoginRequest accepts a login request + AcceptLoginRequest accepts a login request -When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider + When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider (sometimes called "identity provider") to authenticate the subject and then tell ORY Hydra now about it. The login provider is an web-app you write and host, and it must be able to authenticate ("show the subject a login screen") a subject (in OAuth2 the proper name for subject is "resource owner"). @@ -126,9 +188,9 @@ func (a *Client) AcceptLoginRequest(params *AcceptLoginRequestParams) (*AcceptLo } /* -AcceptLogoutRequest accepts a logout request + AcceptLogoutRequest accepts a logout request -When a user or an application requests ORY Hydra to log out a user, this endpoint is used to confirm that logout request. + When a user or an application requests ORY Hydra to log out a user, this endpoint is used to confirm that logout request. No body is required. The response contains a redirect URL which the consent provider should redirect the user-agent to. @@ -165,9 +227,9 @@ func (a *Client) AcceptLogoutRequest(params *AcceptLogoutRequestParams) (*Accept } /* -CreateJSONWebKeySet generates a new JSON web key + CreateJSONWebKeySet generates a new JSON web key -This endpoint is capable of generating JSON Web Key Sets for you. There a different strategies available, such as symmetric cryptographic keys (HS256, HS512) and asymetric cryptographic keys (RS256, ECDSA). If the specified JSON Web Key Set does not exist, it will be created. + This endpoint is capable of generating JSON Web Key Sets for you. There a different strategies available, such as symmetric cryptographic keys (HS256, HS512) and asymetric cryptographic keys (RS256, ECDSA). If the specified JSON Web Key Set does not exist, it will be created. A JSON Web Key (JWK) is a JavaScript Object Notation (JSON) data structure that represents a cryptographic key. A JWK Set is a JSON data structure that represents a set of JWKs. A JSON Web Key is identified by its set and key id. ORY Hydra uses this functionality to store cryptographic keys used for TLS and JSON Web Tokens (such as OpenID Connect ID tokens), and allows storing user-defined keys as well. */ @@ -203,9 +265,9 @@ func (a *Client) CreateJSONWebKeySet(params *CreateJSONWebKeySetParams) (*Create } /* -CreateOAuth2Client creates an o auth 2 0 client + CreateOAuth2Client creates an o auth 2 0 client -Create a new OAuth 2.0 client If you pass `client_secret` the secret will be used, otherwise a random secret will be generated. The secret will be returned in the response and you will not be able to retrieve it later on. Write the secret down and keep it somwhere safe. + Create a new OAuth 2.0 client If you pass `client_secret` the secret will be used, otherwise a random secret will be generated. The secret will be returned in the response and you will not be able to retrieve it later on. Write the secret down and keep it somwhere safe. OAuth 2.0 clients are used to perform OAuth 2.0 and OpenID Connect flows. Usually, OAuth 2.0 clients are generated for applications which want to consume your OAuth 2.0 or OpenID Connect capabilities. To manage ORY Hydra, you will need an OAuth 2.0 Client as well. Make sure that this endpoint is well protected and only callable by first-party components. */ @@ -241,9 +303,9 @@ func (a *Client) CreateOAuth2Client(params *CreateOAuth2ClientParams) (*CreateOA } /* -DeleteJSONWebKey deletes a JSON web key + DeleteJSONWebKey deletes a JSON web key -Use this endpoint to delete a single JSON Web Key. + Use this endpoint to delete a single JSON Web Key. A JSON Web Key (JWK) is a JavaScript Object Notation (JSON) data structure that represents a cryptographic key. A JWK Set is a JSON data structure that represents a set of JWKs. A JSON Web Key is identified by its set and key id. ORY Hydra uses this functionality to store cryptographic keys used for TLS and JSON Web Tokens (such as OpenID Connect ID tokens), and allows storing user-defined keys as well. */ @@ -279,9 +341,9 @@ func (a *Client) DeleteJSONWebKey(params *DeleteJSONWebKeyParams) (*DeleteJSONWe } /* -DeleteJSONWebKeySet deletes a JSON web key set + DeleteJSONWebKeySet deletes a JSON web key set -Use this endpoint to delete a complete JSON Web Key Set and all the keys in that set. + Use this endpoint to delete a complete JSON Web Key Set and all the keys in that set. A JSON Web Key (JWK) is a JavaScript Object Notation (JSON) data structure that represents a cryptographic key. A JWK Set is a JSON data structure that represents a set of JWKs. A JSON Web Key is identified by its set and key id. ORY Hydra uses this functionality to store cryptographic keys used for TLS and JSON Web Tokens (such as OpenID Connect ID tokens), and allows storing user-defined keys as well. */ @@ -317,9 +379,9 @@ func (a *Client) DeleteJSONWebKeySet(params *DeleteJSONWebKeySetParams) (*Delete } /* -DeleteOAuth2Client deletes an o auth 2 0 client + DeleteOAuth2Client deletes an o auth 2 0 client -Delete an existing OAuth 2.0 Client by its ID. + Delete an existing OAuth 2.0 Client by its ID. OAuth 2.0 clients are used to perform OAuth 2.0 and OpenID Connect flows. Usually, OAuth 2.0 clients are generated for applications which want to consume your OAuth 2.0 or OpenID Connect capabilities. To manage ORY Hydra, you will need an OAuth 2.0 Client as well. Make sure that this endpoint is well protected and only callable by first-party components. */ @@ -355,9 +417,9 @@ func (a *Client) DeleteOAuth2Client(params *DeleteOAuth2ClientParams) (*DeleteOA } /* -FlushInactiveOAuth2Tokens flushes expired o auth2 access tokens + FlushInactiveOAuth2Tokens flushes expired o auth2 access tokens -This endpoint flushes expired OAuth2 access tokens from the database. You can set a time after which no tokens will be + This endpoint flushes expired OAuth2 access tokens from the database. You can set a time after which no tokens will be not be touched, in case you want to keep recent tokens for auditing. Refresh tokens can not be flushed as they are deleted automatically when performing the refresh flow. */ @@ -393,9 +455,9 @@ func (a *Client) FlushInactiveOAuth2Tokens(params *FlushInactiveOAuth2TokensPara } /* -GetConsentRequest gets consent request information + GetConsentRequest gets consent request information -When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider + When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider to authenticate the subject and then tell ORY Hydra now about it. If the subject authenticated, he/she must now be asked if the OAuth 2.0 Client which initiated the flow should be allowed to access the resources on the subject's behalf. @@ -438,9 +500,9 @@ func (a *Client) GetConsentRequest(params *GetConsentRequestParams) (*GetConsent } /* -GetJSONWebKey fetches a JSON web key + GetJSONWebKey fetches a JSON web key -This endpoint returns a singular JSON Web Key, identified by the set and the specific key ID (kid). + This endpoint returns a singular JSON Web Key, identified by the set and the specific key ID (kid). */ func (a *Client) GetJSONWebKey(params *GetJSONWebKeyParams) (*GetJSONWebKeyOK, error) { // TODO: Validate the params before sending @@ -474,9 +536,9 @@ func (a *Client) GetJSONWebKey(params *GetJSONWebKeyParams) (*GetJSONWebKeyOK, e } /* -GetJSONWebKeySet retrieves a JSON web key set + GetJSONWebKeySet retrieves a JSON web key set -This endpoint can be used to retrieve JWK Sets stored in ORY Hydra. + This endpoint can be used to retrieve JWK Sets stored in ORY Hydra. A JSON Web Key (JWK) is a JavaScript Object Notation (JSON) data structure that represents a cryptographic key. A JWK Set is a JSON data structure that represents a set of JWKs. A JSON Web Key is identified by its set and key id. ORY Hydra uses this functionality to store cryptographic keys used for TLS and JSON Web Tokens (such as OpenID Connect ID tokens), and allows storing user-defined keys as well. */ @@ -512,9 +574,9 @@ func (a *Client) GetJSONWebKeySet(params *GetJSONWebKeySetParams) (*GetJSONWebKe } /* -GetLoginRequest gets a login request + GetLoginRequest gets a login request -When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider + When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider (sometimes called "identity provider") to authenticate the subject and then tell ORY Hydra now about it. The login provider is an web-app you write and host, and it must be able to authenticate ("show the subject a login screen") a subject (in OAuth2 the proper name for subject is "resource owner"). @@ -554,9 +616,9 @@ func (a *Client) GetLoginRequest(params *GetLoginRequestParams) (*GetLoginReques } /* -GetLogoutRequest gets a logout request + GetLogoutRequest gets a logout request -Use this endpoint to fetch a logout request. + Use this endpoint to fetch a logout request. */ func (a *Client) GetLogoutRequest(params *GetLogoutRequestParams) (*GetLogoutRequestOK, error) { // TODO: Validate the params before sending @@ -590,9 +652,9 @@ func (a *Client) GetLogoutRequest(params *GetLogoutRequestParams) (*GetLogoutReq } /* -GetOAuth2Client gets an o auth 2 0 client + GetOAuth2Client gets an o auth 2 0 client -Get an OAUth 2.0 client by its ID. This endpoint never returns passwords. + Get an OAUth 2.0 client by its ID. This endpoint never returns passwords. OAuth 2.0 clients are used to perform OAuth 2.0 and OpenID Connect flows. Usually, OAuth 2.0 clients are generated for applications which want to consume your OAuth 2.0 or OpenID Connect capabilities. To manage ORY Hydra, you will need an OAuth 2.0 Client as well. Make sure that this endpoint is well protected and only callable by first-party components. */ @@ -628,9 +690,9 @@ func (a *Client) GetOAuth2Client(params *GetOAuth2ClientParams) (*GetOAuth2Clien } /* -GetVersion gets service version + GetVersion gets service version -This endpoint returns the service version typically notated using semantic versioning. + This endpoint returns the service version typically notated using semantic versioning. If the service supports TLS Edge Termination, this endpoint does not require the `X-Forwarded-Proto` header to be set. @@ -667,9 +729,9 @@ func (a *Client) GetVersion(params *GetVersionParams) (*GetVersionOK, error) { } /* -IntrospectOAuth2Token introspects o auth2 tokens + IntrospectOAuth2Token introspects o auth2 tokens -The introspection endpoint allows to check if a token (both refresh and access) is active or not. An active token + The introspection endpoint allows to check if a token (both refresh and access) is active or not. An active token is neither expired nor revoked. If a token is active, additional information on the token will be included. You can set additional data for a token by setting `accessTokenExtra` during the consent flow. @@ -708,9 +770,9 @@ func (a *Client) IntrospectOAuth2Token(params *IntrospectOAuth2TokenParams, auth } /* -IsInstanceAlive checks alive status + IsInstanceAlive checks alive status -This endpoint returns a 200 status code when the HTTP server is up running. + This endpoint returns a 200 status code when the HTTP server is up running. This status does currently not include checks whether the database connection is working. If the service supports TLS Edge Termination, this endpoint does not require the @@ -751,9 +813,9 @@ func (a *Client) IsInstanceAlive(params *IsInstanceAliveParams) (*IsInstanceAliv } /* -ListOAuth2Clients lists o auth 2 0 clients + ListOAuth2Clients lists o auth 2 0 clients -This endpoint lists all clients in the database, and never returns client secrets. + This endpoint lists all clients in the database, and never returns client secrets. OAuth 2.0 clients are used to perform OAuth 2.0 and OpenID Connect flows. Usually, OAuth 2.0 clients are generated for applications which want to consume your OAuth 2.0 or OpenID Connect capabilities. To manage ORY Hydra, you will need an OAuth 2.0 Client as well. Make sure that this endpoint is well protected and only callable by first-party components. The "Link" header is also included in successful responses, which contains one or more links for pagination, formatted like so: '; rel="{page}"', where page is one of the following applicable pages: 'first', 'next', 'last', and 'previous'. @@ -791,9 +853,9 @@ func (a *Client) ListOAuth2Clients(params *ListOAuth2ClientsParams) (*ListOAuth2 } /* -ListSubjectConsentSessions lists all consent sessions of a subject + ListSubjectConsentSessions lists all consent sessions of a subject -This endpoint lists all subject's granted consent sessions, including client and granted scope. + This endpoint lists all subject's granted consent sessions, including client and granted scope. The "Link" header is also included in successful responses, which contains one or more links for pagination, formatted like so: '; rel="{page}"', where page is one of the following applicable pages: 'first', 'next', 'last', and 'previous'. Multiple links can be included in this header, and will be separated by a comma. */ @@ -829,9 +891,9 @@ func (a *Client) ListSubjectConsentSessions(params *ListSubjectConsentSessionsPa } /* -Prometheus gets snapshot metrics from the hydra service if you re using k8s you can then add annotations to your deployment like so + Prometheus gets snapshot metrics from the hydra service if you re using k8s you can then add annotations to your deployment like so -``` + ``` metadata: annotations: prometheus.io/port: "4445" @@ -870,9 +932,9 @@ func (a *Client) Prometheus(params *PrometheusParams) (*PrometheusOK, error) { } /* -RejectConsentRequest rejects a consent request + RejectConsentRequest rejects a consent request -When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider + When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider to authenticate the subject and then tell ORY Hydra now about it. If the subject authenticated, he/she must now be asked if the OAuth 2.0 Client which initiated the flow should be allowed to access the resources on the subject's behalf. @@ -920,9 +982,9 @@ func (a *Client) RejectConsentRequest(params *RejectConsentRequestParams) (*Reje } /* -RejectLoginRequest rejects a login request + RejectLoginRequest rejects a login request -When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider + When an authorization code, hybrid, or implicit OAuth 2.0 Flow is initiated, ORY Hydra asks the login provider (sometimes called "identity provider") to authenticate the subject and then tell ORY Hydra now about it. The login provider is an web-app you write and host, and it must be able to authenticate ("show the subject a login screen") a subject (in OAuth2 the proper name for subject is "resource owner"). @@ -967,9 +1029,9 @@ func (a *Client) RejectLoginRequest(params *RejectLoginRequestParams) (*RejectLo } /* -RejectLogoutRequest rejects a logout request + RejectLogoutRequest rejects a logout request -When a user or an application requests ORY Hydra to log out a user, this endpoint is used to deny that logout request. + When a user or an application requests ORY Hydra to log out a user, this endpoint is used to deny that logout request. No body is required. The response is empty as the logout provider has to chose what action to perform next. @@ -1006,9 +1068,9 @@ func (a *Client) RejectLogoutRequest(params *RejectLogoutRequestParams) (*Reject } /* -RevokeAuthenticationSession invalidates all login sessions of a certain user invalidates a subject s authentication session + RevokeAuthenticationSession invalidates all login sessions of a certain user invalidates a subject s authentication session -This endpoint invalidates a subject's authentication session. After revoking the authentication session, the subject + This endpoint invalidates a subject's authentication session. After revoking the authentication session, the subject has to re-authenticate at ORY Hydra. This endpoint does not invalidate any tokens and does not work with OpenID Connect Front- or Back-channel logout. */ @@ -1044,9 +1106,9 @@ func (a *Client) RevokeAuthenticationSession(params *RevokeAuthenticationSession } /* -RevokeConsentSessions revokes consent sessions of a subject for a specific o auth 2 0 client + RevokeConsentSessions revokes consent sessions of a subject for a specific o auth 2 0 client -This endpoint revokes a subject's granted consent sessions for a specific OAuth 2.0 Client and invalidates all + This endpoint revokes a subject's granted consent sessions for a specific OAuth 2.0 Client and invalidates all associated OAuth 2.0 Access Tokens. */ func (a *Client) RevokeConsentSessions(params *RevokeConsentSessionsParams) (*RevokeConsentSessionsNoContent, error) { @@ -1081,9 +1143,9 @@ func (a *Client) RevokeConsentSessions(params *RevokeConsentSessionsParams) (*Re } /* -UpdateJSONWebKey updates a JSON web key + UpdateJSONWebKey updates a JSON web key -Use this method if you do not want to let Hydra generate the JWKs for you, but instead save your own. + Use this method if you do not want to let Hydra generate the JWKs for you, but instead save your own. A JSON Web Key (JWK) is a JavaScript Object Notation (JSON) data structure that represents a cryptographic key. A JWK Set is a JSON data structure that represents a set of JWKs. A JSON Web Key is identified by its set and key id. ORY Hydra uses this functionality to store cryptographic keys used for TLS and JSON Web Tokens (such as OpenID Connect ID tokens), and allows storing user-defined keys as well. */ @@ -1119,9 +1181,9 @@ func (a *Client) UpdateJSONWebKey(params *UpdateJSONWebKeyParams) (*UpdateJSONWe } /* -UpdateJSONWebKeySet updates a JSON web key set + UpdateJSONWebKeySet updates a JSON web key set -Use this method if you do not want to let Hydra generate the JWKs for you, but instead save your own. + Use this method if you do not want to let Hydra generate the JWKs for you, but instead save your own. A JSON Web Key (JWK) is a JavaScript Object Notation (JSON) data structure that represents a cryptographic key. A JWK Set is a JSON data structure that represents a set of JWKs. A JSON Web Key is identified by its set and key id. ORY Hydra uses this functionality to store cryptographic keys used for TLS and JSON Web Tokens (such as OpenID Connect ID tokens), and allows storing user-defined keys as well. */ @@ -1157,9 +1219,9 @@ func (a *Client) UpdateJSONWebKeySet(params *UpdateJSONWebKeySetParams) (*Update } /* -UpdateOAuth2Client updates an o auth 2 0 client + UpdateOAuth2Client updates an o auth 2 0 client -Update an existing OAuth 2.0 Client. If you pass `client_secret` the secret will be updated and returned via the API. This is the only time you will be able to retrieve the client secret, so write it down and keep it safe. + Update an existing OAuth 2.0 Client. If you pass `client_secret` the secret will be updated and returned via the API. This is the only time you will be able to retrieve the client secret, so write it down and keep it safe. OAuth 2.0 clients are used to perform OAuth 2.0 and OpenID Connect flows. Usually, OAuth 2.0 clients are generated for applications which want to consume your OAuth 2.0 or OpenID Connect capabilities. To manage ORY Hydra, you will need an OAuth 2.0 Client as well. Make sure that this endpoint is well protected and only callable by first-party components. */ diff --git a/internal/httpclient/client/admin/create_json_web_key_set_parameters.go b/internal/httpclient/client/admin/create_json_web_key_set_parameters.go index 7ded5892358..b6a6540b5de 100644 --- a/internal/httpclient/client/admin/create_json_web_key_set_parameters.go +++ b/internal/httpclient/client/admin/create_json_web_key_set_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewCreateJSONWebKeySetParams creates a new CreateJSONWebKeySetParams object diff --git a/internal/httpclient/client/admin/create_json_web_key_set_responses.go b/internal/httpclient/client/admin/create_json_web_key_set_responses.go index 5872654562c..5c802412ff5 100644 --- a/internal/httpclient/client/admin/create_json_web_key_set_responses.go +++ b/internal/httpclient/client/admin/create_json_web_key_set_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // CreateJSONWebKeySetReader is a Reader for the CreateJSONWebKeySet structure. diff --git a/internal/httpclient/client/admin/create_o_auth2_client_parameters.go b/internal/httpclient/client/admin/create_o_auth2_client_parameters.go index 2b56afeadb0..7841e2713c5 100644 --- a/internal/httpclient/client/admin/create_o_auth2_client_parameters.go +++ b/internal/httpclient/client/admin/create_o_auth2_client_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewCreateOAuth2ClientParams creates a new CreateOAuth2ClientParams object diff --git a/internal/httpclient/client/admin/create_o_auth2_client_responses.go b/internal/httpclient/client/admin/create_o_auth2_client_responses.go index d59a14f592a..07f4dd8ee4e 100644 --- a/internal/httpclient/client/admin/create_o_auth2_client_responses.go +++ b/internal/httpclient/client/admin/create_o_auth2_client_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // CreateOAuth2ClientReader is a Reader for the CreateOAuth2Client structure. diff --git a/internal/httpclient/client/admin/delete_json_web_key_responses.go b/internal/httpclient/client/admin/delete_json_web_key_responses.go index d2bc93ae7ff..635a8a7230c 100644 --- a/internal/httpclient/client/admin/delete_json_web_key_responses.go +++ b/internal/httpclient/client/admin/delete_json_web_key_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // DeleteJSONWebKeyReader is a Reader for the DeleteJSONWebKey structure. diff --git a/internal/httpclient/client/admin/delete_json_web_key_set_responses.go b/internal/httpclient/client/admin/delete_json_web_key_set_responses.go index 1ef615e5d49..7b1b49dc3df 100644 --- a/internal/httpclient/client/admin/delete_json_web_key_set_responses.go +++ b/internal/httpclient/client/admin/delete_json_web_key_set_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // DeleteJSONWebKeySetReader is a Reader for the DeleteJSONWebKeySet structure. diff --git a/internal/httpclient/client/admin/delete_o_auth2_client_responses.go b/internal/httpclient/client/admin/delete_o_auth2_client_responses.go index f50f487e8a9..8ca49719ff9 100644 --- a/internal/httpclient/client/admin/delete_o_auth2_client_responses.go +++ b/internal/httpclient/client/admin/delete_o_auth2_client_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // DeleteOAuth2ClientReader is a Reader for the DeleteOAuth2Client structure. diff --git a/internal/httpclient/client/admin/flush_inactive_o_auth2_tokens_parameters.go b/internal/httpclient/client/admin/flush_inactive_o_auth2_tokens_parameters.go index df5d72c76b4..e7d36b34adb 100644 --- a/internal/httpclient/client/admin/flush_inactive_o_auth2_tokens_parameters.go +++ b/internal/httpclient/client/admin/flush_inactive_o_auth2_tokens_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewFlushInactiveOAuth2TokensParams creates a new FlushInactiveOAuth2TokensParams object diff --git a/internal/httpclient/client/admin/flush_inactive_o_auth2_tokens_responses.go b/internal/httpclient/client/admin/flush_inactive_o_auth2_tokens_responses.go index d3af7d50f8c..c8212eb8d22 100644 --- a/internal/httpclient/client/admin/flush_inactive_o_auth2_tokens_responses.go +++ b/internal/httpclient/client/admin/flush_inactive_o_auth2_tokens_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // FlushInactiveOAuth2TokensReader is a Reader for the FlushInactiveOAuth2Tokens structure. diff --git a/internal/httpclient/client/admin/get_consent_request_responses.go b/internal/httpclient/client/admin/get_consent_request_responses.go index 2212ab85033..d2c637712ea 100644 --- a/internal/httpclient/client/admin/get_consent_request_responses.go +++ b/internal/httpclient/client/admin/get_consent_request_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // GetConsentRequestReader is a Reader for the GetConsentRequest structure. diff --git a/internal/httpclient/client/admin/get_json_web_key_responses.go b/internal/httpclient/client/admin/get_json_web_key_responses.go index ab3e6d50a64..bcece315bd8 100644 --- a/internal/httpclient/client/admin/get_json_web_key_responses.go +++ b/internal/httpclient/client/admin/get_json_web_key_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // GetJSONWebKeyReader is a Reader for the GetJSONWebKey structure. diff --git a/internal/httpclient/client/admin/get_json_web_key_set_responses.go b/internal/httpclient/client/admin/get_json_web_key_set_responses.go index 78792c028d1..0ed07eb6a8f 100644 --- a/internal/httpclient/client/admin/get_json_web_key_set_responses.go +++ b/internal/httpclient/client/admin/get_json_web_key_set_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // GetJSONWebKeySetReader is a Reader for the GetJSONWebKeySet structure. diff --git a/internal/httpclient/client/admin/get_login_request_responses.go b/internal/httpclient/client/admin/get_login_request_responses.go index 19972f45844..fea3ba602cc 100644 --- a/internal/httpclient/client/admin/get_login_request_responses.go +++ b/internal/httpclient/client/admin/get_login_request_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // GetLoginRequestReader is a Reader for the GetLoginRequest structure. diff --git a/internal/httpclient/client/admin/get_logout_request_responses.go b/internal/httpclient/client/admin/get_logout_request_responses.go index bfb214e97a8..32ab808df80 100644 --- a/internal/httpclient/client/admin/get_logout_request_responses.go +++ b/internal/httpclient/client/admin/get_logout_request_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // GetLogoutRequestReader is a Reader for the GetLogoutRequest structure. diff --git a/internal/httpclient/client/admin/get_o_auth2_client_responses.go b/internal/httpclient/client/admin/get_o_auth2_client_responses.go index f8ec2fc8d50..10dfe667a74 100644 --- a/internal/httpclient/client/admin/get_o_auth2_client_responses.go +++ b/internal/httpclient/client/admin/get_o_auth2_client_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // GetOAuth2ClientReader is a Reader for the GetOAuth2Client structure. diff --git a/internal/httpclient/client/admin/get_version_responses.go b/internal/httpclient/client/admin/get_version_responses.go index f6c1a92ba83..26e05085c7d 100644 --- a/internal/httpclient/client/admin/get_version_responses.go +++ b/internal/httpclient/client/admin/get_version_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // GetVersionReader is a Reader for the GetVersion structure. diff --git a/internal/httpclient/client/admin/introspect_o_auth2_token_responses.go b/internal/httpclient/client/admin/introspect_o_auth2_token_responses.go index 701f7a375db..bc08053e234 100644 --- a/internal/httpclient/client/admin/introspect_o_auth2_token_responses.go +++ b/internal/httpclient/client/admin/introspect_o_auth2_token_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // IntrospectOAuth2TokenReader is a Reader for the IntrospectOAuth2Token structure. diff --git a/internal/httpclient/client/admin/is_instance_alive_responses.go b/internal/httpclient/client/admin/is_instance_alive_responses.go index 7e4ceed92f5..ba1ec808f65 100644 --- a/internal/httpclient/client/admin/is_instance_alive_responses.go +++ b/internal/httpclient/client/admin/is_instance_alive_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // IsInstanceAliveReader is a Reader for the IsInstanceAlive structure. diff --git a/internal/httpclient/client/admin/list_o_auth2_clients_responses.go b/internal/httpclient/client/admin/list_o_auth2_clients_responses.go index 7dcae4f7cf5..36864e6f339 100644 --- a/internal/httpclient/client/admin/list_o_auth2_clients_responses.go +++ b/internal/httpclient/client/admin/list_o_auth2_clients_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // ListOAuth2ClientsReader is a Reader for the ListOAuth2Clients structure. diff --git a/internal/httpclient/client/admin/list_subject_consent_sessions_responses.go b/internal/httpclient/client/admin/list_subject_consent_sessions_responses.go index 650dc93fa01..1046db43692 100644 --- a/internal/httpclient/client/admin/list_subject_consent_sessions_responses.go +++ b/internal/httpclient/client/admin/list_subject_consent_sessions_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // ListSubjectConsentSessionsReader is a Reader for the ListSubjectConsentSessions structure. diff --git a/internal/httpclient/client/admin/reject_consent_request_parameters.go b/internal/httpclient/client/admin/reject_consent_request_parameters.go index 863ca7c7924..e9e65de1be4 100644 --- a/internal/httpclient/client/admin/reject_consent_request_parameters.go +++ b/internal/httpclient/client/admin/reject_consent_request_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewRejectConsentRequestParams creates a new RejectConsentRequestParams object diff --git a/internal/httpclient/client/admin/reject_consent_request_responses.go b/internal/httpclient/client/admin/reject_consent_request_responses.go index e1a952718e3..80146d229e6 100644 --- a/internal/httpclient/client/admin/reject_consent_request_responses.go +++ b/internal/httpclient/client/admin/reject_consent_request_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // RejectConsentRequestReader is a Reader for the RejectConsentRequest structure. diff --git a/internal/httpclient/client/admin/reject_login_request_parameters.go b/internal/httpclient/client/admin/reject_login_request_parameters.go index a1fd1b6bf49..16e6ea74b5b 100644 --- a/internal/httpclient/client/admin/reject_login_request_parameters.go +++ b/internal/httpclient/client/admin/reject_login_request_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewRejectLoginRequestParams creates a new RejectLoginRequestParams object diff --git a/internal/httpclient/client/admin/reject_login_request_responses.go b/internal/httpclient/client/admin/reject_login_request_responses.go index ad041251581..b7d8de71b9f 100644 --- a/internal/httpclient/client/admin/reject_login_request_responses.go +++ b/internal/httpclient/client/admin/reject_login_request_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // RejectLoginRequestReader is a Reader for the RejectLoginRequest structure. diff --git a/internal/httpclient/client/admin/reject_logout_request_parameters.go b/internal/httpclient/client/admin/reject_logout_request_parameters.go index 85a18f6a8dc..7fa5a2e0f7b 100644 --- a/internal/httpclient/client/admin/reject_logout_request_parameters.go +++ b/internal/httpclient/client/admin/reject_logout_request_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewRejectLogoutRequestParams creates a new RejectLogoutRequestParams object diff --git a/internal/httpclient/client/admin/reject_logout_request_responses.go b/internal/httpclient/client/admin/reject_logout_request_responses.go index 55f3c6a5c36..fff2ca23149 100644 --- a/internal/httpclient/client/admin/reject_logout_request_responses.go +++ b/internal/httpclient/client/admin/reject_logout_request_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // RejectLogoutRequestReader is a Reader for the RejectLogoutRequest structure. diff --git a/internal/httpclient/client/admin/revoke_authentication_session_responses.go b/internal/httpclient/client/admin/revoke_authentication_session_responses.go index aee38eca055..fb6a7d6486e 100644 --- a/internal/httpclient/client/admin/revoke_authentication_session_responses.go +++ b/internal/httpclient/client/admin/revoke_authentication_session_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // RevokeAuthenticationSessionReader is a Reader for the RevokeAuthenticationSession structure. diff --git a/internal/httpclient/client/admin/revoke_consent_sessions_responses.go b/internal/httpclient/client/admin/revoke_consent_sessions_responses.go index 326dee7b68d..c069851824b 100644 --- a/internal/httpclient/client/admin/revoke_consent_sessions_responses.go +++ b/internal/httpclient/client/admin/revoke_consent_sessions_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // RevokeConsentSessionsReader is a Reader for the RevokeConsentSessions structure. diff --git a/internal/httpclient/client/admin/update_json_web_key_parameters.go b/internal/httpclient/client/admin/update_json_web_key_parameters.go index 5b73e77edd6..1e6c950ac2b 100644 --- a/internal/httpclient/client/admin/update_json_web_key_parameters.go +++ b/internal/httpclient/client/admin/update_json_web_key_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewUpdateJSONWebKeyParams creates a new UpdateJSONWebKeyParams object diff --git a/internal/httpclient/client/admin/update_json_web_key_responses.go b/internal/httpclient/client/admin/update_json_web_key_responses.go index d1867d8c7d1..5fe2208af7a 100644 --- a/internal/httpclient/client/admin/update_json_web_key_responses.go +++ b/internal/httpclient/client/admin/update_json_web_key_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // UpdateJSONWebKeyReader is a Reader for the UpdateJSONWebKey structure. diff --git a/internal/httpclient/client/admin/update_json_web_key_set_parameters.go b/internal/httpclient/client/admin/update_json_web_key_set_parameters.go index 91d5d988b51..81a67efcefd 100644 --- a/internal/httpclient/client/admin/update_json_web_key_set_parameters.go +++ b/internal/httpclient/client/admin/update_json_web_key_set_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewUpdateJSONWebKeySetParams creates a new UpdateJSONWebKeySetParams object diff --git a/internal/httpclient/client/admin/update_json_web_key_set_responses.go b/internal/httpclient/client/admin/update_json_web_key_set_responses.go index 37abb9e7685..3725e18f8ea 100644 --- a/internal/httpclient/client/admin/update_json_web_key_set_responses.go +++ b/internal/httpclient/client/admin/update_json_web_key_set_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // UpdateJSONWebKeySetReader is a Reader for the UpdateJSONWebKeySet structure. diff --git a/internal/httpclient/client/admin/update_o_auth2_client_parameters.go b/internal/httpclient/client/admin/update_o_auth2_client_parameters.go index ac0df283222..de471152bfb 100644 --- a/internal/httpclient/client/admin/update_o_auth2_client_parameters.go +++ b/internal/httpclient/client/admin/update_o_auth2_client_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // NewUpdateOAuth2ClientParams creates a new UpdateOAuth2ClientParams object diff --git a/internal/httpclient/client/admin/update_o_auth2_client_responses.go b/internal/httpclient/client/admin/update_o_auth2_client_responses.go index d3b03f99a64..884d972b3fc 100644 --- a/internal/httpclient/client/admin/update_o_auth2_client_responses.go +++ b/internal/httpclient/client/admin/update_o_auth2_client_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // UpdateOAuth2ClientReader is a Reader for the UpdateOAuth2Client structure. diff --git a/internal/httpclient/client/ory_hydra_client.go b/internal/httpclient/client/ory_hydra_client.go index 40f17283f21..93e106fd5c6 100644 --- a/internal/httpclient/client/ory_hydra_client.go +++ b/internal/httpclient/client/ory_hydra_client.go @@ -6,10 +6,10 @@ package client // Editing this file might prove futile when you re-run the swagger generate command import ( - "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/runtime" + "github.com/go-openapi/strfmt" "github.com/ory/hydra/internal/httpclient/client/admin" "github.com/ory/hydra/internal/httpclient/client/public" @@ -57,11 +57,8 @@ func New(transport runtime.ClientTransport, formats strfmt.Registry) *OryHydra { cli := new(OryHydra) cli.Transport = transport - cli.Admin = admin.New(transport, formats) - cli.Public = public.New(transport, formats) - return cli } @@ -106,9 +103,9 @@ func (cfg *TransportConfig) WithSchemes(schemes []string) *TransportConfig { // OryHydra is a client for ory hydra type OryHydra struct { - Admin *admin.Client + Admin admin.ClientService - Public *public.Client + Public public.ClientService Transport runtime.ClientTransport } @@ -116,9 +113,6 @@ type OryHydra struct { // SetTransport changes the transport on the client and all its subresources func (c *OryHydra) SetTransport(transport runtime.ClientTransport) { c.Transport = transport - c.Admin.SetTransport(transport) - c.Public.SetTransport(transport) - } diff --git a/internal/httpclient/client/public/discover_open_id_configuration_responses.go b/internal/httpclient/client/public/discover_open_id_configuration_responses.go index a849e70ceb1..025386771e9 100644 --- a/internal/httpclient/client/public/discover_open_id_configuration_responses.go +++ b/internal/httpclient/client/public/discover_open_id_configuration_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // DiscoverOpenIDConfigurationReader is a Reader for the DiscoverOpenIDConfiguration structure. diff --git a/internal/httpclient/client/public/is_instance_ready_responses.go b/internal/httpclient/client/public/is_instance_ready_responses.go index 22d9c4e5796..79767cd841f 100644 --- a/internal/httpclient/client/public/is_instance_ready_responses.go +++ b/internal/httpclient/client/public/is_instance_ready_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // IsInstanceReadyReader is a Reader for the IsInstanceReady structure. diff --git a/internal/httpclient/client/public/oauth2_token_responses.go b/internal/httpclient/client/public/oauth2_token_responses.go index 380c90fd4af..36e16f5d24c 100644 --- a/internal/httpclient/client/public/oauth2_token_responses.go +++ b/internal/httpclient/client/public/oauth2_token_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // Oauth2TokenReader is a Reader for the Oauth2Token structure. diff --git a/internal/httpclient/client/public/oauth_auth_responses.go b/internal/httpclient/client/public/oauth_auth_responses.go index e89b76e7720..16f9b47fece 100644 --- a/internal/httpclient/client/public/oauth_auth_responses.go +++ b/internal/httpclient/client/public/oauth_auth_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // OauthAuthReader is a Reader for the OauthAuth structure. diff --git a/internal/httpclient/client/public/public_client.go b/internal/httpclient/client/public/public_client.go index 26bbae53373..83b631bd34e 100644 --- a/internal/httpclient/client/public/public_client.go +++ b/internal/httpclient/client/public/public_client.go @@ -9,12 +9,11 @@ import ( "fmt" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" ) // New creates a new public API client. -func New(transport runtime.ClientTransport, formats strfmt.Registry) *Client { +func New(transport runtime.ClientTransport, formats strfmt.Registry) ClientService { return &Client{transport: transport, formats: formats} } @@ -26,10 +25,31 @@ type Client struct { formats strfmt.Registry } +// ClientService is the interface for Client methods +type ClientService interface { + DisconnectUser(params *DisconnectUserParams) error + + DiscoverOpenIDConfiguration(params *DiscoverOpenIDConfigurationParams) (*DiscoverOpenIDConfigurationOK, error) + + IsInstanceReady(params *IsInstanceReadyParams) (*IsInstanceReadyOK, error) + + Oauth2Token(params *Oauth2TokenParams, authInfo runtime.ClientAuthInfoWriter) (*Oauth2TokenOK, error) + + OauthAuth(params *OauthAuthParams) error + + RevokeOAuth2Token(params *RevokeOAuth2TokenParams, authInfo runtime.ClientAuthInfoWriter) (*RevokeOAuth2TokenOK, error) + + Userinfo(params *UserinfoParams, authInfo runtime.ClientAuthInfoWriter) (*UserinfoOK, error) + + WellKnown(params *WellKnownParams) (*WellKnownOK, error) + + SetTransport(transport runtime.ClientTransport) +} + /* -DisconnectUser opens ID connect front backchannel enabled logout + DisconnectUser opens ID connect front backchannel enabled logout -This endpoint initiates and completes user logout at ORY Hydra and initiates OpenID Connect Front-/Back-channel logout: + This endpoint initiates and completes user logout at ORY Hydra and initiates OpenID Connect Front-/Back-channel logout: https://openid.net/specs/openid-connect-frontchannel-1_0.html https://openid.net/specs/openid-connect-backchannel-1_0.html @@ -59,9 +79,9 @@ func (a *Client) DisconnectUser(params *DisconnectUserParams) error { } /* -DiscoverOpenIDConfiguration opens ID connect discovery + DiscoverOpenIDConfiguration opens ID connect discovery -The well known endpoint an be used to retrieve information for OpenID Connect clients. We encourage you to not roll + The well known endpoint an be used to retrieve information for OpenID Connect clients. We encourage you to not roll your own OpenID Connect client but to use an OpenID Connect client library instead. You can learn more on this flow at https://openid.net/specs/openid-connect-discovery-1_0.html . @@ -100,9 +120,9 @@ func (a *Client) DiscoverOpenIDConfiguration(params *DiscoverOpenIDConfiguration } /* -IsInstanceReady checks readiness status + IsInstanceReady checks readiness status -This endpoint returns a 200 status code when the HTTP server is up running and the environment dependencies (e.g. + This endpoint returns a 200 status code when the HTTP server is up running and the environment dependencies (e.g. the database) are responsive as well. If the service supports TLS Edge Termination, this endpoint does not require the @@ -143,9 +163,9 @@ func (a *Client) IsInstanceReady(params *IsInstanceReadyParams) (*IsInstanceRead } /* -Oauth2Token thes o auth 2 0 token endpoint + Oauth2Token thes o auth 2 0 token endpoint -The client makes a request to the token endpoint by sending the + The client makes a request to the token endpoint by sending the following parameters using the "application/x-www-form-urlencoded" HTTP request entity-body. @@ -187,9 +207,9 @@ func (a *Client) Oauth2Token(params *Oauth2TokenParams, authInfo runtime.ClientA } /* -OauthAuth thes o auth 2 0 authorize endpoint + OauthAuth thes o auth 2 0 authorize endpoint -This endpoint is not documented here because you should never use your own implementation to perform OAuth2 flows. + This endpoint is not documented here because you should never use your own implementation to perform OAuth2 flows. OAuth2 is a very popular protocol and a library for your programming language will exists. To learn more about this flow please refer to the specification: https://tools.ietf.org/html/rfc6749 @@ -219,9 +239,9 @@ func (a *Client) OauthAuth(params *OauthAuthParams) error { } /* -RevokeOAuth2Token revokes o auth2 tokens + RevokeOAuth2Token revokes o auth2 tokens -Revoking a token (both access and refresh) means that the tokens will be invalid. A revoked access token can no + Revoking a token (both access and refresh) means that the tokens will be invalid. A revoked access token can no longer be used to make access requests, and a revoked refresh token can no longer be used to refresh an access token. Revoking a refresh token also invalidates the access token that was created with it. A token may only be revoked by the client the token was generated for. @@ -259,9 +279,9 @@ func (a *Client) RevokeOAuth2Token(params *RevokeOAuth2TokenParams, authInfo run } /* -Userinfo opens ID connect userinfo + Userinfo opens ID connect userinfo -This endpoint returns the payload of the ID Token, including the idTokenExtra values, of + This endpoint returns the payload of the ID Token, including the idTokenExtra values, of the provided OAuth 2.0 Access Token. For more information please [refer to the spec](http://openid.net/specs/openid-connect-core-1_0.html#UserInfo). @@ -299,9 +319,9 @@ func (a *Client) Userinfo(params *UserinfoParams, authInfo runtime.ClientAuthInf } /* -WellKnown JSONs web keys discovery + WellKnown JSONs web keys discovery -This endpoint returns JSON Web Keys to be used as public keys for verifying OpenID Connect ID Tokens and, + This endpoint returns JSON Web Keys to be used as public keys for verifying OpenID Connect ID Tokens and, if enabled, OAuth 2.0 JWT Access Tokens. This endpoint can be used with client libraries like [node-jwks-rsa](https://github.com/auth0/node-jwks-rsa) among others. */ diff --git a/internal/httpclient/client/public/revoke_o_auth2_token_responses.go b/internal/httpclient/client/public/revoke_o_auth2_token_responses.go index b3c99642171..1ded11ec8c1 100644 --- a/internal/httpclient/client/public/revoke_o_auth2_token_responses.go +++ b/internal/httpclient/client/public/revoke_o_auth2_token_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // RevokeOAuth2TokenReader is a Reader for the RevokeOAuth2Token structure. diff --git a/internal/httpclient/client/public/userinfo_responses.go b/internal/httpclient/client/public/userinfo_responses.go index 047ce591baa..7292b3367c8 100644 --- a/internal/httpclient/client/public/userinfo_responses.go +++ b/internal/httpclient/client/public/userinfo_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // UserinfoReader is a Reader for the Userinfo structure. diff --git a/internal/httpclient/client/public/well_known_responses.go b/internal/httpclient/client/public/well_known_responses.go index 5943d8c69aa..a0bcd410eb7 100644 --- a/internal/httpclient/client/public/well_known_responses.go +++ b/internal/httpclient/client/public/well_known_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/ory/hydra/internal/httpclient/models" + "github.com/ory/hydra/internal/httpclient/models" ) // WellKnownReader is a Reader for the WellKnown structure. diff --git a/internal/httpclient/models/accept_consent_request.go b/internal/httpclient/models/accept_consent_request.go index 7ce4b660a35..d0a997c4394 100644 --- a/internal/httpclient/models/accept_consent_request.go +++ b/internal/httpclient/models/accept_consent_request.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/accept_login_request.go b/internal/httpclient/models/accept_login_request.go index 278ad58b994..9067c81f995 100644 --- a/internal/httpclient/models/accept_login_request.go +++ b/internal/httpclient/models/accept_login_request.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) diff --git a/internal/httpclient/models/completed_request.go b/internal/httpclient/models/completed_request.go index 8f095b082e6..dfeb88e1ecd 100644 --- a/internal/httpclient/models/completed_request.go +++ b/internal/httpclient/models/completed_request.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/consent_request.go b/internal/httpclient/models/consent_request.go index d6e6a19282f..5a345e87019 100644 --- a/internal/httpclient/models/consent_request.go +++ b/internal/httpclient/models/consent_request.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/consent_request_session.go b/internal/httpclient/models/consent_request_session.go index c86a50a2655..4d2601d8b41 100644 --- a/internal/httpclient/models/consent_request_session.go +++ b/internal/httpclient/models/consent_request_session.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/flush_inactive_o_auth2_tokens_request.go b/internal/httpclient/models/flush_inactive_o_auth2_tokens_request.go index 7e696e44a00..6d1433c32ef 100644 --- a/internal/httpclient/models/flush_inactive_o_auth2_tokens_request.go +++ b/internal/httpclient/models/flush_inactive_o_auth2_tokens_request.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) diff --git a/internal/httpclient/models/generic_error.go b/internal/httpclient/models/generic_error.go index bc6cc4f0855..7355e4d4e52 100644 --- a/internal/httpclient/models/generic_error.go +++ b/internal/httpclient/models/generic_error.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) diff --git a/internal/httpclient/models/health_not_ready_status.go b/internal/httpclient/models/health_not_ready_status.go index 0de7b2c13a2..d10e6d25c60 100644 --- a/internal/httpclient/models/health_not_ready_status.go +++ b/internal/httpclient/models/health_not_ready_status.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/health_status.go b/internal/httpclient/models/health_status.go index 44bb2047eb3..517e8500ffd 100644 --- a/internal/httpclient/models/health_status.go +++ b/internal/httpclient/models/health_status.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/json_web_key.go b/internal/httpclient/models/json_web_key.go index 6fb59d0b4e6..83edf64fae5 100644 --- a/internal/httpclient/models/json_web_key.go +++ b/internal/httpclient/models/json_web_key.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) diff --git a/internal/httpclient/models/json_web_key_set.go b/internal/httpclient/models/json_web_key_set.go index f8bdf7f0794..febc099fcca 100644 --- a/internal/httpclient/models/json_web_key_set.go +++ b/internal/httpclient/models/json_web_key_set.go @@ -8,13 +8,12 @@ package models import ( "strconv" - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) -// JSONWebKeySet JSONWebKeySet represents a JWK Set object. +// JSONWebKeySet JSON web key set // swagger:model JSONWebKeySet type JSONWebKeySet struct { diff --git a/internal/httpclient/models/json_web_key_set_generator_request.go b/internal/httpclient/models/json_web_key_set_generator_request.go index 0b3a7deaaa3..a5fbc68ac1d 100644 --- a/internal/httpclient/models/json_web_key_set_generator_request.go +++ b/internal/httpclient/models/json_web_key_set_generator_request.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) diff --git a/internal/httpclient/models/login_request.go b/internal/httpclient/models/login_request.go index 1bebc69765a..f6747734392 100644 --- a/internal/httpclient/models/login_request.go +++ b/internal/httpclient/models/login_request.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/logout_request.go b/internal/httpclient/models/logout_request.go index 6df0c9b2bd6..8a529a94706 100644 --- a/internal/httpclient/models/logout_request.go +++ b/internal/httpclient/models/logout_request.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/o_auth2_client.go b/internal/httpclient/models/o_auth2_client.go index 4bb4cbab89e..f24af93c768 100644 --- a/internal/httpclient/models/o_auth2_client.go +++ b/internal/httpclient/models/o_auth2_client.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) diff --git a/internal/httpclient/models/o_auth2_token_introspection.go b/internal/httpclient/models/o_auth2_token_introspection.go index 265930fa322..e950fb34337 100644 --- a/internal/httpclient/models/o_auth2_token_introspection.go +++ b/internal/httpclient/models/o_auth2_token_introspection.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) diff --git a/internal/httpclient/models/oauth2_token_response.go b/internal/httpclient/models/oauth2_token_response.go index 6672f775a7e..e5f8f407eff 100644 --- a/internal/httpclient/models/oauth2_token_response.go +++ b/internal/httpclient/models/oauth2_token_response.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/open_id_connect_context.go b/internal/httpclient/models/open_id_connect_context.go index 16fd4cef1cc..ccb34b4aa33 100644 --- a/internal/httpclient/models/open_id_connect_context.go +++ b/internal/httpclient/models/open_id_connect_context.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/previous_consent_session.go b/internal/httpclient/models/previous_consent_session.go index ad53ec97da4..cf5d7dbba4e 100644 --- a/internal/httpclient/models/previous_consent_session.go +++ b/internal/httpclient/models/previous_consent_session.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/reject_request.go b/internal/httpclient/models/reject_request.go index e831d2a5157..63c163e0480 100644 --- a/internal/httpclient/models/reject_request.go +++ b/internal/httpclient/models/reject_request.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/userinfo_response.go b/internal/httpclient/models/userinfo_response.go index 04b067d0429..4954faec28b 100644 --- a/internal/httpclient/models/userinfo_response.go +++ b/internal/httpclient/models/userinfo_response.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/uuid.go b/internal/httpclient/models/uuid.go new file mode 100644 index 00000000000..f5b247624d0 --- /dev/null +++ b/internal/httpclient/models/uuid.go @@ -0,0 +1,30 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package models + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/validate" +) + +// UUID UUID +// swagger:model UUID +type UUID strfmt.UUID4 + +// Validate validates this UUID +func (m UUID) Validate(formats strfmt.Registry) error { + var res []error + + if err := validate.FormatOf("", "body", "uuid4", strfmt.UUID4(m).String(), formats); err != nil { + return err + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} diff --git a/internal/httpclient/models/version.go b/internal/httpclient/models/version.go index 8331ddbdfa5..748ab7974b1 100644 --- a/internal/httpclient/models/version.go +++ b/internal/httpclient/models/version.go @@ -7,7 +7,6 @@ package models import ( strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) diff --git a/internal/httpclient/models/well_known.go b/internal/httpclient/models/well_known.go index 2eb68ebb8e7..e6b245cc91b 100644 --- a/internal/httpclient/models/well_known.go +++ b/internal/httpclient/models/well_known.go @@ -6,9 +6,8 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" - "github.com/go-openapi/errors" + strfmt "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" )