From 40dd9048fc5da3808b9a93daa77411effcdb5f7b Mon Sep 17 00:00:00 2001
From: BrunoQuaresma <bruno_nonato_quaresma@hotmail.com>
Date: Mon, 22 Jan 2024 17:21:20 +0000
Subject: [PATCH 1/2] refactor(site): cosmetic changes + do not use
 ExternalAuth on settings page

---
 .../ExternalAuthPage/ExternalAuthPageView.tsx | 96 ++++++++++---------
 site/src/pages/UserSettingsPage/Sidebar.tsx   |  6 +-
 2 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
index 98f6400ea78eb..a470f89ae5083 100644
--- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
+++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
@@ -24,8 +24,8 @@ import {
   MoreMenuTrigger,
   ThreeDotsButton,
 } from "components/MoreMenu/MoreMenu";
-import { ExternalAuth } from "pages/CreateWorkspacePage/ExternalAuth";
 import { ExternalAuthPollingState } from "pages/CreateWorkspacePage/CreateWorkspacePage";
+import LoadingButton from "@mui/lab/LoadingButton";
 
 export type ExternalAuthPageViewProps = {
   isLoading: boolean;
@@ -60,7 +60,7 @@ export const ExternalAuthPageView: FC<ExternalAuthPageViewProps> = ({
           <TableHead>
             <TableRow>
               <TableCell>Application</TableCell>
-              <TableCell>Link</TableCell>
+              <TableCell />
               <TableCell width="1%"></TableCell>
             </TableRow>
           </TableHead>
@@ -133,57 +133,59 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
           title={name}
           avatar={
             app.display_icon && (
-              <Avatar src={app.display_icon} variant="square" fitImage />
+              <Avatar
+                src={app.display_icon}
+                variant="square"
+                fitImage
+                size="sm"
+              />
             )
           }
         />
       </TableCell>
-      <TableCell>
-        <ExternalAuth
-          displayName={name}
-          // We could specify the user is linked, but the link is invalid.
-          // This could indicate it expired, or was revoked on the other end.
-          authenticated={authenticated}
-          authenticateURL={authURL}
-          displayIcon=""
-          message={authenticated ? "Authenticated" : "Click to Login"}
-          externalAuthPollingState={externalAuthPollingState}
-          startPollingExternalAuth={startPollingExternalAuth}
-          fullWidth={false}
-        />
+      <TableCell css={{ textAlign: "right" }}>
+        <LoadingButton
+          disabled={authenticated}
+          variant="contained"
+          loading={externalAuthPollingState === "polling"}
+          onClick={() => {
+            window.open(authURL, "_blank", "width=900,height=600");
+            startPollingExternalAuth();
+          }}
+        >
+          {authenticated ? "Authenticated" : "Click to Login"}
+        </LoadingButton>
       </TableCell>
       <TableCell>
-        {(link || externalAuth?.authenticated) && (
-          <MoreMenu>
-            <MoreMenuTrigger>
-              <ThreeDotsButton />
-            </MoreMenuTrigger>
-            <MoreMenuContent>
-              <MoreMenuItem
-                onClick={async () => {
-                  onValidateExternalAuth();
-                  // This is kinda jank. It does a refetch of the thing
-                  // it just validated... But we need to refetch to update the
-                  // login button. And the 'onValidateExternalAuth' does the
-                  // message display.
-                  await refetch();
-                }}
-              >
-                Test Validate&hellip;
-              </MoreMenuItem>
-              <Divider />
-              <MoreMenuItem
-                danger
-                onClick={async () => {
-                  onUnlinkExternalAuth();
-                  await refetch();
-                }}
-              >
-                Unlink&hellip;
-              </MoreMenuItem>
-            </MoreMenuContent>
-          </MoreMenu>
-        )}
+        <MoreMenu>
+          <MoreMenuTrigger>
+            <ThreeDotsButton size="small" disabled={!authenticated} />
+          </MoreMenuTrigger>
+          <MoreMenuContent>
+            <MoreMenuItem
+              onClick={async () => {
+                onValidateExternalAuth();
+                // This is kinda jank. It does a refetch of the thing
+                // it just validated... But we need to refetch to update the
+                // login button. And the 'onValidateExternalAuth' does the
+                // message display.
+                await refetch();
+              }}
+            >
+              Test Validate&hellip;
+            </MoreMenuItem>
+            <Divider />
+            <MoreMenuItem
+              danger
+              onClick={async () => {
+                onUnlinkExternalAuth();
+                await refetch();
+              }}
+            >
+              Unlink&hellip;
+            </MoreMenuItem>
+          </MoreMenuContent>
+        </MoreMenu>
       </TableCell>
     </TableRow>
   );
diff --git a/site/src/pages/UserSettingsPage/Sidebar.tsx b/site/src/pages/UserSettingsPage/Sidebar.tsx
index a67d7b2bed171..aac09221e1cf8 100644
--- a/site/src/pages/UserSettingsPage/Sidebar.tsx
+++ b/site/src/pages/UserSettingsPage/Sidebar.tsx
@@ -39,6 +39,9 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {
       <SidebarNavItem href="appearance" icon={AppearanceIcon}>
         Appearance
       </SidebarNavItem>
+      <SidebarNavItem href="external-auth" icon={GitIcon}>
+        External Authentication
+      </SidebarNavItem>
       {showSchedulePage && (
         <SidebarNavItem href="schedule" icon={ScheduleIcon}>
           Schedule
@@ -50,9 +53,6 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {
       <SidebarNavItem href="ssh-keys" icon={FingerprintOutlinedIcon}>
         SSH Keys
       </SidebarNavItem>
-      <SidebarNavItem href="external-auth" icon={GitIcon}>
-        External Authentication
-      </SidebarNavItem>
       <SidebarNavItem href="tokens" icon={VpnKeyOutlined}>
         Tokens
       </SidebarNavItem>

From 0d10b07a6d007ffe23558155fa3ca79e912e5402 Mon Sep 17 00:00:00 2001
From: BrunoQuaresma <bruno_nonato_quaresma@hotmail.com>
Date: Mon, 22 Jan 2024 18:30:10 +0000
Subject: [PATCH 2/2] Fix accessibility

---
 .../ExternalAuthPage/ExternalAuthPageView.tsx            | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
index a470f89ae5083..a009d56c01522 100644
--- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
+++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
@@ -26,6 +26,7 @@ import {
 } from "components/MoreMenu/MoreMenu";
 import { ExternalAuthPollingState } from "pages/CreateWorkspacePage/CreateWorkspacePage";
 import LoadingButton from "@mui/lab/LoadingButton";
+import visuallyHidden from "@mui/utils/visuallyHidden";
 
 export type ExternalAuthPageViewProps = {
   isLoading: boolean;
@@ -60,8 +61,12 @@ export const ExternalAuthPageView: FC<ExternalAuthPageViewProps> = ({
           <TableHead>
             <TableRow>
               <TableCell>Application</TableCell>
-              <TableCell />
-              <TableCell width="1%"></TableCell>
+              <TableCell>
+                <span aria-hidden css={{ ...visuallyHidden }}>
+                  Link to connect
+                </span>
+              </TableCell>
+              <TableCell width="1%" />
             </TableRow>
           </TableHead>
           <TableBody>