coder · Parkreiner · Feb 1, 2024 · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024
diff --git a/site/src/api/queries/users.ts b/site/src/api/queries/users.ts
@@ -13,6 +13,7 @@ import type {
   UpdateUserAppearanceSettingsRequest,
   UsersRequest,
   User,
+  GenerateAPIKeyResponse,
 } from "api/typesGenerated";
 import { getAuthorizationKey } from "./authCheck";
 import { getMetadataAsJSON } from "utils/metadata";
@@ -134,6 +135,13 @@ export const me = (): UseQueryOptions<User> & {
   };
 };
 
+export function apiKey(): UseQueryOptions<GenerateAPIKeyResponse> {
+  return {
+    queryKey: [...meKey, "apiKey"],
+    queryFn: () => API.getApiKey(),
+  };
+}
+
 export const hasFirstUser = () => {
   return {
     queryKey: ["hasFirstUser"],

diff --git a/site/src/components/CodeExample/CodeExample.tsx b/site/src/components/CodeExample/CodeExample.tsx
@@ -1,7 +1,8 @@
-import { type FC } from "react";
+import { type FC, type KeyboardEvent, type MouseEvent, useRef } from "react";
 import { type Interpolation, type Theme } from "@emotion/react";
 import { MONOSPACE_FONT_FAMILY } from "theme/constants";
 import { CopyButton } from "../CopyButton/CopyButton";
+import { visuallyHidden } from "@mui/utils";
 
 export interface CodeExampleProps {
   code: string;
@@ -14,19 +15,72 @@ export interface CodeExampleProps {
  */
 export const CodeExample: FC<CodeExampleProps> = ({
   code,
-  secret,
   className,
+
+  // Defaulting to true to be on the safe side; you should have to opt out of
+  // the secure option, not remember to opt in
+  secret = true,
 }) => {
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  const triggerButton = (event: KeyboardEvent | MouseEvent) => {
+    if (event.target !== buttonRef.current) {
+      buttonRef.current?.click();
+    }
+  };
+
   return (
-    <div css={styles.container} className={className}>
-      <code css={[styles.code, secret && styles.secret]}>{code}</code>
-      <CopyButton text={code} />
+    /* eslint-disable-next-line jsx-a11y/no-static-element-interactions --
+       Expanding clickable area of CodeExample for better ergonomics, but don't
+       want to change the semantics of the HTML elements being rendered
+    */
+    <div
+      css={styles.container}
+      className={className}
+      onClick={triggerButton}
+      onKeyDown={(event) => {
+        if (event.key === "Enter") {
+          triggerButton(event);
+        }
+      }}
+      onKeyUp={(event) => {
+        if (event.key === " ") {
+          triggerButton(event);
+        }
+      }}
+    >
+      <code css={[styles.code, secret && styles.secret]}>
+        {secret ? (
+          <>
+            {/*
+             * Obfuscating text even though we have the characters replaced with
+             * discs in the CSS for two reasons:
+             * 1. The CSS property is non-standard and won't work everywhere;
+             *    MDN warns you not to rely on it alone in production
+             * 2. Even with it turned on and supported, the plaintext is still
+             *    readily available in the HTML itself
+             */}
+            <span aria-hidden>{obfuscateText(code)}</span>
+            <span css={{ ...visuallyHidden }}>
+              Encrypted text. Please access via the copy button.
+            </span>
+          </>
+        ) : (
+          <>{code}</>
+        )}
+      </code>
+
+      <CopyButton ref={buttonRef} text={code} />
     </div>
   );
 };
 
+function obfuscateText(text: string): string {
+  return new Array(text.length).fill("*").join("");
+}
+
 const styles = {
   container: (theme) => ({
+    cursor: "pointer",
     display: "flex",
     flexDirection: "row",
     alignItems: "center",
@@ -37,6 +91,10 @@ const styles = {
     padding: 8,
     lineHeight: "150%",
     border: `1px solid ${theme.experimental.l1.outline}`,
+
+    "&:hover": {
+      backgroundColor: theme.experimental.l2.hover.background,
+    },
   }),
 
   code: {

diff --git a/site/src/components/CopyButton/CopyButton.tsx b/site/src/components/CopyButton/CopyButton.tsx
@@ -2,7 +2,7 @@ import IconButton from "@mui/material/Button";
 import Tooltip from "@mui/material/Tooltip";
 import Check from "@mui/icons-material/Check";
 import { css, type Interpolation, type Theme } from "@emotion/react";
-import { type FC, type ReactNode } from "react";
+import { forwardRef, type MouseEventHandler, type ReactNode } from "react";
 import { useClipboard } from "hooks/useClipboard";
 import { FileCopyIcon } from "../Icons/FileCopyIcon";
 
@@ -13,6 +13,7 @@ interface CopyButtonProps {
   wrapperStyles?: Interpolation<Theme>;
   buttonStyles?: Interpolation<Theme>;
   tooltipTitle?: string;
+  onClick?: MouseEventHandler;
 }
 
 export const Language = {
@@ -23,36 +24,44 @@ export const Language = {
 /**
  * Copy button used inside the CodeBlock component internally
  */
-export const CopyButton: FC<CopyButtonProps> = ({
-  text,
-  ctaCopy,
-  wrapperStyles,
-  buttonStyles,
-  tooltipTitle = Language.tooltipTitle,
-}) => {
-  const { isCopied, copy: copyToClipboard } = useClipboard(text);
+export const CopyButton = forwardRef<HTMLButtonElement, CopyButtonProps>(
+  (props, ref) => {
+    const {
+      text,
+      ctaCopy,
+      wrapperStyles,
+      buttonStyles,
+      onClick: outsideOnClick,
+      tooltipTitle = Language.tooltipTitle,
+    } = props;
+    const { isCopied, copyToClipboard } = useClipboard(text);
 
-  return (
-    <Tooltip title={tooltipTitle} placement="top">
-      <div css={[{ display: "flex" }, wrapperStyles]}>
-        <IconButton
-          css={[styles.button, buttonStyles]}
-          onClick={copyToClipboard}
-          size="small"
-          aria-label={Language.ariaLabel}
-          variant="text"
-        >
-          {isCopied ? (
-            <Check css={styles.copyIcon} />
-          ) : (
-            <FileCopyIcon css={styles.copyIcon} />
-          )}
-          {ctaCopy && <div css={{ marginLeft: 8 }}>{ctaCopy}</div>}
-        </IconButton>
-      </div>
-    </Tooltip>
-  );
-};
+    return (
+      <Tooltip title={tooltipTitle} placement="top">
+        <div css={[{ display: "flex" }, wrapperStyles]}>
+          <IconButton
+            ref={ref}
+            css={[styles.button, buttonStyles]}
+            size="small"
+            aria-label={Language.ariaLabel}
+            variant="text"
+            onClick={(event) => {
+              void copyToClipboard();
+              outsideOnClick?.(event);
+            }}
+          >
+            {isCopied ? (
+              <Check css={styles.copyIcon} />
+            ) : (
+              <FileCopyIcon css={styles.copyIcon} />
+            )}
+            {ctaCopy && <div css={{ marginLeft: 8 }}>{ctaCopy}</div>}
+          </IconButton>
+        </div>
+      </Tooltip>
+    );
+  },
+);
 
 const styles = {
   button: (theme) => css`

diff --git a/site/src/components/CopyableValue/CopyableValue.tsx b/site/src/components/CopyableValue/CopyableValue.tsx
@@ -16,8 +16,8 @@ export const CopyableValue: FC<CopyableValueProps> = ({
   children,
   ...attrs
 }) => {
-  const { isCopied, copy } = useClipboard(value);
-  const clickableProps = useClickable<HTMLSpanElement>(copy);
+  const { isCopied, copyToClipboard } = useClipboard(value);
+  const clickableProps = useClickable<HTMLSpanElement>(copyToClipboard);
 
   return (
     <Tooltip

diff --git a/site/src/hooks/useClipboard.ts b/site/src/hooks/useClipboard.ts
@@ -1,28 +1,31 @@
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 
-export const useClipboard = (
-  text: string,
-): { isCopied: boolean; copy: () => Promise<void> } => {
-  const [isCopied, setIsCopied] = useState<boolean>(false);
+type UseClipboardResult = Readonly<{
+  isCopied: boolean;
+  copyToClipboard: () => Promise<void>;
+}>;
 
-  const copy = async (): Promise<void> => {
+export const useClipboard = (textToCopy: string): UseClipboardResult => {
+  const [isCopied, setIsCopied] = useState(false);
+  const timeoutIdRef = useRef<number | undefined>();
+
+  useEffect(() => {
+    const clearIdsOnUnmount = () => window.clearTimeout(timeoutIdRef.current);
+    return clearIdsOnUnmount;
+  }, []);
+
+  const copyToClipboard = async () => {
     try {
-      await window.navigator.clipboard.writeText(text);
+      await window.navigator.clipboard.writeText(textToCopy);
       setIsCopied(true);
-      window.setTimeout(() => {
+      timeoutIdRef.current = window.setTimeout(() => {
         setIsCopied(false);
       }, 1000);
     } catch (err) {
-      const input = document.createElement("input");
-      input.value = text;
-      document.body.appendChild(input);
-      input.focus();
-      input.select();
-      const result = document.execCommand("copy");
-      document.body.removeChild(input);
-      if (result) {
+      const isExecSupported = simulateClipboardWrite();
+      if (isExecSupported) {
         setIsCopied(true);
-        window.setTimeout(() => {
+        timeoutIdRef.current = window.setTimeout(() => {
           setIsCopied(false);
         }, 1000);
       } else {
@@ -37,8 +40,23 @@ export const useClipboard = (
     }
   };
 
-  return {
-    isCopied,
-    copy,
-  };
+  return { isCopied, copyToClipboard };
 };
+
+function simulateClipboardWrite(): boolean {
+  const previousFocusTarget = document.activeElement;
+  const dummyInput = document.createElement("input");
+  dummyInput.style.visibility = "hidden";
+  document.body.appendChild(dummyInput);
+  dummyInput.focus();
+  dummyInput.select();
+
+  const isExecSupported = document.execCommand("copy");
+  dummyInput.remove();
+
+  if (previousFocusTarget instanceof HTMLElement) {
+    previousFocusTarget.focus();
+  }
+
+  return isExecSupported;
+}
diff --git a/site/src/pages/CliAuthPage/CliAuthPage.tsx b/site/src/pages/CliAuthPage/CliAuthPage.tsx
@@ -1,14 +1,12 @@
 import { type FC } from "react";
 import { Helmet } from "react-helmet-async";
 import { useQuery } from "react-query";
-import { getApiKey } from "api/api";
 import { pageTitle } from "utils/page";
 import { CliAuthPageView } from "./CliAuthPageView";
+import { apiKey } from "api/queries/users";
 
 export const CliAuthenticationPage: FC = () => {
-  const { data } = useQuery({
-    queryFn: () => getApiKey(),
-  });
+  const { data } = useQuery(apiKey());
 
   return (
     <>