Azure · jeremymeng · May 14, 2021
diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json
@@ -64,8 +64,8 @@
     // @azure/test-utils-perfstress should depend on lowest version of @azure/core-http for maximum compatibility, allowing test
     // projects to choose a higher version if desired.
     "@azure/core-http": ["^1.0.0"],
-    // @azure/container-registry is using the beta.1 version for CAE support
-    "@azure/core-rest-pipeline": ["1.1.0-beta.1"],
+    // @azure/container-registry is using the beta.2 version for CAE support
+    "@azure/core-rest-pipeline": ["1.1.0-beta.2"],
     // @azure/event-processor-host is on a much lower major version
     "@azure/ms-rest-nodeauth": ["^0.9.2"],
     // Idenity is moving from v1 to v2. Moving all packages to v2 is going to take a bit of time, in the mean time we could use v2 on the perf-identity tests.

diff --git a/sdk/confidentialledger/confidential-ledger-rest/package.json b/sdk/confidentialledger/confidential-ledger-rest/package.json
@@ -86,7 +86,7 @@
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
     "@azure-rest/core-client": "1.0.0-beta.2",
-    "@azure/core-rest-pipeline": "1.1.0-beta.1",
+    "@azure/core-rest-pipeline": "1.1.0-beta.2",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.0.0"
   },

diff --git a/sdk/containerregistry/container-registry/package.json b/sdk/containerregistry/container-registry/package.json
@@ -76,7 +76,7 @@
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
     "@azure/core-client": "^1.0.0",
-    "@azure/core-rest-pipeline": "1.1.0-beta.1",
+    "@azure/core-rest-pipeline": "1.1.0-beta.2",
     "@azure/core-paging": "^1.1.1",
     "@azure/core-tracing": "1.0.0-preview.11",
     "@azure/core-util": "^1.0.0-beta.1",

diff --git a/sdk/containerregistry/container-registry/src/containerRegistryChallengeHandler.ts b/sdk/containerregistry/container-registry/src/containerRegistryChallengeHandler.ts
@@ -5,14 +5,15 @@ import { GetTokenOptions } from "@azure/core-auth";
 import {
   AuthorizeRequestOnChallengeOptions,
   ChallengeCallbacks,
+  AccessTokenRefresher,
+  createTokenCycler,
   AuthorizeRequestOptions
 } from "@azure/core-rest-pipeline";
 import { parseWWWAuthenticate } from "./wwwAuthenticateParser";
 import {
   ContainerRegistryGetTokenOptions,
   ContainerRegistryRefreshTokenCredential
 } from "./containerRegistryTokenCredential";
-import { AccessTokenRefresher, createTokenCycler } from "./tokenCycler";
 
 const fiveMinutesInMs = 5 * 60 * 1000;
 

diff --git a/sdk/containerregistry/container-registry/src/tokenCycler.ts b/sdk/containerregistry/container-registry/src/tokenCycler.ts
diff --git a/sdk/core-rest/core-client/package.json b/sdk/core-rest/core-client/package.json
@@ -70,7 +70,7 @@
   "prettier": "@azure/eslint-plugin-azure-sdk/prettier.json",
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
-    "@azure/core-rest-pipeline": "1.1.0-beta.1",
+    "@azure/core-rest-pipeline": "1.1.0-beta.2",
     "tslib": "^2.0.0"
   },
   "devDependencies": {

diff --git a/sdk/core/core-rest-pipeline/review/core-rest-pipeline.api.md b/sdk/core/core-rest-pipeline/review/core-rest-pipeline.api.md
@@ -11,6 +11,16 @@ import { GetTokenOptions } from '@azure/core-auth';
 import { OperationTracingOptions } from '@azure/core-tracing';
 import { TokenCredential } from '@azure/core-auth';
 
+// @public
+export interface AccessTokenRefresher<T extends GetTokenOptions> {
+    // (undocumented)
+    cachedToken: AccessToken | null;
+    // Warning: (ae-forgotten-export) The symbol "AccessTokenGetter" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    getToken: AccessTokenGetter<T>;
+}
+
 // @public
 export interface AddPipelineOptions {
     afterPhase?: PipelinePhase;
@@ -89,6 +99,11 @@ export function createPipelineFromOptions(options: InternalPipelineOptions): Pip
 // @public
 export function createPipelineRequest(options: PipelineRequestOptions): PipelineRequest;
 
+// Warning: (ae-forgotten-export) The symbol "TokenCyclerOptions" needs to be exported by the entry point index.d.ts
+//
+// @public
+export function createTokenCycler<T extends GetTokenOptions>(credential: TokenCredential, tokenCyclerOptions?: Partial<TokenCyclerOptions>): AccessTokenRefresher<T>;
+
 // @public
 export function decompressResponsePolicy(): PipelinePolicy;
 

diff --git a/sdk/core/core-rest-pipeline/src/index.ts b/sdk/core/core-rest-pipeline/src/index.ts
@@ -77,3 +77,4 @@ export {
   AuthorizeRequestOnChallengeOptions
 } from "./policies/bearerTokenChallengeAuthenticationPolicy";
 export { ndJsonPolicy, ndJsonPolicyName } from "./policies/ndJsonPolicy";
+export { AccessTokenRefresher, createTokenCycler } from "./util/tokenCycler";
diff --git a/sdk/core/core-rest-pipeline/src/util/tokenCycler.ts b/sdk/core/core-rest-pipeline/src/util/tokenCycler.ts
@@ -10,17 +10,17 @@ import { delay } from "./helpers";
  *
  * @param options - the options to pass to the underlying token provider
  */
-export type AccessTokenGetter = (
+export type AccessTokenGetter<T extends GetTokenOptions> = (
   scopes: string | string[],
-  options: GetTokenOptions
+  options: T
 ) => Promise<AccessToken>;
 
 /**
  * The response of the
  */
-export interface AccessTokenRefresher {
+export interface AccessTokenRefresher<T extends GetTokenOptions> {
   cachedToken: AccessToken | null;
-  getToken: AccessTokenGetter;
+  getToken: AccessTokenGetter<T>;
 }
 
 export interface TokenCyclerOptions {
@@ -112,10 +112,10 @@ async function beginRefresh(
  *
  * @returns - a function that reliably produces a valid access token
  */
-export function createTokenCycler(
+export function createTokenCycler<T extends GetTokenOptions>(
   credential: TokenCredential,
   tokenCyclerOptions?: Partial<TokenCyclerOptions>
-): AccessTokenRefresher {
+): AccessTokenRefresher<T> {
   let refreshWorker: Promise<AccessToken> | null = null;
   let token: AccessToken | null = null;
 
@@ -160,10 +160,7 @@ export function createTokenCycler(
    * Starts a refresh job or returns the existing job if one is already
    * running.
    */
-  function refresh(
-    scopes: string | string[],
-    getTokenOptions: GetTokenOptions
-  ): Promise<AccessToken> {
+  function refresh(scopes: string | string[], getTokenOptions: T): Promise<AccessToken> {
     if (!cycler.isRefreshing) {
       // We bind `scopes` here to avoid passing it around a lot
       const tryGetAccessToken = (): Promise<AccessToken | null> =>
@@ -199,10 +196,7 @@ export function createTokenCycler(
     get cachedToken(): AccessToken | null {
       return token;
     },
-    getToken: async (
-      scopes: string | string[],
-      tokenOptions: GetTokenOptions
-    ): Promise<AccessToken> => {
+    getToken: async (scopes: string | string[], tokenOptions: T): Promise<AccessToken> => {
       //
       // Simple rules:
       // - If we MUST refresh, then return the refresh task, blocking

diff --git a/sdk/core/perf-tests/core-rest-pipeline/package.json b/sdk/core/perf-tests/core-rest-pipeline/package.json
@@ -7,7 +7,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@azure/core-rest-pipeline": "1.1.0-beta.1",
+    "@azure/core-rest-pipeline": "1.1.0-beta.2",
     "@azure/core-auth": "^1.3.0",
     "@azure/test-utils-perfstress": "^1.0.0",
     "dotenv": "^8.2.0"