From ba243f7232083bbfc45e8aca542afc57583784ca Mon Sep 17 00:00:00 2001
From: Laurent Nguyen <laurent.nguyen@microsoft.com>
Date: Tue, 4 Mar 2025 15:04:18 +0100
Subject: [PATCH] Fix strict compile issue

---
 src/Platform/Fabric/FabricUtil.ts | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Platform/Fabric/FabricUtil.ts b/src/Platform/Fabric/FabricUtil.ts
index dc8f28f44..a9a653dd7 100644
--- a/src/Platform/Fabric/FabricUtil.ts
+++ b/src/Platform/Fabric/FabricUtil.ts
@@ -23,12 +23,6 @@ const requestFabricToken = async (): Promise<void> => {
     return;
   }
 
-  if (!userContext.fabricContext || !userContext.databaseAccount) {
-    // This should not happen
-    logConsoleError("Fabric context or database account is missing: cannot request tokens");
-    return;
-  }
-
   lastRequestTimestamp = Date.now();
   try {
     if (isFabricMirrored()) {
@@ -47,6 +41,12 @@ const requestFabricToken = async (): Promise<void> => {
 };
 
 const requestAndStoreDatabaseResourceTokens = async (): Promise<void> => {
+  if (!userContext.fabricContext || !userContext.databaseAccount) {
+    // This should not happen
+    logConsoleError("Fabric context or database account is missing: cannot request tokens");
+    return;
+  }
+
   const resourceTokenInfo = await sendCachedDataMessage<ResourceTokenInfo>(
     FabricMessageTypes.GetAllResourceTokens,
     [],
@@ -88,11 +88,13 @@ const requestAndStoreDatabaseResourceTokens = async (): Promise<void> => {
 };
 
 const requestAndStoreAccessToken = async (): Promise<void> => {
-  const accessTokenInfo = await sendCachedDataMessage<{ accessToken: string }>(
-    FabricMessageTypes.GetAccessToken,
-    [],
-    userContext.fabricContext.artifactInfo?.connectionId,
-  );
+  if (!userContext.fabricContext || !userContext.databaseAccount) {
+    // This should not happen
+    logConsoleError("Fabric context or database account is missing: cannot request tokens");
+    return;
+  }
+
+  const accessTokenInfo = await sendCachedDataMessage<{ accessToken: string }>(FabricMessageTypes.GetAccessToken, []);
 
   updateUserContext({
     aadToken: accessTokenInfo.accessToken,