diff --git a/docs/api.swagger.json b/docs/api.swagger.json index 063e404686f..dd93b734b2b 100644 --- a/docs/api.swagger.json +++ b/docs/api.swagger.json @@ -2486,6 +2486,9 @@ "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:", + "required": [ + "active" + ], "properties": { "active": { "description": "Active is a boolean indicator of whether or not the presented token\nis currently active. The specifics of a token's \"active\" state\nwill vary depending on the implementation of the authorization\nserver and the information it keeps about its tokens, but a \"true\"\nvalue return for the \"active\" property will generally indicate\nthat a given token has been issued by this authorization server,\nhas not been revoked by the resource owner, and is within its\ngiven time window of validity (e.g., after its issuance time and\nbefore its expiration time).", diff --git a/oauth2/introspector.go b/oauth2/introspector.go index d1c0b2dfd98..a2910faff09 100644 --- a/oauth2/introspector.go +++ b/oauth2/introspector.go @@ -33,6 +33,8 @@ type Introspection struct { // has not been revoked by the resource owner, and is within its // given time window of validity (e.g., after its issuance time and // before its expiration time). + // + // required: true Active bool `json:"active"` // Scope is a JSON string containing a space-separated list of diff --git a/sdk/go/hydra/swagger/docs/OAuth2TokenIntrospection.md b/sdk/go/hydra/swagger/docs/OAuth2TokenIntrospection.md index d49ebaaf205..7d0f081eb4b 100644 --- a/sdk/go/hydra/swagger/docs/OAuth2TokenIntrospection.md +++ b/sdk/go/hydra/swagger/docs/OAuth2TokenIntrospection.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Active** | **bool** | Active is a boolean indicator of whether or not the presented token is currently active. The specifics of a token's \"active\" state will vary depending on the implementation of the authorization server and the information it keeps about its tokens, but a \"true\" value return for the \"active\" property will generally indicate that a given token has been issued by this authorization server, has not been revoked by the resource owner, and is within its given time window of validity (e.g., after its issuance time and before its expiration time). | [optional] [default to null] +**Active** | **bool** | Active is a boolean indicator of whether or not the presented token is currently active. The specifics of a token's \"active\" state will vary depending on the implementation of the authorization server and the information it keeps about its tokens, but a \"true\" value return for the \"active\" property will generally indicate that a given token has been issued by this authorization server, has not been revoked by the resource owner, and is within its given time window of validity (e.g., after its issuance time and before its expiration time). | [default to null] **Aud** | **[]string** | | [optional] [default to null] **ClientId** | **string** | ClientID is aclient identifier for the OAuth 2.0 client that requested this token. | [optional] [default to null] **Exp** | **int64** | Expires at is an integer timestamp, measured in the number of seconds since January 1 1970 UTC, indicating when this token will expire. | [optional] [default to null] diff --git a/sdk/go/hydra/swagger/o_auth2_token_introspection.go b/sdk/go/hydra/swagger/o_auth2_token_introspection.go index d8729cdda6b..4e0d12f7c21 100644 --- a/sdk/go/hydra/swagger/o_auth2_token_introspection.go +++ b/sdk/go/hydra/swagger/o_auth2_token_introspection.go @@ -14,7 +14,7 @@ package swagger type OAuth2TokenIntrospection struct { // Active is a boolean indicator of whether or not the presented token is currently active. The specifics of a token's \"active\" state will vary depending on the implementation of the authorization server and the information it keeps about its tokens, but a \"true\" value return for the \"active\" property will generally indicate that a given token has been issued by this authorization server, has not been revoked by the resource owner, and is within its given time window of validity (e.g., after its issuance time and before its expiration time). - Active bool `json:"active,omitempty"` + Active bool `json:"active"` Aud []string `json:"aud,omitempty"` diff --git a/sdk/js/swagger/docs/JSONWebKey.md b/sdk/js/swagger/docs/JSONWebKey.md index 7bbc0c48051..43f77c9cc5d 100644 --- a/sdk/js/swagger/docs/JSONWebKey.md +++ b/sdk/js/swagger/docs/JSONWebKey.md @@ -1,12 +1,24 @@ -# OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKey +# OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JsonWebKey ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**algorithm** | **String** | | [optional] -**certificates** | [**[Certificate]**](Certificate.md) | | [optional] -**key** | **Object** | | [optional] -**keyID** | **String** | | [optional] -**use** | **String** | | [optional] +**alg** | **String** | The \"alg\" (algorithm) parameter identifies the algorithm intended for use with the key. The values used should either be registered in the IANA \"JSON Web Signature and Encryption Algorithms\" registry established by [JWA] or be a value that contains a Collision- Resistant Name. | [optional] +**crv** | **String** | | [optional] +**d** | **String** | | [optional] +**dp** | **String** | | [optional] +**dq** | **String** | | [optional] +**e** | **String** | | [optional] +**k** | **String** | | [optional] +**kid** | **String** | The \"kid\" (key ID) parameter is used to match a specific key. This is used, for instance, to choose among a set of keys within a JWK Set during key rollover. The structure of the \"kid\" value is unspecified. When \"kid\" values are used within a JWK Set, different keys within the JWK Set SHOULD use distinct \"kid\" values. (One example in which different keys might use the same \"kid\" value is if they have different \"kty\" (key type) values but are considered to be equivalent alternatives by the application using them.) The \"kid\" value is a case-sensitive string. | [optional] +**kty** | **String** | The \"kty\" (key type) parameter identifies the cryptographic algorithm family used with the key, such as \"RSA\" or \"EC\". \"kty\" values should either be registered in the IANA \"JSON Web Key Types\" registry established by [JWA] or be a value that contains a Collision- Resistant Name. The \"kty\" value is a case-sensitive string. | [optional] +**n** | **String** | | [optional] +**p** | **String** | | [optional] +**q** | **String** | | [optional] +**qi** | **String** | | [optional] +**use** | **String** | The \"use\" (public key use) parameter identifies the intended use of the public key. The \"use\" parameter is employed to indicate whether a public key is used for encrypting data or verifying the signature on data. Values are commonly \"sig\" (signature) or \"enc\" (encryption). | [optional] +**x** | **String** | | [optional] +**x5c** | **[String]** | The \"x5c\" (X.509 certificate chain) parameter contains a chain of one or more PKIX certificates [RFC5280]. The certificate chain is represented as a JSON array of certificate value strings. Each string in the array is a base64-encoded (Section 4 of [RFC4648] -- not base64url-encoded) DER [ITU.X690.1994] PKIX certificate value. The PKIX certificate containing the key value MUST be the first certificate. | [optional] +**y** | **String** | | [optional] diff --git a/sdk/js/swagger/docs/JSONWebKeySet.md b/sdk/js/swagger/docs/JSONWebKeySet.md index 15db72104b1..c5a28fde64e 100644 --- a/sdk/js/swagger/docs/JSONWebKeySet.md +++ b/sdk/js/swagger/docs/JSONWebKeySet.md @@ -1,8 +1,8 @@ -# OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKeySet +# OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JsonWebKeySet ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**keys** | [**[JSONWebKey]**](JSONWebKey.md) | | [optional] +**keys** | [**[JsonWebKey]**](JsonWebKey.md) | The value of the \"keys\" parameter is an array of JWK values. By default, the order of the JWK values within the array does not imply an order of preference among them, although applications of JWK Sets can choose to assign a meaning to the order for their purposes, if desired. | [optional] diff --git a/sdk/js/swagger/docs/JsonWebKey.md b/sdk/js/swagger/docs/JsonWebKey.md deleted file mode 100644 index 7bbc0c48051..00000000000 --- a/sdk/js/swagger/docs/JsonWebKey.md +++ /dev/null @@ -1,12 +0,0 @@ -# OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKey - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**algorithm** | **String** | | [optional] -**certificates** | [**[Certificate]**](Certificate.md) | | [optional] -**key** | **Object** | | [optional] -**keyID** | **String** | | [optional] -**use** | **String** | | [optional] - - diff --git a/sdk/js/swagger/docs/JsonWebKeySet.md b/sdk/js/swagger/docs/JsonWebKeySet.md deleted file mode 100644 index 15db72104b1..00000000000 --- a/sdk/js/swagger/docs/JsonWebKeySet.md +++ /dev/null @@ -1,8 +0,0 @@ -# OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKeySet - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**keys** | [**[JSONWebKey]**](JSONWebKey.md) | | [optional] - - diff --git a/sdk/js/swagger/docs/OAuth2TokenIntrospection.md b/sdk/js/swagger/docs/OAuth2TokenIntrospection.md index f730118d1a3..49e2af56a43 100644 --- a/sdk/js/swagger/docs/OAuth2TokenIntrospection.md +++ b/sdk/js/swagger/docs/OAuth2TokenIntrospection.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**active** | **Boolean** | Active is a boolean indicator of whether or not the presented token is currently active. The specifics of a token's \"active\" state will vary depending on the implementation of the authorization server and the information it keeps about its tokens, but a \"true\" value return for the \"active\" property will generally indicate that a given token has been issued by this authorization server, has not been revoked by the resource owner, and is within its given time window of validity (e.g., after its issuance time and before its expiration time). | [optional] +**active** | **Boolean** | Active is a boolean indicator of whether or not the presented token is currently active. The specifics of a token's \"active\" state will vary depending on the implementation of the authorization server and the information it keeps about its tokens, but a \"true\" value return for the \"active\" property will generally indicate that a given token has been issued by this authorization server, has not been revoked by the resource owner, and is within its given time window of validity (e.g., after its issuance time and before its expiration time). | **aud** | **[String]** | | [optional] **clientId** | **String** | ClientID is aclient identifier for the OAuth 2.0 client that requested this token. | [optional] **exp** | **Number** | Expires at is an integer timestamp, measured in the number of seconds since January 1 1970 UTC, indicating when this token will expire. | [optional] diff --git a/sdk/js/swagger/src/model/JSONWebKey.js b/sdk/js/swagger/src/model/JSONWebKey.js index 6738aca8f71..2735265b784 100644 --- a/sdk/js/swagger/src/model/JSONWebKey.js +++ b/sdk/js/swagger/src/model/JSONWebKey.js @@ -17,32 +17,31 @@ ;(function(root, factory) { if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. - define(['ApiClient', 'model/Certificate'], factory) + define(['ApiClient'], factory) } else if (typeof module === 'object' && module.exports) { // CommonJS-like environments that support module.exports, like Node. - module.exports = factory(require('../ApiClient'), require('./Certificate')) + module.exports = factory(require('../ApiClient')) } else { // Browser globals (root is window) if (!root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer) { root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer = {} } - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKey = factory( - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.ApiClient, - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.Certificate + root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JsonWebKey = factory( + root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.ApiClient ) } -})(this, function(ApiClient, Certificate) { +})(this, function(ApiClient) { 'use strict' /** - * The JSONWebKey model module. - * @module model/JSONWebKey + * The JsonWebKey model module. + * @module model/JsonWebKey * @version Latest */ /** - * Constructs a new JSONWebKey. - * @alias module:model/JSONWebKey + * Constructs a new JsonWebKey. + * @alias module:model/JsonWebKey * @class */ var exports = function() { @@ -50,57 +49,144 @@ } /** - * Constructs a JSONWebKey from a plain JavaScript object, optionally creating a new instance. + * Constructs a JsonWebKey from a plain JavaScript object, optionally creating a new instance. * Copies all relevant properties from data to obj if supplied or a new instance if not. * @param {Object} data The plain JavaScript object bearing properties of interest. - * @param {module:model/JSONWebKey} obj Optional instance to populate. - * @return {module:model/JSONWebKey} The populated JSONWebKey instance. + * @param {module:model/JsonWebKey} obj Optional instance to populate. + * @return {module:model/JsonWebKey} The populated JsonWebKey instance. */ exports.constructFromObject = function(data, obj) { if (data) { obj = obj || new exports() - if (data.hasOwnProperty('Algorithm')) { - obj['Algorithm'] = ApiClient.convertToType(data['Algorithm'], 'String') + if (data.hasOwnProperty('alg')) { + obj['alg'] = ApiClient.convertToType(data['alg'], 'String') } - if (data.hasOwnProperty('Certificates')) { - obj['Certificates'] = ApiClient.convertToType(data['Certificates'], [ - Certificate - ]) + if (data.hasOwnProperty('crv')) { + obj['crv'] = ApiClient.convertToType(data['crv'], 'String') } - if (data.hasOwnProperty('Key')) { - obj['Key'] = ApiClient.convertToType(data['Key'], Object) + if (data.hasOwnProperty('d')) { + obj['d'] = ApiClient.convertToType(data['d'], 'String') } - if (data.hasOwnProperty('KeyID')) { - obj['KeyID'] = ApiClient.convertToType(data['KeyID'], 'String') + if (data.hasOwnProperty('dp')) { + obj['dp'] = ApiClient.convertToType(data['dp'], 'String') } - if (data.hasOwnProperty('Use')) { - obj['Use'] = ApiClient.convertToType(data['Use'], 'String') + if (data.hasOwnProperty('dq')) { + obj['dq'] = ApiClient.convertToType(data['dq'], 'String') + } + if (data.hasOwnProperty('e')) { + obj['e'] = ApiClient.convertToType(data['e'], 'String') + } + if (data.hasOwnProperty('k')) { + obj['k'] = ApiClient.convertToType(data['k'], 'String') + } + if (data.hasOwnProperty('kid')) { + obj['kid'] = ApiClient.convertToType(data['kid'], 'String') + } + if (data.hasOwnProperty('kty')) { + obj['kty'] = ApiClient.convertToType(data['kty'], 'String') + } + if (data.hasOwnProperty('n')) { + obj['n'] = ApiClient.convertToType(data['n'], 'String') + } + if (data.hasOwnProperty('p')) { + obj['p'] = ApiClient.convertToType(data['p'], 'String') + } + if (data.hasOwnProperty('q')) { + obj['q'] = ApiClient.convertToType(data['q'], 'String') + } + if (data.hasOwnProperty('qi')) { + obj['qi'] = ApiClient.convertToType(data['qi'], 'String') + } + if (data.hasOwnProperty('use')) { + obj['use'] = ApiClient.convertToType(data['use'], 'String') + } + if (data.hasOwnProperty('x')) { + obj['x'] = ApiClient.convertToType(data['x'], 'String') + } + if (data.hasOwnProperty('x5c')) { + obj['x5c'] = ApiClient.convertToType(data['x5c'], ['String']) + } + if (data.hasOwnProperty('y')) { + obj['y'] = ApiClient.convertToType(data['y'], 'String') } } return obj } /** - * @member {String} Algorithm + * The \"alg\" (algorithm) parameter identifies the algorithm intended for use with the key. The values used should either be registered in the IANA \"JSON Web Signature and Encryption Algorithms\" registry established by [JWA] or be a value that contains a Collision- Resistant Name. + * @member {String} alg + */ + exports.prototype['alg'] = undefined + /** + * @member {String} crv + */ + exports.prototype['crv'] = undefined + /** + * @member {String} d + */ + exports.prototype['d'] = undefined + /** + * @member {String} dp + */ + exports.prototype['dp'] = undefined + /** + * @member {String} dq + */ + exports.prototype['dq'] = undefined + /** + * @member {String} e + */ + exports.prototype['e'] = undefined + /** + * @member {String} k + */ + exports.prototype['k'] = undefined + /** + * The \"kid\" (key ID) parameter is used to match a specific key. This is used, for instance, to choose among a set of keys within a JWK Set during key rollover. The structure of the \"kid\" value is unspecified. When \"kid\" values are used within a JWK Set, different keys within the JWK Set SHOULD use distinct \"kid\" values. (One example in which different keys might use the same \"kid\" value is if they have different \"kty\" (key type) values but are considered to be equivalent alternatives by the application using them.) The \"kid\" value is a case-sensitive string. + * @member {String} kid + */ + exports.prototype['kid'] = undefined + /** + * The \"kty\" (key type) parameter identifies the cryptographic algorithm family used with the key, such as \"RSA\" or \"EC\". \"kty\" values should either be registered in the IANA \"JSON Web Key Types\" registry established by [JWA] or be a value that contains a Collision- Resistant Name. The \"kty\" value is a case-sensitive string. + * @member {String} kty + */ + exports.prototype['kty'] = undefined + /** + * @member {String} n + */ + exports.prototype['n'] = undefined + /** + * @member {String} p + */ + exports.prototype['p'] = undefined + /** + * @member {String} q + */ + exports.prototype['q'] = undefined + /** + * @member {String} qi */ - exports.prototype['Algorithm'] = undefined + exports.prototype['qi'] = undefined /** - * @member {Array.} Certificates + * The \"use\" (public key use) parameter identifies the intended use of the public key. The \"use\" parameter is employed to indicate whether a public key is used for encrypting data or verifying the signature on data. Values are commonly \"sig\" (signature) or \"enc\" (encryption). + * @member {String} use */ - exports.prototype['Certificates'] = undefined + exports.prototype['use'] = undefined /** - * @member {Object} Key + * @member {String} x */ - exports.prototype['Key'] = undefined + exports.prototype['x'] = undefined /** - * @member {String} KeyID + * The \"x5c\" (X.509 certificate chain) parameter contains a chain of one or more PKIX certificates [RFC5280]. The certificate chain is represented as a JSON array of certificate value strings. Each string in the array is a base64-encoded (Section 4 of [RFC4648] -- not base64url-encoded) DER [ITU.X690.1994] PKIX certificate value. The PKIX certificate containing the key value MUST be the first certificate. + * @member {Array.} x5c */ - exports.prototype['KeyID'] = undefined + exports.prototype['x5c'] = undefined /** - * @member {String} Use + * @member {String} y */ - exports.prototype['Use'] = undefined + exports.prototype['y'] = undefined return exports }) diff --git a/sdk/js/swagger/src/model/JSONWebKeySet.js b/sdk/js/swagger/src/model/JSONWebKeySet.js index 6b07a379fa6..3744d51b825 100644 --- a/sdk/js/swagger/src/model/JSONWebKeySet.js +++ b/sdk/js/swagger/src/model/JSONWebKeySet.js @@ -17,32 +17,32 @@ ;(function(root, factory) { if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. - define(['ApiClient', 'model/JSONWebKey'], factory) + define(['ApiClient', 'model/JsonWebKey'], factory) } else if (typeof module === 'object' && module.exports) { // CommonJS-like environments that support module.exports, like Node. - module.exports = factory(require('../ApiClient'), require('./JSONWebKey')) + module.exports = factory(require('../ApiClient'), require('./JsonWebKey')) } else { // Browser globals (root is window) if (!root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer) { root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer = {} } - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKeySet = factory( + root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JsonWebKeySet = factory( root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.ApiClient, - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKey + root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JsonWebKey ) } -})(this, function(ApiClient, JSONWebKey) { +})(this, function(ApiClient, JsonWebKey) { 'use strict' /** - * The JSONWebKeySet model module. - * @module model/JSONWebKeySet + * The JsonWebKeySet model module. + * @module model/JsonWebKeySet * @version Latest */ /** - * Constructs a new JSONWebKeySet. - * @alias module:model/JSONWebKeySet + * Constructs a new JsonWebKeySet. + * @alias module:model/JsonWebKeySet * @class */ var exports = function() { @@ -50,25 +50,26 @@ } /** - * Constructs a JSONWebKeySet from a plain JavaScript object, optionally creating a new instance. + * Constructs a JsonWebKeySet from a plain JavaScript object, optionally creating a new instance. * Copies all relevant properties from data to obj if supplied or a new instance if not. * @param {Object} data The plain JavaScript object bearing properties of interest. - * @param {module:model/JSONWebKeySet} obj Optional instance to populate. - * @return {module:model/JSONWebKeySet} The populated JSONWebKeySet instance. + * @param {module:model/JsonWebKeySet} obj Optional instance to populate. + * @return {module:model/JsonWebKeySet} The populated JsonWebKeySet instance. */ exports.constructFromObject = function(data, obj) { if (data) { obj = obj || new exports() if (data.hasOwnProperty('keys')) { - obj['keys'] = ApiClient.convertToType(data['keys'], [JSONWebKey]) + obj['keys'] = ApiClient.convertToType(data['keys'], [JsonWebKey]) } } return obj } /** - * @member {Array.} keys + * The value of the \"keys\" parameter is an array of JWK values. By default, the order of the JWK values within the array does not imply an order of preference among them, although applications of JWK Sets can choose to assign a meaning to the order for their purposes, if desired. + * @member {Array.} keys */ exports.prototype['keys'] = undefined diff --git a/sdk/js/swagger/src/model/JsonWebKey.js b/sdk/js/swagger/src/model/JsonWebKey.js deleted file mode 100644 index 6738aca8f71..00000000000 --- a/sdk/js/swagger/src/model/JsonWebKey.js +++ /dev/null @@ -1,106 +0,0 @@ -/** - * ORY Hydra - Cloud Native OAuth 2.0 and OpenID Connect Server - * Welcome to the ORY Hydra HTTP API documentation. You will find documentation for all HTTP APIs here. Keep in mind that this document reflects the latest branch, always. Support for versioned documentation is coming in the future. - * - * OpenAPI spec version: Latest - * Contact: hi@ory.am - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * - * Swagger Codegen version: 2.2.3 - * - * Do not edit the class manually. - * - */ - -;(function(root, factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. - define(['ApiClient', 'model/Certificate'], factory) - } else if (typeof module === 'object' && module.exports) { - // CommonJS-like environments that support module.exports, like Node. - module.exports = factory(require('../ApiClient'), require('./Certificate')) - } else { - // Browser globals (root is window) - if (!root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer) { - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer = {} - } - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKey = factory( - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.ApiClient, - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.Certificate - ) - } -})(this, function(ApiClient, Certificate) { - 'use strict' - - /** - * The JSONWebKey model module. - * @module model/JSONWebKey - * @version Latest - */ - - /** - * Constructs a new JSONWebKey. - * @alias module:model/JSONWebKey - * @class - */ - var exports = function() { - var _this = this - } - - /** - * Constructs a JSONWebKey from a plain JavaScript object, optionally creating a new instance. - * Copies all relevant properties from data to obj if supplied or a new instance if not. - * @param {Object} data The plain JavaScript object bearing properties of interest. - * @param {module:model/JSONWebKey} obj Optional instance to populate. - * @return {module:model/JSONWebKey} The populated JSONWebKey instance. - */ - exports.constructFromObject = function(data, obj) { - if (data) { - obj = obj || new exports() - - if (data.hasOwnProperty('Algorithm')) { - obj['Algorithm'] = ApiClient.convertToType(data['Algorithm'], 'String') - } - if (data.hasOwnProperty('Certificates')) { - obj['Certificates'] = ApiClient.convertToType(data['Certificates'], [ - Certificate - ]) - } - if (data.hasOwnProperty('Key')) { - obj['Key'] = ApiClient.convertToType(data['Key'], Object) - } - if (data.hasOwnProperty('KeyID')) { - obj['KeyID'] = ApiClient.convertToType(data['KeyID'], 'String') - } - if (data.hasOwnProperty('Use')) { - obj['Use'] = ApiClient.convertToType(data['Use'], 'String') - } - } - return obj - } - - /** - * @member {String} Algorithm - */ - exports.prototype['Algorithm'] = undefined - /** - * @member {Array.} Certificates - */ - exports.prototype['Certificates'] = undefined - /** - * @member {Object} Key - */ - exports.prototype['Key'] = undefined - /** - * @member {String} KeyID - */ - exports.prototype['KeyID'] = undefined - /** - * @member {String} Use - */ - exports.prototype['Use'] = undefined - - return exports -}) diff --git a/sdk/js/swagger/src/model/JsonWebKeySet.js b/sdk/js/swagger/src/model/JsonWebKeySet.js deleted file mode 100644 index 6b07a379fa6..00000000000 --- a/sdk/js/swagger/src/model/JsonWebKeySet.js +++ /dev/null @@ -1,76 +0,0 @@ -/** - * ORY Hydra - Cloud Native OAuth 2.0 and OpenID Connect Server - * Welcome to the ORY Hydra HTTP API documentation. You will find documentation for all HTTP APIs here. Keep in mind that this document reflects the latest branch, always. Support for versioned documentation is coming in the future. - * - * OpenAPI spec version: Latest - * Contact: hi@ory.am - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * - * Swagger Codegen version: 2.2.3 - * - * Do not edit the class manually. - * - */ - -;(function(root, factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. - define(['ApiClient', 'model/JSONWebKey'], factory) - } else if (typeof module === 'object' && module.exports) { - // CommonJS-like environments that support module.exports, like Node. - module.exports = factory(require('../ApiClient'), require('./JSONWebKey')) - } else { - // Browser globals (root is window) - if (!root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer) { - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer = {} - } - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKeySet = factory( - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.ApiClient, - root.OryHydraCloudNativeOAuth20AndOpenIdConnectServer.JSONWebKey - ) - } -})(this, function(ApiClient, JSONWebKey) { - 'use strict' - - /** - * The JSONWebKeySet model module. - * @module model/JSONWebKeySet - * @version Latest - */ - - /** - * Constructs a new JSONWebKeySet. - * @alias module:model/JSONWebKeySet - * @class - */ - var exports = function() { - var _this = this - } - - /** - * Constructs a JSONWebKeySet from a plain JavaScript object, optionally creating a new instance. - * Copies all relevant properties from data to obj if supplied or a new instance if not. - * @param {Object} data The plain JavaScript object bearing properties of interest. - * @param {module:model/JSONWebKeySet} obj Optional instance to populate. - * @return {module:model/JSONWebKeySet} The populated JSONWebKeySet instance. - */ - exports.constructFromObject = function(data, obj) { - if (data) { - obj = obj || new exports() - - if (data.hasOwnProperty('keys')) { - obj['keys'] = ApiClient.convertToType(data['keys'], [JSONWebKey]) - } - } - return obj - } - - /** - * @member {Array.} keys - */ - exports.prototype['keys'] = undefined - - return exports -}) diff --git a/sdk/js/swagger/src/model/OAuth2TokenIntrospection.js b/sdk/js/swagger/src/model/OAuth2TokenIntrospection.js index 63b1d32610c..9ae6c44799f 100644 --- a/sdk/js/swagger/src/model/OAuth2TokenIntrospection.js +++ b/sdk/js/swagger/src/model/OAuth2TokenIntrospection.js @@ -44,9 +44,12 @@ * https://tools.ietf.org/html/rfc7662 * @alias module:model/OAuth2TokenIntrospection * @class + * @param active {Boolean} Active is a boolean indicator of whether or not the presented token is currently active. The specifics of a token's \"active\" state will vary depending on the implementation of the authorization server and the information it keeps about its tokens, but a \"true\" value return for the \"active\" property will generally indicate that a given token has been issued by this authorization server, has not been revoked by the resource owner, and is within its given time window of validity (e.g., after its issuance time and before its expiration time). */ - var exports = function() { + var exports = function(active) { var _this = this + + _this['active'] = active } /** diff --git a/sdk/php/swagger/docs/Model/JSONWebKey.md b/sdk/php/swagger/docs/Model/JSONWebKey.md index d693ac2a666..36119ee9415 100644 --- a/sdk/php/swagger/docs/Model/JSONWebKey.md +++ b/sdk/php/swagger/docs/Model/JSONWebKey.md @@ -1,13 +1,25 @@ -# JSONWebKey +# JsonWebKey ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**algorithm** | **string** | | [optional] -**certificates** | [**\Hydra\SDK\Model\Certificate[]**](Certificate.md) | | [optional] -**key** | **object** | | [optional] -**key_id** | **string** | | [optional] -**use** | **string** | | [optional] +**alg** | **string** | The \"alg\" (algorithm) parameter identifies the algorithm intended for use with the key. The values used should either be registered in the IANA \"JSON Web Signature and Encryption Algorithms\" registry established by [JWA] or be a value that contains a Collision- Resistant Name. | [optional] +**crv** | **string** | | [optional] +**d** | **string** | | [optional] +**dp** | **string** | | [optional] +**dq** | **string** | | [optional] +**e** | **string** | | [optional] +**k** | **string** | | [optional] +**kid** | **string** | The \"kid\" (key ID) parameter is used to match a specific key. This is used, for instance, to choose among a set of keys within a JWK Set during key rollover. The structure of the \"kid\" value is unspecified. When \"kid\" values are used within a JWK Set, different keys within the JWK Set SHOULD use distinct \"kid\" values. (One example in which different keys might use the same \"kid\" value is if they have different \"kty\" (key type) values but are considered to be equivalent alternatives by the application using them.) The \"kid\" value is a case-sensitive string. | [optional] +**kty** | **string** | The \"kty\" (key type) parameter identifies the cryptographic algorithm family used with the key, such as \"RSA\" or \"EC\". \"kty\" values should either be registered in the IANA \"JSON Web Key Types\" registry established by [JWA] or be a value that contains a Collision- Resistant Name. The \"kty\" value is a case-sensitive string. | [optional] +**n** | **string** | | [optional] +**p** | **string** | | [optional] +**q** | **string** | | [optional] +**qi** | **string** | | [optional] +**use** | **string** | The \"use\" (public key use) parameter identifies the intended use of the public key. The \"use\" parameter is employed to indicate whether a public key is used for encrypting data or verifying the signature on data. Values are commonly \"sig\" (signature) or \"enc\" (encryption). | [optional] +**x** | **string** | | [optional] +**x5c** | **string[]** | The \"x5c\" (X.509 certificate chain) parameter contains a chain of one or more PKIX certificates [RFC5280]. The certificate chain is represented as a JSON array of certificate value strings. Each string in the array is a base64-encoded (Section 4 of [RFC4648] -- not base64url-encoded) DER [ITU.X690.1994] PKIX certificate value. The PKIX certificate containing the key value MUST be the first certificate. | [optional] +**y** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk/php/swagger/docs/Model/JSONWebKeySet.md b/sdk/php/swagger/docs/Model/JSONWebKeySet.md index 4d85289d79a..41cebd564ed 100644 --- a/sdk/php/swagger/docs/Model/JSONWebKeySet.md +++ b/sdk/php/swagger/docs/Model/JSONWebKeySet.md @@ -1,9 +1,9 @@ -# JSONWebKeySet +# JsonWebKeySet ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**keys** | [**\Hydra\SDK\Model\JSONWebKey[]**](JSONWebKey.md) | | [optional] +**keys** | [**\Hydra\SDK\Model\JsonWebKey[]**](JsonWebKey.md) | The value of the \"keys\" parameter is an array of JWK values. By default, the order of the JWK values within the array does not imply an order of preference among them, although applications of JWK Sets can choose to assign a meaning to the order for their purposes, if desired. | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk/php/swagger/docs/Model/JsonWebKey.md b/sdk/php/swagger/docs/Model/JsonWebKey.md deleted file mode 100644 index d693ac2a666..00000000000 --- a/sdk/php/swagger/docs/Model/JsonWebKey.md +++ /dev/null @@ -1,14 +0,0 @@ -# JSONWebKey - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**algorithm** | **string** | | [optional] -**certificates** | [**\Hydra\SDK\Model\Certificate[]**](Certificate.md) | | [optional] -**key** | **object** | | [optional] -**key_id** | **string** | | [optional] -**use** | **string** | | [optional] - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - - diff --git a/sdk/php/swagger/docs/Model/JsonWebKeySet.md b/sdk/php/swagger/docs/Model/JsonWebKeySet.md deleted file mode 100644 index 4d85289d79a..00000000000 --- a/sdk/php/swagger/docs/Model/JsonWebKeySet.md +++ /dev/null @@ -1,10 +0,0 @@ -# JSONWebKeySet - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**keys** | [**\Hydra\SDK\Model\JSONWebKey[]**](JSONWebKey.md) | | [optional] - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - - diff --git a/sdk/php/swagger/docs/Model/OAuth2TokenIntrospection.md b/sdk/php/swagger/docs/Model/OAuth2TokenIntrospection.md index 554b02df9bf..feb542a932c 100644 --- a/sdk/php/swagger/docs/Model/OAuth2TokenIntrospection.md +++ b/sdk/php/swagger/docs/Model/OAuth2TokenIntrospection.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**active** | **bool** | Active is a boolean indicator of whether or not the presented token is currently active. The specifics of a token's \"active\" state will vary depending on the implementation of the authorization server and the information it keeps about its tokens, but a \"true\" value return for the \"active\" property will generally indicate that a given token has been issued by this authorization server, has not been revoked by the resource owner, and is within its given time window of validity (e.g., after its issuance time and before its expiration time). | [optional] +**active** | **bool** | Active is a boolean indicator of whether or not the presented token is currently active. The specifics of a token's \"active\" state will vary depending on the implementation of the authorization server and the information it keeps about its tokens, but a \"true\" value return for the \"active\" property will generally indicate that a given token has been issued by this authorization server, has not been revoked by the resource owner, and is within its given time window of validity (e.g., after its issuance time and before its expiration time). | **aud** | **string[]** | | [optional] **client_id** | **string** | ClientID is aclient identifier for the OAuth 2.0 client that requested this token. | [optional] **exp** | **int** | Expires at is an integer timestamp, measured in the number of seconds since January 1 1970 UTC, indicating when this token will expire. | [optional] diff --git a/sdk/php/swagger/lib/Model/JSONWebKey.php b/sdk/php/swagger/lib/Model/JSONWebKey.php index 50080d87c7a..4101c09bc00 100644 --- a/sdk/php/swagger/lib/Model/JSONWebKey.php +++ b/sdk/php/swagger/lib/Model/JSONWebKey.php @@ -1,6 +1,6 @@ 'string', - 'certificates' => '\Hydra\SDK\Model\Certificate[]', - 'key' => 'object', - 'key_id' => 'string', - 'use' => 'string' + 'alg' => 'string', + 'crv' => 'string', + 'd' => 'string', + 'dp' => 'string', + 'dq' => 'string', + 'e' => 'string', + 'k' => 'string', + 'kid' => 'string', + 'kty' => 'string', + 'n' => 'string', + 'p' => 'string', + 'q' => 'string', + 'qi' => 'string', + 'use' => 'string', + 'x' => 'string', + 'x5c' => 'string[]', + 'y' => 'string' ]; /** @@ -66,11 +78,23 @@ class JSONWebKey implements ArrayAccess * @var string[] */ protected static $swaggerFormats = [ - 'algorithm' => null, - 'certificates' => null, - 'key' => null, - 'key_id' => null, - 'use' => null + 'alg' => null, + 'crv' => null, + 'd' => null, + 'dp' => null, + 'dq' => null, + 'e' => null, + 'k' => null, + 'kid' => null, + 'kty' => null, + 'n' => null, + 'p' => null, + 'q' => null, + 'qi' => null, + 'use' => null, + 'x' => null, + 'x5c' => null, + 'y' => null ]; public static function swaggerTypes() @@ -88,11 +112,23 @@ public static function swaggerFormats() * @var string[] */ protected static $attributeMap = [ - 'algorithm' => 'Algorithm', - 'certificates' => 'Certificates', - 'key' => 'Key', - 'key_id' => 'KeyID', - 'use' => 'Use' + 'alg' => 'alg', + 'crv' => 'crv', + 'd' => 'd', + 'dp' => 'dp', + 'dq' => 'dq', + 'e' => 'e', + 'k' => 'k', + 'kid' => 'kid', + 'kty' => 'kty', + 'n' => 'n', + 'p' => 'p', + 'q' => 'q', + 'qi' => 'qi', + 'use' => 'use', + 'x' => 'x', + 'x5c' => 'x5c', + 'y' => 'y' ]; @@ -101,11 +137,23 @@ public static function swaggerFormats() * @var string[] */ protected static $setters = [ - 'algorithm' => 'setAlgorithm', - 'certificates' => 'setCertificates', - 'key' => 'setKey', - 'key_id' => 'setKeyId', - 'use' => 'setUse' + 'alg' => 'setAlg', + 'crv' => 'setCrv', + 'd' => 'setD', + 'dp' => 'setDp', + 'dq' => 'setDq', + 'e' => 'setE', + 'k' => 'setK', + 'kid' => 'setKid', + 'kty' => 'setKty', + 'n' => 'setN', + 'p' => 'setP', + 'q' => 'setQ', + 'qi' => 'setQi', + 'use' => 'setUse', + 'x' => 'setX', + 'x5c' => 'setX5c', + 'y' => 'setY' ]; @@ -114,11 +162,23 @@ public static function swaggerFormats() * @var string[] */ protected static $getters = [ - 'algorithm' => 'getAlgorithm', - 'certificates' => 'getCertificates', - 'key' => 'getKey', - 'key_id' => 'getKeyId', - 'use' => 'getUse' + 'alg' => 'getAlg', + 'crv' => 'getCrv', + 'd' => 'getD', + 'dp' => 'getDp', + 'dq' => 'getDq', + 'e' => 'getE', + 'k' => 'getK', + 'kid' => 'getKid', + 'kty' => 'getKty', + 'n' => 'getN', + 'p' => 'getP', + 'q' => 'getQ', + 'qi' => 'getQi', + 'use' => 'getUse', + 'x' => 'getX', + 'x5c' => 'getX5c', + 'y' => 'getY' ]; public static function attributeMap() @@ -152,11 +212,23 @@ public static function getters() */ public function __construct(array $data = null) { - $this->container['algorithm'] = isset($data['algorithm']) ? $data['algorithm'] : null; - $this->container['certificates'] = isset($data['certificates']) ? $data['certificates'] : null; - $this->container['key'] = isset($data['key']) ? $data['key'] : null; - $this->container['key_id'] = isset($data['key_id']) ? $data['key_id'] : null; + $this->container['alg'] = isset($data['alg']) ? $data['alg'] : null; + $this->container['crv'] = isset($data['crv']) ? $data['crv'] : null; + $this->container['d'] = isset($data['d']) ? $data['d'] : null; + $this->container['dp'] = isset($data['dp']) ? $data['dp'] : null; + $this->container['dq'] = isset($data['dq']) ? $data['dq'] : null; + $this->container['e'] = isset($data['e']) ? $data['e'] : null; + $this->container['k'] = isset($data['k']) ? $data['k'] : null; + $this->container['kid'] = isset($data['kid']) ? $data['kid'] : null; + $this->container['kty'] = isset($data['kty']) ? $data['kty'] : null; + $this->container['n'] = isset($data['n']) ? $data['n'] : null; + $this->container['p'] = isset($data['p']) ? $data['p'] : null; + $this->container['q'] = isset($data['q']) ? $data['q'] : null; + $this->container['qi'] = isset($data['qi']) ? $data['qi'] : null; $this->container['use'] = isset($data['use']) ? $data['use'] : null; + $this->container['x'] = isset($data['x']) ? $data['x'] : null; + $this->container['x5c'] = isset($data['x5c']) ? $data['x5c'] : null; + $this->container['y'] = isset($data['y']) ? $data['y'] : null; } /** @@ -185,85 +257,274 @@ public function valid() /** - * Gets algorithm + * Gets alg * @return string */ - public function getAlgorithm() + public function getAlg() { - return $this->container['algorithm']; + return $this->container['alg']; } /** - * Sets algorithm - * @param string $algorithm + * Sets alg + * @param string $alg The \"alg\" (algorithm) parameter identifies the algorithm intended for use with the key. The values used should either be registered in the IANA \"JSON Web Signature and Encryption Algorithms\" registry established by [JWA] or be a value that contains a Collision- Resistant Name. * @return $this */ - public function setAlgorithm($algorithm) + public function setAlg($alg) { - $this->container['algorithm'] = $algorithm; + $this->container['alg'] = $alg; return $this; } /** - * Gets certificates - * @return \Hydra\SDK\Model\Certificate[] + * Gets crv + * @return string + */ + public function getCrv() + { + return $this->container['crv']; + } + + /** + * Sets crv + * @param string $crv + * @return $this + */ + public function setCrv($crv) + { + $this->container['crv'] = $crv; + + return $this; + } + + /** + * Gets d + * @return string */ - public function getCertificates() + public function getD() { - return $this->container['certificates']; + return $this->container['d']; } /** - * Sets certificates - * @param \Hydra\SDK\Model\Certificate[] $certificates + * Sets d + * @param string $d * @return $this */ - public function setCertificates($certificates) + public function setD($d) { - $this->container['certificates'] = $certificates; + $this->container['d'] = $d; return $this; } /** - * Gets key - * @return object + * Gets dp + * @return string */ - public function getKey() + public function getDp() { - return $this->container['key']; + return $this->container['dp']; } /** - * Sets key - * @param object $key + * Sets dp + * @param string $dp * @return $this */ - public function setKey($key) + public function setDp($dp) { - $this->container['key'] = $key; + $this->container['dp'] = $dp; return $this; } /** - * Gets key_id + * Gets dq * @return string */ - public function getKeyId() + public function getDq() { - return $this->container['key_id']; + return $this->container['dq']; } /** - * Sets key_id - * @param string $key_id + * Sets dq + * @param string $dq * @return $this */ - public function setKeyId($key_id) + public function setDq($dq) { - $this->container['key_id'] = $key_id; + $this->container['dq'] = $dq; + + return $this; + } + + /** + * Gets e + * @return string + */ + public function getE() + { + return $this->container['e']; + } + + /** + * Sets e + * @param string $e + * @return $this + */ + public function setE($e) + { + $this->container['e'] = $e; + + return $this; + } + + /** + * Gets k + * @return string + */ + public function getK() + { + return $this->container['k']; + } + + /** + * Sets k + * @param string $k + * @return $this + */ + public function setK($k) + { + $this->container['k'] = $k; + + return $this; + } + + /** + * Gets kid + * @return string + */ + public function getKid() + { + return $this->container['kid']; + } + + /** + * Sets kid + * @param string $kid The \"kid\" (key ID) parameter is used to match a specific key. This is used, for instance, to choose among a set of keys within a JWK Set during key rollover. The structure of the \"kid\" value is unspecified. When \"kid\" values are used within a JWK Set, different keys within the JWK Set SHOULD use distinct \"kid\" values. (One example in which different keys might use the same \"kid\" value is if they have different \"kty\" (key type) values but are considered to be equivalent alternatives by the application using them.) The \"kid\" value is a case-sensitive string. + * @return $this + */ + public function setKid($kid) + { + $this->container['kid'] = $kid; + + return $this; + } + + /** + * Gets kty + * @return string + */ + public function getKty() + { + return $this->container['kty']; + } + + /** + * Sets kty + * @param string $kty The \"kty\" (key type) parameter identifies the cryptographic algorithm family used with the key, such as \"RSA\" or \"EC\". \"kty\" values should either be registered in the IANA \"JSON Web Key Types\" registry established by [JWA] or be a value that contains a Collision- Resistant Name. The \"kty\" value is a case-sensitive string. + * @return $this + */ + public function setKty($kty) + { + $this->container['kty'] = $kty; + + return $this; + } + + /** + * Gets n + * @return string + */ + public function getN() + { + return $this->container['n']; + } + + /** + * Sets n + * @param string $n + * @return $this + */ + public function setN($n) + { + $this->container['n'] = $n; + + return $this; + } + + /** + * Gets p + * @return string + */ + public function getP() + { + return $this->container['p']; + } + + /** + * Sets p + * @param string $p + * @return $this + */ + public function setP($p) + { + $this->container['p'] = $p; + + return $this; + } + + /** + * Gets q + * @return string + */ + public function getQ() + { + return $this->container['q']; + } + + /** + * Sets q + * @param string $q + * @return $this + */ + public function setQ($q) + { + $this->container['q'] = $q; + + return $this; + } + + /** + * Gets qi + * @return string + */ + public function getQi() + { + return $this->container['qi']; + } + + /** + * Sets qi + * @param string $qi + * @return $this + */ + public function setQi($qi) + { + $this->container['qi'] = $qi; return $this; } @@ -279,7 +540,7 @@ public function getUse() /** * Sets use - * @param string $use + * @param string $use The \"use\" (public key use) parameter identifies the intended use of the public key. The \"use\" parameter is employed to indicate whether a public key is used for encrypting data or verifying the signature on data. Values are commonly \"sig\" (signature) or \"enc\" (encryption). * @return $this */ public function setUse($use) @@ -288,6 +549,69 @@ public function setUse($use) return $this; } + + /** + * Gets x + * @return string + */ + public function getX() + { + return $this->container['x']; + } + + /** + * Sets x + * @param string $x + * @return $this + */ + public function setX($x) + { + $this->container['x'] = $x; + + return $this; + } + + /** + * Gets x5c + * @return string[] + */ + public function getX5c() + { + return $this->container['x5c']; + } + + /** + * Sets x5c + * @param string[] $x5c The \"x5c\" (X.509 certificate chain) parameter contains a chain of one or more PKIX certificates [RFC5280]. The certificate chain is represented as a JSON array of certificate value strings. Each string in the array is a base64-encoded (Section 4 of [RFC4648] -- not base64url-encoded) DER [ITU.X690.1994] PKIX certificate value. The PKIX certificate containing the key value MUST be the first certificate. + * @return $this + */ + public function setX5c($x5c) + { + $this->container['x5c'] = $x5c; + + return $this; + } + + /** + * Gets y + * @return string + */ + public function getY() + { + return $this->container['y']; + } + + /** + * Sets y + * @param string $y + * @return $this + */ + public function setY($y) + { + $this->container['y'] = $y; + + return $this; + } /** * Returns true if offset exists. False otherwise. * @param integer $offset Offset diff --git a/sdk/php/swagger/lib/Model/JSONWebKeySet.php b/sdk/php/swagger/lib/Model/JSONWebKeySet.php index 677d563a572..bcd3ceeea0f 100644 --- a/sdk/php/swagger/lib/Model/JSONWebKeySet.php +++ b/sdk/php/swagger/lib/Model/JSONWebKeySet.php @@ -1,6 +1,6 @@ '\Hydra\SDK\Model\JSONWebKey[]' + 'keys' => '\Hydra\SDK\Model\JsonWebKey[]' ]; /** @@ -162,7 +162,7 @@ public function valid() /** * Gets keys - * @return \Hydra\SDK\Model\JSONWebKey[] + * @return \Hydra\SDK\Model\JsonWebKey[] */ public function getKeys() { @@ -171,7 +171,7 @@ public function getKeys() /** * Sets keys - * @param \Hydra\SDK\Model\JSONWebKey[] $keys + * @param \Hydra\SDK\Model\JsonWebKey[] $keys The value of the \"keys\" parameter is an array of JWK values. By default, the order of the JWK values within the array does not imply an order of preference among them, although applications of JWK Sets can choose to assign a meaning to the order for their purposes, if desired. * @return $this */ public function setKeys($keys) diff --git a/sdk/php/swagger/lib/Model/JsonWebKey.php b/sdk/php/swagger/lib/Model/JsonWebKey.php deleted file mode 100644 index 50080d87c7a..00000000000 --- a/sdk/php/swagger/lib/Model/JsonWebKey.php +++ /dev/null @@ -1,350 +0,0 @@ - 'string', - 'certificates' => '\Hydra\SDK\Model\Certificate[]', - 'key' => 'object', - 'key_id' => 'string', - 'use' => 'string' - ]; - - /** - * Array of property to format mappings. Used for (de)serialization - * @var string[] - */ - protected static $swaggerFormats = [ - 'algorithm' => null, - 'certificates' => null, - 'key' => null, - 'key_id' => null, - 'use' => null - ]; - - public static function swaggerTypes() - { - return self::$swaggerTypes; - } - - public static function swaggerFormats() - { - return self::$swaggerFormats; - } - - /** - * Array of attributes where the key is the local name, and the value is the original name - * @var string[] - */ - protected static $attributeMap = [ - 'algorithm' => 'Algorithm', - 'certificates' => 'Certificates', - 'key' => 'Key', - 'key_id' => 'KeyID', - 'use' => 'Use' - ]; - - - /** - * Array of attributes to setter functions (for deserialization of responses) - * @var string[] - */ - protected static $setters = [ - 'algorithm' => 'setAlgorithm', - 'certificates' => 'setCertificates', - 'key' => 'setKey', - 'key_id' => 'setKeyId', - 'use' => 'setUse' - ]; - - - /** - * Array of attributes to getter functions (for serialization of requests) - * @var string[] - */ - protected static $getters = [ - 'algorithm' => 'getAlgorithm', - 'certificates' => 'getCertificates', - 'key' => 'getKey', - 'key_id' => 'getKeyId', - 'use' => 'getUse' - ]; - - public static function attributeMap() - { - return self::$attributeMap; - } - - public static function setters() - { - return self::$setters; - } - - public static function getters() - { - return self::$getters; - } - - - - - - /** - * Associative array for storing property values - * @var mixed[] - */ - protected $container = []; - - /** - * Constructor - * @param mixed[] $data Associated array of property values initializing the model - */ - public function __construct(array $data = null) - { - $this->container['algorithm'] = isset($data['algorithm']) ? $data['algorithm'] : null; - $this->container['certificates'] = isset($data['certificates']) ? $data['certificates'] : null; - $this->container['key'] = isset($data['key']) ? $data['key'] : null; - $this->container['key_id'] = isset($data['key_id']) ? $data['key_id'] : null; - $this->container['use'] = isset($data['use']) ? $data['use'] : null; - } - - /** - * show all the invalid properties with reasons. - * - * @return array invalid properties with reasons - */ - public function listInvalidProperties() - { - $invalid_properties = []; - - return $invalid_properties; - } - - /** - * validate all the properties in the model - * return true if all passed - * - * @return bool True if all properties are valid - */ - public function valid() - { - - return true; - } - - - /** - * Gets algorithm - * @return string - */ - public function getAlgorithm() - { - return $this->container['algorithm']; - } - - /** - * Sets algorithm - * @param string $algorithm - * @return $this - */ - public function setAlgorithm($algorithm) - { - $this->container['algorithm'] = $algorithm; - - return $this; - } - - /** - * Gets certificates - * @return \Hydra\SDK\Model\Certificate[] - */ - public function getCertificates() - { - return $this->container['certificates']; - } - - /** - * Sets certificates - * @param \Hydra\SDK\Model\Certificate[] $certificates - * @return $this - */ - public function setCertificates($certificates) - { - $this->container['certificates'] = $certificates; - - return $this; - } - - /** - * Gets key - * @return object - */ - public function getKey() - { - return $this->container['key']; - } - - /** - * Sets key - * @param object $key - * @return $this - */ - public function setKey($key) - { - $this->container['key'] = $key; - - return $this; - } - - /** - * Gets key_id - * @return string - */ - public function getKeyId() - { - return $this->container['key_id']; - } - - /** - * Sets key_id - * @param string $key_id - * @return $this - */ - public function setKeyId($key_id) - { - $this->container['key_id'] = $key_id; - - return $this; - } - - /** - * Gets use - * @return string - */ - public function getUse() - { - return $this->container['use']; - } - - /** - * Sets use - * @param string $use - * @return $this - */ - public function setUse($use) - { - $this->container['use'] = $use; - - return $this; - } - /** - * Returns true if offset exists. False otherwise. - * @param integer $offset Offset - * @return boolean - */ - public function offsetExists($offset) - { - return isset($this->container[$offset]); - } - - /** - * Gets offset. - * @param integer $offset Offset - * @return mixed - */ - public function offsetGet($offset) - { - return isset($this->container[$offset]) ? $this->container[$offset] : null; - } - - /** - * Sets value based on offset. - * @param integer $offset Offset - * @param mixed $value Value to be set - * @return void - */ - public function offsetSet($offset, $value) - { - if (is_null($offset)) { - $this->container[] = $value; - } else { - $this->container[$offset] = $value; - } - } - - /** - * Unsets offset. - * @param integer $offset Offset - * @return void - */ - public function offsetUnset($offset) - { - unset($this->container[$offset]); - } - - /** - * Gets the string presentation of the object - * @return string - */ - public function __toString() - { - if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print - return json_encode(\Hydra\SDK\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT); - } - - return json_encode(\Hydra\SDK\ObjectSerializer::sanitizeForSerialization($this)); - } -} - - diff --git a/sdk/php/swagger/lib/Model/JsonWebKeySet.php b/sdk/php/swagger/lib/Model/JsonWebKeySet.php deleted file mode 100644 index 677d563a572..00000000000 --- a/sdk/php/swagger/lib/Model/JsonWebKeySet.php +++ /dev/null @@ -1,242 +0,0 @@ - '\Hydra\SDK\Model\JSONWebKey[]' - ]; - - /** - * Array of property to format mappings. Used for (de)serialization - * @var string[] - */ - protected static $swaggerFormats = [ - 'keys' => null - ]; - - public static function swaggerTypes() - { - return self::$swaggerTypes; - } - - public static function swaggerFormats() - { - return self::$swaggerFormats; - } - - /** - * Array of attributes where the key is the local name, and the value is the original name - * @var string[] - */ - protected static $attributeMap = [ - 'keys' => 'keys' - ]; - - - /** - * Array of attributes to setter functions (for deserialization of responses) - * @var string[] - */ - protected static $setters = [ - 'keys' => 'setKeys' - ]; - - - /** - * Array of attributes to getter functions (for serialization of requests) - * @var string[] - */ - protected static $getters = [ - 'keys' => 'getKeys' - ]; - - public static function attributeMap() - { - return self::$attributeMap; - } - - public static function setters() - { - return self::$setters; - } - - public static function getters() - { - return self::$getters; - } - - - - - - /** - * Associative array for storing property values - * @var mixed[] - */ - protected $container = []; - - /** - * Constructor - * @param mixed[] $data Associated array of property values initializing the model - */ - public function __construct(array $data = null) - { - $this->container['keys'] = isset($data['keys']) ? $data['keys'] : null; - } - - /** - * show all the invalid properties with reasons. - * - * @return array invalid properties with reasons - */ - public function listInvalidProperties() - { - $invalid_properties = []; - - return $invalid_properties; - } - - /** - * validate all the properties in the model - * return true if all passed - * - * @return bool True if all properties are valid - */ - public function valid() - { - - return true; - } - - - /** - * Gets keys - * @return \Hydra\SDK\Model\JSONWebKey[] - */ - public function getKeys() - { - return $this->container['keys']; - } - - /** - * Sets keys - * @param \Hydra\SDK\Model\JSONWebKey[] $keys - * @return $this - */ - public function setKeys($keys) - { - $this->container['keys'] = $keys; - - return $this; - } - /** - * Returns true if offset exists. False otherwise. - * @param integer $offset Offset - * @return boolean - */ - public function offsetExists($offset) - { - return isset($this->container[$offset]); - } - - /** - * Gets offset. - * @param integer $offset Offset - * @return mixed - */ - public function offsetGet($offset) - { - return isset($this->container[$offset]) ? $this->container[$offset] : null; - } - - /** - * Sets value based on offset. - * @param integer $offset Offset - * @param mixed $value Value to be set - * @return void - */ - public function offsetSet($offset, $value) - { - if (is_null($offset)) { - $this->container[] = $value; - } else { - $this->container[$offset] = $value; - } - } - - /** - * Unsets offset. - * @param integer $offset Offset - * @return void - */ - public function offsetUnset($offset) - { - unset($this->container[$offset]); - } - - /** - * Gets the string presentation of the object - * @return string - */ - public function __toString() - { - if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print - return json_encode(\Hydra\SDK\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT); - } - - return json_encode(\Hydra\SDK\ObjectSerializer::sanitizeForSerialization($this)); - } -} - - diff --git a/sdk/php/swagger/lib/Model/OAuth2TokenIntrospection.php b/sdk/php/swagger/lib/Model/OAuth2TokenIntrospection.php index 4d3c9eebd51..1485ba39f5f 100644 --- a/sdk/php/swagger/lib/Model/OAuth2TokenIntrospection.php +++ b/sdk/php/swagger/lib/Model/OAuth2TokenIntrospection.php @@ -211,6 +211,9 @@ public function listInvalidProperties() { $invalid_properties = []; + if ($this->container['active'] === null) { + $invalid_properties[] = "'active' can't be null"; + } return $invalid_properties; } @@ -223,6 +226,9 @@ public function listInvalidProperties() public function valid() { + if ($this->container['active'] === null) { + return false; + } return true; }