Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Centralize PostHog reset in signOut helper (#2465)

Luke Vella74a5566a167e
diff --git a/apps/web/src/app/[locale]/accept-invite/[inviteId]/components/sign-out-button.tsx b/apps/web/src/app/[locale]/accept-invite/[inviteId]/components/sign-out-button.tsx
index c6f4039c0..9085d10e4 100644
--- a/apps/web/src/app/[locale]/accept-invite/[inviteId]/components/sign-out-button.tsx
+++ b/apps/web/src/app/[locale]/accept-invite/[inviteId]/components/sign-out-button.tsx
@@ -1,12 +1,13 @@
"use client";
-import { posthog } from "@rallly/posthog/client";
import { Button } from "@rallly/ui/button";
+import { useRouter } from "next/navigation";
import React from "react";
import { Trans } from "@/i18n/client";
import { signOut } from "@/lib/auth-client";
export function SignOutButton() {
+ const router = useRouter();
const [isPending, setIsPending] = React.useState(false);
return (
<Button
@@ -14,8 +15,12 @@ export function SignOutButton() {
loading={isPending}
onClick={async () => {
setIsPending(true);
- await signOut();
- posthog?.reset();
+ try {
+ await signOut();
+ router.refresh();
+ } finally {
+ setIsPending(false);
+ }
}}
>
<Trans
diff --git a/apps/web/src/app/[locale]/e/[id]/components/user-dropdown.tsx b/apps/web/src/app/[locale]/e/[id]/components/user-dropdown.tsx
index 3bbb81186..ac7d610c2 100644
--- a/apps/web/src/app/[locale]/e/[id]/components/user-dropdown.tsx
+++ b/apps/web/src/app/[locale]/e/[id]/components/user-dropdown.tsx
@@ -15,7 +15,7 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Trans } from "@/i18n/client";
-import { authClient } from "@/lib/auth-client";
+import { signOut } from "@/lib/auth-client";
export function UserDropdown({
name,
@@ -69,7 +69,7 @@ export function UserDropdown({
<DropdownMenuItem
className="flex items-center gap-x-2"
onClick={async () => {
- await authClient.signOut();
+ await signOut();
router.refresh();
}}
>
diff --git a/apps/web/src/app/[locale]/error.tsx b/apps/web/src/app/[locale]/error.tsx
index 6e5f92cc8..94b0465c1 100644
--- a/apps/web/src/app/[locale]/error.tsx
+++ b/apps/web/src/app/[locale]/error.tsx
@@ -10,7 +10,7 @@ import React from "react";
import { ErrorPage, ErrorPageLinkItem } from "@/components/error-page";
import { RouterLoadingIndicator } from "@/components/router-loading-indicator";
import { Trans } from "@/i18n/client";
-import { authClient } from "@/lib/auth-client";
+import { signOut } from "@/lib/auth-client";
import { INVALID_SESSION } from "@/lib/errors/invalid-session-error";
export default function LocaleErrorBoundary({
@@ -25,12 +25,8 @@ export default function LocaleErrorBoundary({
React.useEffect(() => {
if (isInvalidSession) {
- authClient.signOut({
- fetchOptions: {
- onSuccess: () => {
- router.push("/login");
- },
- },
+ signOut().finally(() => {
+ router.push("/login");
});
return;
}
diff --git a/apps/web/src/components/nav-user.tsx b/apps/web/src/components/nav-user.tsx
index afca2edcb..fffb999d1 100644
--- a/apps/web/src/components/nav-user.tsx
+++ b/apps/web/src/components/nav-user.tsx
@@ -1,6 +1,5 @@
"use client";
-import { posthog } from "@rallly/posthog/client";
import { Button } from "@rallly/ui/button";
import {
DropdownMenu,
@@ -28,6 +27,7 @@ import {
UserIcon,
} from "lucide-react";
import Link from "next/link";
+import { useRouter } from "next/navigation";
import React from "react";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { RouterLoadingIndicator } from "@/components/router-loading-indicator";
@@ -40,6 +40,7 @@ export function NavUser() {
const { data: user } = trpc.user.getAuthed.useQuery();
const [isPending, setIsPending] = React.useState(false);
const { theme, setTheme } = useTheme();
+ const router = useRouter();
if (!user) {
return null;
@@ -124,8 +125,12 @@ export function NavUser() {
<DropdownMenuItem
onClick={async () => {
setIsPending(true);
- await signOut();
- posthog?.reset();
+ try {
+ await signOut();
+ router.refresh();
+ } finally {
+ setIsPending(false);
+ }
}}
>
<Icon>
diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsx
index e134ccabd..1f22f754b 100644
--- a/apps/web/src/components/user-dropdown.tsx
+++ b/apps/web/src/components/user-dropdown.tsx
@@ -1,5 +1,4 @@
"use client";
-import { posthog } from "@rallly/posthog/client";
import { buttonVariants, cn } from "@rallly/ui";
import { Button } from "@rallly/ui/button";
import {
@@ -30,6 +29,7 @@ import {
UserIcon,
} from "lucide-react";
import Link from "next/link";
+import { useRouter } from "next/navigation";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { useUser } from "@/components/user-provider";
import { useTheme } from "@/features/theme/client";
@@ -39,6 +39,7 @@ import { useFeatureFlag } from "@/lib/feature-flags/client";
export const UserDropdown = ({ className }: { className?: string }) => {
const { user } = useUser();
+ const router = useRouter();
const { theme, setTheme } = useTheme();
const isRegistrationEnabled = useFeatureFlag("registration");
@@ -162,7 +163,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
<DropdownMenuItem
onClick={async () => {
await signOut();
- posthog?.reset();
+ router.refresh();
}}
className="flex items-center gap-x-2"
>
diff --git a/apps/web/src/lib/auth-client.ts b/apps/web/src/lib/auth-client.ts
index b3e15708a..00411a9b8 100644
--- a/apps/web/src/lib/auth-client.ts
+++ b/apps/web/src/lib/auth-client.ts
@@ -1,3 +1,4 @@
+import { posthog } from "@rallly/posthog/client";
import { absoluteUrl } from "@rallly/utils/absolute-url";
import {
anonymousClient,
@@ -22,5 +23,5 @@ export const authClient = createAuthClient({
export async function signOut() {
await authClient.signOut();
- window.location.href = "/login";
+ posthog?.reset();
}
diff --git a/apps/web/src/trpc/client/provider.tsx b/apps/web/src/trpc/client/provider.tsx
index 2453446f0..e92cc5e73 100644
--- a/apps/web/src/trpc/client/provider.tsx
+++ b/apps/web/src/trpc/client/provider.tsx
@@ -11,7 +11,7 @@ import { httpBatchLink, TRPCClientError } from "@trpc/client";
import { useState } from "react";
import superjson from "superjson";
import { useTranslation } from "@/i18n/client";
-import { authClient } from "@/lib/auth-client";
+import { signOut } from "@/lib/auth-client";
import { trpc } from "../client";
import type { AppRouter } from "../routers";
@@ -29,7 +29,7 @@ export function TRPCProvider(props: { children: React.ReactNode }) {
switch (error.data?.code) {
case "UNAUTHORIZED":
- authClient.signOut().finally(() => {
+ signOut().finally(() => {
window.location.href = "/login";
});
break;