@fluidframework/odsp-driver 2.3.0-288113 → 2.4.0-294316

package/src/compactSnapshotParser.ts

@@ -70,10 +70,8 @@ function readBlobSection(node: NodeTypes): {
 			 */
 			slowBlobStructureCount += 1;
 			const records = getNodeProps(blob);
-			// TODO why are we non null asserting here?
-			assertBlobCoreInstance(records.data!, "data should be of BlobCore type");
-			// TODO why are we non null asserting here?
-			const id = getStringInstance(records.id!, "blob id should be string");
+			assertBlobCoreInstance(records.data, "data should be of BlobCore type");
+			const id = getStringInstance(records.id, "blob id should be string");
 			blobContents.set(id, records.data.arrayBuffer);
 		}
 	}
@@ -88,10 +86,8 @@ function readOpsSection(node: NodeTypes): ISequencedDocumentMessage[] {
 	assertNodeCoreInstance(node, "Deltas should be of type NodeCore");
 	const ops: ISequencedDocumentMessage[] = [];
 	const records = getNodeProps(node);
-	// TODO Why are we non null asserting here?
-	assertNumberInstance(records.firstSequenceNumber!, "Seq number should be a number");
-	// TODO Why are we non null asserting here?
-	assertNodeCoreInstance(records.deltas!, "Deltas should be a Node");
+	assertNumberInstance(records.firstSequenceNumber, "Seq number should be a number");
+	assertNodeCoreInstance(records.deltas, "Deltas should be a Node");
 	for (let i = 0; i < records.deltas.length; ++i) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		ops.push(JSON.parse(records.deltas.getString(i)));
@@ -100,8 +96,7 @@ function readOpsSection(node: NodeTypes): ISequencedDocumentMessage[] {
 	// when there are no ops. So just make the code resilient to that bug. Service has also
 	// fixed that bug.
 	assert(
-		// Non null asserting here because of the length check
-		ops.length === 0 || records.firstSequenceNumber.valueOf() === ops[0]!.sequenceNumber,
+		ops.length === 0 || records.firstSequenceNumber.valueOf() === ops[0].sequenceNumber,
 		0x280 /* "Validate first op seq number" */,
 	);
 	return ops;
@@ -206,8 +201,7 @@ function readTreeSection(node: NodeCore): {
 			snapshotTree.unreferenced = true;
 		}
 
-		// TODO Why are we non null asserting here?
-		const path = getStringInstance(records.name!, "Path name should be string");
+		const path = getStringInstance(records.name, "Path name should be string");
 		if (records.value !== undefined) {
 			snapshotTree.blobs[path] = getStringInstance(
 				records.value,
@@ -220,8 +214,7 @@ function readTreeSection(node: NodeCore): {
 			trees[path] = result.snapshotTree;
 			if (records.groupId !== undefined) {
 				const groupId = getStringInstance(records.groupId, "groupId should be a string");
-				// Non null asserting since trees[path] is already created
-				trees[path]!.groupId = groupId;
+				trees[path].groupId = groupId;
 				treeStructureCountWithGroupId++;
 			}
 			slowTreeStructureCount += result.slowTreeStructureCount;
@@ -246,14 +239,11 @@ function readSnapshotSection(node: NodeTypes): {
 	assertNodeCoreInstance(node, "Snapshot should be of type NodeCore");
 	const records = getNodeProps(node);
 
-	// TODO Why are we non null asserting here?
-	assertNodeCoreInstance(records.treeNodes!, "TreeNodes should be of type NodeCore");
-	// TODO Why are we non null asserting here?
-	assertNumberInstance(records.sequenceNumber!, "sequenceNumber should be of type number");
+	assertNodeCoreInstance(records.treeNodes, "TreeNodes should be of type NodeCore");
+	assertNumberInstance(records.sequenceNumber, "sequenceNumber should be of type number");
 	const { snapshotTree, slowTreeStructureCount, treeStructureCountWithGroupId } =
 		readTreeSection(records.treeNodes);
-	// TODO Why are we non null asserting here?
-	snapshotTree.id = getStringInstance(records.id!, "snapshotId should be string");
+	snapshotTree.id = getStringInstance(records.id, "snapshotId should be string");
 	const sequenceNumber = records.sequenceNumber.valueOf();
 	return {
 		sequenceNumber,
@@ -279,10 +269,8 @@ export function parseCompactSnapshotResponse(
 
 	const records = getNodeProps(root);
 
-	// TODO Why are we non null asserting here?
-	const mrv = getStringInstance(records.mrv!, "minReadVersion should be string");
-	// TODO Why are we non null asserting here?
-	const cv = getStringInstance(records.cv!, "createVersion should be string");
+	const mrv = getStringInstance(records.mrv, "minReadVersion should be string");
+	const cv = getStringInstance(records.cv, "createVersion should be string");
 	if (records.lsn !== undefined) {
 		assertNumberInstance(records.lsn, "lsn should be a number");
 	}
@@ -301,11 +289,9 @@ export function parseCompactSnapshotResponse(
 	);
 
 	const [snapshot, durationSnapshotTree] = measure(() =>
-		// TODO Why are we non null asserting here?
-		readSnapshotSection(records.snapshot!),
+		readSnapshotSection(records.snapshot),
 	);
-	// TODO Why are we non null asserting here?
-	const [blobContents, durationBlobs] = measure(() => readBlobSection(records.blobs!));
+	const [blobContents, durationBlobs] = measure(() => readBlobSection(records.blobs));
 
 	return {
 		...snapshot,

package/src/compactSnapshotWriter.ts

@@ -130,8 +130,7 @@ function writeSnapshotSection(
 function writeOpsSection(rootNode: NodeCore, ops: ISequencedDocumentMessage[]): void {
 	let firstSequenceNumber: number | undefined;
 	if (ops.length > 0) {
-		// Non null asserting here because of the length check above
-		firstSequenceNumber = ops[0]!.sequenceNumber;
+		firstSequenceNumber = ops[0].sequenceNumber;
 	}
 	if (firstSequenceNumber !== undefined) {
 		rootNode.addDictionaryString("deltas");
@@ -163,8 +162,7 @@ export function convertToCompactSnapshot(snapshotContents: ISnapshot): Uint8Arra
 	if (latestSequenceNumber === undefined) {
 		latestSequenceNumber =
 			snapshotContents.ops.length > 0
-				? // Non null asserting here because of the length check above
-					snapshotContents.ops[snapshotContents.ops.length - 1]!.sequenceNumber
+				? snapshotContents.ops[snapshotContents.ops.length - 1].sequenceNumber
 				: snapshotContents.sequenceNumber;
 	}
 

package/src/createNewUtils.ts

@@ -72,8 +72,7 @@ function convertCreateNewSummaryTreeToTreeAndBlobsCore(
 	};
 	const keys = Object.keys(summary.tree);
 	for (const key of keys) {
-		// Non null asserting for now this should change to Object.entries
-		const summaryObject = summary.tree[key]!;
+		const summaryObject = summary.tree[key];
 
 		switch (summaryObject.type) {
 			case SummaryType.Tree: {
@@ -151,8 +150,7 @@ function convertSummaryToSnapshotTreeForCreateNew(summary: ISummaryTree): IOdspS
 	const keys = Object.keys(summary.tree);
 	for (const key of keys) {
 		assert(!key.includes("/"), 0x9cc /* id should not include slashes */);
-		// Non null asserting for now this should change to Object.entries
-		const summaryObject = summary.tree[key]!;
+		const summaryObject = summary.tree[key];
 
 		let value: OdspSummaryTreeValue;
 		// Tracks if an entry is unreferenced. Currently, only tree entries can be marked as unreferenced. If the

package/src/fetchSnapshot.ts

@@ -505,8 +505,7 @@ async function fetchLatestSnapshotCore(
 			const sequenceNumber: number = snapshot.sequenceNumber ?? 0;
 			const seqNumberFromOps =
 				snapshot.ops && snapshot.ops.length > 0
-					? // Non null asserting here because of the length check above
-						snapshot.ops[0]!.sequenceNumber - 1
+					? snapshot.ops[0].sequenceNumber - 1
 					: undefined;
 
 			if (

package/src/getFileLink.ts

@@ -6,12 +6,12 @@
 import type { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
 import { NonRetryableError, runWithRetry } from "@fluidframework/driver-utils/internal";
-import { hasRedirectionLocation } from "@fluidframework/odsp-doclib-utils/internal";
 import {
 	IOdspUrlParts,
 	OdspErrorTypes,
 	OdspResourceTokenFetchOptions,
 	TokenFetcher,
+	type IOdspResolvedUrl,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
 	ITelemetryLoggerExt,
@@ -44,10 +44,10 @@ const fileLinkCache = new Map<string, Promise<string>>();
  */
 export async function getFileLink(
 	getToken: TokenFetcher<OdspResourceTokenFetchOptions>,
-	odspUrlParts: IOdspUrlParts,
+	resolvedUrl: IOdspResolvedUrl,
 	logger: ITelemetryLoggerExt,
 ): Promise<string> {
-	const cacheKey = `${odspUrlParts.siteUrl}_${odspUrlParts.driveId}_${odspUrlParts.itemId}`;
+	const cacheKey = `${resolvedUrl.siteUrl}_${resolvedUrl.driveId}_${resolvedUrl.itemId}`;
 	const maybeFileLinkCacheEntry = fileLinkCache.get(cacheKey);
 	if (maybeFileLinkCacheEntry !== undefined) {
 		return maybeFileLinkCacheEntry;
@@ -61,7 +61,7 @@ export async function getFileLink(
 				async () =>
 					runWithRetryForCoherencyAndServiceReadOnlyErrors(
 						async () =>
-							getFileLinkWithLocationRedirectionHandling(getToken, odspUrlParts, logger),
+							getFileLinkWithLocationRedirectionHandling(getToken, resolvedUrl, logger),
 						"getFileLinkCore",
 						logger,
 					),
@@ -116,32 +116,41 @@ export async function getFileLink(
  */
 async function getFileLinkWithLocationRedirectionHandling(
 	getToken: TokenFetcher<OdspResourceTokenFetchOptions>,
-	odspUrlParts: IOdspUrlParts,
+	resolvedUrl: IOdspResolvedUrl,
 	logger: ITelemetryLoggerExt,
 ): Promise<string> {
 	// We can have chains of location redirection one after the other, so have a for loop
 	// so that we can keep handling the same type of error. Set max number of redirection to 5.
 	let lastError: unknown;
+	let locationRedirected = false;
 	for (let count = 1; count <= 5; count++) {
 		try {
-			return await getFileLinkCore(getToken, odspUrlParts, logger);
+			const fileItem = await getFileItemLite(getToken, resolvedUrl, logger, true);
+			// Sometimes the siteUrl in the actual file is different from the siteUrl in the resolvedUrl due to location
+			// redirection. This creates issues in the getSharingInformation call. So we need to update the siteUrl in the
+			// resolvedUrl to the siteUrl in the fileItem which is the updated siteUrl.
+			const oldSiteDomain = new URL(resolvedUrl.siteUrl).origin;
+			const newSiteDomain = new URL(fileItem.sharepointIds.siteUrl).origin;
+			if (oldSiteDomain !== newSiteDomain) {
+				locationRedirected = true;
+				logger.sendTelemetryEvent({
+					eventName: "LocationRedirectionErrorForGetOdspFileLink",
+					retryCount: count,
+				});
+				renameTenantInOdspResolvedUrl(resolvedUrl, newSiteDomain);
+			}
+			return await getFileLinkCore(getToken, resolvedUrl, logger, fileItem);
 		} catch (error: unknown) {
 			lastError = error;
+			// If the getSharingLink call fails with the 401/403/404 error, then it could be due to that the file has moved
+			// to another location. This could occur in case we have more than 1 tenant rename. In that case, we should retry
+			// the getFileItemLite call to get the updated fileItem.
 			if (
 				isFluidError(error) &&
-				error.errorType === OdspErrorTypes.fileNotFoundOrAccessDeniedError &&
-				hasRedirectionLocation(error) &&
-				error.redirectLocation !== undefined
+				locationRedirected &&
+				(error.errorType === OdspErrorTypes.fileNotFoundOrAccessDeniedError ||
+					error.errorType === OdspErrorTypes.authorizationError)
 			) {
-				const redirectLocation = error.redirectLocation;
-				logger.sendTelemetryEvent({
-					eventName: "LocationRedirectionErrorForGetOdspFileLink",
-					retryCount: count,
-				});
-				// Generate the new SiteUrl from the redirection location.
-				const newSiteDomain = new URL(redirectLocation).origin;
-				const newSiteUrl = `${newSiteDomain}${new URL(odspUrlParts.siteUrl).pathname}`;
-				odspUrlParts.siteUrl = newSiteUrl;
 				continue;
 			}
 			throw error;
@@ -154,9 +163,8 @@ async function getFileLinkCore(
 	getToken: TokenFetcher<OdspResourceTokenFetchOptions>,
 	odspUrlParts: IOdspUrlParts,
 	logger: ITelemetryLoggerExt,
+	fileItem: FileItemLite,
 ): Promise<string> {
-	const fileItem = await getFileItemLite(getToken, odspUrlParts, logger, true);
-
 	// ODSP link requires extra call to return link that is resistant to file being renamed or moved to different folder
 	return PerformanceEvent.timedExecAsync(
 		logger,
@@ -194,7 +202,6 @@ async function getFileLinkCore(
 					headers: {
 						"Content-Type": "application/json;odata=verbose",
 						"Accept": "application/json;odata=verbose",
-						"redirect": "manual",
 						...headers,
 					},
 				};
@@ -281,7 +288,6 @@ async function getFileItemLite(
 				);
 
 				const headers = getHeadersWithAuth(authHeader);
-				headers.redirect = "manual";
 				const requestInit = { method, headers };
 				const response = await fetchHelper(url, requestInit);
 				additionalProps = response.propsToLog;
@@ -302,3 +308,29 @@ async function getFileItemLite(
 		},
 	);
 }
+
+/**
+ * It takes a resolved url with old siteUrl and patches resolved url with updated site url domain.
+ * @param odspResolvedUrl - Previous odsp resolved url with older site url.
+ * @param newSiteDomain - New site domain after the tenant rename.
+ */
+function renameTenantInOdspResolvedUrl(
+	odspResolvedUrl: IOdspResolvedUrl,
+	newSiteDomain: string,
+): void {
+	const newSiteUrl = `${newSiteDomain}${new URL(odspResolvedUrl.siteUrl).pathname}`;
+	odspResolvedUrl.siteUrl = newSiteUrl;
+
+	if (odspResolvedUrl.endpoints.attachmentGETStorageUrl) {
+		odspResolvedUrl.endpoints.attachmentGETStorageUrl = `${newSiteDomain}${new URL(odspResolvedUrl.endpoints.attachmentGETStorageUrl).pathname}`;
+	}
+	if (odspResolvedUrl.endpoints.attachmentPOSTStorageUrl) {
+		odspResolvedUrl.endpoints.attachmentPOSTStorageUrl = `${newSiteDomain}${new URL(odspResolvedUrl.endpoints.attachmentPOSTStorageUrl).pathname}`;
+	}
+	if (odspResolvedUrl.endpoints.deltaStorageUrl) {
+		odspResolvedUrl.endpoints.deltaStorageUrl = `${newSiteDomain}${new URL(odspResolvedUrl.endpoints.deltaStorageUrl).pathname}`;
+	}
+	if (odspResolvedUrl.endpoints.snapshotStorageUrl) {
+		odspResolvedUrl.endpoints.snapshotStorageUrl = `${newSiteDomain}${new URL(odspResolvedUrl.endpoints.snapshotStorageUrl).pathname}`;
+	}
+}

package/src/localOdspDriver/localOdspDeltaStorageService.ts

@@ -38,8 +38,7 @@ export class LocalOdspDeltaStorageService implements IDocumentDeltaStorageServic
 		);
 		validateMessages("cached", messages, from, this.logger);
 
-		// Non null asserting here because of the length check
-		if (messages.length === 0 || messages[0]!.sequenceNumber !== from) {
+		if (messages.length === 0 || messages[0].sequenceNumber !== from) {
 			this.snapshotOps = [];
 		}
 		this.snapshotOps = this.snapshotOps.filter(

package/src/odspDelayLoadedDeltaStream.ts

@@ -472,8 +472,7 @@ export class OdspDelayLoadedDeltaStream {
 	}
 
 	private emitMetaDataUpdateEvent(metadata: Record<string, string>): void {
-		// TODO Why are we non null asserting here?
-		const label = JSON.parse(metadata.sensitivityLabelsInfo!) as {
+		const label = JSON.parse(metadata.sensitivityLabelsInfo) as {
 			labels: unknown;
 			timestamp: number;
 		};
@@ -482,8 +481,7 @@ export class OdspDelayLoadedDeltaStream {
 		if (time > this.labelUpdateTimestamp) {
 			this.labelUpdateTimestamp = time;
 			this.metadataUpdateHandler({
-				// TODO Why are we non null asserting here?
-				sensitivityLabelsInfo: metadata.sensitivityLabelsInfo!,
+				sensitivityLabelsInfo: metadata.sensitivityLabelsInfo,
 			});
 		}
 	}

package/src/odspDeltaStorageService.ts

@@ -106,8 +106,7 @@ export class OdspDeltaStorageService {
 					clearTimeout(timer);
 					const deltaStorageResponse = response.content;
 					const messages =
-						// Non null asserting here because of the length check
-						deltaStorageResponse.value.length > 0 && "op" in deltaStorageResponse.value[0]!
+						deltaStorageResponse.value.length > 0 && "op" in deltaStorageResponse.value[0]
 							? (deltaStorageResponse.value as ISequencedDeltaOpMessage[]).map(
 									(operation) => operation.op,
 								)
@@ -188,8 +187,7 @@ export class OdspDeltaStorageWithCache implements IDocumentDeltaStorageService {
 					(op) => op.sequenceNumber >= from && op.sequenceNumber < to,
 				);
 				validateMessages("cached", messages, from, this.logger);
-				// Non null asserting here because of the length check
-				if (messages.length > 0 && messages[0]!.sequenceNumber === from) {
+				if (messages.length > 0 && messages[0].sequenceNumber === from) {
 					this.snapshotOps = this.snapshotOps.filter((op) => op.sequenceNumber >= to);
 					opsFromSnapshot += messages.length;
 					return { messages, partialResult: true };

package/src/odspDocumentDeltaConnection.ts

@@ -36,7 +36,6 @@ import { SocketIOClientStatic } from "./socketModule.js";
 const protocolVersions = ["^0.4.0", "^0.3.0", "^0.2.0", "^0.1.0"];
 const feature_get_ops = "api_get_ops";
 const feature_flush_ops = "api_flush_ops";
-const feature_submit_signals_v2 = "submit_signals_v2";
 
 export interface FlushResult {
 	lastPersistedSequenceNumber?: number;
@@ -296,9 +295,7 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
 			relayUserAgent: [client.details.environment, ` driverVersion:${pkgVersion}`].join(";"),
 		};
 
-		connectMessage.supportedFeatures = {
-			[feature_submit_signals_v2]: true,
-		};
+		connectMessage.supportedFeatures = {};
 
 		// Reference to this client supporting get_ops flow.
 		if (mc.config.getBoolean("Fluid.Driver.Odsp.GetOpsEnabled") !== false) {
@@ -591,10 +588,8 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
 				if (messages !== undefined && messages.length > 0) {
 					this.logger.sendPerformanceEvent({
 						...common,
-						// Non null asserting here because of the length check above
-						first: messages[0]!.sequenceNumber,
-						// Non null asserting here because of the length check above
-						last: messages[messages.length - 1]!.sequenceNumber,
+						first: messages[0].sequenceNumber,
+						last: messages[messages.length - 1].sequenceNumber,
 						length: messages.length,
 					});
 					this.emit("op", this.documentId, messages);

package/src/odspDocumentStorageServiceBase.ts

@@ -198,8 +198,7 @@ export abstract class OdspDocumentStorageServiceBase implements IDocumentStorage
 				// eslint-disable-next-line unicorn/no-null
 				return null;
 			}
-			// Non null asserting here because of the length check above
-			id = versions[0]!.id;
+			id = versions[0].id;
 		}
 
 		const snapshotTree = await this.readTree(id, scenarioName);
@@ -258,8 +257,7 @@ export abstract class OdspDocumentStorageServiceBase implements IDocumentStorage
 	protected combineProtocolAndAppSnapshotTree(snapshotTree: ISnapshotTree): ISnapshotTree {
 		// When we upload the container snapshot, we upload appTree in ".app" and protocol tree in ".protocol"
 		// So when we request the snapshot we get ".app" as tree and not as commit node as in the case just above.
-		// TODO Why are we non null asserting here?
-		const hierarchicalAppTree = snapshotTree.trees[".app"]!;
+		const hierarchicalAppTree = snapshotTree.trees[".app"];
 		const hierarchicalProtocolTree = snapshotTree.trees[".protocol"];
 		const summarySnapshotTree: ISnapshotTree = {
 			blobs: {

package/src/odspDriverUrlResolver.ts

@@ -262,8 +262,7 @@ export function decodeOdspUrl(url: string): {
 	}
 
 	return {
-		// TODO Why are we non null asserting here?
-		siteUrl: siteUrl!,
+		siteUrl,
 		driveId: decodeURIComponent(driveId),
 		itemId: decodeURIComponent(itemId),
 		path: decodeURIComponent(path),

package/src/odspSnapshotParser.ts

@@ -28,8 +28,7 @@ function buildHierarchy(flatTree: IOdspSnapshotCommit): ISnapshotTree {
 		const entryPathBase = entry.path.slice(lastIndex + 1);
 
 		// ODSP snapshots are created breadth-first so we can assume we see tree nodes prior to their contents
-		// TODO Why are we non null asserting here?
-		const node = lookup[entryPathDir]!;
+		const node = lookup[entryPathDir];
 
 		// Add in either the blob or tree
 		if (entry.type === "tree") {
@@ -70,19 +69,16 @@ export function convertOdspSnapshotToSnapshotTreeAndBlobs(
 		}
 	}
 
-	// TODO Why are we non null asserting here?
-	const sequenceNumber = odspSnapshot?.trees[0]!.sequenceNumber;
+	const sequenceNumber = odspSnapshot?.trees[0].sequenceNumber;
 
 	const val: ISnapshot = {
 		blobContents: blobsWithBufferContent,
 		ops: odspSnapshot.ops?.map((op) => op.op) ?? [],
 		sequenceNumber,
-		// TODO Why are we non null asserting here?
-		snapshotTree: buildHierarchy(odspSnapshot.trees[0]!),
+		snapshotTree: buildHierarchy(odspSnapshot.trees[0]),
 		latestSequenceNumber:
 			odspSnapshot.ops && odspSnapshot.ops.length > 0
-				? // Non null asserting here because of the length check above
-					odspSnapshot.ops[odspSnapshot.ops.length - 1]!.sequenceNumber
+				? odspSnapshot.ops[odspSnapshot.ops.length - 1].sequenceNumber
 				: sequenceNumber,
 		snapshotFormatV: 1,
 	};

package/src/odspSummaryUploadManager.ts

@@ -180,8 +180,7 @@ export class OdspSummaryUploadManager {
 		const keys = Object.keys(tree.tree);
 		for (const key of keys) {
 			assert(!key.includes("/"), 0x9cd /* id should not include slashes */);
-			// Non null asserting for now, this should be changed to Object.entries
-			const summaryObject = tree.tree[key]!;
+			const summaryObject = tree.tree[key];
 
 			let id: string | undefined;
 			let value: OdspSummaryTreeValue | undefined;

package/src/odspUrlHelper.ts

@@ -110,10 +110,8 @@ export async function getOdspUrlParts(url: URL): Promise<IOdspUrlParts | undefin
 			}
 		}
 
-		// TODO Why are we non null asserting here?
-		const driveId = joinSessionMatch[3] ?? joinSessionMatch[5]!;
-		// TODO Why are we non null asserting here?
-		const itemId = joinSessionMatch[4]!;
+		const driveId = joinSessionMatch[3] || joinSessionMatch[5];
+		const itemId = joinSessionMatch[4];
 
 		return { siteUrl: `${url.origin}${url.pathname}`, driveId, itemId };
 	} else {
@@ -122,10 +120,8 @@ export async function getOdspUrlParts(url: URL): Promise<IOdspUrlParts | undefin
 		if (joinSessionMatch === null) {
 			return undefined;
 		}
-		// TODO Why are we non null asserting here?
-		const driveId = joinSessionMatch[2]!;
-		// TODO Why are we non null asserting here?
-		const itemId = joinSessionMatch[3]!;
+		const driveId = joinSessionMatch[2];
+		const itemId = joinSessionMatch[3];
 
 		return { siteUrl: `${url.origin}${url.pathname}`, driveId, itemId };
 	}

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/odsp-driver";
-export const pkgVersion = "2.3.0-288113";
+export const pkgVersion = "2.4.0-294316";

package/src/zipItDataRepresentationUtils.ts

@@ -301,46 +301,39 @@ export class NodeCore {
 	}
 
 	public get(index: number): NodeTypes {
-		// TODO Why are we non null asserting here?
-		return this.children[index]!;
+		return this.children[index];
 	}
 
 	public getString(index: number): string {
-		// TODO Why are we non null asserting here?
-		const node = this.children[index]!;
+		const node = this.children[index];
 		return getStringInstance(node, "getString should return string");
 	}
 
 	public getMaybeString(index: number): string | undefined {
-		// TODO Why are we non null asserting here?
-		const node = this.children[index]!;
+		const node = this.children[index];
 		return getMaybeStringInstance(node);
 	}
 
 	public getBlob(index: number): BlobCore {
-		// TODO Why are we non null asserting here?
-		const node = this.children[index]!;
+		const node = this.children[index];
 		assertBlobCoreInstance(node, "getBlob should return a blob");
 		return node;
 	}
 
 	public getNode(index: number): NodeCore {
-		// TODO Why are we non null asserting here?
-		const node = this.children[index]!;
+		const node = this.children[index];
 		assertNodeCoreInstance(node, "getNode should return a node");
 		return node;
 	}
 
 	public getNumber(index: number): number {
-		// TODO Why are we non null asserting here?
-		const node = this.children[index]!;
+		const node = this.children[index];
 		assertNumberInstance(node, "getNumber should return a number");
 		return node;
 	}
 
 	public getBool(index: number): boolean {
-		// TODO Why are we non null asserting here?
-		const node = this.children[index]!;
+		const node = this.children[index];
 		assertBoolInstance(node, "getBool should return a boolean");
 		return node;
 	}
@@ -556,8 +549,7 @@ export class NodeCore {
 
 		for (const el of stringsToResolve) {
 			for (let it = el.startPos; it < el.endPos; it++) {
-				// Non null asserting here because we are iterating over startPos
-				stringBuffer[length] = input[it]!;
+				stringBuffer[length] = input[it];
 				length++;
 			}
 			stringBuffer[length] = 0;
@@ -569,8 +561,7 @@ export class NodeCore {
 		if (result.length === stringsToResolve.length + 1) {
 			// All is good, we expect all the cases to get here
 			for (let i = 0; i < stringsToResolve.length; i++) {
-				// Non null asserting here because we are iterating over stringsToResolve
-				stringsToResolve[i]!.content = result[i];
+				stringsToResolve[i].content = result[i];
 			}
 		} else {
 			// String content has \0 chars!

package/tsconfig.json

@@ -6,5 +6,6 @@
 		"rootDir": "./src",
 		"outDir": "./lib",
 		"exactOptionalPropertyTypes": false,
+		"noUncheckedIndexedAccess": false,
 	},
 }