github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: next_path enabled for oauth auth (#4526)

Browse Source
This commit is contained in:
guru_sainath 2024-05-20 16:00:32 +05:30 committed by GitHub
parent 836452f074
commit 1355873e32
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
space/components/account/oauth/github-button.tsx
View File

@ -1,4 +1,5 @@
import { FC } from "react"; import { FC } from "react";
import { useSearchParams } from "next/navigation";
import Image from "next/image"; import Image from "next/image";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
// helpers // helpers
@ -12,12 +13,14 @@ export type GithubOAuthButtonProps = {
}; };
export const GithubOAuthButton: FC<GithubOAuthButtonProps> = (props) => { export const GithubOAuthButton: FC<GithubOAuthButtonProps> = (props) => {
const searchParams = useSearchParams();
const nextPath = searchParams.get("next_path") || undefined;
const { text } = props; const { text } = props;
// hooks // hooks
const { resolvedTheme } = useTheme(); const { resolvedTheme } = useTheme();
const handleSignIn = () => { 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 ( return (

5
space/components/account/oauth/google-button.tsx
View File

@ -1,4 +1,5 @@
import { FC } from "react"; import { FC } from "react";
import { useSearchParams } from "next/navigation";
import Image from "next/image"; import Image from "next/image";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
// helpers // helpers
@ -11,12 +12,14 @@ export type GoogleOAuthButtonProps = {
}; };
export const GoogleOAuthButton: FC<GoogleOAuthButtonProps> = (props) => { export const GoogleOAuthButton: FC<GoogleOAuthButtonProps> = (props) => {
const searchParams = useSearchParams();
const nextPath = searchParams.get("next_path") || undefined;
const { text } = props; const { text } = props;
// hooks // hooks
const { resolvedTheme } = useTheme(); const { resolvedTheme } = useTheme();
const handleSignIn = () => { 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 ( return (

5
web/components/account/oauth/github-button.tsx
View File

@ -1,4 +1,5 @@
import { FC } from "react"; import { FC } from "react";
import { useRouter } from "next/router";
import Image from "next/image"; import Image from "next/image";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
// helpers // helpers
@ -12,12 +13,14 @@ export type GithubOAuthButtonProps = {
}; };
export const GithubOAuthButton: FC<GithubOAuthButtonProps> = (props) => { export const GithubOAuthButton: FC<GithubOAuthButtonProps> = (props) => {
const { query } = useRouter();
const { next_path } = query;
const { text } = props; const { text } = props;
// hooks // hooks
const { resolvedTheme } = useTheme(); const { resolvedTheme } = useTheme();
const handleSignIn = () => { 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 ( return (

5
web/components/account/oauth/google-button.tsx
View File

@ -1,4 +1,5 @@
import { FC } from "react"; import { FC } from "react";
import { useRouter } from "next/router";
import Image from "next/image"; import Image from "next/image";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
// helpers // helpers
@ -11,12 +12,14 @@ export type GoogleOAuthButtonProps = {
}; };
export const GoogleOAuthButton: FC<GoogleOAuthButtonProps> = (props) => { export const GoogleOAuthButton: FC<GoogleOAuthButtonProps> = (props) => {
const { query } = useRouter();
const { next_path } = query;
const { text } = props; const { text } = props;
// hooks // hooks
const { resolvedTheme } = useTheme(); const { resolvedTheme } = useTheme();
const handleSignIn = () => { 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 ( return (