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

chore: backend redirection

Browse Source
This commit is contained in:
gurusainath 2024-05-01 17:50:21 +05:30
parent d26c2fd6de
commit 75f6f643ac
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/lib/wrappers/instance-wrapper.tsx
View File

@ -52,6 +52,7 @@ export const InstanceWrapper: FC<TInstanceWrapper> = observer((props) => {
); );
if (instance?.instance?.is_setup_done && pageType === EInstancePageType.PRE_SETUP) redirect("/"); if (instance?.instance?.is_setup_done && pageType === EInstancePageType.PRE_SETUP) redirect("/");
if (!instance?.instance?.is_setup_done && pageType === EInstancePageType.POST_SETUP) redirect("/setup"); if (!instance?.instance?.is_setup_done && pageType === EInstancePageType.POST_SETUP) redirect("/setup");
return <>{children}</>; return <>{children}</>;

11
apiserver/plane/authentication/views/space/magic.py
View File

@ -122,9 +122,18 @@ class MagicSignInSpaceEndpoint(View):
# Login the user and record his device info # Login the user and record his device info
user_login(request=request, user=user) user_login(request=request, user=user)
# redirect to referer path # redirect to referer path
if user.is_password_autoset and profile.is_onboarded:
path = "spaces/accounts/set-password"
else:
# Get the redirection path
path = (
str(next_path)
if next_path
else "spaces"
)
url = urljoin( url = urljoin(
base_host(request=request), base_host(request=request),
str(next_path) if next_path else "spaces", path
) )
return HttpResponseRedirect(url) return HttpResponseRedirect(url)