mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fixes callbackUrl issue in login page (#1848)

Browse source 
* fix: remove use of window.location in redirect of callbackUrl in Login Page

* Adds WEBSITE_URL constant to callbackUrl in login page

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
This commit is contained in:
Agusti Fernandez 2022-02-15 11:34:12 +01:00 committed by GitHub
parent 5f4bd87f0d
commit 5445ca5944
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/web/pages/auth/login.tsx
View file

@ -58,7 +58,8 @@ export default function Login({
const telemetry = useTelemetry(); const telemetry = useTelemetry();
const callbackUrl = typeof router.query?.callbackUrl === "string" ? router.query.callbackUrl : "/"; const callbackUrl =
typeof router.query?.callbackUrl === "string" ? `${WEBSITE_URL}/${router.query.callbackUrl}` : "/";
const LoginFooter = ( const LoginFooter = (
<span> <span>
@ -98,7 +99,7 @@ export default function Login({
.then((res) => { .then((res) => {
if (!res) setErrorMessage(errorMessages[ErrorCode.InternalServerError]); if (!res) setErrorMessage(errorMessages[ErrorCode.InternalServerError]);
// we're logged in! let's do a hard refresh to the desired url // we're logged in! let's do a hard refresh to the desired url
else if (!res.error) window.location.replace(callbackUrl); else if (!res.error) router.push(callbackUrl);
// reveal two factor input if required // reveal two factor input if required
else if (res.error === ErrorCode.SecondFactorRequired) setTwoFactorRequired(true); else if (res.error === ErrorCode.SecondFactorRequired) setTwoFactorRequired(true);
// fallback if error not found // fallback if error not found