diff --git a/lib/services/apimanagement/lib/models/apiContract.js b/lib/services/apimanagement/lib/models/apiContract.js index e08973bc7c..39fce0a814 100644 --- a/lib/services/apimanagement/lib/models/apiContract.js +++ b/lib/services/apimanagement/lib/models/apiContract.js @@ -29,6 +29,16 @@ class ApiContract extends models['Resource'] { * @member {string} [authenticationSettings.oAuth2.authorizationServerId] * OAuth authorization server identifier. * @member {string} [authenticationSettings.oAuth2.scope] operations scope. + * @member {object} [authenticationSettings.openid] OpenID Connect + * Authentication Settings + * @member {string} [authenticationSettings.openid.openidProviderId] OAuth + * authorization server identifier. + * @member {array} [authenticationSettings.openid.bearerTokenSendingMethods] + * How to send token to the server. + * @member {boolean} [authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, + * true - API is included into closed products only, false - API is included + * into open products alone, null - there is a mix of products. * @member {object} [subscriptionKeyParameterNames] Protocols over which API * is made available. * @member {string} [subscriptionKeyParameterNames.header] Subscription key diff --git a/lib/services/apimanagement/lib/models/apiCreateOrUpdateParameter.js b/lib/services/apimanagement/lib/models/apiCreateOrUpdateParameter.js index 6516697fc5..30c69b5125 100644 --- a/lib/services/apimanagement/lib/models/apiCreateOrUpdateParameter.js +++ b/lib/services/apimanagement/lib/models/apiCreateOrUpdateParameter.js @@ -26,6 +26,16 @@ class ApiCreateOrUpdateParameter { * @member {string} [authenticationSettings.oAuth2.authorizationServerId] * OAuth authorization server identifier. * @member {string} [authenticationSettings.oAuth2.scope] operations scope. + * @member {object} [authenticationSettings.openid] OpenID Connect + * Authentication Settings + * @member {string} [authenticationSettings.openid.openidProviderId] OAuth + * authorization server identifier. + * @member {array} [authenticationSettings.openid.bearerTokenSendingMethods] + * How to send token to the server. + * @member {boolean} [authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, + * true - API is included into closed products only, false - API is included + * into open products alone, null - there is a mix of products. * @member {object} [subscriptionKeyParameterNames] Protocols over which API * is made available. * @member {string} [subscriptionKeyParameterNames.header] Subscription key diff --git a/lib/services/apimanagement/lib/models/apiEntityBaseContract.js b/lib/services/apimanagement/lib/models/apiEntityBaseContract.js index bef323bc1a..7950277f38 100644 --- a/lib/services/apimanagement/lib/models/apiEntityBaseContract.js +++ b/lib/services/apimanagement/lib/models/apiEntityBaseContract.js @@ -26,6 +26,16 @@ class ApiEntityBaseContract { * @member {string} [authenticationSettings.oAuth2.authorizationServerId] * OAuth authorization server identifier. * @member {string} [authenticationSettings.oAuth2.scope] operations scope. + * @member {object} [authenticationSettings.openid] OpenID Connect + * Authentication Settings + * @member {string} [authenticationSettings.openid.openidProviderId] OAuth + * authorization server identifier. + * @member {array} [authenticationSettings.openid.bearerTokenSendingMethods] + * How to send token to the server. + * @member {boolean} [authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, + * true - API is included into closed products only, false - API is included + * into open products alone, null - there is a mix of products. * @member {object} [subscriptionKeyParameterNames] Protocols over which API * is made available. * @member {string} [subscriptionKeyParameterNames.header] Subscription key diff --git a/lib/services/apimanagement/lib/models/apiUpdateContract.js b/lib/services/apimanagement/lib/models/apiUpdateContract.js index b03a016834..3a3e6b143f 100644 --- a/lib/services/apimanagement/lib/models/apiUpdateContract.js +++ b/lib/services/apimanagement/lib/models/apiUpdateContract.js @@ -26,6 +26,16 @@ class ApiUpdateContract { * @member {string} [authenticationSettings.oAuth2.authorizationServerId] * OAuth authorization server identifier. * @member {string} [authenticationSettings.oAuth2.scope] operations scope. + * @member {object} [authenticationSettings.openid] OpenID Connect + * Authentication Settings + * @member {string} [authenticationSettings.openid.openidProviderId] OAuth + * authorization server identifier. + * @member {array} [authenticationSettings.openid.bearerTokenSendingMethods] + * How to send token to the server. + * @member {boolean} [authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, + * true - API is included into closed products only, false - API is included + * into open products alone, null - there is a mix of products. * @member {object} [subscriptionKeyParameterNames] Protocols over which API * is made available. * @member {string} [subscriptionKeyParameterNames.header] Subscription key diff --git a/lib/services/apimanagement/lib/models/authenticationSettingsContract.js b/lib/services/apimanagement/lib/models/authenticationSettingsContract.js index 1f70fdafab..a61c1f6770 100644 --- a/lib/services/apimanagement/lib/models/authenticationSettingsContract.js +++ b/lib/services/apimanagement/lib/models/authenticationSettingsContract.js @@ -21,6 +21,15 @@ class AuthenticationSettingsContract { * @member {string} [oAuth2.authorizationServerId] OAuth authorization server * identifier. * @member {string} [oAuth2.scope] operations scope. + * @member {object} [openid] OpenID Connect Authentication Settings + * @member {string} [openid.openidProviderId] OAuth authorization server + * identifier. + * @member {array} [openid.bearerTokenSendingMethods] How to send token to + * the server. + * @member {boolean} [subscriptionKeyRequired] Specifies whether subscription + * key is required during call to this API, true - API is included into + * closed products only, false - API is included into open products alone, + * null - there is a mix of products. */ constructor() { } @@ -46,6 +55,21 @@ class AuthenticationSettingsContract { name: 'Composite', className: 'OAuth2AuthenticationSettingsContract' } + }, + openid: { + required: false, + serializedName: 'openid', + type: { + name: 'Composite', + className: 'OpenIdAuthenticationSettingsContract' + } + }, + subscriptionKeyRequired: { + required: false, + serializedName: 'subscriptionKeyRequired', + type: { + name: 'Boolean' + } } } } diff --git a/lib/services/apimanagement/lib/models/index.d.ts b/lib/services/apimanagement/lib/models/index.d.ts index f489d3d0d1..6555a15fe6 100644 --- a/lib/services/apimanagement/lib/models/index.d.ts +++ b/lib/services/apimanagement/lib/models/index.d.ts @@ -216,6 +216,16 @@ export interface ApiVersionSetContractDetails { * @member {string} [authenticationSettings.oAuth2.authorizationServerId] OAuth * authorization server identifier. * @member {string} [authenticationSettings.oAuth2.scope] operations scope. + * @member {object} [authenticationSettings.openid] OpenID Connect + * Authentication Settings + * @member {string} [authenticationSettings.openid.openidProviderId] OAuth + * authorization server identifier. + * @member {array} [authenticationSettings.openid.bearerTokenSendingMethods] + * How to send token to the server. + * @member {boolean} [authenticationSettings.subscriptionKeyRequired] Specifies + * whether subscription key is required during call to this API, true - API is + * included into closed products only, false - API is included into open + * products alone, null - there is a mix of products. * @member {object} [subscriptionKeyParameterNames] Protocols over which API is * made available. * @member {string} [subscriptionKeyParameterNames.header] Subscription key @@ -302,6 +312,16 @@ export interface ApiContractProperties extends ApiEntityBaseContract { * @member {string} [authenticationSettings.oAuth2.authorizationServerId] OAuth * authorization server identifier. * @member {string} [authenticationSettings.oAuth2.scope] operations scope. + * @member {object} [authenticationSettings.openid] OpenID Connect + * Authentication Settings + * @member {string} [authenticationSettings.openid.openidProviderId] OAuth + * authorization server identifier. + * @member {array} [authenticationSettings.openid.bearerTokenSendingMethods] + * How to send token to the server. + * @member {boolean} [authenticationSettings.subscriptionKeyRequired] Specifies + * whether subscription key is required during call to this API, true - API is + * included into closed products only, false - API is included into open + * products alone, null - there is a mix of products. * @member {object} [subscriptionKeyParameterNames] Protocols over which API is * made available. * @member {string} [subscriptionKeyParameterNames.header] Subscription key @@ -393,6 +413,16 @@ export interface ApiCreateOrUpdatePropertiesWsdlSelector { * @member {string} [authenticationSettings.oAuth2.authorizationServerId] OAuth * authorization server identifier. * @member {string} [authenticationSettings.oAuth2.scope] operations scope. + * @member {object} [authenticationSettings.openid] OpenID Connect + * Authentication Settings + * @member {string} [authenticationSettings.openid.openidProviderId] OAuth + * authorization server identifier. + * @member {array} [authenticationSettings.openid.bearerTokenSendingMethods] + * How to send token to the server. + * @member {boolean} [authenticationSettings.subscriptionKeyRequired] Specifies + * whether subscription key is required during call to this API, true - API is + * included into closed products only, false - API is included into open + * products alone, null - there is a mix of products. * @member {object} [subscriptionKeyParameterNames] Protocols over which API is * made available. * @member {string} [subscriptionKeyParameterNames.header] Subscription key @@ -487,6 +517,16 @@ export interface ApiCreateOrUpdateParameter { * @member {string} [authenticationSettings.oAuth2.authorizationServerId] OAuth * authorization server identifier. * @member {string} [authenticationSettings.oAuth2.scope] operations scope. + * @member {object} [authenticationSettings.openid] OpenID Connect + * Authentication Settings + * @member {string} [authenticationSettings.openid.openidProviderId] OAuth + * authorization server identifier. + * @member {array} [authenticationSettings.openid.bearerTokenSendingMethods] + * How to send token to the server. + * @member {boolean} [authenticationSettings.subscriptionKeyRequired] Specifies + * whether subscription key is required during call to this API, true - API is + * included into closed products only, false - API is included into open + * products alone, null - there is a mix of products. * @member {object} [subscriptionKeyParameterNames] Protocols over which API is * made available. * @member {string} [subscriptionKeyParameterNames.header] Subscription key @@ -550,6 +590,20 @@ export interface OAuth2AuthenticationSettingsContract { scope?: string; } +/** + * @class + * Initializes a new instance of the OpenIdAuthenticationSettingsContract class. + * @constructor + * API OAuth2 Authentication settings details. + * + * @member {string} [openidProviderId] OAuth authorization server identifier. + * @member {array} [bearerTokenSendingMethods] How to send token to the server. + */ +export interface OpenIdAuthenticationSettingsContract { + openidProviderId?: string; + bearerTokenSendingMethods?: string[]; +} + /** * @class * Initializes a new instance of the AuthenticationSettingsContract class. @@ -560,9 +614,20 @@ export interface OAuth2AuthenticationSettingsContract { * @member {string} [oAuth2.authorizationServerId] OAuth authorization server * identifier. * @member {string} [oAuth2.scope] operations scope. + * @member {object} [openid] OpenID Connect Authentication Settings + * @member {string} [openid.openidProviderId] OAuth authorization server + * identifier. + * @member {array} [openid.bearerTokenSendingMethods] How to send token to the + * server. + * @member {boolean} [subscriptionKeyRequired] Specifies whether subscription + * key is required during call to this API, true - API is included into closed + * products only, false - API is included into open products alone, null - + * there is a mix of products. */ export interface AuthenticationSettingsContract { oAuth2?: OAuth2AuthenticationSettingsContract; + openid?: OpenIdAuthenticationSettingsContract; + subscriptionKeyRequired?: boolean; } /** diff --git a/lib/services/apimanagement/lib/models/index.js b/lib/services/apimanagement/lib/models/index.js index 4ff350f27d..eead049a1a 100644 --- a/lib/services/apimanagement/lib/models/index.js +++ b/lib/services/apimanagement/lib/models/index.js @@ -36,6 +36,7 @@ exports.ApiCreateOrUpdatePropertiesWsdlSelector = require('./apiCreateOrUpdatePr exports.ApiCreateOrUpdateParameter = require('./apiCreateOrUpdateParameter'); exports.ApiUpdateContract = require('./apiUpdateContract'); exports.OAuth2AuthenticationSettingsContract = require('./oAuth2AuthenticationSettingsContract'); +exports.OpenIdAuthenticationSettingsContract = require('./openIdAuthenticationSettingsContract'); exports.AuthenticationSettingsContract = require('./authenticationSettingsContract'); exports.SubscriptionKeyParameterNamesContract = require('./subscriptionKeyParameterNamesContract'); exports.ApiRevisionContract = require('./apiRevisionContract'); diff --git a/lib/services/apimanagement/lib/models/openIdAuthenticationSettingsContract.js b/lib/services/apimanagement/lib/models/openIdAuthenticationSettingsContract.js new file mode 100644 index 0000000000..4a0e260159 --- /dev/null +++ b/lib/services/apimanagement/lib/models/openIdAuthenticationSettingsContract.js @@ -0,0 +1,68 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +'use strict'; + +/** + * API OAuth2 Authentication settings details. + * + */ +class OpenIdAuthenticationSettingsContract { + /** + * Create a OpenIdAuthenticationSettingsContract. + * @member {string} [openidProviderId] OAuth authorization server identifier. + * @member {array} [bearerTokenSendingMethods] How to send token to the + * server. + */ + constructor() { + } + + /** + * Defines the metadata of OpenIdAuthenticationSettingsContract + * + * @returns {object} metadata of OpenIdAuthenticationSettingsContract + * + */ + mapper() { + return { + required: false, + serializedName: 'OpenIdAuthenticationSettingsContract', + type: { + name: 'Composite', + className: 'OpenIdAuthenticationSettingsContract', + modelProperties: { + openidProviderId: { + required: false, + serializedName: 'openidProviderId', + type: { + name: 'String' + } + }, + bearerTokenSendingMethods: { + required: false, + serializedName: 'bearerTokenSendingMethods', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'BearerTokenSendingMethodsElementType', + type: { + name: 'String' + } + } + } + } + } + } + }; + } +} + +module.exports = OpenIdAuthenticationSettingsContract; diff --git a/lib/services/apimanagement/lib/operations/api.js b/lib/services/apimanagement/lib/operations/api.js index 0716da2a0b..b2a038f940 100644 --- a/lib/services/apimanagement/lib/operations/api.js +++ b/lib/services/apimanagement/lib/operations/api.js @@ -606,6 +606,21 @@ function _get(resourceGroupName, serviceName, apiId, options, callback) { * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. * @@ -931,6 +946,21 @@ function _createOrUpdate(resourceGroupName, serviceName, apiId, parameters, opti * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. * @@ -2159,6 +2189,21 @@ class Api { * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. * @@ -2298,6 +2343,21 @@ class Api { * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. * @@ -2458,6 +2518,21 @@ class Api { * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. * @@ -2556,6 +2631,21 @@ class Api { * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. * diff --git a/lib/services/apimanagement/lib/operations/index.d.ts b/lib/services/apimanagement/lib/operations/index.d.ts index 88e9dc2ea2..2ca8c1db27 100644 --- a/lib/services/apimanagement/lib/operations/index.d.ts +++ b/lib/services/apimanagement/lib/operations/index.d.ts @@ -812,6 +812,21 @@ export interface Api { * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. * @@ -939,6 +954,21 @@ export interface Api { * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. * @@ -1084,6 +1114,21 @@ export interface Api { * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. * @@ -1170,6 +1215,21 @@ export interface Api { * @param {string} [parameters.authenticationSettings.oAuth2.scope] operations * scope. * + * @param {object} [parameters.authenticationSettings.openid] OpenID Connect + * Authentication Settings + * + * @param {string} [parameters.authenticationSettings.openid.openidProviderId] + * OAuth authorization server identifier. + * + * @param {array} + * [parameters.authenticationSettings.openid.bearerTokenSendingMethods] How to + * send token to the server. + * + * @param {boolean} [parameters.authenticationSettings.subscriptionKeyRequired] + * Specifies whether subscription key is required during call to this API, true + * - API is included into closed products only, false - API is included into + * open products alone, null - there is a mix of products. + * * @param {object} [parameters.subscriptionKeyParameterNames] Protocols over * which API is made available. *