diff --git a/apps/web/app/api/auth/[...nextauth]/authOptions.ts b/apps/web/app/api/auth/[...nextauth]/authOptions.ts index 2741b21ee7..936efdfc70 100644 --- a/apps/web/app/api/auth/[...nextauth]/authOptions.ts +++ b/apps/web/app/api/auth/[...nextauth]/authOptions.ts @@ -130,7 +130,7 @@ export const authOptions: NextAuthOptions = { select: { id: true, createdAt: true, - onboardingDisplayed: true, + onboardingCompleted: true, memberships: { select: { teamId: true, @@ -152,7 +152,7 @@ export const authOptions: NextAuthOptions = { const additionalAttributs = { id: existingUser.id, createdAt: existingUser.createdAt, - onboardingDisplayed: existingUser.onboardingDisplayed, + onboardingCompleted: existingUser.onboardingCompleted, teamId: existingUser.memberships.length > 0 ? existingUser.memberships[0].teamId : undefined, plan: existingUser.memberships.length > 0 && existingUser.memberships[0].team @@ -172,7 +172,7 @@ export const authOptions: NextAuthOptions = { // @ts-ignore session.user.createdAt = token?.createdAt ? new Date(token?.createdAt).toISOString() : undefined; // @ts-ignore - session.user.onboardingDisplayed = token?.onboardingDisplayed; + session.user.onboardingCompleted = token?.onboardingCompleted; // @ts-ignore session.user.teamId = token?.teamId; // @ts-ignore @@ -251,7 +251,7 @@ export const authOptions: NextAuthOptions = { name: user.name, email: user.email, emailVerified: new Date(Date.now()), - onboardingDisplayed: false, + onboardingCompleted: false, identityProvider: provider, identityProviderAccountId: user.id as string, accounts: { diff --git a/apps/web/app/onboarding/Onboarding.tsx b/apps/web/app/onboarding/Onboarding.tsx index e09d6ed87d..243b01e781 100644 --- a/apps/web/app/onboarding/Onboarding.tsx +++ b/apps/web/app/onboarding/Onboarding.tsx @@ -60,7 +60,7 @@ export default function Onboarding({ session }: OnboardingProps) { const done = async () => { setIsLoading(true); try { - const updatedProfile = { ...profile, onboardingDisplayed: true }; + const updatedProfile = { ...profile, onboardingCompleted: true }; await triggerProfileMutate(updatedProfile); if (environment) { router.push(`/environments/${environment.id}/surveys`); diff --git a/apps/web/app/page.tsx b/apps/web/app/page.tsx index 79f9f6b737..b516bd63fc 100644 --- a/apps/web/app/page.tsx +++ b/apps/web/app/page.tsx @@ -27,7 +27,7 @@ export default async function Home() { redirect("/auth/login"); } - if (session?.user && !session?.user?.onboardingDisplayed) { + if (session?.user && !session?.user?.onboardingCompleted) { return redirect(`/onboarding`); } diff --git a/apps/web/lib/users/users.ts b/apps/web/lib/users/users.ts index da1fc5c85a..159bf7a7b5 100644 --- a/apps/web/lib/users/users.ts +++ b/apps/web/lib/users/users.ts @@ -16,7 +16,7 @@ export const createUser = async ( email, password: hashedPassword, inviteToken, - onboardingDisplayed: false, + onboardingCompleted: false, }), }); if (res.status !== 200) { diff --git a/packages/database/prisma/migrations/20230503132723_rename_onboarding_flag/migration.sql b/packages/database/prisma/migrations/20230503132723_rename_onboarding_flag/migration.sql new file mode 100644 index 0000000000..44deeb6186 --- /dev/null +++ b/packages/database/prisma/migrations/20230503132723_rename_onboarding_flag/migration.sql @@ -0,0 +1,9 @@ +/* + Warnings: + + - You are about to drop the column `onboardingDisplayed` on the `User` table. All the data in the column will be lost. + +*/ +-- AlterTable +ALTER TABLE "User" DROP COLUMN "onboardingDisplayed", +ADD COLUMN "onboardingCompleted" BOOLEAN NOT NULL DEFAULT false; diff --git a/packages/database/prisma/schema.prisma b/packages/database/prisma/schema.prisma index 01057d3df6..c52f8d49a5 100644 --- a/packages/database/prisma/schema.prisma +++ b/packages/database/prisma/schema.prisma @@ -334,7 +334,7 @@ model User { email String @unique emailVerified DateTime? @map(name: "email_verified") password String? - onboardingDisplayed Boolean @default(false) + onboardingCompleted Boolean @default(false) identityProvider IdentityProvider @default(email) identityProviderAccountId String? memberships Membership[] diff --git a/packages/types/next-auth.d.ts b/packages/types/next-auth.d.ts index 023931343e..a2dfcfcb15 100644 --- a/packages/types/next-auth.d.ts +++ b/packages/types/next-auth.d.ts @@ -12,7 +12,7 @@ declare module "next-auth" { plan?: string; email: string; name: string; - onboardingDisplayed: boolean; + onboardingCompleted: boolean; image?: StaticImageData; }; }