get rid of onboarding requirements
This commit is contained in:
@ -40,16 +40,9 @@ export default resolver.pipe(resolver.zod(Login), async ({ email, password }, ct
|
||||
const user = await authenticateUser(email, password);
|
||||
|
||||
const organization = user.memberships[0]!.organization;
|
||||
const hasCompletedOnboarding =
|
||||
Boolean(organization.twilioAccountSid) &&
|
||||
Boolean(organization.twilioAuthToken) &&
|
||||
Boolean(organization.twilioApiKey) &&
|
||||
Boolean(organization.twilioApiSecret) &&
|
||||
Boolean(organization.phoneNumbers.length > 1);
|
||||
await ctx.session.$create({
|
||||
userId: user.id,
|
||||
roles: [user.role, user.memberships[0]!.role],
|
||||
hasCompletedOnboarding: hasCompletedOnboarding || undefined,
|
||||
orgId: organization.id,
|
||||
});
|
||||
|
||||
|
@ -31,6 +31,7 @@ export default resolver.pipe(resolver.zod(Signup), async ({ email, password, ful
|
||||
userId: user.id,
|
||||
roles: [user.role, user.memberships[0]!.role],
|
||||
orgId: user.memberships[0]!.organizationId,
|
||||
shouldShowWelcomeMessage: true,
|
||||
});
|
||||
return user;
|
||||
});
|
||||
|
@ -29,7 +29,7 @@ const SignUp: BlitzPage = () => {
|
||||
onSubmit={async (values) => {
|
||||
try {
|
||||
await signupMutation(values);
|
||||
router.push(Routes.StepOne());
|
||||
await router.push(Routes.Welcome());
|
||||
} catch (error: any) {
|
||||
if (error.code === "P2002" && error.meta?.target?.includes("email")) {
|
||||
// This error comes from Prisma
|
||||
@ -47,7 +47,13 @@ const SignUp: BlitzPage = () => {
|
||||
);
|
||||
};
|
||||
|
||||
SignUp.redirectAuthenticatedTo = Routes.StepOne();
|
||||
SignUp.redirectAuthenticatedTo = ({ session }) => {
|
||||
if (session.shouldShowWelcomeMessage) {
|
||||
return Routes.Welcome();
|
||||
}
|
||||
|
||||
return Routes.Messages();
|
||||
};
|
||||
|
||||
SignUp.getLayout = (page) => <BaseLayout title="Sign Up">{page}</BaseLayout>;
|
||||
|
||||
|
28
app/auth/pages/welcome.tsx
Normal file
28
app/auth/pages/welcome.tsx
Normal file
@ -0,0 +1,28 @@
|
||||
import type { BlitzPage, GetServerSideProps } from "blitz";
|
||||
import { getSession, Routes, useRouter } from "blitz";
|
||||
|
||||
const Welcome: BlitzPage = () => {
|
||||
const router = useRouter();
|
||||
|
||||
return (
|
||||
<div>
|
||||
<p>Thanks for joining Shellphone</p>
|
||||
<p>Let us know if you need our help</p>
|
||||
<p>Make sure to set up your phone number</p>
|
||||
<button onClick={() => router.push(Routes.Messages())}>Open my phone</button>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
Welcome.authenticate = { redirectTo: Routes.SignIn() };
|
||||
|
||||
export const getServerSideProps: GetServerSideProps = async ({ req, res }) => {
|
||||
const session = await getSession(req, res);
|
||||
await session.$setPublicData({ shouldShowWelcomeMessage: undefined });
|
||||
|
||||
return {
|
||||
props: {},
|
||||
};
|
||||
};
|
||||
|
||||
export default Welcome;
|
Reference in New Issue
Block a user