Skip to content

The Open Source DocuSign Alternative.

fix: make auth migration more flexible

David Nguyen595e901bc29e
diff --git a/apps/remix/app/routes/_authenticated+/settings+/security+/index.tsx b/apps/remix/app/routes/_authenticated+/settings+/security+/index.tsx
index 8e505ed78..cf162fdd7 100644
--- a/apps/remix/app/routes/_authenticated+/settings+/security+/index.tsx
+++ b/apps/remix/app/routes/_authenticated+/settings+/security+/index.tsx
@@ -25,30 +25,42 @@ export function meta() {
export async function loader() {
const { user } = getLoaderSession();
- const accounts = await prisma.account.findMany({
- where: {
- userId: user.id,
- },
- select: {
- provider: true,
- },
- });
-
- const providers = accounts.map((account) => account.provider);
+ // Todo: Use providers instead after RR7 migration.
+ // const accounts = await prisma.account.findMany({
+ // where: {
+ // userId: user.id,
+ // },
+ // select: {
+ // provider: true,
+ // },
+ // });
+
+ // const providers = accounts.map((account) => account.provider);
+ // let hasEmailPasswordAccount = providers.includes('DOCUMENSO');
+
+ const hasEmailPasswordAccount: boolean = await prisma.user
+ .count({
+ where: {
+ id: user.id,
+ password: {
+ not: null,
+ },
+ },
+ })
+ .then((value) => value > 0);
return {
- providers,
+ // providers,
+ hasEmailPasswordAccount,
};
}
export default function SettingsSecurity({ loaderData }: Route.ComponentProps) {
- const { providers } = loaderData;
+ const { hasEmailPasswordAccount } = loaderData;
const { _ } = useLingui();
const { user } = useSession();
- const hasEmailPasswordAccount = providers.includes('DOCUMENSO');
-
return (
<div>
<SettingsHeader
diff --git a/packages/lib/server-only/user/create-user.ts b/packages/lib/server-only/user/create-user.ts
index c6b9576c5..fd20be7a8 100644
--- a/packages/lib/server-only/user/create-user.ts
+++ b/packages/lib/server-only/user/create-user.ts
@@ -58,15 +58,16 @@ export const createUser = async ({ name, email, password, signature, url }: Crea
},
});
- await tx.account.create({
- data: {
- userId: user.id,
- type: 'emailPassword', // Todo
- provider: 'DOCUMENSO', // Todo: Enums
- providerAccountId: user.id.toString(),
- password: hashedPassword,
- },
- });
+ // Todo: Migrate to use this after RR7.
+ // await tx.account.create({
+ // data: {
+ // userId: user.id,
+ // type: 'emailPassword', // Todo
+ // provider: 'DOCUMENSO', // Todo: Enums
+ // providerAccountId: user.id.toString(),
+ // password: hashedPassword,
+ // },
+ // });
return user;
});