CodeGen from PR 15364 in Azure/azure-rest-api-specs

Merge c15d80d2aaaca55dc1ad31cf23a7511510f76c0a into eaae6d973b6d3bf57fc3228ad8f8a59ddebaec08

sdk/cognitiveservices/cognitiveservices-luis-authoring/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Microsoft
+Copyright (c) 2021 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

sdk/cognitiveservices/cognitiveservices-luis-authoring/README.md

@@ -1,69 +1,72 @@
 ## An isomorphic javascript sdk for - LUISAuthoringClient
 
-This package contains an isomorphic SDK for LUISAuthoringClient.
-
-Package version | LUIS Authoring API version
---------------- | --------------------------
-3.0.0           |  /luis/api/v2.0
-4.0.0-preview.3 |  /luis/authoring/v3.0-preview
+This package contains an isomorphic SDK (runs both in node.js and in browsers) for LUISAuthoringClient.
 
 ### Currently supported environments
 
-- Node.js version 6.x.x or higher
-- Browser JavaScript
+- [LTS versions of Node.js](https://nodejs.org/about/releases/)
+- Latest versions of Safari, Chrome, Edge and Firefox.
+
+### Prerequisites
+
+You must have an [Azure subscription](https://azure.microsoft.com/free/).
 
-### How to Install
+### How to install
 
+To use this SDK in your project, you will need to install two packages.
+- `@azure/cognitiveservices-luis-authoring` that contains the client.
+- `@azure/identity` that provides different mechanisms for the client to authenticate your requests using Azure Active Directory.
+
+Install both packages using the below command:
 ```bash
-npm install @azure/cognitiveservices-luis-authoring
+npm install --save @azure/cognitiveservices-luis-authoring @azure/identity
 ```
+> **Note**: You may have used either `@azure/ms-rest-nodeauth` or `@azure/ms-rest-browserauth` in the past. These packages are in maintenance mode receiving critical bug fixes, but no new features.
+If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/), or are writing a client side browser application, we strongly encourage you to upgrade to `@azure/identity` which uses the latest versions of Azure Active Directory and MSAL APIs and provides more authentication options.
 
 ### How to use
 
-#### nodejs - Authentication, client creation and listPhraseLists features as an example written in TypeScript.
-
-##### Install @azure/ms-rest-azure-js
+- If you are writing a client side browser application,
+  - Follow the instructions in the section on Authenticating client side browser applications in [Azure Identity examples](https://aka.ms/azsdk/js/identity/examples) to register your application in the Microsoft identity platform and set the right permissions.
+  - Copy the client ID and tenant ID from the Overview section of your app registration in Azure portal and use it in the browser sample below.
+- If you are writing a server side application,
+  - [Select a credential from `@azure/identity` based on the authentication method of your choice](https://aka.ms/azsdk/js/identity/examples)
+  - Complete the set up steps required by the credential if any.
+  - Use the credential you picked in the place of `DefaultAzureCredential` in the Node.js sample below.
 
-```bash
-npm install @azure/ms-rest-azure-js
-```
+In the below samples, we pass the credential and the Azure subscription id to instantiate the client.
+Once the client is created, explore the operations on it either in your favorite editor or in our [API reference documentation](https://docs.microsoft.com/javascript/api) to get started.
+#### nodejs - Authentication, client creation, and listPhraseLists features as an example written in JavaScript.
 
 ##### Sample code
 
 ```javascript
-const { CognitiveServicesCredentials } = require("@azure/ms-rest-azure-js");
+const { DefaultAzureCredential } = require("@azure/identity");
 const { LUISAuthoringClient } = require("@azure/cognitiveservices-luis-authoring");
-
-let authoringKey = process.env["luis-authoring-key"];
-const creds = new CognitiveServicesCredentials(authoringKey);
-
-// check the following link to find your region
-// https://docs.microsoft.com/azure/cognitive-services/luis/luis-reference-regions
-const region = "<your-region>";
-const client = new LUISAuthoringClient(
-  creds,
-  "https://" + region + ".api.cognitive.microsoft.com/"
-);
-
-const appId = "<your-app-id>"; // replace this with your appId.
-const versionId = "0.1"; // replace with version of your luis application. Initial value will be 0.1
-
+const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
+
+// Use `DefaultAzureCredential` or any other credential of your choice based on https://aka.ms/azsdk/js/identity/examples
+// Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead.
+const creds = new DefaultAzureCredential();
+const client = new LUISAuthoringClient(creds, subscriptionId);
+const appId = ec7b1657-199d-4d8a-bbb2-89a11a42e02a;
+const versionId = "testversionId";
 const skip = 1;
 const take = 1;
-
-client.features
-  .listPhraseLists(appId, versionId, { skip, take })
-  .then((result) => {
-    console.log("The result is:");
-    console.log(result);
-  })
-  .catch((err) => {
-    console.error(err);
-  });
+client.features.listPhraseLists(appId, versionId, skip, take).then((result) => {
+  console.log("The result is:");
+  console.log(result);
+}).catch((err) => {
+  console.log("An error occurred:");
+  console.error(err);
+});
 ```
 
-#### browser - Authentication, client creation and listPhraseLists features as an example written in JavaScript.
+#### browser - Authentication, client creation, and listPhraseLists features as an example written in JavaScript.
 
+In browser applications, we recommend using the `InteractiveBrowserCredential` that interactively authenticates using the default system browser.
+  - See [Single-page application: App registration guide](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-app-registration) to configure your app registration for the browser.
+  - Note down the client Id from the previous step and use it in the browser sample below.
 
 ##### Sample code
 
@@ -74,31 +77,28 @@ client.features
 <html lang="en">
   <head>
     <title>@azure/cognitiveservices-luis-authoring sample</title>
-    <script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
     <script src="node_modules/@azure/cognitiveservices-luis-authoring/dist/cognitiveservices-luis-authoring.js"></script>
     <script type="text/javascript">
-      let authoringKey = process.env["luis-authoring-key"];
-      const creds = new msRest.ApiKeyCredentials({ inHeader: { 'Ocp-Apim-Subscription-Key': authoringKey } });
-
-      const region = "<your-region>";
-      const client = new Azure.CognitiveservicesLuisAuthoring.LUISAuthoringClient(
-        creds,
-        "https://" + region + ".api.cognitive.microsoft.com/"
-      );
-      const appId = "<your-app-id>"; // replace this with your appId.
-      const versionId = "0.1"; // replace with version of your luis application. Initial value will be 0.1
+      const subscriptionId = "<Subscription_Id>";
+      // Create credentials using the `@azure/identity` package.
+      // Please note that you can also use credentials from the `@azure/ms-rest-browserauth` package instead.
+      const credential = new InteractiveBrowserCredential(
+      {
+        clientId: "<client id for your Azure AD app>",
+        tenant: "<optional tenant for your organization>"
+      });
+      const client = new Azure.CognitiveservicesLuisAuthoring.LUISAuthoringClient(creds, subscriptionId);
+      const appId = ec7b1657-199d-4d8a-bbb2-89a11a42e02a;
+      const versionId = "testversionId";
       const skip = 1;
       const take = 1;
-      client.features
-        .listPhraseLists(appId, versionId, { skip, take })
-        .then((result) => {
-          console.log("The result is:");
-          console.log(result);
-        })
-        .catch((err) => {
-          console.log("An error occurred:");
-          console.error(err);
-        });
+      client.features.listPhraseLists(appId, versionId, skip, take).then((result) => {
+        console.log("The result is:");
+        console.log(result);
+      }).catch((err) => {
+        console.log("An error occurred:");
+        console.error(err);
+      });
     </script>
   </head>
   <body></body>
@@ -109,4 +109,4 @@ client.features
 
 - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
 
-![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fcognitiveservices%2Fcognitiveservices-luis-authoring%2FREADME.png)
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/cognitiveservices/cognitiveservices-luis-authoring/README.png)

sdk/cognitiveservices/cognitiveservices-luis-authoring/package.json

@@ -4,7 +4,8 @@
   "description": "LUISAuthoringClient Library with typescript type definitions for node.js and browser.",
   "version": "4.0.0-preview.3",
   "dependencies": {
-    "@azure/ms-rest-js": "^2.0.3",
+    "@azure/ms-rest-js": "^2.2.0",
+    "@azure/core-auth": "^1.1.4",
     "tslib": "^1.10.0"
   },
   "keywords": [
@@ -19,20 +20,13 @@
   "module": "./esm/lUISAuthoringClient.js",
   "types": "./esm/lUISAuthoringClient.d.ts",
   "devDependencies": {
-    "@types/chai": "^4.2.0",
-    "@types/mocha": "^5.2.7",
-    "mocha": "^6.1.4",
-    "nock": "^10.0.0",
-    "rollup": "^0.66.2",
-    "@azure/ms-rest-azure-js": "^2.0.1",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "typescript": "^3.6.0",
+    "rollup": "^1.18.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
-    "ts-node": "^8.3.0",
-    "typescript": "^3.1.1",
-    "uglify-js": "^3.4.9",
-    "ts-mocha": "^6.0.0"
+    "uglify-js": "^3.6.0"
   },
-  "homepage": "https://github.com/azure/azure-sdk-for-js/tree/main/sdk/cognitiveservices/cognitiveservices-luis-authoring",
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/cognitiveservices/cognitiveservices-luis-authoring",
   "repository": {
     "type": "git",
     "url": "https://github.com/Azure/azure-sdk-for-js.git"
@@ -57,8 +51,7 @@
   "scripts": {
     "build": "tsc && rollup -c rollup.config.js && npm run minify",
     "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/cognitiveservices-luis-authoring.js.map'\" -o ./dist/cognitiveservices-luis-authoring.min.js ./dist/cognitiveservices-luis-authoring.js",
-    "prepack": "npm install && npm run build",
-    "test": "ts-mocha -p tsconfig.test.json test/**/*.test.ts --timeout 100000"
+    "prepack": "npm install && npm run build"
   },
   "sideEffects": false,
   "autoPublish": true

sdk/cognitiveservices/cognitiveservices-luis-authoring/rollup.config.js

@@ -21,10 +21,9 @@ const config = {
       "@azure/ms-rest-azure-js": "msRestAzure"
     },
     banner: `/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- * 
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */`

sdk/cognitiveservices/cognitiveservices-luis-authoring/src/lUISAuthoringClient.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is
@@ -31,9 +30,14 @@ class LUISAuthoringClient extends LUISAuthoringClientContext {
    * @param endpoint Supported Cognitive Services endpoints (protocol and hostname, for example:
    * https://westus.api.cognitive.microsoft.com).
    * @param credentials Subscription credentials which uniquely identify client subscription.
+   * Credentials implementing the TokenCredential interface from the @azure/identity package are
+   * recommended. For more information about these credentials, see
+   * {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
+   * ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
+   * @azure/ms-rest-browserauth are also supported.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, endpoint: string, options?: msRest.ServiceClientOptions) {
+  constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, endpoint: string, options?: msRest.ServiceClientOptions) {
     super(credentials, endpoint, options);
     this.features = new operations.Features(this);
     this.examples = new operations.Examples(this);

sdk/cognitiveservices/cognitiveservices-luis-authoring/src/lUISAuthoringClientContext.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is
@@ -15,16 +14,21 @@ const packageVersion = "4.0.0-preview.3";
 
 export class LUISAuthoringClientContext extends msRest.ServiceClient {
   endpoint: string;
-  credentials: msRest.ServiceClientCredentials;
+  credentials: msRest.ServiceClientCredentials | TokenCredential;
 
   /**
    * Initializes a new instance of the LUISAuthoringClientContext class.
    * @param endpoint Supported Cognitive Services endpoints (protocol and hostname, for example:
    * https://westus.api.cognitive.microsoft.com).
    * @param credentials Subscription credentials which uniquely identify client subscription.
+   * Credentials implementing the TokenCredential interface from the @azure/identity package are
+   * recommended. For more information about these credentials, see
+   * {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
+   * ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
+   * @azure/ms-rest-browserauth are also supported.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, endpoint: string, options?: msRest.ServiceClientOptions) {
+  constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, endpoint: string, options?: msRest.ServiceClientOptions) {
     if (endpoint == undefined) {
       throw new Error("'endpoint' cannot be null.");
     }
@@ -43,7 +47,7 @@ export class LUISAuthoringClientContext extends msRest.ServiceClient {
 
     super(credentials, options);
 
-    this.baseUri = "{Endpoint}/luis/authoring/v3.0-preview";
+    this.baseUri = "{Endpoint}/luis/authoring/v3.0";
     this.requestContentType = "application/json; charset=utf-8";
     this.endpoint = endpoint;
     this.credentials = credentials;

sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/appsMappers.ts

@@ -1,8 +1,7 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- * 
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */

sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/azureAccountsMappers.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/examplesMappers.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/featuresMappers.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/index.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
@@ -2379,6 +2378,16 @@ export interface VersionsImportLuFormatOptionalParams extends msRest.RequestOpti
   versionId?: string;
 }
 
+/**
+ * Optional Parameters.
+ */
+export interface TrainTrainVersionOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * An enum value specifying mode of training.
+   */
+  mode?: string;
+}
+
 /**
  * Optional Parameters.
  */

sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/mappers.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/modelMappers.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.