Merge pull request #2706 from zowe/Remove-Theia

Remove Theia Support

packages/zowe-explorer-api/CHANGELOG.md

@@ -25,12 +25,8 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 
 - Grouped common methods into singleton classes [#2109](https://github.com/zowe/vscode-extension-for-zowe/issues/2109)
 
-### Bug fixes
-
 ## `3.0.0-next.202401241448`
 
-### New features and enhancements
-
 ### Bug fixes
 
 - Changed IApiExplorerExtenders.initForZowe `profileTypeConfigurations: imperative.ICommandProfileTypeConfiguration[]` to a required argument to address issues seen after registration of profile type when not passed. [#2575](https://github.com/zowe/vscode-extension-for-zowe/issues/2575)

packages/zowe-explorer-api/__tests__/__unit__/security/KeytarApi.unit.test.ts

@@ -24,30 +24,30 @@ describe("KeytarApi", () => {
     it("should initialize Imperative credential manager", async () => {
         isCredsSecuredSpy.mockReturnValueOnce(true);
         credMgrInitializeSpy.mockResolvedValueOnce();
-        await new KeytarApi(undefined as unknown as imperative.Logger).activateKeytar(false, false);
-        expect(isCredsSecuredSpy).toHaveBeenCalledTimes(1);
-        expect(credMgrInitializeSpy).toHaveBeenCalledTimes(1);
+        await new KeytarApi(undefined as unknown as imperative.Logger).activateKeytar(false);
+        expect(isCredsSecuredSpy).toBeCalledTimes(1);
+        expect(credMgrInitializeSpy).toBeCalledTimes(1);
     });
 
     it("should do nothing if secure credential plugin is not active", async () => {
         isCredsSecuredSpy.mockReturnValueOnce(false);
-        await new KeytarApi(undefined as unknown as imperative.Logger).activateKeytar(false, false);
-        expect(isCredsSecuredSpy).toHaveBeenCalledTimes(1);
-        expect(credMgrInitializeSpy).not.toHaveBeenCalled();
+        await new KeytarApi(undefined as unknown as imperative.Logger).activateKeytar(false);
+        expect(isCredsSecuredSpy).toBeCalledTimes(1);
+        expect(credMgrInitializeSpy).not.toBeCalled();
     });
 
     it("should do nothing if API has already been initialized", async () => {
         isCredsSecuredSpy.mockReturnValueOnce(true);
-        await new KeytarApi(undefined as unknown as imperative.Logger).activateKeytar(true, false);
-        expect(isCredsSecuredSpy).toHaveBeenCalledTimes(1);
-        expect(credMgrInitializeSpy).not.toHaveBeenCalled();
+        await new KeytarApi(undefined as unknown as imperative.Logger).activateKeytar(true);
+        expect(isCredsSecuredSpy).toBeCalledTimes(1);
+        expect(credMgrInitializeSpy).not.toBeCalled();
     });
 
     it("should do nothing if Keytar module is missing", async () => {
         jest.mock("@zowe/secrets-for-zowe-sdk", () => {});
         isCredsSecuredSpy.mockReturnValueOnce(true);
-        await new KeytarApi(undefined as unknown as imperative.Logger).activateKeytar(false, false);
-        expect(isCredsSecuredSpy).toHaveBeenCalledTimes(1);
-        expect(credMgrInitializeSpy).not.toHaveBeenCalled();
+        await new KeytarApi(undefined as unknown as imperative.Logger).activateKeytar(false);
+        expect(isCredsSecuredSpy).toBeCalledTimes(1);
+        expect(credMgrInitializeSpy).not.toBeCalled();
     });
 });

packages/zowe-explorer-api/__tests__/__unit__/security/KeytarCredentialManager.unit.test.ts

@@ -87,23 +87,6 @@ describe("KeytarCredentialManager", () => {
             expect(Object.keys((keytar as object)["keyring"]).length).toBe(5);
         });
 
-        it("should handle CredentialManager in Imperative settings - Theia", () => {
-            jest.spyOn(fs, "existsSync").mockReturnValueOnce(true);
-            const readFileSyncSpy = jest.spyOn(fs, "readFileSync").mockReturnValue(
-                JSON.stringify({
-                    overrides: {
-                        CredentialManager: scsPluginName,
-                    },
-                })
-            );
-            jest.spyOn(process, "cwd").mockReturnValueOnce(__dirname + "/../../../../..");
-            const keytar = KeytarCredentialManager.getSecurityModules("@zowe/secrets-for-zowe-sdk", true);
-            expect(keytar).toBeDefined();
-            expect(loggerWarnSpy).not.toHaveBeenCalled();
-            expect(readFileSyncSpy).toHaveBeenCalledTimes(1);
-            expect(Object.keys((keytar as object)["keyring"]).length).toBe(5);
-        });
-
         it("should handle empty Imperative settings", () => {
             jest.spyOn(fs, "existsSync").mockReturnValueOnce(true);
             const readFileSyncSpy = jest.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify({}));

packages/zowe-explorer-api/src/security/KeytarApi.ts

@@ -19,7 +19,7 @@ export class KeytarApi {
     public constructor(protected log: imperative.Logger) {}
 
     // v1 specific
-    public async activateKeytar(initialized: boolean, _isTheia: boolean): Promise<void> {
+    public async activateKeytar(initialized: boolean): Promise<void> {
         const log = imperative.Logger.getAppLogger();
         const profiles = new ProfilesCache(log, vscode.workspace.workspaceFolders?.[0]?.uri.fsPath);
         const isSecure = await profiles.isCredentialsSecured();

packages/zowe-explorer-api/src/security/KeytarCredentialManager.ts

@@ -73,7 +73,7 @@ export class KeytarCredentialManager extends imperative.AbstractCredentialManage
         this.preferredService = service;
     }
 
-    public static getSecurityModules(moduleName: string, isTheia: boolean): NodeModule | undefined {
+    public static getSecurityModules(moduleName: string): NodeModule | undefined {
         let imperativeIsSecure = false;
         try {
             const fileName = path.join(FileManagement.getZoweDir(), "settings", "imperative.json");
@@ -89,7 +89,7 @@ export class KeytarCredentialManager extends imperative.AbstractCredentialManage
             imperative.Logger.getAppLogger().warn(error as string);
             return undefined;
         }
-        return imperativeIsSecure ? getSecurityModules(moduleName, isTheia) : undefined;
+        return imperativeIsSecure ? getSecurityModules(moduleName) : undefined;
     }
 
     /**
@@ -203,10 +203,10 @@ export class KeytarCredentialManager extends imperative.AbstractCredentialManage
 /**
  * Imports the necessary security modules
  */
-export function getSecurityModules(moduleName: string, isTheia: boolean): NodeModule | undefined {
+export function getSecurityModules(moduleName: string): NodeModule | undefined {
     const r = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require;
     // Workaround for Theia issue (https://github.com/eclipse-theia/theia/issues/4935)
-    const appRoot = isTheia ? process.cwd() : vscode.env.appRoot;
+    const appRoot = vscode.env.appRoot;
     try {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return r(`${appRoot}/node_modules/${moduleName}`);

packages/zowe-explorer-ftp-extension/CHANGELOG.md

@@ -16,8 +16,6 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum
 - Adapted to new API changes from grouping of common methods into singleton classes [#2109](https://github.com/zowe/vscode-extension-for-zowe/issues/2109)
 - Migrated to webpack v5 [#2214](https://github.com/zowe/vscode-extension-for-zowe/issues/2214)
 
-## Bug fixes
-
 ## `3.0.0-next.202401241448`
 
 ### Bug fixes

packages/zowe-explorer/CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 
 - **Breaking:** Removed `zowe.uss.binary` and `zowe.uss.text` commands. Use `zowe.uss.openWithEncoding` instead.
 - Added UI migration steps on startup for users with v1 profiles to either convert existing v1 profiles to team configuration file or create a new team configuration file. [#2284](https://github.com/zowe/vscode-extension-for-zowe/issues/2284)
+- Removal of Theia support. [#2647](https://github.com/zowe/vscode-extension-for-zowe/issues/2647)
 
 ### Bug fixes