diff --git a/.schema/api.swagger.json b/.schema/api.swagger.json index 74669a7136b..638ca364a20 100755 --- a/.schema/api.swagger.json +++ b/.schema/api.swagger.json @@ -1828,13 +1828,13 @@ "title": "JSONRawMessage represents a json.RawMessage that works well with JSON, SQL, and Swagger." }, "JSONWebKey": { - "description": "JSONWebKey It is important that this model object is named JSONWebKey for\n\"swagger generate spec\" to generate only on definition of a\nJSONWebKey.", + "description": "It is important that this model object is named JSONWebKey for\n\"swagger generate spec\" to generate only on definition of a\nJSONWebKey.", "type": "object", "required": [ - "use", - "kty", + "alg", "kid", - "alg" + "kty", + "use" ], "properties": { "alg": { @@ -1843,32 +1843,26 @@ "example": "RS256" }, "crv": { - "description": "crv", "type": "string", "example": "P-256" }, "d": { - "description": "d", "type": "string", "example": "T_N8I-6He3M8a7X1vWt6TGIx4xB_GP3Mb4SsZSA4v-orvJzzRiQhLlRR81naWYxfQAYt5isDI6_C2L9bdWo4FFPjGQFvNoRX-_sBJyBI_rl-TBgsZYoUlAj3J92WmY2inbA-PwyJfsaIIDceYBC-eX-xiCu6qMqkZi3MwQAFL6bMdPEM0z4JBcwFT3VdiWAIRUuACWQwrXMq672x7fMuaIaHi7XDGgt1ith23CLfaREmJku9PQcchbt_uEY-hqrFY6ntTtS4paWWQj86xLL94S-Tf6v6xkL918PfLSOTq6XCzxvlFwzBJqApnAhbwqLjpPhgUG04EDRrqrSBc5Y1BLevn6Ip5h1AhessBp3wLkQgz_roeckt-ybvzKTjESMuagnpqLvOT7Y9veIug2MwPJZI2VjczRc1vzMs25XrFQ8DpUy-bNdp89TmvAXwctUMiJdgHloJw23Cv03gIUAkDnsTqZmkpbIf-crpgNKFmQP_EDKoe8p_PXZZgfbRri3NoEVGP7Mk6yEu8LjJhClhZaBNjuWw2-KlBfOA3g79mhfBnkInee5KO9mGR50qPk1V-MorUYNTFMZIm0kFE6eYVWFBwJHLKYhHU34DoiK1VP-svZpC2uAMFNA_UJEwM9CQ2b8qe4-5e9aywMvwcuArRkAB5mBIfOaOJao3mfukKAE" }, "dp": { - "description": "dp", "type": "string", "example": "G4sPXkc6Ya9y8oJW9_ILj4xuppu0lzi_H7VTkS8xj5SdX3coE0oimYwxIi2emTAue0UOa5dpgFGyBJ4c8tQ2VF402XRugKDTP8akYhFo5tAA77Qe_NmtuYZc3C3m3I24G2GvR5sSDxUyAN2zq8Lfn9EUms6rY3Ob8YeiKkTiBj0" }, "dq": { - "description": "dq", "type": "string", "example": "s9lAH9fggBsoFR8Oac2R_E2gw282rT2kGOAhvIllETE1efrA6huUUvMfBcMpn8lqeW6vzznYY5SSQF7pMdC_agI3nG8Ibp1BUb0JUiraRNqUfLhcQb_d9GF4Dh7e74WbRsobRonujTYN1xCaP6TO61jvWrX-L18txXw494Q_cgk" }, "e": { - "description": "e", "type": "string", "example": "AQAB" }, "k": { - "description": "k", "type": "string", "example": "GawgguFyGrWKav7AX4VKUg" }, @@ -1883,22 +1877,18 @@ "example": "RSA" }, "n": { - "description": "n", "type": "string", "example": "vTqrxUyQPl_20aqf5kXHwDZrel-KovIp8s7ewJod2EXHl8tWlRB3_Rem34KwBfqlKQGp1nqah-51H4Jzruqe0cFP58hPEIt6WqrvnmJCXxnNuIB53iX_uUUXXHDHBeaPCSRoNJzNysjoJ30TIUsKBiirhBa7f235PXbKiHducLevV6PcKxJ5cY8zO286qJLBWSPm-OIevwqsIsSIH44Qtm9sioFikhkbLwoqwWORGAY0nl6XvVOlhADdLjBSqSAeT1FPuCDCnXwzCDR8N9IFB_IjdStFkC-rVt2K5BYfPd0c3yFp_vHR15eRd0zJ8XQ7woBC8Vnsac6Et1pKS59pX6256DPWu8UDdEOolKAPgcd_g2NpA76cAaF_jcT80j9KrEzw8Tv0nJBGesuCjPNjGs_KzdkWTUXt23Hn9QJsdc1MZuaW0iqXBepHYfYoqNelzVte117t4BwVp0kUM6we0IqyXClaZgOI8S-WDBw2_Ovdm8e5NmhYAblEVoygcX8Y46oH6bKiaCQfKCFDMcRgChme7AoE1yZZYsPbaG_3IjPrC4LBMHQw8rM9dWjJ8ImjicvZ1pAm0dx-KHCP3y5PVKrxBDf1zSOsBRkOSjB8TPODnJMz6-jd5hTtZxpZPwPoIdCanTZ3ZD6uRBpTmDwtpRGm63UQs1m5FWPwb0T2IF0" }, "p": { - "description": "p", "type": "string", "example": "6NbkXwDWUhi-eR55Cgbf27FkQDDWIamOaDr0rj1q0f1fFEz1W5A_09YvG09Fiv1AO2-D8Rl8gS1Vkz2i0zCSqnyy8A025XOcRviOMK7nIxE4OH_PEsko8dtIrb3TmE2hUXvCkmzw9EsTF1LQBOGC6iusLTXepIC1x9ukCKFZQvdgtEObQ5kzd9Nhq-cdqmSeMVLoxPLd1blviVT9Vm8-y12CtYpeJHOaIDtVPLlBhJiBoPKWg3vxSm4XxIliNOefqegIlsmTIa3MpS6WWlCK3yHhat0Q-rRxDxdyiVdG_wzJvp0Iw_2wms7pe-PgNPYvUWH9JphWP5K38YqEBiJFXQ" }, "q": { - "description": "q", "type": "string", "example": "0A1FmpOWR91_RAWpqreWSavNaZb9nXeKiBo0DQGBz32DbqKqQ8S4aBJmbRhJcctjCLjain-ivut477tAUMmzJwVJDDq2MZFwC9Q-4VYZmFU4HJityQuSzHYe64RjN-E_NQ02TWhG3QGW6roq6c57c99rrUsETwJJiwS8M5p15Miuz53DaOjv-uqqFAFfywN5WkxHbraBcjHtMiQuyQbQqkCFh-oanHkwYNeytsNhTu2mQmwR5DR2roZ2nPiFjC6nsdk-A7E3S3wMzYYFw7jvbWWoYWo9vB40_MY2Y0FYQSqcDzcBIcq_0tnnasf3VW4Fdx6m80RzOb2Fsnln7vKXAQ" }, "qi": { - "description": "qi", "type": "string", "example": "GyM_p6JrXySiz1toFgKbWV-JdI3jQ4ypu9rbMWx3rQJBfmt0FoYzgUIZEVFEcOqwemRN81zoDAaa-Bk0KWNGDjJHZDdDmFhW3AN7lI-puxk_mHZGJ11rxyR8O55XLSe3SPmRfKwZI6yU24ZxvQKFYItdldUKGzO6Ia6zTKhAVRU" }, @@ -1908,7 +1898,6 @@ "example": "sig" }, "x": { - "description": "x", "type": "string", "example": "f83OJ3D2xF1Bg8vub9tLe1gHMzV76e8Tus9uPHvRVEU" }, @@ -1920,14 +1909,13 @@ } }, "y": { - "description": "y", "type": "string", "example": "x_FEzRu9m36HLN_tue659LNpXW6pCyStikYjKIWI5a0" } } }, "JSONWebKeySet": { - "description": "JSONWebKeySet It is important that this model object is named JSONWebKeySet for\n\"swagger generate spec\" to generate only on definition of a\nJSONWebKeySet. Since one with the same name is previously defined as\nclient.Client.JSONWebKeys and this one is last, this one will be\neffectively written in the swagger spec.", + "description": "It is important that this model object is named JSONWebKeySet for\n\"swagger generate spec\" to generate only on definition of a\nJSONWebKeySet. Since one with the same name is previously defined as\nclient.Client.JSONWebKeys and this one is last, this one will be\neffectively written in the swagger spec.", "type": "object", "properties": { "keys": { @@ -1949,7 +1937,7 @@ }, "PluginConfig": { "type": "object", - "title": "PluginConfig PluginConfig PluginConfig PluginConfig The config of a plugin.", + "title": "PluginConfig The config of a plugin.", "required": [ "Args", "Description", @@ -2036,7 +2024,7 @@ } }, "PluginConfigArgs": { - "description": "PluginConfigArgs PluginConfigArgs plugin config args", + "description": "PluginConfigArgs plugin config args", "type": "object", "required": [ "Description", @@ -2091,7 +2079,7 @@ } }, "PluginConfigLinux": { - "description": "PluginConfigLinux PluginConfigLinux plugin config linux", + "description": "PluginConfigLinux plugin config linux", "type": "object", "required": [ "AllowAllDevices", @@ -2120,7 +2108,7 @@ } }, "PluginConfigNetwork": { - "description": "PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork plugin config network", + "description": "PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork plugin config network", "type": "object", "required": [ "Type" @@ -2150,7 +2138,7 @@ } }, "PluginConfigUser": { - "description": "PluginConfigUser PluginConfigUser plugin config user", + "description": "PluginConfigUser plugin config user", "type": "object", "properties": { "GID": { @@ -2197,7 +2185,7 @@ } }, "PluginEnv": { - "description": "PluginEnv plugin env", + "description": "PluginEnv PluginEnv plugin env", "type": "object", "required": [ "Description", @@ -2228,7 +2216,7 @@ } }, "PluginInterfaceType": { - "description": "PluginInterfaceType PluginInterfaceType plugin interface type", + "description": "PluginInterfaceType plugin interface type", "type": "object", "required": [ "Capability", @@ -2301,7 +2289,7 @@ }, "PluginSettings": { "type": "object", - "title": "PluginSettings PluginSettings Settings that can be modified by users.", + "title": "PluginSettings PluginSettings PluginSettings Settings that can be modified by users.", "required": [ "Args", "Devices", @@ -2340,7 +2328,7 @@ } }, "PreviousConsentSession": { - "description": "PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession The response used to return used consent requests\nsame as HandledLoginRequest, just with consent_request exposed as json", + "description": "PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession The response used to return used consent requests\nsame as HandledLoginRequest, just with consent_request exposed as json", "type": "object", "properties": { "consent_request": { @@ -2361,7 +2349,7 @@ } }, "handled_at": { - "description": "handled at\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time", + "description": "handled at\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time\nFormat: date-time", "type": "string", "format": "date-time" }, @@ -2387,7 +2375,7 @@ } }, "VolumeUsageData": { - "description": "VolumeUsageData Usage details about the volume. This information is used by the\n`GET /system/df` endpoint, and omitted in other endpoints.", + "description": "VolumeUsageData VolumeUsageData Usage details about the volume. This information is used by the\n`GET /system/df` endpoint, and omitted in other endpoints.", "type": "object", "required": [ "RefCount", @@ -2408,7 +2396,7 @@ }, "acceptConsentRequest": { "type": "object", - "title": "AcceptConsentRequest AcceptConsentRequest AcceptConsentRequest The request payload used to accept a consent request.", + "title": "AcceptConsentRequest AcceptConsentRequest AcceptConsentRequest AcceptConsentRequest The request payload used to accept a consent request.", "properties": { "grant_access_token_audience": { "type": "array", @@ -2443,7 +2431,7 @@ }, "acceptLoginRequest": { "type": "object", - "title": "HandledLoginRequest is the request payload used to accept a login request.", + "title": "AcceptLoginRequest HandledLoginRequest is the request payload used to accept a login request.", "required": [ "subject" ], @@ -2476,7 +2464,7 @@ }, "completedRequest": { "type": "object", - "title": "CompletedRequest The response payload sent when accepting or rejecting a login or consent request.", + "title": "CompletedRequest CompletedRequest The response payload sent when accepting or rejecting a login or consent request.", "properties": { "redirect_to": { "description": "RedirectURL is the URL which you should redirect the user to once the authentication process is completed.", @@ -2486,7 +2474,7 @@ }, "consentRequest": { "type": "object", - "title": "ConsentRequest Contains information on an ongoing consent request.", + "title": "ConsentRequest ConsentRequest Contains information on an ongoing consent request.", "properties": { "acr": { "description": "ACR represents the Authentication AuthorizationContext Class Reference value for this authentication session. You can use it\nto express that, for example, a user authenticated using two factor authentication.", @@ -2543,7 +2531,7 @@ }, "consentRequestSession": { "type": "object", - "title": "Used to pass session data to a consent request.", + "title": "ConsentRequestSession Used to pass session data to a consent request.", "properties": { "access_token": { "description": "AccessToken sets session data for the access and refresh token, as well as any future tokens issued by the\nrefresh grant. Keep in mind that this data will be available to anyone performing OAuth 2.0 Challenge Introspection.\nIf only your services can perform OAuth 2.0 Challenge Introspection, this is usually fine. But if third parties\ncan access that endpoint as well, sensitive data from the session might be exposed to them. Use with care!", @@ -2562,10 +2550,11 @@ } }, "flushInactiveOAuth2TokensRequest": { + "description": "FlushInactiveOAuth2TokensRequest flush inactive o auth2 tokens request", "type": "object", "properties": { "notAfter": { - "description": "NotAfter sets after which point tokens should not be flushed. This is useful when you want to keep a history\nof recently issued tokens for auditing.", + "description": "NotAfter sets after which point tokens should not be flushed. This is useful when you want to keep a history\nof recently issued tokens for auditing.\nFormat: date-time", "type": "string", "format": "date-time" } @@ -2574,7 +2563,7 @@ "genericError": { "description": "Error responses are sent when an error (e.g. unauthorized, bad request, ...) occurred.", "type": "object", - "title": "Error response", + "title": "GenericError Error response", "required": [ "error" ], @@ -2603,6 +2592,7 @@ } }, "healthNotReadyStatus": { + "description": "HealthNotReadyStatus health not ready status", "type": "object", "properties": { "errors": { @@ -2615,7 +2605,7 @@ } }, "healthStatus": { - "description": "HealthStatus HealthStatus health status", + "description": "HealthStatus HealthStatus HealthStatus health status", "type": "object", "properties": { "status": { @@ -2625,12 +2615,11 @@ } }, "jsonWebKeySetGeneratorRequest": { - "description": "JSONWebKeySetGeneratorRequest json web key set generator request", "type": "object", "required": [ "alg", - "use", - "kid" + "kid", + "use" ], "properties": { "alg": { @@ -2649,7 +2638,7 @@ }, "loginRequest": { "type": "object", - "title": "LoginRequest LoginRequest LoginRequest LoginRequest LoginRequest Contains information on an ongoing login request.", + "title": "LoginRequest LoginRequest LoginRequest LoginRequest LoginRequest LoginRequest Contains information on an ongoing login request.", "properties": { "challenge": { "description": "Challenge is the identifier (\"login challenge\") of the login request. It is used to\nidentify the session.", @@ -2695,7 +2684,7 @@ }, "logoutRequest": { "type": "object", - "title": "LogoutRequest LogoutRequest LogoutRequest Contains information about an ongoing logout request.", + "title": "Contains information about an ongoing logout request.", "properties": { "request_url": { "description": "RequestURL is the original Logout URL requested.", @@ -2846,7 +2835,7 @@ "oAuth2TokenIntrospection": { "description": "https://tools.ietf.org/html/rfc7662", "type": "object", - "title": "Introspection contains an access token's session data as specified by IETF RFC 7662, see:", + "title": "OAuth2TokenIntrospection Introspection contains an access token's session data as specified by IETF RFC 7662, see:", "required": [ "active" ], @@ -2915,7 +2904,7 @@ } }, "oauth2TokenResponse": { - "description": "Oauth2TokenResponse Oauth2TokenResponse Oauth2TokenResponse The Access Token Response", + "description": "Oauth2TokenResponse Oauth2TokenResponse Oauth2TokenResponse Oauth2TokenResponse The Access Token Response", "type": "object", "properties": { "access_token": { @@ -2947,7 +2936,7 @@ }, "openIDConnectContext": { "type": "object", - "title": "OpenIDConnectContext Contains optional information about the OpenID Connect request.", + "title": "Contains optional information about the OpenID Connect request.", "properties": { "acr_values": { "description": "ACRValues is the Authentication AuthorizationContext Class Reference requested in the OAuth 2.0 Authorization request.\nIt is a parameter defined by OpenID Connect and expresses which level of authentication (e.g. 2FA) is required.\n\nOpenID Connect defines it as follows:\n\u003e Requested Authentication AuthorizationContext Class Reference values. Space-separated string that specifies the acr values\nthat the Authorization Server is being requested to use for processing this Authentication Request, with the\nvalues appearing in order of preference. The Authentication AuthorizationContext Class satisfied by the authentication\nperformed is returned as the acr Claim Value, as specified in Section 2. The acr Claim is requested as a\nVoluntary Claim by this parameter.", @@ -2982,7 +2971,7 @@ }, "rejectRequest": { "type": "object", - "title": "RejectRequest RejectRequest RejectRequest The request payload used to accept a login or consent request.", + "title": "The request payload used to accept a login or consent request.", "properties": { "error": { "description": "error", @@ -3008,7 +2997,7 @@ } }, "userinfoResponse": { - "description": "The userinfo response", + "description": "UserinfoResponse The userinfo response", "type": "object", "properties": { "birthdate": { @@ -3091,7 +3080,7 @@ } }, "version": { - "description": "Version version", + "description": "Version Version version", "type": "object", "properties": { "version": { @@ -3103,7 +3092,7 @@ "wellKnown": { "description": "It includes links to several endpoints (e.g. /oauth2/token) and exposes information on supported signature algorithms\namong others.", "type": "object", - "title": "WellKnown WellKnown WellKnown represents important OpenID Connect discovery metadata", + "title": "WellKnown WellKnown WellKnown WellKnown represents important OpenID Connect discovery metadata", "required": [ "issuer", "authorization_endpoint", diff --git a/cmd/cli/handler_migrate.go b/cmd/cli/handler_migrate.go index e40cf51b0d9..bc98876b03f 100644 --- a/cmd/cli/handler_migrate.go +++ b/cmd/cli/handler_migrate.go @@ -1,11 +1,9 @@ package cli import ( - "bufio" "context" "fmt" "os" - "strings" "github.com/ory/x/cmdx" @@ -82,7 +80,7 @@ func (h *MigrateHandler) MigrateSQL(cmd *cobra.Command, args []string) { if !flagx.MustGetBool(cmd, "yes") { fmt.Println("") fmt.Println("To skip the next question use flag --yes (at your own risk).") - if !askForConfirmation("Do you wish to execute this migration plan?") { + if !cmdx.AskForConfirmation("Do you wish to execute this migration plan?", nil, nil) { fmt.Println("Migration aborted.") return } @@ -95,21 +93,3 @@ func (h *MigrateHandler) MigrateSQL(cmd *cobra.Command, args []string) { fmt.Println("Successfully applied migrations!") } - -func askForConfirmation(s string) bool { - reader := bufio.NewReader(os.Stdin) - - for { - fmt.Printf("%s [y/n]: ", s) - - response, err := reader.ReadString('\n') - cmdx.Must(err, "%s", err) - - response = strings.ToLower(strings.TrimSpace(response)) - if response == "y" || response == "yes" { - return true - } else if response == "n" || response == "no" { - return false - } - } -} diff --git a/go.mod b/go.mod index 7fbacd15a4c..d05dfe760c6 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/ory/herodot v0.7.0 github.com/ory/sdk/swagutil v0.0.0-20200430101046-db494fac5eb6 github.com/ory/viper v1.7.4 - github.com/ory/x v0.0.116 + github.com/ory/x v0.0.119 github.com/pborman/uuid v1.2.0 github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 020346c53f6..b1154935912 100644 --- a/go.sum +++ b/go.sum @@ -909,8 +909,8 @@ github.com/ory/x v0.0.85/go.mod h1:s44V8t3xyjWZREcU+mWlp4h302rTuM4aLXcW+y5FbQ8= github.com/ory/x v0.0.88/go.mod h1:wrnJRjIfYXFY/AUiuUlcIUpLBDxFtWc+8x6toAeLZXU= github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g= github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= -github.com/ory/x v0.0.116 h1:gq47UBzFe9l8n4CToLFMAkjNwqTR+oq1JZYxhA0T5dM= -github.com/ory/x v0.0.116/go.mod h1:ImFneVZHXPCeI1EYXLzRylIkOUMQnWT9Xwuasd8QHxw= +github.com/ory/x v0.0.119 h1:XJiUkZt416m0e15Zx81MfM5S31BK+HCZLn9vhXFfj5g= +github.com/ory/x v0.0.119/go.mod h1:ImFneVZHXPCeI1EYXLzRylIkOUMQnWT9Xwuasd8QHxw= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= diff --git a/internal/httpclient/models/accept_consent_request.go b/internal/httpclient/models/accept_consent_request.go index 690396d467b..7b9d703a801 100644 --- a/internal/httpclient/models/accept_consent_request.go +++ b/internal/httpclient/models/accept_consent_request.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// AcceptConsentRequest AcceptConsentRequest AcceptConsentRequest AcceptConsentRequest The request payload used to accept a consent request. +// AcceptConsentRequest AcceptConsentRequest AcceptConsentRequest AcceptConsentRequest AcceptConsentRequest The request payload used to accept a consent request. // // swagger:model acceptConsentRequest type AcceptConsentRequest struct { diff --git a/internal/httpclient/models/accept_login_request.go b/internal/httpclient/models/accept_login_request.go index 4eae3c7ccc3..e353110d1f5 100644 --- a/internal/httpclient/models/accept_login_request.go +++ b/internal/httpclient/models/accept_login_request.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// AcceptLoginRequest HandledLoginRequest is the request payload used to accept a login request. +// AcceptLoginRequest AcceptLoginRequest HandledLoginRequest is the request payload used to accept a login request. // // swagger:model acceptLoginRequest type AcceptLoginRequest struct { diff --git a/internal/httpclient/models/completed_request.go b/internal/httpclient/models/completed_request.go index f6339e9b93a..b7e059946f0 100644 --- a/internal/httpclient/models/completed_request.go +++ b/internal/httpclient/models/completed_request.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// CompletedRequest CompletedRequest The response payload sent when accepting or rejecting a login or consent request. +// CompletedRequest CompletedRequest CompletedRequest The response payload sent when accepting or rejecting a login or consent request. // // swagger:model completedRequest type CompletedRequest struct { diff --git a/internal/httpclient/models/consent_request.go b/internal/httpclient/models/consent_request.go index ebb49e57ef3..9735f52f9a0 100644 --- a/internal/httpclient/models/consent_request.go +++ b/internal/httpclient/models/consent_request.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// ConsentRequest ConsentRequest Contains information on an ongoing consent request. +// ConsentRequest ConsentRequest ConsentRequest Contains information on an ongoing consent request. // // swagger:model consentRequest type ConsentRequest struct { diff --git a/internal/httpclient/models/consent_request_session.go b/internal/httpclient/models/consent_request_session.go index 4a7ada6ce52..c6911966579 100644 --- a/internal/httpclient/models/consent_request_session.go +++ b/internal/httpclient/models/consent_request_session.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// ConsentRequestSession Used to pass session data to a consent request. +// ConsentRequestSession ConsentRequestSession Used to pass session data to a consent request. // // swagger:model consentRequestSession type ConsentRequestSession struct { 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 6bd161403a9..c33b44a9e61 100644 --- a/internal/httpclient/models/flush_inactive_o_auth2_tokens_request.go +++ b/internal/httpclient/models/flush_inactive_o_auth2_tokens_request.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// FlushInactiveOAuth2TokensRequest flush inactive o auth2 tokens request +// FlushInactiveOAuth2TokensRequest FlushInactiveOAuth2TokensRequest flush inactive o auth2 tokens request // // swagger:model flushInactiveOAuth2TokensRequest type FlushInactiveOAuth2TokensRequest struct { @@ -20,6 +20,7 @@ type FlushInactiveOAuth2TokensRequest struct { // NotAfter sets after which point tokens should not be flushed. This is useful when you want to keep a history // of recently issued tokens for auditing. // Format: date-time + // Format: date-time NotAfter strfmt.DateTime `json:"notAfter,omitempty"` } diff --git a/internal/httpclient/models/generic_error.go b/internal/httpclient/models/generic_error.go index 59282884ae2..c3499c0a4bd 100644 --- a/internal/httpclient/models/generic_error.go +++ b/internal/httpclient/models/generic_error.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// GenericError Error response +// GenericError GenericError Error response // // Error responses are sent when an error (e.g. unauthorized, bad request, ...) occurred. // diff --git a/internal/httpclient/models/health_not_ready_status.go b/internal/httpclient/models/health_not_ready_status.go index 64626783ed4..4e697f273c4 100644 --- a/internal/httpclient/models/health_not_ready_status.go +++ b/internal/httpclient/models/health_not_ready_status.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// HealthNotReadyStatus health not ready status +// HealthNotReadyStatus HealthNotReadyStatus health not ready status // // swagger:model healthNotReadyStatus type HealthNotReadyStatus struct { diff --git a/internal/httpclient/models/health_status.go b/internal/httpclient/models/health_status.go index 1387f0223d0..bf4db5d820f 100644 --- a/internal/httpclient/models/health_status.go +++ b/internal/httpclient/models/health_status.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// HealthStatus HealthStatus HealthStatus health status +// HealthStatus HealthStatus HealthStatus HealthStatus health status // // swagger:model healthStatus type HealthStatus struct { diff --git a/internal/httpclient/models/json_web_key.go b/internal/httpclient/models/json_web_key.go index c40b04cb285..737cde8d02d 100644 --- a/internal/httpclient/models/json_web_key.go +++ b/internal/httpclient/models/json_web_key.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// JSONWebKey JSONWebKey It is important that this model object is named JSONWebKey for +// JSONWebKey It is important that this model object is named JSONWebKey for // "swagger generate spec" to generate only on definition of a // JSONWebKey. // diff --git a/internal/httpclient/models/json_web_key_set.go b/internal/httpclient/models/json_web_key_set.go index 87dfb0b251d..87649fa82c9 100644 --- a/internal/httpclient/models/json_web_key_set.go +++ b/internal/httpclient/models/json_web_key_set.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/swag" ) -// JSONWebKeySet JSONWebKeySet It is important that this model object is named JSONWebKeySet for +// JSONWebKeySet It is important that this model object is named JSONWebKeySet for // "swagger generate spec" to generate only on definition of a // JSONWebKeySet. Since one with the same name is previously defined as // client.Client.JSONWebKeys and this one is last, this one will be 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 6c9c8b7e907..37144b9e72b 100644 --- a/internal/httpclient/models/json_web_key_set_generator_request.go +++ b/internal/httpclient/models/json_web_key_set_generator_request.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// JSONWebKeySetGeneratorRequest JSONWebKeySetGeneratorRequest json web key set generator request +// JSONWebKeySetGeneratorRequest json web key set generator request // // swagger:model jsonWebKeySetGeneratorRequest type JSONWebKeySetGeneratorRequest struct { diff --git a/internal/httpclient/models/login_request.go b/internal/httpclient/models/login_request.go index bceb62a2644..18d635694dd 100644 --- a/internal/httpclient/models/login_request.go +++ b/internal/httpclient/models/login_request.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/swag" ) -// LoginRequest LoginRequest LoginRequest LoginRequest LoginRequest LoginRequest Contains information on an ongoing login request. +// LoginRequest LoginRequest LoginRequest LoginRequest LoginRequest LoginRequest LoginRequest Contains information on an ongoing login request. // // swagger:model loginRequest type LoginRequest struct { diff --git a/internal/httpclient/models/logout_request.go b/internal/httpclient/models/logout_request.go index db49ab51cdc..13c8550e98f 100644 --- a/internal/httpclient/models/logout_request.go +++ b/internal/httpclient/models/logout_request.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// LogoutRequest LogoutRequest LogoutRequest LogoutRequest Contains information about an ongoing logout request. +// LogoutRequest Contains information about an ongoing logout request. // // swagger:model logoutRequest type LogoutRequest struct { diff --git a/internal/httpclient/models/o_auth2_token_introspection.go b/internal/httpclient/models/o_auth2_token_introspection.go index c2667fba65c..7b239019822 100644 --- a/internal/httpclient/models/o_auth2_token_introspection.go +++ b/internal/httpclient/models/o_auth2_token_introspection.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// OAuth2TokenIntrospection Introspection contains an access token's session data as specified by IETF RFC 7662, see: +// OAuth2TokenIntrospection OAuth2TokenIntrospection Introspection contains an access token's session data as specified by IETF RFC 7662, see: // // https://tools.ietf.org/html/rfc7662 // diff --git a/internal/httpclient/models/oauth2_token_response.go b/internal/httpclient/models/oauth2_token_response.go index 0289635b086..47b0806ed18 100644 --- a/internal/httpclient/models/oauth2_token_response.go +++ b/internal/httpclient/models/oauth2_token_response.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// Oauth2TokenResponse Oauth2TokenResponse Oauth2TokenResponse Oauth2TokenResponse The Access Token Response +// Oauth2TokenResponse Oauth2TokenResponse Oauth2TokenResponse Oauth2TokenResponse Oauth2TokenResponse The Access Token Response // // swagger:model oauth2TokenResponse type Oauth2TokenResponse struct { diff --git a/internal/httpclient/models/open_id_connect_context.go b/internal/httpclient/models/open_id_connect_context.go index 8282af5ddc1..aa4aa9c6c8b 100644 --- a/internal/httpclient/models/open_id_connect_context.go +++ b/internal/httpclient/models/open_id_connect_context.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// OpenIDConnectContext OpenIDConnectContext Contains optional information about the OpenID Connect request. +// OpenIDConnectContext Contains optional information about the OpenID Connect request. // // swagger:model openIDConnectContext type OpenIDConnectContext struct { diff --git a/internal/httpclient/models/plugin_config.go b/internal/httpclient/models/plugin_config.go index 8b8ed013a31..caaeea8e7d6 100644 --- a/internal/httpclient/models/plugin_config.go +++ b/internal/httpclient/models/plugin_config.go @@ -14,7 +14,7 @@ import ( "github.com/go-openapi/validate" ) -// PluginConfig PluginConfig PluginConfig PluginConfig PluginConfig The config of a plugin. +// PluginConfig PluginConfig The config of a plugin. // // swagger:model PluginConfig type PluginConfig struct { diff --git a/internal/httpclient/models/plugin_config_args.go b/internal/httpclient/models/plugin_config_args.go index bdf3db18014..053450e0ae9 100644 --- a/internal/httpclient/models/plugin_config_args.go +++ b/internal/httpclient/models/plugin_config_args.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// PluginConfigArgs PluginConfigArgs PluginConfigArgs plugin config args +// PluginConfigArgs PluginConfigArgs plugin config args // // swagger:model PluginConfigArgs type PluginConfigArgs struct { diff --git a/internal/httpclient/models/plugin_config_linux_swagger.go b/internal/httpclient/models/plugin_config_linux_swagger.go index 0278a276593..5671eb4d28a 100644 --- a/internal/httpclient/models/plugin_config_linux_swagger.go +++ b/internal/httpclient/models/plugin_config_linux_swagger.go @@ -14,7 +14,7 @@ import ( "github.com/go-openapi/validate" ) -// PluginConfigLinux PluginConfigLinux PluginConfigLinux plugin config linux +// PluginConfigLinux PluginConfigLinux plugin config linux // // swagger:model PluginConfigLinux type PluginConfigLinux struct { diff --git a/internal/httpclient/models/plugin_config_network.go b/internal/httpclient/models/plugin_config_network.go index de35fcb58ba..73e5304e9d6 100644 --- a/internal/httpclient/models/plugin_config_network.go +++ b/internal/httpclient/models/plugin_config_network.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork plugin config network +// PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork PluginConfigNetwork plugin config network // // swagger:model PluginConfigNetwork type PluginConfigNetwork struct { diff --git a/internal/httpclient/models/plugin_config_user.go b/internal/httpclient/models/plugin_config_user.go index c7cf4f9f7bc..73574d68ff6 100644 --- a/internal/httpclient/models/plugin_config_user.go +++ b/internal/httpclient/models/plugin_config_user.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// PluginConfigUser PluginConfigUser PluginConfigUser plugin config user +// PluginConfigUser PluginConfigUser plugin config user // // swagger:model PluginConfigUser type PluginConfigUser struct { diff --git a/internal/httpclient/models/plugin_env.go b/internal/httpclient/models/plugin_env.go index 6ed6644db68..9cc364d13c0 100644 --- a/internal/httpclient/models/plugin_env.go +++ b/internal/httpclient/models/plugin_env.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// PluginEnv PluginEnv plugin env +// PluginEnv PluginEnv PluginEnv plugin env // // swagger:model PluginEnv type PluginEnv struct { diff --git a/internal/httpclient/models/plugin_interface_type.go b/internal/httpclient/models/plugin_interface_type.go index 5972c7fae5f..d66549040eb 100644 --- a/internal/httpclient/models/plugin_interface_type.go +++ b/internal/httpclient/models/plugin_interface_type.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// PluginInterfaceType PluginInterfaceType PluginInterfaceType plugin interface type +// PluginInterfaceType PluginInterfaceType plugin interface type // // swagger:model PluginInterfaceType type PluginInterfaceType struct { diff --git a/internal/httpclient/models/plugin_settings.go b/internal/httpclient/models/plugin_settings.go index 2b97cab091f..1c88fa36837 100644 --- a/internal/httpclient/models/plugin_settings.go +++ b/internal/httpclient/models/plugin_settings.go @@ -14,7 +14,7 @@ import ( "github.com/go-openapi/validate" ) -// PluginSettings PluginSettings PluginSettings Settings that can be modified by users. +// PluginSettings PluginSettings PluginSettings PluginSettings Settings that can be modified by users. // // swagger:model PluginSettings type PluginSettings struct { diff --git a/internal/httpclient/models/previous_consent_session.go b/internal/httpclient/models/previous_consent_session.go index 28c96ff40c5..9de91036ecd 100644 --- a/internal/httpclient/models/previous_consent_session.go +++ b/internal/httpclient/models/previous_consent_session.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession The response used to return used consent requests +// PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession PreviousConsentSession The response used to return used consent requests // same as HandledLoginRequest, just with consent_request exposed as json // // swagger:model PreviousConsentSession @@ -55,6 +55,7 @@ type PreviousConsentSession struct { // Format: date-time // Format: date-time // Format: date-time + // Format: date-time HandledAt strfmt.DateTime `json:"handled_at,omitempty"` // Remember, if set to true, tells ORY Hydra to remember this consent authorization and reuse it if the same diff --git a/internal/httpclient/models/reject_request.go b/internal/httpclient/models/reject_request.go index 78e1c0d9e1a..bb75c9a11a3 100644 --- a/internal/httpclient/models/reject_request.go +++ b/internal/httpclient/models/reject_request.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// RejectRequest RejectRequest RejectRequest RejectRequest The request payload used to accept a login or consent request. +// RejectRequest The request payload used to accept a login or consent request. // // swagger:model rejectRequest type RejectRequest struct { diff --git a/internal/httpclient/models/userinfo_response.go b/internal/httpclient/models/userinfo_response.go index 9b5fb8685fb..34b1468d991 100644 --- a/internal/httpclient/models/userinfo_response.go +++ b/internal/httpclient/models/userinfo_response.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// UserinfoResponse The userinfo response +// UserinfoResponse UserinfoResponse The userinfo response // // swagger:model userinfoResponse type UserinfoResponse struct { diff --git a/internal/httpclient/models/version.go b/internal/httpclient/models/version.go index 5c3daa37852..4c8e253f692 100644 --- a/internal/httpclient/models/version.go +++ b/internal/httpclient/models/version.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/swag" ) -// Version Version version +// Version Version Version version // // swagger:model version type Version struct { diff --git a/internal/httpclient/models/volume_usage_data.go b/internal/httpclient/models/volume_usage_data.go index 886190c490b..9d5221c09f9 100644 --- a/internal/httpclient/models/volume_usage_data.go +++ b/internal/httpclient/models/volume_usage_data.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// VolumeUsageData VolumeUsageData Usage details about the volume. This information is used by the +// VolumeUsageData VolumeUsageData VolumeUsageData Usage details about the volume. This information is used by the // `GET /system/df` endpoint, and omitted in other endpoints. // // swagger:model VolumeUsageData diff --git a/internal/httpclient/models/well_known.go b/internal/httpclient/models/well_known.go index ad25e8bdf45..127d766647a 100644 --- a/internal/httpclient/models/well_known.go +++ b/internal/httpclient/models/well_known.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/validate" ) -// WellKnown WellKnown WellKnown WellKnown represents important OpenID Connect discovery metadata +// WellKnown WellKnown WellKnown WellKnown WellKnown represents important OpenID Connect discovery metadata // // It includes links to several endpoints (e.g. /oauth2/token) and exposes information on supported signature algorithms // among others.