Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor AccountInner and AppSidebar components to utilize useSignout hook

Bill Yang59700315049d
diff --git a/client/src/app/settings/account/components/AccountInner.tsx b/client/src/app/settings/account/components/AccountInner.tsx
index 3f6536ff0..5219ab9e2 100644
--- a/client/src/app/settings/account/components/AccountInner.tsx
+++ b/client/src/app/settings/account/components/AccountInner.tsx
@@ -15,11 +15,13 @@ import { IS_CLOUD } from "../../../../lib/const";
import { ApiKeyManager } from "./ApiKeyManager";
import { ChangePassword } from "./ChangePassword";
import { DeleteAccount } from "./DeleteAccount";
+import { useSignout } from "../../../../hooks/useSignout";
export function AccountInner() {
const session = authClient.useSession();
const router = useRouter();
const queryClient = useQueryClient();
+ const signout = useSignout();
const updateAccountSettings = useUpdateAccountSettings();
const [email, setEmail] = useState(session.data?.user.email ?? "");
@@ -158,15 +160,7 @@ export function AccountInner() {
</div>
</div>
)}
- <Button
- variant="outline"
- onClick={async () => {
- // Clear the query cache before signing out
- queryClient.clear();
- await authClient.signOut();
- router.push("/login");
- }}
- >
+ <Button variant="outline" onClick={signout}>
Sign out
</Button>
</CardContent>
diff --git a/client/src/components/AppSidebar.tsx b/client/src/components/AppSidebar.tsx
index cd570502d..2ab4b559a 100644
--- a/client/src/components/AppSidebar.tsx
+++ b/client/src/components/AppSidebar.tsx
@@ -11,6 +11,7 @@ import { cn } from "../lib/utils";
import { RybbitLogo } from "./RybbitLogo";
import { ThemeSwitcher } from "./ThemeSwitcher";
import { authClient } from "../lib/auth";
+import { useSignout } from "../hooks/useSignout";
function AdminLink({ isExpanded }: { isExpanded: boolean }) {
const pathname = usePathname();
@@ -33,6 +34,7 @@ function AppSidebarContent() {
const { data: session } = authClient.useSession();
const [isExpanded, setIsExpanded] = useState(false);
const embed = useEmbedablePage();
+ const signout = useSignout();
if (embed) return null;
@@ -87,7 +89,7 @@ function AppSidebarContent() {
expanded={isExpanded}
/>
<SidebarLink
- onClick={() => authClient.signOut()}
+ onClick={signout}
icon={<LogOut className="w-5 h-5" />}
label="Sign out"
expanded={isExpanded}
diff --git a/client/src/hooks/useSignout.ts b/client/src/hooks/useSignout.ts
new file mode 100644
index 000000000..cd90f0491
--- /dev/null
+++ b/client/src/hooks/useSignout.ts
@@ -0,0 +1,14 @@
+import { useQueryClient } from "@tanstack/react-query";
+import { useRouter } from "next/router";
+import { authClient } from "../lib/auth";
+
+export function useSignout() {
+ const queryClient = useQueryClient();
+ const router = useRouter();
+
+ return async () => {
+ queryClient.clear();
+ await authClient.signOut();
+ router.push("/login");
+ };
+}