Use the value saved in the clipboard when logging in using a token #4165

Fixes: #4165

Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>

Author: vrubezhny

src/openshift/cluster.ts

@@ -935,13 +935,11 @@ export class Cluster extends OpenShiftItem {
     }
 
     static async readFromClipboard(): Promise<string> {
-        let r = '';
         try {
-            r = await env.clipboard.readText();
+            return await env.clipboard.readText();
         } catch (ignore) {
-            // ignore exceptions and return empty string
+            return '';
         }
-        return r;
     }
 
     static async getUrlFromClipboard(): Promise<string | null> {
@@ -952,41 +950,35 @@ export class Cluster extends OpenShiftItem {
         return null;
     }
 
+    static async getTokenFromClipboard(): Promise<string> {
+        const clipboard = (await Cluster.readFromClipboard()).trim();
+        return Cluster.validateLoginToken(clipboard) ? clipboard : '';
+    }
+
     @vsCommand('openshift.explorer.login.tokenLogin')
     static async tokenLogin(
         userClusterUrl: string,
         skipConfirmation = false,
         userToken?: string,
         abortController?: AbortController
     ): Promise<string | null> {
-        let token: string;
         const response = await Cluster.requestLoginConfirmation(skipConfirmation);
 
         if (response !== 'Yes') return null;
 
         let clusterURL = userClusterUrl;
-        let clusterUrlFromClipboard: string;
-
-        if (!clusterURL) {
-            clusterUrlFromClipboard = await Cluster.getUrlFromClipboard();
-        }
-
-        if (
-            (!clusterURL && clusterUrlFromClipboard) ||
-            clusterURL?.trim() === clusterUrlFromClipboard
-        ) {
-            token = NameValidator.getToken(await Cluster.readFromClipboard());
-            clusterURL = clusterUrlFromClipboard;
-        }
 
         if (!clusterURL) {
             clusterURL = await Cluster.getUrl(abortController);
         }
 
+        if (!clusterURL) return null;
+
         let ocToken: string;
         if (!userToken) {
             const prompt = 'Provide Bearer token for authentication to the API server';
-            const validateInput = (value: string) => NameValidator.emptyName('Bearer token cannot be empty', value ? value : '');
+            const validateInput = (value: string) => NameValidator.validateLoginToken('Bearer token should be a valid "sha256" token', value ? value : '');
+            const token = await Cluster.getTokenFromClipboard();
             ocToken = await inputValue(prompt, token ? token : '', true, validateInput,
                 `Provide Bearer token for: ${clusterURL}`, abortController);
             if (ocToken === null) {
@@ -1027,8 +1019,7 @@ export class Cluster extends OpenShiftItem {
     }
 
     static validateLoginToken(token: string): boolean {
-        const sha256Regex = /^sha256~([A-Za-z0-9_-]+)$/;
-        return sha256Regex.test(token);
+        return NameValidator.validateLoginToken('Error', token) === null;
     }
 
     @vsCommand('openshift.explorer.login.clipboard')

src/openshift/nameValidator.ts

@@ -36,6 +36,10 @@ export function validateRFC1123DNSLabel(message: string, value: string): string
   return validator.matches(value, '^[a-z0-9]([-a-z0-9]*[a-z0-9])*$') ? null : message;
 }
 
+export function validateLoginToken(message: string, value: string): string | null {
+    return validator.matches(value, '^sha256~([A-Za-z0-9_-]+)$') ? null : message
+}
+
 export function clusterURL(value: string): string | null {
     const urlRegex = value.match(/--server=(https?:\/\/[^ ]*)/);
     return urlRegex ? urlRegex[1] : null;

src/util/inputValue.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Red Hat, Inc. All rights reserved.
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
-import { InputBox, QuickInputButton, QuickInputButtons, ThemeIcon, window } from 'vscode';
+import { env, InputBox, QuickInputButton, QuickInputButtons, ThemeIcon, window } from 'vscode';
 
 export class quickBtn implements QuickInputButton {
     constructor(public iconPath: ThemeIcon, public tooltip: string) { }
@@ -31,12 +31,35 @@ export function inputValue(prompt: string, initialValue: string, password: boole
         if (placeHolder) input.placeholder = placeHolder;
         const enterBtn = new quickBtn(new ThemeIcon('check'), 'Enter');
         const cancelBtn = new quickBtn(new ThemeIcon('close'), 'Cancel');
-        input.buttons = [QuickInputButtons.Back, enterBtn, cancelBtn];
+        const pasteBtn = new quickBtn(new ThemeIcon('output'), 'Paste from Clipboard');
+        const hideBtn = new quickBtn(new ThemeIcon('eye'), 'Hide value');
+        const showBtn = new quickBtn(new ThemeIcon('eye-closed'), 'Show value');
+        let isHidden = password;
+        const updateButtons = (() => {
+            const buttons = [];
+            if (password) {
+                buttons.push(isHidden ? showBtn : hideBtn);
+            }
+            buttons.push(pasteBtn, QuickInputButtons.Back, enterBtn, cancelBtn);
+            input.buttons = buttons;
+        });
+        updateButtons();
         const validationMessage: string = validate(input.value? input.value : '');
         const resolveAndClose = ((result) => {
             input.dispose();
             resolve(result);
         });
+        const pasteFromClipboard = (async () => {
+            try {
+                const clipboard = (await env.clipboard.readText()).trim();
+                if (clipboard.length > 0) {
+                    input.value = clipboard;
+                    input.validationMessage = validate(clipboard);
+                }
+            } catch (ignore) {
+                // Do nothing
+            }
+        });
         input.ignoreFocusOut = true;
         if (validationMessage) {
             input.validationMessage = validationMessage;
@@ -67,6 +90,13 @@ export function inputValue(prompt: string, initialValue: string, password: boole
         })
         input.onDidTriggerButton(async (event) => {
             if (event === QuickInputButtons.Back) resolveAndClose(undefined);
+            else if (event === showBtn) {
+                input.password = isHidden = !isHidden;
+                updateButtons();
+            } else if (event === hideBtn) {
+                input.password = isHidden = !isHidden;
+                updateButtons();
+            } else if (event === pasteBtn) await pasteFromClipboard();
             else if (event === cancelBtn) resolveAndClose(null);
             else if (event === enterBtn) await acceptInput();
         });