diff --git a/sdk/appservice/arm-appservice/package.json b/sdk/appservice/arm-appservice/package.json index 3b79f69082dd..2ed38981c18c 100644 --- a/sdk/appservice/arm-appservice/package.json +++ b/sdk/appservice/arm-appservice/package.json @@ -27,7 +27,7 @@ "rollup-plugin-sourcemaps": "^0.4.2", "uglify-js": "^3.6.0" }, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/appservice/arm-appservice", + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/appservice/arm-appservice", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" diff --git a/sdk/appservice/arm-appservice/src/models/index.ts b/sdk/appservice/arm-appservice/src/models/index.ts index ff353311f7e7..11a903bd01de 100644 --- a/sdk/appservice/arm-appservice/src/models/index.ts +++ b/sdk/appservice/arm-appservice/src/models/index.ts @@ -6609,7 +6609,7 @@ export interface AllowedAudiencesValidation { /** * The configuration settings of the Azure Active Directory allowed principals. */ -export interface AllowedPrincipals extends ProxyOnlyResource { +export interface AllowedPrincipals { /** * The list of the allowed groups. */ @@ -6647,7 +6647,7 @@ export interface ApiKVReference extends ProxyOnlyResource { * The configuration settings of the app registration for providers that have app ids and app * secrets */ -export interface AppRegistration extends ProxyOnlyResource { +export interface AppRegistration { /** * The App ID of the app used for login. */ @@ -6685,7 +6685,7 @@ export interface LoginScopes { /** * The configuration settings of the Apple provider. */ -export interface Apple extends ProxyOnlyResource { +export interface Apple { /** * false if the Apple provider should not be enabled despite the set registration; * otherwise, true. @@ -6789,7 +6789,7 @@ export interface AuthPlatform { /** * The configuration settings of the Azure Active Directory app registration. */ -export interface AzureActiveDirectoryRegistration extends ProxyOnlyResource { +export interface AzureActiveDirectoryRegistration { /** * The OpenID Connect Issuer URI that represents the entity which issues access tokens for this * application. @@ -6835,7 +6835,7 @@ export interface AzureActiveDirectoryRegistration extends ProxyOnlyResource { /** * The configuration settings of the Azure Active Directory login flow. */ -export interface AzureActiveDirectoryLogin extends ProxyOnlyResource { +export interface AzureActiveDirectoryLogin { /** * Login parameters to send to the OpenID Connect authorization endpoint when * a user logs in. Each parameter must be in the form "key=value". @@ -6879,7 +6879,7 @@ export interface DefaultAuthorizationPolicy { /** * The configuration settings of the Azure Active Directory token validation flow. */ -export interface AzureActiveDirectoryValidation extends ProxyOnlyResource { +export interface AzureActiveDirectoryValidation { /** * The configuration settings of the checks that should be made while validating the JWT Claims. */ @@ -6959,7 +6959,7 @@ export interface AzureStaticWebAppsRegistration { /** * The configuration settings of the Azure Static Web Apps provider. */ -export interface AzureStaticWebApps extends ProxyOnlyResource { +export interface AzureStaticWebApps { /** * false if the Azure Static Web Apps provider should not be enabled despite the set * registration; otherwise, true. @@ -7147,7 +7147,7 @@ export interface BackupRequest extends ProxyOnlyResource { /** * The configuration settings of the storage of the tokens if blob storage is used. */ -export interface BlobStorageTokenStore extends ProxyOnlyResource { +export interface BlobStorageTokenStore { /** * The name of the app setting containing the SAS URL of the blob storage containing the tokens. */ @@ -7496,7 +7496,7 @@ export interface OpenIdConnectLogin { /** * The configuration settings of the custom Open ID Connect provider. */ -export interface CustomOpenIdConnectProvider extends ProxyOnlyResource { +export interface CustomOpenIdConnectProvider { /** * false if the custom Open ID provider provider should not be enabled; otherwise, * true. @@ -7739,7 +7739,7 @@ export interface FunctionSecrets { /** * The configuration settings of the GitHub provider. */ -export interface GitHub extends ProxyOnlyResource { +export interface GitHub { /** * false if the GitHub provider should not be enabled despite the set registration; * otherwise, true. @@ -7845,7 +7845,7 @@ export interface GlobalValidation { /** * The configuration settings of the Google provider. */ -export interface Google extends ProxyOnlyResource { +export interface Google { /** * false if the Google provider should not be enabled despite the set registration; * otherwise, true. @@ -7970,6 +7970,29 @@ export interface HttpSettings { forwardProxy?: ForwardProxy; } +/** + * The configuration settings of the legacy Microsoft Account provider. + */ +export interface LegacyMicrosoftAccount { + /** + * false if the legacy Microsoft Account provider should not be enabled despite the + * set registration; otherwise, true. + */ + enabled?: boolean; + /** + * The configuration settings of the app registration for the legacy Microsoft Account provider. + */ + registration?: ClientRegistration; + /** + * The configuration settings of the login flow. + */ + login?: LoginScopes; + /** + * The configuration settings of the legacy Microsoft Account provider token validation flow. + */ + validation?: AllowedAudiencesValidation; +} + /** * The configuration settings of the app registration for the Twitter provider. */ @@ -7990,7 +8013,7 @@ export interface TwitterRegistration { /** * The configuration settings of the Twitter provider. */ -export interface Twitter extends ProxyOnlyResource { +export interface Twitter { /** * false if the Twitter provider should not be enabled despite the set registration; * otherwise, true. @@ -8002,29 +8025,6 @@ export interface Twitter extends ProxyOnlyResource { registration?: TwitterRegistration; } -/** - * The configuration settings of the legacy Microsoft Account provider. - */ -export interface LegacyMicrosoftAccount extends ProxyOnlyResource { - /** - * false if the legacy Microsoft Account provider should not be enabled despite the - * set registration; otherwise, true. - */ - enabled?: boolean; - /** - * The configuration settings of the app registration for the legacy Microsoft Account provider. - */ - registration?: ClientRegistration; - /** - * The configuration settings of the login flow. - */ - login?: LoginScopes; - /** - * The configuration settings of the legacy Microsoft Account provider token validation flow. - */ - validation?: AllowedAudiencesValidation; -} - /** * The configuration settings of each of the identity providers used to configure App Service * Authentication/Authorization. @@ -8046,19 +8046,14 @@ export interface IdentityProviders { * The configuration settings of the Google provider. */ google?: Google; - /** - * The configuration settings of the Twitter provider. - */ - twitter?: Twitter; - /** - * The map of the name of the alias of each custom Open ID Connect provider to the - * configuration settings of the custom Open ID Connect provider. - */ - customOpenIdConnectProviders?: { [propertyName: string]: CustomOpenIdConnectProvider }; /** * The configuration settings of the legacy Microsoft Account provider. */ legacyMicrosoftAccount?: LegacyMicrosoftAccount; + /** + * The configuration settings of the Twitter provider. + */ + twitter?: Twitter; /** * The configuration settings of the Apple provider. */ @@ -8067,6 +8062,11 @@ export interface IdentityProviders { * The configuration settings of the Azure Static Web Apps provider. */ azureStaticWebApps?: AzureStaticWebApps; + /** + * The map of the name of the alias of each custom Open ID Connect provider to the + * configuration settings of the custom Open ID Connect provider. + */ + customOpenIdConnectProviders?: { [propertyName: string]: CustomOpenIdConnectProvider }; } /** @@ -17765,26 +17765,6 @@ export type ResourceHealthMetadataListBySiteSlotNextResponse = ResourceHealthMet }; }; -/** - * Contains response data for the generateGithubAccessTokenForAppserviceCLIAsync operation. - */ -export type GenerateGithubAccessTokenForAppserviceCLIAsyncResponse = AppserviceGithubToken & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: AppserviceGithubToken; - }; -}; - /** * Contains response data for the getPublishingUser operation. */ diff --git a/sdk/appservice/arm-appservice/src/models/mappers.ts b/sdk/appservice/arm-appservice/src/models/mappers.ts index 43e4f061d4bb..fd831bf456a0 100644 --- a/sdk/appservice/arm-appservice/src/models/mappers.ts +++ b/sdk/appservice/arm-appservice/src/models/mappers.ts @@ -11457,9 +11457,8 @@ export const AllowedPrincipals: msRest.CompositeMapper = { name: "Composite", className: "AllowedPrincipals", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, groups: { - serializedName: "properties.groups", + serializedName: "groups", type: { name: "Sequence", element: { @@ -11470,7 +11469,7 @@ export const AllowedPrincipals: msRest.CompositeMapper = { } }, identities: { - serializedName: "properties.identities", + serializedName: "identities", type: { name: "Sequence", element: { @@ -11572,15 +11571,14 @@ export const AppRegistration: msRest.CompositeMapper = { name: "Composite", className: "AppRegistration", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, appId: { - serializedName: "properties.appId", + serializedName: "appId", type: { name: "String" } }, appSecretSettingName: { - serializedName: "properties.appSecretSettingName", + serializedName: "appSecretSettingName", type: { name: "String" } @@ -11638,22 +11636,21 @@ export const Apple: msRest.CompositeMapper = { name: "Composite", className: "Apple", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, enabled: { - serializedName: "properties.enabled", + serializedName: "enabled", type: { name: "Boolean" } }, registration: { - serializedName: "properties.registration", + serializedName: "registration", type: { name: "Composite", className: "AppleRegistration" } }, login: { - serializedName: "properties.login", + serializedName: "login", type: { name: "Composite", className: "LoginScopes" @@ -11817,39 +11814,38 @@ export const AzureActiveDirectoryRegistration: msRest.CompositeMapper = { name: "Composite", className: "AzureActiveDirectoryRegistration", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, openIdIssuer: { - serializedName: "properties.openIdIssuer", + serializedName: "openIdIssuer", type: { name: "String" } }, clientId: { - serializedName: "properties.clientId", + serializedName: "clientId", type: { name: "String" } }, clientSecretSettingName: { - serializedName: "properties.clientSecretSettingName", + serializedName: "clientSecretSettingName", type: { name: "String" } }, clientSecretCertificateThumbprint: { - serializedName: "properties.clientSecretCertificateThumbprint", + serializedName: "clientSecretCertificateThumbprint", type: { name: "String" } }, clientSecretCertificateSubjectAlternativeName: { - serializedName: "properties.clientSecretCertificateSubjectAlternativeName", + serializedName: "clientSecretCertificateSubjectAlternativeName", type: { name: "String" } }, clientSecretCertificateIssuer: { - serializedName: "properties.clientSecretCertificateIssuer", + serializedName: "clientSecretCertificateIssuer", type: { name: "String" } @@ -11864,9 +11860,8 @@ export const AzureActiveDirectoryLogin: msRest.CompositeMapper = { name: "Composite", className: "AzureActiveDirectoryLogin", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, loginParameters: { - serializedName: "properties.loginParameters", + serializedName: "loginParameters", type: { name: "Sequence", element: { @@ -11877,7 +11872,7 @@ export const AzureActiveDirectoryLogin: msRest.CompositeMapper = { } }, disableWWWAuthenticate: { - serializedName: "properties.disableWWWAuthenticate", + serializedName: "disableWWWAuthenticate", type: { name: "Boolean" } @@ -11952,16 +11947,15 @@ export const AzureActiveDirectoryValidation: msRest.CompositeMapper = { name: "Composite", className: "AzureActiveDirectoryValidation", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, jwtClaimChecks: { - serializedName: "properties.jwtClaimChecks", + serializedName: "jwtClaimChecks", type: { name: "Composite", className: "JwtClaimChecks" } }, allowedAudiences: { - serializedName: "properties.allowedAudiences", + serializedName: "allowedAudiences", type: { name: "Sequence", element: { @@ -11972,7 +11966,7 @@ export const AzureActiveDirectoryValidation: msRest.CompositeMapper = { } }, defaultAuthorizationPolicy: { - serializedName: "properties.defaultAuthorizationPolicy", + serializedName: "defaultAuthorizationPolicy", type: { name: "Composite", className: "DefaultAuthorizationPolicy" @@ -12075,15 +12069,14 @@ export const AzureStaticWebApps: msRest.CompositeMapper = { name: "Composite", className: "AzureStaticWebApps", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, enabled: { - serializedName: "properties.enabled", + serializedName: "enabled", type: { name: "Boolean" } }, registration: { - serializedName: "properties.registration", + serializedName: "registration", type: { name: "Composite", className: "AzureStaticWebAppsRegistration" @@ -12392,9 +12385,8 @@ export const BlobStorageTokenStore: msRest.CompositeMapper = { name: "Composite", className: "BlobStorageTokenStore", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, sasUrlSettingName: { - serializedName: "properties.sasUrlSettingName", + serializedName: "sasUrlSettingName", type: { name: "String" } @@ -13155,22 +13147,21 @@ export const CustomOpenIdConnectProvider: msRest.CompositeMapper = { name: "Composite", className: "CustomOpenIdConnectProvider", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, enabled: { - serializedName: "properties.enabled", + serializedName: "enabled", type: { name: "Boolean" } }, registration: { - serializedName: "properties.registration", + serializedName: "registration", type: { name: "Composite", className: "OpenIdConnectRegistration" } }, login: { - serializedName: "properties.login", + serializedName: "login", type: { name: "Composite", className: "OpenIdConnectLogin" @@ -13535,22 +13526,21 @@ export const GitHub: msRest.CompositeMapper = { name: "Composite", className: "GitHub", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, enabled: { - serializedName: "properties.enabled", + serializedName: "enabled", type: { name: "Boolean" } }, registration: { - serializedName: "properties.registration", + serializedName: "registration", type: { name: "Composite", className: "ClientRegistration" } }, login: { - serializedName: "properties.login", + serializedName: "login", type: { name: "Composite", className: "LoginScopes" @@ -13703,29 +13693,28 @@ export const Google: msRest.CompositeMapper = { name: "Composite", className: "Google", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, enabled: { - serializedName: "properties.enabled", + serializedName: "enabled", type: { name: "Boolean" } }, registration: { - serializedName: "properties.registration", + serializedName: "registration", type: { name: "Composite", className: "ClientRegistration" } }, login: { - serializedName: "properties.login", + serializedName: "login", type: { name: "Composite", className: "LoginScopes" } }, validation: { - serializedName: "properties.validation", + serializedName: "validation", type: { name: "Composite", className: "AllowedAudiencesValidation" @@ -13926,84 +13915,82 @@ export const HttpSettings: msRest.CompositeMapper = { } }; -export const TwitterRegistration: msRest.CompositeMapper = { - serializedName: "TwitterRegistration", +export const LegacyMicrosoftAccount: msRest.CompositeMapper = { + serializedName: "LegacyMicrosoftAccount", type: { name: "Composite", - className: "TwitterRegistration", + className: "LegacyMicrosoftAccount", modelProperties: { - consumerKey: { - serializedName: "consumerKey", + enabled: { + serializedName: "enabled", type: { - name: "String" + name: "Boolean" } }, - consumerSecretSettingName: { - serializedName: "consumerSecretSettingName", + registration: { + serializedName: "registration", type: { - name: "String" + name: "Composite", + className: "ClientRegistration" + } + }, + login: { + serializedName: "login", + type: { + name: "Composite", + className: "LoginScopes" + } + }, + validation: { + serializedName: "validation", + type: { + name: "Composite", + className: "AllowedAudiencesValidation" } } } } }; -export const Twitter: msRest.CompositeMapper = { - serializedName: "Twitter", +export const TwitterRegistration: msRest.CompositeMapper = { + serializedName: "TwitterRegistration", type: { name: "Composite", - className: "Twitter", + className: "TwitterRegistration", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, - enabled: { - serializedName: "properties.enabled", + consumerKey: { + serializedName: "consumerKey", type: { - name: "Boolean" + name: "String" } }, - registration: { - serializedName: "properties.registration", + consumerSecretSettingName: { + serializedName: "consumerSecretSettingName", type: { - name: "Composite", - className: "TwitterRegistration" + name: "String" } } } } }; -export const LegacyMicrosoftAccount: msRest.CompositeMapper = { - serializedName: "LegacyMicrosoftAccount", +export const Twitter: msRest.CompositeMapper = { + serializedName: "Twitter", type: { name: "Composite", - className: "LegacyMicrosoftAccount", + className: "Twitter", modelProperties: { - ...ProxyOnlyResource.type.modelProperties, enabled: { - serializedName: "properties.enabled", + serializedName: "enabled", type: { name: "Boolean" } }, registration: { - serializedName: "properties.registration", - type: { - name: "Composite", - className: "ClientRegistration" - } - }, - login: { - serializedName: "properties.login", - type: { - name: "Composite", - className: "LoginScopes" - } - }, - validation: { - serializedName: "properties.validation", + serializedName: "registration", type: { name: "Composite", - className: "AllowedAudiencesValidation" + className: "TwitterRegistration" } } } @@ -14044,30 +14031,18 @@ export const IdentityProviders: msRest.CompositeMapper = { className: "Google" } }, - twitter: { - serializedName: "twitter", + legacyMicrosoftAccount: { + serializedName: "legacyMicrosoftAccount", type: { name: "Composite", - className: "Twitter" - } - }, - customOpenIdConnectProviders: { - serializedName: "customOpenIdConnectProviders", - type: { - name: "Dictionary", - value: { - type: { - name: "Composite", - className: "CustomOpenIdConnectProvider" - } - } + className: "LegacyMicrosoftAccount" } }, - legacyMicrosoftAccount: { - serializedName: "legacyMicrosoftAccount", + twitter: { + serializedName: "twitter", type: { name: "Composite", - className: "LegacyMicrosoftAccount" + className: "Twitter" } }, apple: { @@ -14083,6 +14058,18 @@ export const IdentityProviders: msRest.CompositeMapper = { name: "Composite", className: "AzureStaticWebApps" } + }, + customOpenIdConnectProviders: { + serializedName: "customOpenIdConnectProviders", + type: { + name: "Dictionary", + value: { + type: { + name: "Composite", + className: "CustomOpenIdConnectProvider" + } + } + } } } } diff --git a/sdk/appservice/arm-appservice/src/webSiteManagementClient.ts b/sdk/appservice/arm-appservice/src/webSiteManagementClient.ts index aeec0eec437c..5c3d0c35206e 100644 --- a/sdk/appservice/arm-appservice/src/webSiteManagementClient.ts +++ b/sdk/appservice/arm-appservice/src/webSiteManagementClient.ts @@ -71,39 +71,6 @@ class WebSiteManagementClient extends WebSiteManagementClientContext { this.webApps = new operations.WebApps(this); } - /** - * Description for Exchange code for GitHub access token for AppService CLI - * @summary Exchange code for GitHub access token for AppService CLI - * @param code Code string to exchange for Github Access token - * @param state State string used for verification. - * @param [options] The optional parameters - * @returns Promise - */ - generateGithubAccessTokenForAppserviceCLIAsync(code: string, state: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param code Code string to exchange for Github Access token - * @param state State string used for verification. - * @param callback The callback - */ - generateGithubAccessTokenForAppserviceCLIAsync(code: string, state: string, callback: msRest.ServiceCallback): void; - /** - * @param code Code string to exchange for Github Access token - * @param state State string used for verification. - * @param options The optional parameters - * @param callback The callback - */ - generateGithubAccessTokenForAppserviceCLIAsync(code: string, state: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - generateGithubAccessTokenForAppserviceCLIAsync(code: string, state: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.sendOperationRequest( - { - code, - state, - options - }, - generateGithubAccessTokenForAppserviceCLIAsyncOperationSpec, - callback) as Promise; - } - /** * Description for Gets publishing user * @summary Gets publishing user @@ -712,36 +679,6 @@ class WebSiteManagementClient extends WebSiteManagementClientContext { // Operation Specifications const serializer = new msRest.Serializer(Mappers); -const generateGithubAccessTokenForAppserviceCLIAsyncOperationSpec: msRest.OperationSpec = { - httpMethod: "POST", - path: "providers/Microsoft.Web/generateGithubAccessTokenForAppserviceCLI", - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - requestBody: { - parameterPath: { - code: "code", - state: "state" - }, - mapper: { - ...Mappers.AppserviceGithubTokenRequest, - required: true - } - }, - responses: { - 200: { - bodyMapper: Mappers.AppserviceGithubToken - }, - default: { - bodyMapper: Mappers.DefaultErrorResponse - } - }, - serializer -}; - const getPublishingUserOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "providers/Microsoft.Web/publishingUsers/web",