@fluidframework/odsp-driver 2.0.0 → 2.0.2

package/src/odspDeltaStorageService.ts

@@ -31,7 +31,7 @@ import { getWithRetryForTokenRefresh } from "./odspUtils.js";
 export class OdspDeltaStorageService {
 	constructor(
 		private readonly deltaFeedUrl: string,
-		private readonly getStorageToken: InstrumentedStorageTokenFetcher,
+		private readonly getAuthHeader: InstrumentedStorageTokenFetcher,
 		private readonly epochTracker: EpochTracker,
 		private readonly logger: ITelemetryLoggerExt,
 	) {}
@@ -52,9 +52,13 @@ export class OdspDeltaStorageService {
 	): Promise<IDeltasFetchResult> {
 		return getWithRetryForTokenRefresh(async (options) => {
 			// Note - this call ends up in getSocketStorageDiscovery() and can refresh token
-			// Thus it needs to be done before we call getStorageToken() to reduce extra calls
-			const baseUrl = this.buildUrl(from, to);
-			const storageToken = await this.getStorageToken(options, "DeltaStorage");
+			// Thus it needs to be done before we call getAuthHeader() to reduce extra calls
+			const url = this.buildUrl(from, to);
+			const method = "POST";
+			const authHeader = await this.getAuthHeader(
+				{ ...options, request: { url, method } },
+				"DeltaStorage",
+			);
 
 			return PerformanceEvent.timedExecAsync(
 				this.logger,
@@ -69,7 +73,7 @@ export class OdspDeltaStorageService {
 				async (event) => {
 					const formBoundary = uuid();
 					let postBody = `--${formBoundary}\r\n`;
-					postBody += `Authorization: Bearer ${storageToken}\r\n`;
+					postBody += `Authorization: ${authHeader}\r\n`;
 					postBody += `X-HTTP-Method-Override: GET\r\n`;
 
 					postBody += `_post: 1\r\n`;
@@ -88,11 +92,11 @@ export class OdspDeltaStorageService {
 
 					const response =
 						await this.epochTracker.fetchAndParseAsJSON<IDeltaStorageGetResponse>(
-							baseUrl,
+							url,
 							{
 								headers,
 								body: postBody,
-								method: "POST",
+								method,
 								signal: abort.signal,
 							},
 							"ops",

package/src/odspDocumentService.ts

@@ -64,7 +64,7 @@ export class OdspDocumentService
 	 * Creates a new OdspDocumentService instance.
 	 *
 	 * @param resolvedUrl - resolved url identifying document that will be managed by returned service instance.
-	 * @param getStorageToken - function that can provide the storage token. This is is also referred to as
+	 * @param getAuthHeader - function that can provide the Authentication header value. This is is also referred to as
 	 * the "Vroom" token in SPO.
 	 * @param getWebsocketToken - function that can provide a token for accessing the web socket. This is also referred
 	 * to as the "Push" token in SPO. If undefined then websocket token is expected to be returned with joinSession
@@ -77,7 +77,7 @@ export class OdspDocumentService
 	 */
 	public static async create(
 		resolvedUrl: IResolvedUrl,
-		getStorageToken: InstrumentedStorageTokenFetcher,
+		getAuthHeader: InstrumentedStorageTokenFetcher,
 		// eslint-disable-next-line @rushstack/no-new-null
 		getWebsocketToken: ((options: TokenFetchOptions) => Promise<string | null>) | undefined,
 		logger: ITelemetryLoggerExt,
@@ -89,7 +89,7 @@ export class OdspDocumentService
 	): Promise<IDocumentService> {
 		return new OdspDocumentService(
 			getOdspResolvedUrl(resolvedUrl),
-			getStorageToken,
+			getAuthHeader,
 			getWebsocketToken,
 			logger,
 			cache,
@@ -110,7 +110,7 @@ export class OdspDocumentService
 
 	/**
 	 * @param odspResolvedUrl - resolved url identifying document that will be managed by this service instance.
-	 * @param getStorageToken - function that can provide the storage token. This is is also referred to as
+	 * @param getAuthHeader - function that can provide the Authentication header value. This is is also referred to as
 	 * the "Vroom" token in SPO.
 	 * @param getWebsocketToken - function that can provide a token for accessing the web socket. This is also referred
 	 * to as the "Push" token in SPO. If undefined then websocket token is expected to be returned with joinSession
@@ -124,7 +124,7 @@ export class OdspDocumentService
 	 */
 	private constructor(
 		public readonly odspResolvedUrl: IOdspResolvedUrl,
-		private readonly getStorageToken: InstrumentedStorageTokenFetcher,
+		private readonly getAuthHeader: InstrumentedStorageTokenFetcher,
 		private readonly getWebsocketToken:
 			| ((options: TokenFetchOptions) => Promise<string | null>)
 			| undefined,
@@ -175,7 +175,7 @@ export class OdspDocumentService
 		if (!this.storageManager) {
 			this.storageManager = new OdspDocumentStorageService(
 				this.odspResolvedUrl,
-				this.getStorageToken,
+				this.getAuthHeader,
 				this.mc.logger,
 				true,
 				this.cache,
@@ -208,7 +208,7 @@ export class OdspDocumentService
 		const snapshotOps = this.storageManager?.ops ?? [];
 		const service = new OdspDeltaStorageService(
 			this.odspResolvedUrl.endpoints.deltaStorageUrl,
-			this.getStorageToken,
+			this.getAuthHeader,
 			this.epochTracker,
 			this.mc.logger,
 		);
@@ -285,7 +285,7 @@ export class OdspDocumentService
 		this.odspDelayLoadedDeltaStream = new module.OdspDelayLoadedDeltaStream(
 			this.odspResolvedUrl,
 			this._policies,
-			this.getStorageToken,
+			this.getAuthHeader,
 			this.getWebsocketToken,
 			this.mc,
 			this.cache,

package/src/odspDocumentServiceFactoryCore.ts

@@ -167,7 +167,7 @@ export class OdspDocumentServiceFactoryCore
 					this.hostPolicy.enableSingleRequestForShareLinkWithCreate,
 			},
 			async (event) => {
-				const getStorageToken = toInstrumentedOdspStorageTokenFetcher(
+				const getAuthHeader = toInstrumentedOdspStorageTokenFetcher(
 					odspLogger,
 					resolvedUrlData,
 					this.getStorageToken,
@@ -188,7 +188,7 @@ export class OdspDocumentServiceFactoryCore
 					});
 				const _odspResolvedUrl = isNewFileInfo(fileInfo)
 					? await module.createNewFluidFile(
-							getStorageToken,
+							getAuthHeader,
 							fileInfo,
 							odspLogger,
 							createNewSummary,
@@ -200,7 +200,7 @@ export class OdspDocumentServiceFactoryCore
 							this.hostPolicy.enableSingleRequestForShareLinkWithCreate,
 						)
 					: await module.createNewContainerOnExistingFile(
-							getStorageToken,
+							getAuthHeader,
 							fileInfo,
 							odspLogger,
 							createNewSummary,
@@ -300,11 +300,13 @@ export class OdspDocumentServiceFactoryCore
 			this.getWebsocketToken === undefined
 				? undefined
 				: async (options: TokenFetchOptions): Promise<string | null> =>
+						// websocket expects a plain token
 						toInstrumentedOdspTokenFetcher(
 							extLogger,
 							resolvedUrlData,
 							this.getWebsocketToken!,
 							false /* throwOnNullToken */,
+							true /* returnPlainToken */,
 						)(options, "GetWebsocketToken");
 
 		return OdspDocumentService.create(

package/src/odspDocumentStorageManager.ts

@@ -51,7 +51,7 @@ import {
 	fetchSnapshot,
 	fetchSnapshotWithRedeem,
 } from "./fetchSnapshot.js";
-import { getUrlAndHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
+import { getHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
 import { IOdspCache, IPrefetchSnapshotContents } from "./odspCache.js";
 import { FlushResult } from "./odspDocumentDeltaConnection.js";
 import { OdspDocumentStorageServiceBase } from "./odspDocumentStorageServiceBase.js";
@@ -63,6 +63,7 @@ import {
 	isInstanceOfISnapshot,
 	isSnapshotFetchForLoadingGroup,
 	useLegacyFlowWithoutGroupsForSnapshotFetch,
+	type TokenFetchOptionsEx,
 } from "./odspUtils.js";
 import { pkgVersion as driverVersion } from "./packageVersion.js";
 
@@ -98,7 +99,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 
 	constructor(
 		private readonly odspResolvedUrl: IOdspResolvedUrl,
-		private readonly getStorageToken: InstrumentedStorageTokenFetcher,
+		private readonly getAuthHeader: InstrumentedStorageTokenFetcher,
 		private readonly logger: ITelemetryLoggerExt,
 		private readonly fetchFullSnapshot: boolean,
 		private readonly cache: IOdspCache,
@@ -124,12 +125,13 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		this.checkAttachmentPOSTUrl();
 
 		const response = await getWithRetryForTokenRefresh(async (options) => {
-			const storageToken = await this.getStorageToken(options, "CreateBlob");
-			const { url, headers } = getUrlAndHeadersWithAuth(
-				`${this.attachmentPOSTUrl}/content`,
-				storageToken,
-				!!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,
+			const url = `${this.attachmentPOSTUrl}/content`;
+			const method = "POST";
+			const authHeader = await this.getAuthHeader(
+				{ ...options, request: { url, method } },
+				"CreateBlob",
 			);
+			const headers = getHeadersWithAuth(authHeader);
 			headers["Content-Type"] = "application/octet-stream";
 
 			return PerformanceEvent.timedExecAsync(
@@ -146,7 +148,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 							{
 								body: file,
 								headers,
-								method: "POST",
+								method,
 							},
 							"createBlob",
 						),
@@ -170,13 +172,13 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		this.checkAttachmentGETUrl();
 
 		const blob = await getWithRetryForTokenRefresh(async (options) => {
-			const storageToken = await this.getStorageToken(options, "GetBlob");
-			const unAuthedUrl = `${this.attachmentGETUrl}/${encodeURIComponent(blobId)}/content`;
-			const { url, headers } = getUrlAndHeadersWithAuth(
-				unAuthedUrl,
-				storageToken,
-				!!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,
+			const url = `${this.attachmentGETUrl}/${encodeURIComponent(blobId)}/content`;
+			const method = "GET";
+			const authHeader = await this.getAuthHeader(
+				{ ...options, request: { url, method } },
+				"GetBlob",
 			);
+			const headers = getHeadersWithAuth(authHeader);
 
 			return PerformanceEvent.timedExecAsync(
 				this.logger,
@@ -483,12 +485,13 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		}
 
 		return getWithRetryForTokenRefresh(async (options) => {
-			const storageToken = await this.getStorageToken(options, "GetVersions");
-			const { url, headers } = getUrlAndHeadersWithAuth(
-				`${this.snapshotUrl}/versions?top=${count}`,
-				storageToken,
-				!!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,
+			const url = `${this.snapshotUrl}/versions?top=${count}`;
+			const method = "GET";
+			const storageToken = await this.getAuthHeader(
+				{ ...options, request: { url, method } },
+				"GetVersions",
 			);
+			const headers = getHeadersWithAuth(storageToken);
 
 			// Fetch the latest snapshot versions for the document
 			const response = await PerformanceEvent.timedExecAsync(
@@ -604,14 +607,16 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 
 		const snapshotDownloader = async (
 			finalOdspResolvedUrl: IOdspResolvedUrl,
-			storageToken: string,
+			tokenFetcher: InstrumentedStorageTokenFetcher,
+			tokenFetchOptions: TokenFetchOptionsEx,
 			loadingGroupId: string[] | undefined,
 			options: ISnapshotOptions | undefined,
 			controller?: AbortController,
 		): Promise<ISnapshotRequestAndResponseOptions> => {
 			return downloadSnapshot(
 				finalOdspResolvedUrl,
-				storageToken,
+				tokenFetcher,
+				tokenFetchOptions,
 				loadingGroupId,
 				options,
 				this.snapshotFormatFetchType,
@@ -631,7 +636,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		try {
 			const odspSnapshot = await fetchSnapshotWithRedeem(
 				this.odspResolvedUrl,
-				this.getStorageToken,
+				this.getAuthHeader,
 				snapshotOptions,
 				!!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,
 				this.logger,
@@ -673,7 +678,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 				};
 				const odspSnapshot = await fetchSnapshotWithRedeem(
 					this.odspResolvedUrl,
-					this.getStorageToken,
+					this.getAuthHeader,
 					snapshotOptionsWithoutBlobs,
 					!!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,
 					this.logger,
@@ -767,10 +772,9 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 			});
 		this.odspSummaryUploadManager = new module.OdspSummaryUploadManager(
 			this.odspResolvedUrl.endpoints.snapshotStorageUrl,
-			this.getStorageToken,
+			this.getAuthHeader,
 			this.logger,
 			this.epochTracker,
-			!!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,
 			this.relayServiceTenantAndSessionId,
 		);
 		return this.odspSummaryUploadManager;
@@ -811,15 +815,15 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		scenarioName?: string,
 	): Promise<ISnapshotTree | undefined> {
 		return getWithRetryForTokenRefresh(async (options) => {
-			const storageToken = await this.getStorageToken(options, "ReadCommit");
-			const snapshotDownloader = async (
-				url: string,
-				fetchOptions: RequestInit,
-				// eslint-disable-next-line unicorn/consistent-function-scoping
-			): Promise<IOdspResponse<unknown>> => {
+			const snapshotDownloader = async (url: string): Promise<IOdspResponse<unknown>> => {
+				const authHeader = await this.getAuthHeader(
+					{ ...options, request: { url, method: "GET" } },
+					"ReadCommit",
+				);
+				const headers = getHeadersWithAuth(authHeader);
 				return this.epochTracker.fetchAndParseAsJSON(
 					url,
-					fetchOptions,
+					{ headers },
 					"snapshotTree",
 					undefined,
 					scenarioName,
@@ -827,7 +831,6 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 			};
 			const snapshot = await fetchSnapshot(
 				this.snapshotUrl!,
-				storageToken,
 				id,
 				this.fetchFullSnapshot,
 				!!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,

package/src/odspSummaryUploadManager.ts

@@ -28,7 +28,7 @@ import {
 	OdspSummaryTreeValue,
 } from "./contracts.js";
 import { EpochTracker } from "./epochTracker.js";
-import { getUrlAndHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
+import { getHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
 import { getWithRetryForTokenRefresh } from "./odspUtils.js";
 
 /**
@@ -42,10 +42,9 @@ export class OdspSummaryUploadManager {
 
 	constructor(
 		private readonly snapshotUrl: string,
-		private readonly getStorageToken: InstrumentedStorageTokenFetcher,
+		private readonly getAuthHeader: InstrumentedStorageTokenFetcher,
 		logger: ITelemetryLoggerExt,
 		private readonly epochTracker: EpochTracker,
-		private readonly forceAccessTokenViaAuthorizationHeader: boolean,
 		private readonly relayServiceTenantAndSessionId: () => string | undefined,
 	) {
 		this.mc = loggerToMonitoringContext(logger);
@@ -102,13 +101,14 @@ export class OdspSummaryUploadManager {
 		};
 
 		return getWithRetryForTokenRefresh(async (options) => {
-			const storageToken = await this.getStorageToken(options, "WriteSummaryTree");
-
-			const { url, headers } = getUrlAndHeadersWithAuth(
-				`${this.snapshotUrl}/snapshot`,
-				storageToken,
-				this.forceAccessTokenViaAuthorizationHeader,
+			const url = `${this.snapshotUrl}/snapshot`;
+			const method = "POST";
+			const authHeader = await this.getAuthHeader(
+				{ ...options, request: { url, method } },
+				"WriteSummaryTree",
 			);
+
+			const headers = getHeadersWithAuth(authHeader);
 			headers["Content-Type"] = "application/json";
 			const relayServiceTenantAndSessionId = this.relayServiceTenantAndSessionId();
 			// This would be undefined in case of summary is uploaded in detached container with attachment

package/src/odspUtils.ts

@@ -31,6 +31,7 @@ import {
 	InstrumentedStorageTokenFetcher,
 	InstrumentedTokenFetcher,
 	OdspErrorTypes,
+	authHeaderFromTokenResponse,
 	OdspResourceTokenFetchOptions,
 	TokenFetchOptions,
 	TokenFetcher,
@@ -64,7 +65,14 @@ export interface IOdspResponse<T> {
 	duration: number;
 }
 
-export interface TokenFetchOptionsEx extends TokenFetchOptions {
+/**
+ * This interface captures the portion of TokenFetchOptions required for refreshing tokens
+ * It is controlled by logic in getWithRetryForTokenRefresh to specify what is the required refresh behavior
+ */
+export interface TokenFetchOptionsEx {
+	refresh: boolean;
+	claims?: string;
+	tenantId?: string;
 	/**
 	 * The previous error we hit in {@link getWithRetryForTokenRefresh}.
 	 */
@@ -354,7 +362,8 @@ export function toInstrumentedOdspStorageTokenFetcher(
 		logger,
 		resolvedUrlParts,
 		tokenFetcher,
-		true, // throwOnNullToken,
+		true, // throwOnNullToken
+		false, // returnPlainToken
 	);
 	// Drop undefined from signature - we can do it safely due to throwOnNullToken == true above
 	return res as InstrumentedStorageTokenFetcher;
@@ -364,12 +373,14 @@ export function toInstrumentedOdspStorageTokenFetcher(
  * Returns a function that can be used to fetch storage or websocket token.
  * There are scenarios where websocket token is not required / present (consumer stack and ordering service token),
  * thus it could return null. Use toInstrumentedOdspStorageTokenFetcher if you deal with storage token.
+ * @param returnPlainToken - When true, tokenResponse.token is returned. When false, tokenResponse.authorizationHeader is returned or an authorization header value is created based on tokenResponse.token
  */
 export function toInstrumentedOdspTokenFetcher(
 	logger: ITelemetryLoggerExt,
 	resolvedUrlParts: IOdspUrlParts,
 	tokenFetcher: TokenFetcher<OdspResourceTokenFetchOptions>,
 	throwOnNullToken: boolean,
+	returnPlainToken: boolean,
 ): InstrumentedTokenFetcher {
 	return async (
 		options: TokenFetchOptions,
@@ -394,7 +405,9 @@ export function toInstrumentedOdspTokenFetcher(
 					...resolvedUrlParts,
 				}).then(
 					(tokenResponse) => {
-						const token = tokenFromResponse(tokenResponse);
+						const returnVal = returnPlainToken
+							? tokenFromResponse(tokenResponse)
+							: authHeaderFromTokenResponse(tokenResponse);
 						// This event alone generates so many events that is materially impacts cost of telemetry
 						// Thus do not report end event when it comes back quickly.
 						// Note that most of the hosts do not report if result is comming from cache or not,
@@ -403,10 +416,10 @@ export function toInstrumentedOdspTokenFetcher(
 						if (alwaysRecordTokenFetchTelemetry || event.duration >= 32) {
 							event.end({
 								fromCache: isTokenFromCache(tokenResponse),
-								isNull: token === null,
+								isNull: returnVal === null,
 							});
 						}
-						if (token === null && throwOnNullToken) {
+						if (returnVal === null && throwOnNullToken) {
 							throw new NonRetryableError(
 								// pre-0.58 error message: Token is null for ${name} call
 								`The Host-provided token fetcher returned null`,
@@ -414,7 +427,7 @@ export function toInstrumentedOdspTokenFetcher(
 								{ method: name, driverVersion },
 							);
 						}
-						return token;
+						return returnVal;
 					},
 					(error) => {
 						// There is an important but unofficial contract here where token providers can set canRetry: true

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/odsp-driver";
-export const pkgVersion = "2.0.0";
+export const pkgVersion = "2.0.2";

package/src/prefetchLatestSnapshot.ts

@@ -15,6 +15,7 @@ import {
 	OdspResourceTokenFetchOptions,
 	TokenFetcher,
 	getKeyForCacheEntry,
+	type InstrumentedStorageTokenFetcher,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
 	PerformanceEvent,
@@ -35,6 +36,7 @@ import {
 	createOdspLogger,
 	getOdspResolvedUrl,
 	toInstrumentedOdspStorageTokenFetcher,
+	type TokenFetchOptionsEx,
 } from "./odspUtils.js";
 
 /**
@@ -45,7 +47,7 @@ import {
  * @param getStorageToken - function that can provide the storage token for a given site. This is
  * is also referred to as the "VROOM" token in SPO.
  * @param persistedCache - Cache to store the fetched snapshot.
- * @param forceAccessTokenViaAuthorizationHeader - whether to force passing given token via authorization header.
+ * @param forceAccessTokenViaAuthorizationHeader - @deprecated Not used, true value always used instead. Whether to force passing given token via authorization header.
  * @param logger - Logger to have telemetry events.
  * @param hostSnapshotFetchOptions - Options to fetch the snapshot if any. Otherwise default will be used.
  * @param enableRedeemFallback - True to have the sharing link redeem fallback in case the Trees Latest/Redeem
@@ -86,7 +88,7 @@ export async function prefetchLatestSnapshot(
 		driveId: odspResolvedUrl.driveId,
 		itemId: odspResolvedUrl.itemId,
 	};
-	const storageTokenFetcher = toInstrumentedOdspStorageTokenFetcher(
+	const getAuthHeader = toInstrumentedOdspStorageTokenFetcher(
 		odspLogger,
 		resolvedUrlData,
 		getStorageToken,
@@ -94,14 +96,16 @@ export async function prefetchLatestSnapshot(
 
 	const snapshotDownloader = async (
 		finalOdspResolvedUrl: IOdspResolvedUrl,
-		storageToken: string,
+		storageTokenFetcher: InstrumentedStorageTokenFetcher,
+		tokenFetchOptions: TokenFetchOptionsEx,
 		loadingGroupId: string[] | undefined,
 		snapshotOptions: ISnapshotOptions | undefined,
 		controller?: AbortController,
 	): Promise<ISnapshotRequestAndResponseOptions> => {
 		return downloadSnapshot(
 			finalOdspResolvedUrl,
-			storageToken,
+			storageTokenFetcher,
+			tokenFetchOptions,
 			loadingGroupId,
 			snapshotOptions,
 			undefined,
@@ -135,7 +139,7 @@ export async function prefetchLatestSnapshot(
 			);
 			await fetchSnapshotWithRedeem(
 				odspResolvedUrl,
-				storageTokenFetcher,
+				getAuthHeader,
 				hostSnapshotFetchOptions,
 				forceAccessTokenViaAuthorizationHeader,
 				odspLogger,

package/src/vroom.ts

@@ -31,7 +31,7 @@ interface IJoinSessionBody {
  * @param path - The API path that is relevant to this request
  * @param method - The type of request, such as GET or POST
  * @param logger - A logger to use for this request
- * @param getStorageToken - A function that is able to provide the access token for this request
+ * @param getAuthHeader - A function that is able to provide the access token for this request
  * @param epochTracker - fetch wrapper which incorporates epoch logic around joinSession call
  * @param requestSocketToken - flag indicating whether joinSession is expected to return access token
  * which is used when establishing websocket connection with collab session backend service.
@@ -44,17 +44,21 @@ interface IJoinSessionBody {
 export async function fetchJoinSession(
 	urlParts: IOdspUrlParts,
 	path: string,
-	method: string,
+	method: "GET" | "POST",
 	logger: ITelemetryLoggerExt,
-	getStorageToken: InstrumentedStorageTokenFetcher,
+	getAuthHeader: InstrumentedStorageTokenFetcher,
 	epochTracker: EpochTracker,
 	requestSocketToken: boolean,
 	options: TokenFetchOptionsEx,
 	disableJoinSessionRefresh: boolean | undefined,
 	isRefreshingJoinSession: boolean,
-	guestDisplayName?: string,
 ): Promise<ISocketStorageDiscovery> {
-	const token = await getStorageToken(options, "JoinSession");
+	const apiRoot = getApiRoot(new URL(urlParts.siteUrl));
+	const url = `${apiRoot}/drives/${urlParts.driveId}/items/${urlParts.itemId}/${path}?ump=1`;
+	const authHeader = await getAuthHeader(
+		{ ...options, request: { url, method } },
+		"JoinSession",
+	);
 
 	const tokenRefreshProps = options.refresh
 		? { hasClaims: !!options.claims, hasTenantId: !!options.tenantId }
@@ -75,10 +79,9 @@ export async function fetchJoinSession(
 			...tokenRefreshProps,
 		},
 		async (event) => {
-			const apiRoot = getApiRoot(new URL(urlParts.siteUrl));
 			const formBoundary = uuid();
 			let postBody = `--${formBoundary}\r\n`;
-			postBody += `Authorization: Bearer ${token}\r\n`;
+			postBody += `Authorization: ${authHeader}\r\n`;
 			postBody += `X-HTTP-Method-Override: POST\r\n`;
 			postBody += `Content-Type: application/json\r\n`;
 			if (!disableJoinSessionRefresh) {
@@ -90,9 +93,6 @@ export async function fetchJoinSession(
 				const body: IJoinSessionBody = {
 					requestSocketToken: true,
 				};
-				if (guestDisplayName !== undefined) {
-					body.guestDisplayName = guestDisplayName;
-				}
 				postBody += `\r\n${JSON.stringify(body)}\r\n`;
 			}
 			postBody += `\r\n--${formBoundary}--`;
@@ -103,7 +103,7 @@ export async function fetchJoinSession(
 			const response = await runWithRetry(
 				async () =>
 					epochTracker.fetchAndParseAsJSON<ISocketStorageDiscovery>(
-						`${apiRoot}/drives/${urlParts.driveId}/items/${urlParts.itemId}/${path}?ump=1`,
+						url,
 						{ method, headers, body: postBody },
 						"joinSession",
 						true,