fix: next_path enabled for oauth auth (#4526)

makeplane · May 20, 2024 · 1355873 · 1355873
1 parent 836452f
commit 1355873
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/space/components/account/oauth/github-button.tsx b/space/components/account/oauth/github-button.tsx
@@ -1,4 +1,5 @@
 import { FC } from "react";
+import { useSearchParams } from "next/navigation";
 import Image from "next/image";
 import { useTheme } from "next-themes";
 // helpers
@@ -12,12 +13,14 @@ export type GithubOAuthButtonProps = {
 };
 
 export const GithubOAuthButton: FC<GithubOAuthButtonProps> = (props) => {
+  const searchParams = useSearchParams();
+  const nextPath = searchParams.get("next_path") || undefined;
   const { text } = props;
   // hooks
   const { resolvedTheme } = useTheme();
 
   const handleSignIn = () => {
-    window.location.assign(`${API_BASE_URL}/auth/spaces/github/`);
+    window.location.assign(`${API_BASE_URL}/auth/spaces/github/${nextPath ? `?next_path=${nextPath}` : ``}`);
   };
 
   return (

diff --git a/space/components/account/oauth/google-button.tsx b/space/components/account/oauth/google-button.tsx
@@ -1,4 +1,5 @@
 import { FC } from "react";
+import { useSearchParams } from "next/navigation";
 import Image from "next/image";
 import { useTheme } from "next-themes";
 // helpers
@@ -11,12 +12,14 @@ export type GoogleOAuthButtonProps = {
 };
 
 export const GoogleOAuthButton: FC<GoogleOAuthButtonProps> = (props) => {
+  const searchParams = useSearchParams();
+  const nextPath = searchParams.get("next_path") || undefined;
   const { text } = props;
   // hooks
   const { resolvedTheme } = useTheme();
 
   const handleSignIn = () => {
-    window.location.assign(`${API_BASE_URL}/auth/spaces/google/`);
+    window.location.assign(`${API_BASE_URL}/auth/spaces/google/${nextPath ? `?next_path=${nextPath}` : ``}`);
   };
 
   return (

diff --git a/web/components/account/oauth/github-button.tsx b/web/components/account/oauth/github-button.tsx
@@ -1,4 +1,5 @@
 import { FC } from "react";
+import { useRouter } from "next/router";
 import Image from "next/image";
 import { useTheme } from "next-themes";
 // helpers
@@ -12,12 +13,14 @@ export type GithubOAuthButtonProps = {
 };
 
 export const GithubOAuthButton: FC<GithubOAuthButtonProps> = (props) => {
+  const { query } = useRouter();
+  const { next_path } = query;
   const { text } = props;
   // hooks
   const { resolvedTheme } = useTheme();
 
   const handleSignIn = () => {
-    window.location.assign(`${API_BASE_URL}/auth/github/`);
+    window.location.assign(`${API_BASE_URL}/auth/github/${next_path ? `?next_path=${next_path}` : ``}`);
   };
 
   return (

diff --git a/web/components/account/oauth/google-button.tsx b/web/components/account/oauth/google-button.tsx
@@ -1,4 +1,5 @@
 import { FC } from "react";
+import { useRouter } from "next/router";
 import Image from "next/image";
 import { useTheme } from "next-themes";
 // helpers
@@ -11,12 +12,14 @@ export type GoogleOAuthButtonProps = {
 };
 
 export const GoogleOAuthButton: FC<GoogleOAuthButtonProps> = (props) => {
+  const { query } = useRouter();
+  const { next_path } = query;
   const { text } = props;
   // hooks
   const { resolvedTheme } = useTheme();
 
   const handleSignIn = () => {
-    window.location.assign(`${API_BASE_URL}/auth/google/`);
+    window.location.assign(`${API_BASE_URL}/auth/google/${next_path ? `?next_path=${next_path}` : ``}`);
   };
 
   return (