Use @azure/core-http and its TokenCredential interface

sdk/storage/storage-queue/package.json

@@ -73,7 +73,7 @@
   "homepage": "https://github.com/Azure/azure-storage-js#readme",
   "sideEffects": false,
   "dependencies": {
-    "@azure/ms-rest-js": "^1.2.6",
+    "@azure/core-http": "^1.2.6",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

sdk/storage/storage-queue/rollup.base.config.js

@@ -23,7 +23,7 @@ const depNames = Object.keys(pkg.dependencies);
 const production = process.env.NODE_ENV === "production";
 
 export function nodeConfig(test = false) {
-  const externalNodeBuiltins = ["@azure/ms-rest-js", "crypto", "fs", "os"];
+  const externalNodeBuiltins = ["@azure/core-http", "crypto", "fs", "os"];
   const baseConfig = {
     input: "dist-esm/src/index.js",
     external: depNames.concat(externalNodeBuiltins),

sdk/storage/storage-queue/src/Aborter.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { AbortSignalLike, isNode } from "@azure/ms-rest-js";
+import { AbortSignalLike, isNode } from "@azure/core-http";
 
 /**
  * An aborter instance implements AbortSignal interface, can abort HTTP requests.

sdk/storage/storage-queue/src/BrowserPolicyFactory.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/ms-rest-js";
+import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/core-http";
 import { BrowserPolicy } from "./policies/BrowserPolicy";
 
 /**

sdk/storage/storage-queue/src/LoggingPolicyFactory.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/ms-rest-js";
+import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/core-http";
 import { LoggingPolicy } from "./policies/LoggingPolicy";
 
 /**

sdk/storage/storage-queue/src/MessageIdClient.ts

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import * as coreHttp from "@azure/core-http";
 import * as Models from "./generated/lib/models";
 import { Aborter } from "./Aborter";
 import { MessageId } from "./generated/lib/operations";
@@ -85,12 +86,16 @@ export class MessageIdClient extends StorageClient {
    *                     "https://myaccount.queue.core.windows.net/myqueue/messages/messageid". You can
    *                     append a SAS if using AnonymousCredential, such as
    *                     "https://myaccount.queue.core.windows.net/myqueue/messages/messageid?sasString".
-   * @param {Credential} credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
-   *                                If not specified, anonymous credential is used.
+   * @param {Credential | coreHttp.TokenCredential} credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
+   *                                                           If not specified, anonymous credential is used.
    * @param {NewPipelineOptions} [options] Options to configure the HTTP pipeline.
    * @memberof MessageIdClient
    */
-  constructor(url: string, credential?: Credential, options?: NewPipelineOptions);
+  constructor(
+    url: string,
+    credential?: Credential | coreHttp.TokenCredential,
+    options?: NewPipelineOptions
+  );
   /**
    * Creates an instance of MessageIdClient.
    *
@@ -105,14 +110,17 @@ export class MessageIdClient extends StorageClient {
   constructor(url: string, pipeline: Pipeline);
   constructor(
     urlOrConnectionString: string,
-    credentialOrPipelineOrQueueName?: Credential | Pipeline | string,
+    credentialOrPipelineOrQueueName?: Credential | coreHttp.TokenCredential | Pipeline | string,
     messageIdOrOptions?: string | NewPipelineOptions,
     options: NewPipelineOptions = {}
   ) {
     let pipeline: Pipeline;
     if (credentialOrPipelineOrQueueName instanceof Pipeline) {
       pipeline = credentialOrPipelineOrQueueName;
-    } else if (credentialOrPipelineOrQueueName instanceof Credential) {
+    } else if (
+      credentialOrPipelineOrQueueName instanceof Credential ||
+      coreHttp.isTokenCredential(credentialOrPipelineOrQueueName)
+    ) {
       options = messageIdOrOptions as NewPipelineOptions;
       pipeline = newPipeline(credentialOrPipelineOrQueueName, options);
     } else if (

sdk/storage/storage-queue/src/MessagesClient.ts

@@ -1,7 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { HttpResponse } from "@azure/ms-rest-js";
+import {
+  HttpResponse,
+  TokenCredential as CoreHttpTokenCredential,
+  isTokenCredential as isCoreHttpTokenCredential
+} from "@azure/core-http";
 import * as Models from "./generated/lib/models";
 import { Aborter } from "./Aborter";
 import { Messages } from "./generated/lib/operations";
@@ -180,12 +184,16 @@ export class MessagesClient extends StorageClient {
    *                     "https://myaccount.queue.core.windows.net/myqueue/messages". You can
    *                     append a SAS if using AnonymousCredential, such as
    *                     "https://myaccount.queue.core.windows.net/myqueue/messages?sasString".
-   * @param {Credential} credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
+   * @param {Credential | CoreHttpTokenCredential } credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
    *                                If not specified, anonymous credential is used.
    * @param {NewPipelineOptions} [options] Options to configure the HTTP pipeline.
    * @memberof MessagesClient
    */
-  constructor(url: string, credential?: Credential, options?: NewPipelineOptions);
+  constructor(
+    url: string,
+    credential?: Credential | CoreHttpTokenCredential,
+    options?: NewPipelineOptions
+  );
   /**
    * Creates an instance of MessagesClient.
    *
@@ -200,13 +208,16 @@ export class MessagesClient extends StorageClient {
   constructor(url: string, pipeline: Pipeline);
   constructor(
     urlOrConnectionString: string,
-    credentialOrPipelineOrQueueName?: Credential | Pipeline | string,
+    credentialOrPipelineOrQueueName?: Credential | CoreHttpTokenCredential | Pipeline | string,
     options?: NewPipelineOptions
   ) {
     let pipeline: Pipeline;
     if (credentialOrPipelineOrQueueName instanceof Pipeline) {
       pipeline = credentialOrPipelineOrQueueName;
-    } else if (credentialOrPipelineOrQueueName instanceof Credential) {
+    } else if (
+      credentialOrPipelineOrQueueName instanceof Credential ||
+      isCoreHttpTokenCredential(credentialOrPipelineOrQueueName)
+    ) {
       pipeline = newPipeline(credentialOrPipelineOrQueueName, options);
     } else if (
       !credentialOrPipelineOrQueueName &&

sdk/storage/storage-queue/src/Pipeline.ts

@@ -14,8 +14,11 @@ import {
   RequestPolicyFactory,
   RequestPolicyOptions,
   ServiceClientOptions,
-  WebResource
-} from "@azure/ms-rest-js";
+  WebResource,
+  TokenCredential as CoreHttpTokenCredential,
+  isTokenCredential as isCoreHttpTokenCredential,
+  bearerTokenAuthenticationPolicy
+} from "@azure/core-http";
 import { BrowserPolicyFactory } from "./BrowserPolicyFactory";
 import { Credential } from "./credentials/Credential";
 import { LoggingPolicyFactory } from "./LoggingPolicyFactory";
@@ -159,13 +162,13 @@ export interface NewPipelineOptions {
  * Creates a new Pipeline object with Credential provided.
  *
  * @static
- * @param {Credential} credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
+ * @param {Credential | CoreHttpTokenCredential } credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
  * @param {NewPipelineOptions} [pipelineOptions] Options.
  * @returns {Pipeline} A new Pipeline object.
  * @memberof Pipeline
  */
 export function newPipeline(
-  credential: Credential,
+  credential: Credential | CoreHttpTokenCredential,
   pipelineOptions: NewPipelineOptions = {}
 ): Pipeline {
   // Order is important. Closer to the API at the top & closer to the network at the bottom.
@@ -178,7 +181,9 @@ export function newPipeline(
     deserializationPolicy(), // Default deserializationPolicy is provided by protocol layer
     new RetryPolicyFactory(pipelineOptions.retryOptions),
     new LoggingPolicyFactory(),
-    credential
+    isCoreHttpTokenCredential(credential)
+      ? bearerTokenAuthenticationPolicy(credential, "https://storage.azure.com/.default")
+      : credential
   ];
 
   return new Pipeline(factories, {

sdk/storage/storage-queue/src/QueueClient.ts

@@ -1,7 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { HttpResponse } from "@azure/ms-rest-js";
+import {
+  HttpResponse,
+  TokenCredential as CoreHttpTokenCredential,
+  isTokenCredential as isCoreHttpTokenCredential
+} from "@azure/core-http";
 import * as Models from "./generated/lib/models";
 import { Aborter } from "./Aborter";
 import { Queue } from "./generated/lib/operations";
@@ -219,12 +223,16 @@ export class QueueClient extends StorageClient {
    *                     "https://myaccount.queue.core.windows.net/myqueue". You can
    *                     append a SAS if using AnonymousCredential, such as
    *                     "https://myaccount.queue.core.windows.net/myqueue?sasString".
-   * @param {Credential} credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
+   * @param {Credential | CoreHttpTokenCredential } credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
    *                                If not specified, anonymous credential is used.
    * @param {NewPipelineOptions} [options] Options to configure the HTTP pipeline.
    * @memberof QueueClient
    */
-  constructor(url: string, credential?: Credential, options?: NewPipelineOptions);
+  constructor(
+    url: string,
+    credential?: Credential | CoreHttpTokenCredential,
+    options?: NewPipelineOptions
+  );
   /**
    * Creates an instance of QueueClient.
    *
@@ -239,13 +247,16 @@ export class QueueClient extends StorageClient {
   constructor(url: string, pipeline: Pipeline);
   constructor(
     urlOrConnectionString: string,
-    credentialOrPipelineOrQueueName?: Credential | Pipeline | string,
+    credentialOrPipelineOrQueueName?: Credential | CoreHttpTokenCredential | Pipeline | string,
     options?: NewPipelineOptions
   ) {
     let pipeline: Pipeline;
     if (credentialOrPipelineOrQueueName instanceof Pipeline) {
       pipeline = credentialOrPipelineOrQueueName;
-    } else if (credentialOrPipelineOrQueueName instanceof Credential) {
+    } else if (
+      credentialOrPipelineOrQueueName instanceof Credential ||
+      isCoreHttpTokenCredential(credentialOrPipelineOrQueueName)
+    ) {
       pipeline = newPipeline(credentialOrPipelineOrQueueName, options);
     } else if (
       !credentialOrPipelineOrQueueName &&
@@ -286,7 +297,7 @@ export class QueueClient extends StorageClient {
     return this.queueContext.create({
       ...options,
       abortSignal: aborter
-    });
+    } as Models.QueueCreateOptionalParams);
   }
 
   /**
@@ -350,7 +361,7 @@ export class QueueClient extends StorageClient {
     return this.queueContext.setMetadata({
       abortSignal: aborter,
       metadata
-    });
+    } as Models.QueueSetMetadataOptionalParams);
   }
 
   /**

sdk/storage/storage-queue/src/QueueServiceClient.ts

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import * as coreHttp from "@azure/core-http";
 import * as Models from "./generated/lib/models";
 import { Aborter } from "./Aborter";
 import { ListQueuesIncludeType } from "./generated/lib/models/index";
@@ -122,7 +123,10 @@ export class QueueServiceClient extends StorageClient {
    * @returns {QueueServiceClient} A new QueueServiceClient object from the given connection string.
    * @memberof QueueServiceClient
    */
-  public static fromConnectionString(connectionString: string, options?: NewPipelineOptions): QueueServiceClient {
+  public static fromConnectionString(
+    connectionString: string,
+    options?: NewPipelineOptions
+  ): QueueServiceClient {
     const extractedCreds = extractConnectionStringParts(connectionString);
     const sharedKeyCredential = new SharedKeyCredential(
       extractedCreds.accountName,
@@ -148,12 +152,16 @@ export class QueueServiceClient extends StorageClient {
    * @param {string} url A URL string pointing to Azure Storage queue service, such as
    *                     "https://myaccount.queue.core.windows.net". You can append a SAS
    *                     if using AnonymousCredential, such as "https://myaccount.queue.core.windows.net?sasString".
-   * @param {Credential} credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
+   * @param {Credential | coreHttp.TokenCredential} credential Such as AnonymousCredential, SharedKeyCredential or TokenCredential.
    *                                If not specified, anonymous credential is used.
    * @param {NewPipelineOptions} [options] Options to configure the HTTP pipeline.
    * @memberof QueueServiceClient
    */
-  constructor(url: string, credential?: Credential, options?: NewPipelineOptions);
+  constructor(
+    url: string,
+    credential?: Credential | coreHttp.TokenCredential,
+    options?: NewPipelineOptions
+  );
   /**
    * Creates an instance of QueueServiceClient.
    *
@@ -167,13 +175,16 @@ export class QueueServiceClient extends StorageClient {
   constructor(url: string, pipeline: Pipeline);
   constructor(
     url: string,
-    credentialOrPipeline?: Credential | Pipeline,
+    credentialOrPipeline?: Credential | coreHttp.TokenCredential | Pipeline,
     options?: NewPipelineOptions
   ) {
     let pipeline: Pipeline;
     if (credentialOrPipeline instanceof Pipeline) {
       pipeline = credentialOrPipeline;
-    } else if (credentialOrPipeline instanceof Credential) {
+    } else if (
+      credentialOrPipeline instanceof Credential ||
+      coreHttp.isTokenCredential(credentialOrPipeline)
+    ) {
       pipeline = newPipeline(credentialOrPipeline, options);
     } else {
       // The second paramter is undefined. Use anonymous credential.
@@ -322,6 +333,6 @@ export class QueueServiceClient extends StorageClient {
       abortSignal: aborter,
       marker,
       ...options
-    });
+    } as Models.ServiceListQueuesSegmentOptionalParams);
   }
 }

sdk/storage/storage-queue/src/RetryPolicyFactory.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/ms-rest-js";
+import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/core-http";
 import { RetryPolicy, RetryPolicyType } from "./policies/RetryPolicy";
 
 /**

sdk/storage/storage-queue/src/TelemetryPolicyFactory.ts

@@ -6,7 +6,7 @@ import {
   RequestPolicy,
   RequestPolicyFactory,
   RequestPolicyOptions
-} from "@azure/ms-rest-js";
+} from "@azure/core-http";
 import * as os from "os";
 
 import { TelemetryPolicy } from "./policies/TelemetryPolicy";

sdk/storage/storage-queue/src/UniqueRequestIDPolicyFactory.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/ms-rest-js";
+import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/core-http";
 import { UniqueRequestIDPolicy } from "./policies/UniqueRequestIDPolicy";
 
 /**

sdk/storage/storage-queue/src/credentials/AnonymousCredential.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { RequestPolicy, RequestPolicyOptions } from "@azure/ms-rest-js";
+import { RequestPolicy, RequestPolicyOptions } from "@azure/core-http";
 
 import { AnonymousCredentialPolicy } from "../policies/AnonymousCredentialPolicy";
 import { Credential } from "./Credential";

sdk/storage/storage-queue/src/credentials/Credential.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/ms-rest-js";
+import { RequestPolicy, RequestPolicyFactory, RequestPolicyOptions } from "@azure/core-http";
 import { CredentialPolicy } from "../policies/CredentialPolicy";
 
 /**

sdk/storage/storage-queue/src/credentials/SharedKeyCredential.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import * as Crypto from "crypto";
-import { RequestPolicy, RequestPolicyOptions } from "@azure/ms-rest-js";
+import { RequestPolicy, RequestPolicyOptions } from "@azure/core-http";
 
 import { SharedKeyCredentialPolicy } from "../policies/SharedKeyCredentialPolicy";
 import { Credential } from "./Credential";

sdk/storage/storage-queue/src/credentials/TokenCredential.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { RequestPolicy, RequestPolicyOptions } from "@azure/ms-rest-js";
+import { RequestPolicy, RequestPolicyOptions } from "@azure/core-http";
 
 import { Credential } from "../credentials/Credential";
 import { TokenCredentialPolicy } from "../policies/TokenCredentialPolicy";