init

Signed-off-by: jace-roell <[email protected]>

Author: jace-roell

packages/zowe-explorer/src/configuration/Profiles.ts

@@ -890,8 +890,8 @@ export class Profiles extends ProfilesCache {
                         comment: ["Service profile name"],
                     })
                 );
-                AuthHandler.unlockProfile(serviceProfile, true);
                 ZoweVsCodeExtension.onProfileUpdatedEmitter.fire(serviceProfile);
+                AuthHandler.unlockProfile(serviceProfile, true);
             }
             return loginOk;
         } catch (err) {

packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts

@@ -85,8 +85,14 @@ export class DatasetFSProvider extends BaseProvider implements vscode.FileSystem
             isFetching = queryParams.has("fetch") && queryParams.get("fetch") === "true";
         }
 
-        const entry = isFetching ? await this.remoteLookupForResource(uri) : this.lookup(uri, false);
         const uriInfo = FsAbstractUtils.getInfoForUri(uri, Profiles.getInstance());
+
+        if (AuthHandler.sessTypeFromProfile(uriInfo.profile) === imperative.SessConstants.AUTH_TYPE_TOKEN && !uriInfo.profile.profile.tokenValue) {
+            throw vscode.FileSystemError.Unavailable("Profile is using token type but missing a token");
+        }
+
+        const entry = isFetching ? await this.remoteLookupForResource(uri) : this.lookup(uri, false);
+
         // Do not perform remote lookup for profile or directory URIs; the code below is for change detection on PS or PDS members only
         if (uriInfo.isRoot || FsAbstractUtils.isDirectoryEntry(entry)) {
             return entry;
@@ -255,6 +261,10 @@ export class DatasetFSProvider extends BaseProvider implements vscode.FileSystem
         let pdsMember: boolean;
         let uriPath: string[];
 
+        if (AuthHandler.sessTypeFromProfile(uriInfo.profile) === imperative.SessConstants.AUTH_TYPE_TOKEN && !uriInfo.profile.profile.tokenValue) {
+            throw vscode.FileSystemError.Unavailable("Profile is using token type but missing a token");
+        }
+
         await AuthUtils.retryRequest(uriInfo.profile, async () => {
             try {
                 entry = this.lookup(uri, false) as PdsEntry | DsEntry;

packages/zowe-explorer/src/trees/shared/SharedInit.ts

@@ -24,6 +24,7 @@ import {
     imperative,
     AuthHandler,
     FsAbstractUtils,
+    UriFsInfo,
 } from "@zowe/zowe-explorer-api";
 import { SharedActions } from "./SharedActions";
 import { SharedHistoryView } from "./SharedHistoryView";
@@ -445,15 +446,28 @@ export class SharedInit {
         const profInfo = Profiles.getInstance();
         const profileNames = new Set<string>();
 
+        let uriMap = new Map<string, UriFsInfo>();
         if (profileType) {
             profInfo.getProfiles(profileType).forEach((prof) => profileNames.add(prof.name));
             newWorkspaces = newWorkspaces.filter((f) => {
-                const uriInfo = FsAbstractUtils.getInfoForUri(f.uri);
+                const uriInfo = FsAbstractUtils.getInfoForUri(f.uri, profInfo);
+                uriMap[f.uri.path] = uriInfo;
                 return profileNames.has(uriInfo.profileName);
             });
         }
 
         for (const folder of newWorkspaces) {
+            const uriInfo = uriMap[folder.uri.path];
+
+            const session = ZoweExplorerApiRegister.getInstance().getCommonApi(uriInfo.profile).getSession(uriInfo.profile);
+            if (
+                (session.ISession.type === imperative.SessConstants.AUTH_TYPE_TOKEN ||
+                    session.ISession.type === imperative.SessConstants.AUTH_TYPE_NONE) &&
+                !uriInfo.profile.profile.tokenValue
+            ) {
+                throw vscode.FileSystemError.Unavailable("Profile is using token type but missing a token");
+            }
+
             try {
                 await (folder.uri.scheme === ZoweScheme.DS ? DatasetFSProvider.instance : UssFSProvider.instance).remoteLookupForResource(folder.uri);
             } catch (err) {

packages/zowe-explorer/src/trees/uss/UssFSProvider.ts

@@ -77,8 +77,12 @@ export class UssFSProvider extends BaseProvider implements vscode.FileSystemProv
             isFetching = queryParams.has("fetch") && queryParams.get("fetch") === "true";
         }
 
-        const entry = isFetching ? await this.remoteLookupForResource(uri) : this.lookup(uri, false);
         const uriInfo = FsAbstractUtils.getInfoForUri(uri, Profiles.getInstance());
+        if (AuthHandler.sessTypeFromProfile(uriInfo.profile) === imperative.SessConstants.AUTH_TYPE_TOKEN && !uriInfo.profile.profile.tokenValue) {
+            throw vscode.FileSystemError.Unavailable("Profile is using token type but missing a token");
+        }
+        const entry = isFetching ? await this.remoteLookupForResource(uri) : this.lookup(uri, false);
+
         // Do not perform remote lookup for profile or directory URIs; the code below is for change detection on USS files only
         if (uriInfo.isRoot || FsAbstractUtils.isDirectoryEntry(entry)) {
             return entry;
@@ -208,6 +212,10 @@ export class UssFSProvider extends BaseProvider implements vscode.FileSystemProv
     private async fetchEntries(uri: vscode.Uri, uriInfo: UriFsInfo): Promise<UssDirectory | UssFile> {
         const entryExists = this.exists(uri);
 
+        if (AuthHandler.sessTypeFromProfile(uriInfo.profile) === imperative.SessConstants.AUTH_TYPE_TOKEN && !uriInfo.profile.profile.tokenValue) {
+            throw vscode.FileSystemError.Unavailable("Profile is using token type but missing a token");
+        }
+
         // Wait for any ongoing authentication process to complete
         await AuthUtils.reauthenticateIfCancelled(uriInfo.profile);
         await AuthHandler.waitForUnlock(uriInfo.profile);

packages/zowe-explorer/src/utils/AuthUtils.ts

@@ -27,6 +27,7 @@ import { ZoweLogger } from "../tools/ZoweLogger";
 import { SharedTreeProviders } from "../trees/shared/SharedTreeProviders";
 import { SettingsConfig } from "../configuration/SettingsConfig";
 import { SharedContext } from "../trees/shared/SharedContext";
+import { ImperativeError } from "@zowe/imperative";
 
 interface ErrorContext {
     apiType?: ZoweExplorerApiType;
@@ -47,7 +48,9 @@ export class AuthUtils {
         if (AuthHandler.isProfileLocked(profile) && AuthHandler.wasAuthCancelled(profile)) {
             // The original error doesn't matter here, we just need to trigger the flow.
             await this.handleProfileAuthOnError(
-                new Error("User cancelled previous authentication, but a new action requires authentication. Prompting user to re-authenticate."),
+                new ImperativeError({
+                    msg: "User cancelled previous authentication, but a new action requires authentication. Prompting user to re-authenticate. (All configured authentication methods failed)",
+                }),
                 profile
             );
         }