Skip to content

Commit 7d58111

Browse files
atrakhConvex, Inc.
authored andcommitted
dashboard: redirect logouts back to login page (#43609)
GitOrigin-RevId: 49755c1e869b0506f1d3fe42ea58a04afeb12775
1 parent a57fc18 commit 7d58111

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

npm-packages/dashboard/src/components/header/UserMenu/UserMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export function UserMenu() {
103103
</>
104104
) : null}
105105
<hr className="mx-4" />
106-
<MenuLink href="/api/auth/logout">
106+
<MenuLink href="/api/auth/logout?returnTo=/api/auth/login">
107107
<div className="flex w-full items-center justify-between">
108108
Log Out
109109
<ExitIcon className="text-content-secondary" />

npm-packages/dashboard/src/components/profile/ConnectedIdentities.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function ConnectedIdentities() {
2828
setConfirmUnlinkId(null);
2929
try {
3030
await unlinkIdentity({ userId: confirmUnlinkId });
31-
window.location.href = "/api/auth/logout";
31+
window.location.href = "/api/auth/logout?returnTo=/api/auth/login";
3232
} finally {
3333
setUnlinkingId(null);
3434
}

npm-packages/dashboard/src/components/teamSettings/TeamSSO.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { Tooltip } from "@ui/Tooltip";
1919
import {
2020
QuestionMarkCircledIcon,
2121
ExclamationTriangleIcon,
22+
ExternalLinkIcon,
2223
} from "@radix-ui/react-icons";
2324
import { cn } from "@ui/cn";
2425
import { useProfileEmails } from "api/profile";
@@ -527,6 +528,7 @@ function ManageDomainsButton({
527528
loading={loading}
528529
onClick={onClick}
529530
disabled={disabled}
531+
icon={<ExternalLinkIcon />}
530532
>
531533
Manage domains
532534
</Button>
@@ -553,6 +555,7 @@ function ManageSSOConfigurationButton({
553555
onClick={onClick}
554556
disabled={disabled}
555557
tip={tooltip}
558+
icon={<ExternalLinkIcon />}
556559
>
557560
Manage SSO configuration
558561
</Button>
@@ -579,6 +582,7 @@ function CertificateRenewalButton({
579582
onClick={onClick}
580583
disabled={disabled}
581584
tip={tooltip}
585+
icon={<ExternalLinkIcon />}
582586
>
583587
Renew Certificate
584588
</Button>

npm-packages/dashboard/src/lib/withAuthenticatedPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ function withSWRFallback(Page: NextPage) {
141141
</Callout>
142142
<UIProvider>
143143
<Button
144-
href="/api/auth/logout"
144+
href="/api/auth/logout?returnTo=/api/auth/login"
145145
variant="neutral"
146146
className="ml-auto w-fit"
147147
>

npm-packages/dashboard/src/pages/_app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ function AppInner({ Component, pageProps }: Omit<AppProps, "router">) {
142142
</span>
143143
<Button
144144
className="ml-auto w-fit"
145-
href="/api/auth/logout"
145+
href="/api/auth/logout?returnTo=/api/auth/login"
146146
icon={<ExitIcon />}
147147
>
148148
Log Out

npm-packages/dashboard/src/pages/auth.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Auth() {
2626
<UIProvider>
2727
<Button
2828
variant="neutral"
29-
href="/api/auth/logout"
29+
href="/api/auth/logout?returnTo=/api/auth/login"
3030
className={classNames("mt-4 ml-auto")}
3131
>
3232
Log Out

npm-packages/dashboard/src/pages/profile.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ function Profile() {
8989
document.cookie = "";
9090
window.localStorage.clear();
9191
await deleteAccount();
92-
window.location.href = "/api/auth/logout";
92+
window.location.href =
93+
"/api/auth/logout?returnTo=/api/auth/login";
9394
} catch (e: any) {
9495
setDeleteAccountError(e.message);
9596
throw e;

0 commit comments

Comments
 (0)