Update oc command parsing to extract correct cluster url and token

This PR fixes #1967.

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

Author: dgolovin

package.json

@@ -209,6 +209,7 @@
     "onCommand:openshift.explorer.login",
     "onCommand:openshift.explorer.login.credentialsLogin",
     "onCommand:openshift.explorer.login.tokenLogin",
+    "onCommand:openshift.explorer.login.clipboard",
     "onCommand:openshift.explorer.logout",
     "onCommand:openshift.explorer.refresh",
     "onCommand:openshift.componentTypesView.refresh",
@@ -347,6 +348,11 @@
         "title": "Login into Cluster with credentials",
         "category": "OpenShift"
       },
+      {
+        "command": "openshift.explorer.login.clipboard",
+        "title": "Login into Cluster using URL and token from clipboard",
+        "category": "OpenShift"
+      },
       {
         "command": "openshift.explorer.switchContext",
         "title": "Switch Contexts",

src/openshift/cluster.ts

@@ -306,7 +306,7 @@ export class Cluster extends OpenShiftItem {
     }
 
     @vsCommand('openshift.explorer.login.tokenLogin')
-    static async tokenLogin(userClusterUrl: string, skipConfirmation = false): Promise<string | null> {
+    static async tokenLogin(userClusterUrl: string, skipConfirmation = false, userToken?: string): Promise<string | null> {
         let token: string;
         const response = await Cluster.requestLoginConfirmation(skipConfirmation);
 
@@ -328,21 +328,36 @@ export class Cluster extends OpenShiftItem {
             clusterURL = await Cluster.getUrl();
         }
 
-        const ocToken = await window.showInputBox({
-            value: token,
-            prompt: 'Provide Bearer token for authentication to the API server',
-            ignoreFocusOut: true,
-            password: true
-        });
-        if (!ocToken) return null;
-
+        let ocToken: string;
+        if (!userToken) {
+            ocToken = await window.showInputBox({
+                value: token,
+                prompt: 'Provide Bearer token for authentication to the API server',
+                ignoreFocusOut: true,
+                password: true
+            });
+            if (!ocToken) return null;
+        } else {
+            ocToken = userToken;
+        }
         return Progress.execFunctionWithProgress(`Login to the cluster: ${clusterURL}`,
             () => Cluster.odo.execute(Command.odoLoginWithToken(clusterURL, ocToken.trim()))
             .then((result) => Cluster.loginMessage(clusterURL, result))
             .catch((error) => Promise.reject(new VsCommandError(`Failed to login to cluster '${clusterURL}' with '${Filters.filterToken(error.message)}'!`, 'Failed to login to cluster')))
         );
     }
 
+    @vsCommand('openshift.explorer.login.clipboard')
+    static async loginUsingClipboardInfo(): Promise<string | null> {
+        const clipboard = await Cluster.readFromClipboard();
+        if(!Cluster.ocLoginCommandMatches(clipboard)) {
+            throw new VsCommandError('Cannot parse login command in clipboard.')
+        }
+        const url = Cluster.clusterURL(clipboard);
+        const token = Cluster.getToken(clipboard);
+        return Cluster.tokenLogin(url, true, token);
+    }
+
     static async loginMessage(clusterURL: string, result: CliExitData): Promise<string | undefined> {
         if (result.stderr === '') {
             Cluster.explorer.refresh();

src/openshift/openshiftItem.ts

@@ -84,13 +84,12 @@ export default class OpenShiftItem {
     }
 
     static clusterURL(value: string): string | null {
-        const urlRegex = value.match('(https?://[^ ]*)');
-        return urlRegex ? urlRegex[0] : null;
+        const urlRegex = value.match(/--server=(https?:\/\/[^ ]*)/);
+        return urlRegex ? urlRegex[1] : null;
     }
 
     static ocLoginCommandMatches(value: string): string | null {
-        const ocLoginRegex = /oc login (http|https):(.*?) --token=(.*)/;
-        return ocLoginRegex.test(value) ? value : null;
+        return OpenShiftItem.clusterURL(value) !== null && OpenShiftItem.getToken(value) !== null ? value : null;
     }
 
     static getToken(value: string): string | null {