Set 'loggedIn' context to true only after server url is detected (#1991)

Signed-off-by: Denis Golovin dgolovin@redhat.com

Author: dgolovin

src/odo.ts

@@ -481,15 +481,6 @@ export class OdoImpl implements Odo {
 
     private static instance: Odo;
 
-    private readonly odoLoginMessages = [
-        'Please log in to the cluster',
-        'the server has asked for the client to provide credentials',
-        'Please login to your server',
-        'Unauthorized',
-        'User "system:anonymous" cannot list resource "projects"',
-        '"system:anonymous"',
-    ];
-
     public readonly subject: Subject<OdoEvent> = new Subject<OdoEvent>();
 
     public static get Instance(): Odo {
@@ -508,37 +499,17 @@ export class OdoImpl implements Odo {
     }
 
     public async _getClusters(): Promise<OpenShiftObject[]> {
-        let clusters: OpenShiftObject[] = await this.getClustersWithOdo();
-        if (clusters.length === 0) {
-            clusters = await this.getClustersWithOc();
-        }
-        return clusters;
-    }
-
-    private async getClustersWithOc(): Promise<OpenShiftObject[]> {
-        let clusters: OpenShiftObject[] = [];
-        const result: cliInstance.CliExitData = await this.execute(Command.printOcVersion(), process.cwd(), false);
-        clusters = result.stdout.trim().split('\n').filter((value) => {
-            return value.includes('Server ');
-        }).map((value) => {
-            const server: string = value.substr(value.indexOf(' ')+1).trim();
-            return new OpenShiftCluster(server);
-        });
-        return clusters;
-    }
-
-    private async getClustersWithOdo(): Promise<OpenShiftObject[]> {
         let clusters: OpenShiftObject[] = [];
         const result: cliInstance.CliExitData = await this.execute(
-            Command.printOdoVersionAndProjects(), process.cwd(), false
+            Command.printOdoVersion(), process.cwd(), false
         );
-        commands.executeCommand('setContext', 'isLoggedIn', true);
-        clusters = result.stdout.trim().split('\n').filter((value) => {
-            return value.includes('Server:');
-        }).map((value) => {
-            const server: string = value.substr(value.indexOf(':')+1).trim();
-            return new OpenShiftCluster(server);
-        });
+        commands.executeCommand('setContext', 'isLoggedIn', false);
+        clusters = result.stdout.trim().split('\n')
+            .filter((value) => value.includes('Server:'))
+            .map((value) => {
+                commands.executeCommand('setContext', 'isLoggedIn', true);
+                return new OpenShiftCluster(value.substr(value.indexOf(':')+1).trim())
+            });
         return clusters;
     }
 
@@ -801,8 +772,8 @@ export class OdoImpl implements Odo {
     }
 
     public async requireLogin(): Promise<boolean> {
-        const result: cliInstance.CliExitData = await this.execute(Command.printOdoVersionAndProjects(), process.cwd(), false);
-        return this.odoLoginMessages.some((msg) => result.stderr.includes(msg));
+        const result: cliInstance.CliExitData = await this.execute('oc whoami', process.cwd(), false);
+        return !!result.error;
     }
 
     private async insertAndReveal(item: OpenShiftObject): Promise<OpenShiftObject> {

test/unit/odo.test.ts

@@ -146,15 +146,10 @@ suite('odo', () => {
             yamlStub.returns({ ActiveApplications: activeProjs });
             execStub.onFirstCall().resolves({
                 error: undefined,
-                stdout: 'Server https://172.17.185.52:8443',
+                stdout: 'Server: https://172.17.185.52:8443',
                 stderr: ''
             });
             execStub.onSecondCall().resolves({
-                error: undefined,
-                stdout: 'Server https://172.17.185.52:8443',
-                stderr: ''
-            });
-            execStub.onThirdCall().resolves({
                 error: undefined,
                 stdout: JSON.stringify({
                         items: [
@@ -590,54 +585,27 @@ suite('odo', () => {
             `Server: ${clusterUrl}`,
             'Kubernetes: v1.11.0+d4cacc0'
         ];
-        const odoVersionOutLoggedOut = [
-            'odo v0.0.15 (2f7ed497)',
-            '',
-            'Kubernetes: v1.11.0+d4cacc0'
-        ];
-        const oc = [
-            'oc v3.9.0+191fece',
-            'kubernetes v1.9.1+a0ce1bc657',
-            'features: Basic-Auth',
-            '',
-            `Server ${clusterUrl}`,
-            'kubernetes v1.11.0+d4cacc0'
-        ];
 
-        test('extension first uses odo version to get cluster url', async () => {
+        test('extension uses odo version to get cluster url', async () => {
             sandbox.stub(odo.OdoImpl.prototype, 'execute').resolves({
                 error: undefined,
                 stdout: odoVersionOutLoggedIn.join('\n'),
                 stderr: ''
             });
             const cluster: odo.OpenShiftObject[] = await odo.getInstance().getClusters();
-            assert.equal(cluster[0].getName(), clusterUrl);
-        });
-
-        test('extension uses oc version to get cluster url as a backup plan', async () => {
-            sandbox.stub(odo.OdoImpl.prototype, 'execute').onFirstCall().resolves({
-                error: undefined,
-                stdout: odoVersionOutLoggedOut.join('\n'),
-                stderr: ''
-            }).onSecondCall().resolves({
-                error: undefined,
-                stdout: oc.join('\n'),
-                stderr: ''
-            });
-            const cluster: odo.OpenShiftObject[] = await odo.getInstance().getClusters();
-            assert.equal(cluster[0].getName(), clusterUrl);
+            expect(cluster[0].getName()).equals(clusterUrl);
         });
 
         test('extension uses odo version to determine if login is required', async () => {
             const stub = sandbox.stub(odoCli, 'execute').resolves({ error: null, stdout: 'logged in', stderr: ''});
             const result = await odoCli.requireLogin();
 
-            expect(stub).calledOnceWith(verbose.Command.printOdoVersionAndProjects());
+            expect(stub).calledOnceWith('oc whoami');
             expect(result).false;
         });
 
         test('requireLogin returns true if odo is not logged in to the cluster', async () => {
-            sandbox.stub(odoCli, 'execute').resolves({ error: null, stdout: '', stderr: 'Please log in to the cluster'});
+            sandbox.stub(odoCli, 'execute').resolves({ error: new Error('Not logged in!'), stdout: '', stderr: ''});
             const result = await odoCli.requireLogin();
 
             expect(result).true;