Revert "Add vscode github built-in plugin as a default plugin" (#900)

This reverts commit 666e14a.
eclipse-che · Nov 2, 2020 · 29f34a7 · 29f34a7
1 parent b18c209
commit 29f34a7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 35 deletions.
diff --git a/generator/src/templates/theiaPlugins.json b/generator/src/templates/theiaPlugins.json
@@ -52,7 +52,6 @@
     "vscode-builtin-yaml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/yaml-1.39.1-prel.vsix",
     "vscode-editorconfig": "https://github.com/theia-ide/editorconfig-vscode/releases/download/v0.14.4/EditorConfig-0.14.4.vsix",
     "vscode-git": "https://open-vsx.org/api/vscode/git/1.49.3/file/vscode.git-1.49.3.vsix",
-    "vscode-github": "https://open-vsx.org/api/vscode/github/1.50.0/file/vscode.github-1.50.0.vsix",
     "vscode-references-view": "https://github.com/theia-ide/vscode-references-view/releases/download/v0.0.47/references-view-0.0.47.vsix",
     "vscode-builtin-theme-abyss": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-abyss-1.39.1-prel.vsix",
     "vscode-builtin-theme-defaults": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-defaults-1.39.1-prel.vsix",

diff --git a/plugins/github-auth-plugin/src/github-auth-plugin.ts b/plugins/github-auth-plugin/src/github-auth-plugin.ts
@@ -12,43 +12,43 @@ import * as theia from '@theia/plugin';
 import * as che from '@eclipse-che/plugin';
 
 export async function start(context: theia.PluginContext): Promise<void> {
-    let session: theia.AuthenticationSession | undefined = context.workspaceState.get('session');
-    const onDidChangeSessions = new theia.EventEmitter<theia.AuthenticationProviderAuthenticationSessionsChangeEvent>();
-    theia.authentication.registerAuthenticationProvider({
-        id: 'github',
-        label: 'GitHub',
-        supportsMultipleAccounts: false,
-        onDidChangeSessions: onDidChangeSessions.event,
-        getSessions: async () => {
-            if (session) {
-                return [session];
-            } else {
-                return [];
-            }
-        },
-        login: async (scopes: string[]) => {
-            const githubUser = await che.github.getUser();
-            session = {
-                id: 'github-session',
-                accessToken: await che.github.getToken(),
-                account: { label: githubUser.login, id: githubUser.id.toString() },
-                scopes
-            };
-            context.workspaceState.update('session', session);
-            onDidChangeSessions.fire({ added: [session.id], removed: [], changed: [] });
-            return session;
-        },
-        logout: async (id: string) => {
-            session = undefined;
-            context.workspaceState.update('session', session);
-            onDidChangeSessions.fire({ added: [], removed: [id], changed: [] });
-        }
-    }
-    );
     if (theia.plugins.getPlugin('github.vscode-pull-request-github')) {
+        let session: theia.AuthenticationSession | undefined = context.workspaceState.get('session');
+        const onDidChangeSessions = new theia.EventEmitter<theia.AuthenticationProviderAuthenticationSessionsChangeEvent>();
+        theia.authentication.registerAuthenticationProvider({
+                id: 'github',
+                label: 'GitHub',
+                supportsMultipleAccounts: false,
+                onDidChangeSessions: onDidChangeSessions.event,
+                getSessions: async () => {
+                    if (session) {
+                        return [session];
+                    } else {
+                        return [];
+                    }
+                },
+                login: async (scopes: string[]) => {
+                    const githubUser = await che.github.getUser();
+                    session = {
+                        id: 'github-session',
+                        accessToken: await che.github.getToken(),
+                        account: {label: githubUser.login, id: githubUser.id.toString()},
+                        scopes
+                    };
+                    context.workspaceState.update('session', session);
+                    onDidChangeSessions.fire({ added: [session.id], removed: [], changed: [] });
+                    return session;
+                },
+                logout: async (id: string) => {
+                    session = undefined;
+                    context.workspaceState.update('session', session);
+                    onDidChangeSessions.fire({ added: [], removed: [id], changed: [] });
+                }
+            }
+        );
         if (session) {
             onDidChangeSessions.fire({ added: [session.id], removed: [], changed: [] });
-            // TODO Remove the notification when https://github.com/eclipse-theia/theia/issues/7178 is fixed.
+        // TODO Remove the notification when https://github.com/eclipse-theia/theia/issues/7178 is fixed.
         } else {
             const signIn = 'Sign in';
             const result = await theia.window.showInformationMessage(