Merge pull request #846 from deyaaeldeen/identity-adapter

adding TokenCredential as part of the credential type accepted

.gulp/gulpfile.iced

@@ -72,6 +72,7 @@ task 'test/azure-metadata', '', [], (done) ->
 task 'test/multiapi', '', [], (done) ->
   cwd = "#{basefolder}/test/multiapi"
   await execute "npm install", {cwd: cwd, silent: false }, defer _
+  await execute "npm run bootstrap", {cwd: cwd, silent: false}, defer _
   await execute "npm run build", { cwd: cwd, silent: false }, defer _
   done()
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft.azure/autorest.typescript",
-  "version": "4.4.4",
+  "version": "4.5.0",
   "description": "The typescript extension for classic generators in AutoRest.",
   "scripts": {
     "autorest": "autorest",
@@ -42,8 +42,8 @@
   },
   "homepage": "https://github.com/Azure/autorest.typescript/blob/master/README.md",
   "devDependencies": {
-    "@azure/ms-rest-azure-js": "^2.0.1",
-    "@azure/ms-rest-js": "^2.0.4",
+    "@azure/ms-rest-azure-js": "^2.1.0",
+    "@azure/ms-rest-js": "^2.2.0",
     "@microsoft.azure/autorest.modeler": "^2.3.47",
     "@microsoft.azure/autorest.testserver": "^2.7.1",
     "@ts-common/azure-js-dev-tools": "^0.7.1",

src/azure/Model/CodeModelTSa.cs

@@ -70,7 +70,7 @@ public override void ConstructRuntimeImportForModelIndex(TSBuilder builder)
 
         public override void PackageDependencies(JSONObject dependencies)
         {
-            dependencies.StringProperty("@azure/ms-rest-azure-js", "^2.0.1");
+            dependencies.StringProperty("@azure/ms-rest-azure-js", "^2.1.0");
             base.PackageDependencies(dependencies);
         }
 
@@ -79,6 +79,7 @@ public string GenerateAzureServiceClientImports()
             TSBuilder builder = new TSBuilder();
 
             builder.ImportAllAs("msRest", "@azure/ms-rest-js");
+            builder.Import(new string[] {"TokenCredential"}, "@azure/core-auth");
 
             bool usesAzureOptionsType = OptionalParameterTypeForClientConstructor == "AzureServiceClientOptions";
             if (usesAzureOptionsType || MethodTemplateModels.Any((MethodTS method) => method.IsLongRunningOperation))
@@ -145,9 +146,9 @@ public override string GenerateMapperIndex()
             return builder.ToString();
         }
 
-        protected override void GenerateNodeSampleImports(TSBuilder builder)
+        protected override void GenerateNodeSampleImports(JSBuilder builder)
         {
-            GenerateNodeSampleMsRestNodeAuthImport(builder);
+            GenerateNodeSampleIdentityImport(builder);
             GenerateNodeSampleClientImport(builder);
         }
 

src/azure/Templates/AzureServiceClientContextTemplate.cshtml

@@ -15,6 +15,7 @@ if (usesCustomOptionsType)
 }
 import * as msRest from "@@azure/ms-rest-js";
 import * as msRestAzure from "@@azure/ms-rest-azure-js";
+import { TokenCredential } from "@@azure/core-auth";
 @EmptyLine
 const packageName = "@Model.Settings.PackageName";
 const packageVersion = "@Model.Settings.PackageVersion";
@@ -38,7 +39,7 @@ export class @(Model.ContextName) extends msRestAzure.AzureServiceClient {
       options = {};
     }
 
-    if(!options.userAgent) {
+    if (!options.userAgent) {
       const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
       options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
     }
@@ -65,7 +66,7 @@ export class @(Model.ContextName) extends msRestAzure.AzureServiceClient {
   @EmptyLine
   @foreach (var property in optionalParameters.Where(p => p.Name != "generateClientRequestId"))
   {
-    @:if(options.@(property.Name) !== null && options.@(property.Name) !== undefined) {
+    @:if (options.@(property.Name) !== null && options.@(property.Name) !== undefined) {
     @:  this.@(property.Name) = options.@(property.Name);
     @:}
   }