wip(fix): Make 401 handling rigid for FS lookup

Signed-off-by: Trae Yelovich <[email protected]>
zowe · Feb 24, 2025 · 895e8a9 · 895e8a9
1 parent 53c1630
commit 895e8a9
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 18 deletions.
diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts b/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts
@@ -287,18 +287,31 @@ export class DatasetFSProvider extends BaseProvider implements vscode.FileSystem
             this.createDirectory(profileUri);
         }
 
-        if (uriInfo.isRoot) {
-            // profile entry; check if "pattern" filter is in query.
+        try {
+            // Wait for any ongoing authentication to complete
+            await AuthHandler.waitForUnlock(uriInfo.profile);
+
+            if (uriInfo.isRoot) {
+                // profile entry; check if "pattern" filter is in query.
+                const urlQuery = new URLSearchParams(uri.query);
+                if (!urlQuery.has("pattern")) {
+                    return this._lookupAsDirectory(profileUri, false);
+                }
 
-            const urlQuery = new URLSearchParams(uri.query);
-            if (!urlQuery.has("pattern")) {
-                return this._lookupAsDirectory(profileUri, false);
+                return this.fetchEntriesForProfile(uri, uriInfo, urlQuery.get("pattern"));
+            } else {
+                // data set or one of its members
+                return this.fetchDataset(uri, uriInfo);
             }
-
-            return this.fetchEntriesForProfile(uri, uriInfo, urlQuery.get("pattern"));
-        } else {
-            // data set or one of its members
-            return this.fetchDataset(uri, uriInfo);
+        } catch (err) {
+            await AuthUtils.handleProfileAuthOnError(err, uriInfo.profile);
+            // If the profile is locked (authentication failed), throw an error to prevent further attempts
+            if (AuthHandler.isProfileLocked(uriInfo.profile)) {
+                throw vscode.FileSystemError.NoPermissions(
+                    vscode.l10n.t("Authentication failed. Please update credentials through the 'Update Credentials' command.")
+                );
+            }
+            throw err;
         }
     }
 

diff --git a/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts b/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts
@@ -220,21 +220,33 @@ export class UssFSProvider extends BaseProvider implements vscode.FileSystemProv
     public async remoteLookupForResource(uri: vscode.Uri): Promise<UssDirectory | UssFile> {
         const uriInfo = FsAbstractUtils.getInfoForUri(uri, Profiles.getInstance());
         const profileUri = vscode.Uri.from({ scheme: ZoweScheme.USS, path: uriInfo.profileName });
-
         // Ensure that an entry exists for the given profile
         if (!this.exists(profileUri)) {
             this.createDirectory(profileUri);
         }
 
-        if (uriInfo.isRoot) {
-            // profile entry; check if "pattern" is in query.
-            const urlQuery = new URLSearchParams(uri.query);
-            if (!urlQuery.has("searchPath")) {
-                return this._lookupAsDirectory(profileUri, false) as UssDirectory;
+        try {
+            await AuthHandler.waitForUnlock(uriInfo.profile);
+            if (uriInfo.isRoot) {
+                // profile entry; check if "searchPath" is in query.
+                const urlQuery = new URLSearchParams(uri.query);
+                if (!urlQuery.has("searchPath")) {
+                    return this._lookupAsDirectory(profileUri, false) as UssDirectory;
+                }
             }
+            return this.fetchEntries(uri, uriInfo);
+        } catch (err) {
+            // Handle authentication errors through AuthHandler
+            await AuthUtils.handleProfileAuthOnError(err, uriInfo.profile);
+
+            // If the profile is locked (authentication failed), throw an error to prevent further attempts
+            if (AuthHandler.isProfileLocked(uriInfo.profile)) {
+                throw vscode.FileSystemError.NoPermissions(
+                    vscode.l10n.t("Authentication failed. Please update credentials through the 'Update Credentials' command.")
+                );
+            }
+            throw err;
         }
-
-        return this.fetchEntries(uri, uriInfo);
     }
 
     /**