[v2] Port fixes for invalid credential handling

packages/zowe-explorer/CHANGELOG.md

@@ -17,20 +17,22 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 - Fixed an issue where a migrated data set is unusable after it is recalled through Zowe Explorer. [#3294](https://github.com/zowe/zowe-explorer-vscode/issues/3294)
 - Fixed an issue where a recalled PDS is expandable after it is migrated through Zowe Explorer. [#3294](https://github.com/zowe/zowe-explorer-vscode/issues/3294)
 - Fixed an issue where data set nodes did not update if migrated or recalled outside of Zowe Explorer. [#3294](https://github.com/zowe/zowe-explorer-vscode/issues/3294)
-- Fixed issue where Search operation did not prompt for credentials if profile contains expired token. [#2259](https://github.com/zowe/zowe-explorer-vscode/issues/2259)
-- Fixed issue where inactive status was not displayed for profiles loaded from Global Config. [#3134](https://github.com/zowe/zowe-explorer-vscode/issues/3134)
 - Fixed an issue where clicking on a file in the Unix System Services tree caused the tree to abruptly change focus to the selected item. [#2486](https://github.com/zowe/zowe-explorer-vscode/issues/2486)
 - Fixed an issue where binary USS files were not fetched using the "Pull from Mainframe" context menu option. [#3355](https://github.com/zowe/zowe-explorer-vscode/issues/3355)
 - Fixed an issue with Auto Save where a failed UNIX file or data set save operation caused an infinite loop of save requests. [#2406](https://github.com/zowe/zowe-explorer-vscode/issues/2406), [#2627](https://github.com/zowe/zowe-explorer-vscode/issues/2627)
 - Fixed an issue where "Open with Encoding" menu failed when tagged encoding was selected for a binary USS file. [#3377](https://github.com/zowe/zowe-explorer-vscode/pull/3377)
 - Fixed an issue where editing a team config file or updating secrets in the OS credential vault could trigger multiple events for a single action. [#3378](https://github.com/zowe/zowe-explorer-vscode/pull/3378)
 - Updated the `@zowe/cli` dependency to v7.29.8 for technical currency. [#3378](https://github.com/zowe/zowe-explorer-vscode/pull/3378)
+- Fixed issue where Search operation did not prompt for credentials if profile contains expired token. [#2259](https://github.com/zowe/zowe-explorer-vscode/issues/2259)
+- Fixed issue where inactive status was not displayed for profiles loaded from Global Config. [#3134](https://github.com/zowe/zowe-explorer-vscode/issues/3134)
+- Fixed an issue where invalid credentials could trigger the **Update Credentials** prompt twice in new VS Code session. [#3376](https://github.com/zowe/zowe-explorer-vscode/pull/3376)
+- Fixed an issue where expanding a job node to show spool doesn't trigger the **Update Credentials** prompt when credentials are invalid. [#3376](https://github.com/zowe/zowe-explorer-vscode/pull/3376)
 
 ## `2.18.0`
 
 ### New features and enhancements
 
-- Added new Zowe Explorer z/OS Console webview with access via VS Code command pallete to issue MVS Console commands. [#2925](https://github.com/zowe/zowe-explorer-vscode/pull/2925)
+- Added new Zowe Explorer z/OS Console webview with access via VS Code command palette to issue MVS Console commands. [#2925](https://github.com/zowe/zowe-explorer-vscode/pull/2925)
 
 ### Bug fixes
 

packages/zowe-explorer/__tests__/__theia__/theia/extension.theiaChrome.ts

@@ -120,7 +120,7 @@ export async function removeFavoriteProfileFromJobs(): Promise<void> {
 
 export async function addProfileToFavoritesInDatasets(): Promise<void> {
     const addTofavorite = await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.secondDatasetProfileXpath)), WAITTIME);
-    await addTofavorite.click();
+    await driverChrome.actions().move({ origin: addTofavorite }).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
     await driverChrome.actions().contextClick(addTofavorite).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
@@ -129,7 +129,7 @@ export async function addProfileToFavoritesInDatasets(): Promise<void> {
 
 export async function addProfileToFavoritesInUss(): Promise<void> {
     const addTofavorite = await driverChrome.wait(until.elementLocated(By.xpath(UssLocators.secondUssProfileXpath)), WAITTIME);
-    await addTofavorite.click();
+    await driverChrome.actions().move({ origin: addTofavorite }).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
     await driverChrome.actions().contextClick(addTofavorite).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
@@ -138,7 +138,7 @@ export async function addProfileToFavoritesInUss(): Promise<void> {
 
 export async function addProfileToFavoritesInJobs(): Promise<void> {
     const addTofavorite = await driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.secondJobsProfileXpath)), WAITTIME);
-    await addTofavorite.click();
+    await driverChrome.actions().move({ origin: addTofavorite }).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
     await driverChrome.actions().contextClick(addTofavorite).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
@@ -191,7 +191,7 @@ export async function verifyProfileIsHideInJobs(): Promise<boolean> {
 
 export async function deleteDefaultProfileInDatasets(): Promise<void> {
     const profileName = await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.defaultDatasetsProfileXpath)), WAITTIME);
-    await profileName.click();
+    await driverChrome.actions().move({ origin: profileName }).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
     await driverChrome.actions().contextClick(profileName).perform();
     await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.manageProfileFromDatasetsXpath)), WAITTIME).click();

packages/zowe-explorer/__tests__/__unit__/Profiles.extended.unit.test.ts

@@ -1436,7 +1436,7 @@ describe("Profiles Unit Tests - function checkCurrentProfile", () => {
         jest.spyOn(utils.ProfilesUtils, "isUsingTokenAuth").mockResolvedValueOnce(true);
         environmentSetup(globalMocks);
         setupProfilesCheck(globalMocks);
-        const ssoLoginSpy = jest.spyOn(Profiles.getInstance(), "ssoLogin").mockResolvedValueOnce();
+        const ssoLoginSpy = jest.spyOn(Profiles.getInstance(), "ssoLogin").mockResolvedValueOnce(true);
         jest.spyOn(Profiles.getInstance(), "loadNamedProfile").mockReturnValueOnce(globalMocks.testProfile);
         await expect(Profiles.getInstance().checkCurrentProfile(globalMocks.testProfile)).resolves.toEqual({ name: "sestest", status: "active" });
         expect(ssoLoginSpy).toHaveBeenCalledTimes(1);