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

Adds BASE_URL to callbackUrl in signup page and Shell component (#1882)

Browse source 
* add WEBSITE_URL to callbackUrl in signup page and Shell component

* fix: WEBSITE_URL -> BASE_URL, login missing do in another pr maybe

Co-authored-by: Agusti Fernandez <agusti@colony.io>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Agusti Fernandez <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Agusti Fernandez 2022-02-21 21:09:56 +01:00 committed by GitHub
parent 9863178025
commit 373bc1660c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/web/components/Shell.tsx
View file

@ -22,6 +22,7 @@ import TrialBanner from "@ee/components/TrialBanner";
import HelpMenuItemDynamic from "@ee/lib/intercom/HelpMenuItemDynamic"; import HelpMenuItemDynamic from "@ee/lib/intercom/HelpMenuItemDynamic";
import classNames from "@lib/classNames"; import classNames from "@lib/classNames";
import { BASE_URL } from "@lib/config/constants";
import { shouldShowOnboarding } from "@lib/getting-started"; import { shouldShowOnboarding } from "@lib/getting-started";
import { useLocale } from "@lib/hooks/useLocale"; import { useLocale } from "@lib/hooks/useLocale";
import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@lib/telemetry"; import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@lib/telemetry";
@ -61,7 +62,7 @@ function useRedirectToLoginIfUnauthenticated() {
router.replace({ router.replace({
pathname: "/auth/login", pathname: "/auth/login",
query: { query: {
callbackUrl: `${location.pathname}${location.search}`, callbackUrl: `${BASE_URL}/${location.pathname}${location.search}`,
}, },
}); });
} }

14
apps/web/pages/auth/signup.tsx
View file

@ -4,6 +4,7 @@ import { useRouter } from "next/router";
import { FormProvider, SubmitHandler, useForm } from "react-hook-form"; import { FormProvider, SubmitHandler, useForm } from "react-hook-form";
import { asStringOrNull } from "@lib/asStringOrNull"; import { asStringOrNull } from "@lib/asStringOrNull";
import { BASE_URL } from "@lib/config/constants";
import { useLocale } from "@lib/hooks/useLocale"; import { useLocale } from "@lib/hooks/useLocale";
import prisma from "@lib/prisma"; import prisma from "@lib/prisma";
import { isSAMLLoginEnabled } from "@lib/saml"; import { isSAMLLoginEnabled } from "@lib/saml";
@ -56,7 +57,12 @@ export default function Signup({ email }: Props) {
method: "POST", method: "POST",
}) })
.then(handleErrors) .then(handleErrors)
.then(async () => await signIn("Cal.com", { callbackUrl: (router.query.callbackUrl || "") as string })) .then(
async () =>
await signIn("Cal.com", {
callbackUrl: (`${BASE_URL}/${router.query.callbackUrl}` || "") as string,
})
)
.catch((err) => { .catch((err) => {
methods.setError("apiError", { message: err.message }); methods.setError("apiError", { message: err.message });
}); });
@ -123,7 +129,9 @@ export default function Signup({ email }: Props) {
color="secondary" color="secondary"
className="w-5/12 justify-center" className="w-5/12 justify-center"
onClick={() => onClick={() =>
signIn("Cal.com", { callbackUrl: (router.query.callbackUrl || "") as string }) signIn("Cal.com", {
callbackUrl: (`${BASE_URL}/${router.query.callbackUrl}` || "") as string,
})
}> }>
{t("login_instead")} {t("login_instead")}
</Button> </Button>
@ -176,7 +184,7 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
return { return {
redirect: { redirect: {
permanent: false, permanent: false,
destination: "/auth/login?callbackUrl=" + ctx.query.callbackUrl, destination: "/auth/login?callbackUrl=" + `${BASE_URL}/${ctx.query.callbackUrl}`,
}, },
}; };
} }