Detect loggin status using listing projects to support k8s clusters

This PR fixes #2393.

Signed-off-by: Denis Golovin [email protected]

Author: dgolovin

src/odo.ts

@@ -507,13 +507,22 @@ export class OdoImpl implements Odo {
         const result: cliInstance.CliExitData = await this.execute(
             Command.printOdoVersion(), process.cwd(), false
         );
-        commands.executeCommand('setContext', 'isLoggedIn', false);
+        void 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())
+                void commands.executeCommand('setContext', 'isLoggedIn', true);
+                return new OpenShiftCluster(value.substr(value.indexOf(':')+1).trim());
             });
+        if (clusters.length === 0) {
+          const projects = await this.execute(
+            Command.listProjects(), process.cwd(), false
+          );
+          if (!projects.error) {
+            clusters.push(new OpenShiftCluster(new KubeConfigUtils().getCurrentCluster().server));
+            void commands.executeCommand('setContext', 'isLoggedIn', true);
+          }
+        }
         return clusters;
     }
 
@@ -786,8 +795,10 @@ export class OdoImpl implements Odo {
     }
 
     public async requireLogin(): Promise<boolean> {
-        const result: cliInstance.CliExitData = await this.execute(new CommandText('oc whoami'), process.cwd(), false);
-        return !!result.error;
+      return await Promise.any([
+        this.execute(new CommandText('oc whoami')),
+        this.execute(Command.listProjects())
+      ]).then(() => false).catch(() => true);
     }
 
     private async insertAndReveal(item: OpenShiftObject, notification = true): Promise<OpenShiftObject> {

test/unit/odo.test.ts

@@ -174,12 +174,12 @@ suite('odo', () => {
         test('getProjects returns empty list if no projects present', async () => {
             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',
+                stdout: 'Server: https://172.17.185.52:8443',
                 stderr: ''
             });
             execStub.onThirdCall().resolves({ stdout: '', stderr: '', error: null });
@@ -576,12 +576,12 @@ suite('odo', () => {
             const stub = sandbox.stub(odoCli, 'execute').resolves({ error: null, stdout: 'logged in', stderr: ''});
             const result = await odoCli.requireLogin();
 
-            expect(stub).calledOnceWith(new CommandText('oc whoami'));
+            expect(stub).calledWith(new CommandText('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: new Error('Not logged in!'), stdout: '', stderr: ''});
+            sandbox.stub(odoCli, 'execute').returns(Promise.reject('Not logged in!'));
             const result = await odoCli.requireLogin();
 
             expect(result).true;