mirror of
https://github.com/documenso/documenso.git
synced 2025-11-10 04:22:32 +10:00
feat: google auth without schema change
This commit is contained in:
3
apps/web/process-env.d.ts
vendored
3
apps/web/process-env.d.ts
vendored
@ -11,5 +11,8 @@ declare namespace NodeJS {
|
|||||||
NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET: string;
|
NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET: string;
|
||||||
|
|
||||||
NEXT_PUBLIC_SUBSCRIPTIONS_ENABLED: string;
|
NEXT_PUBLIC_SUBSCRIPTIONS_ENABLED: string;
|
||||||
|
|
||||||
|
NEXT_PRIVATE_GOOGLE_CLIENT_ID: string;
|
||||||
|
NEXT_PRIVATE_GOOGLE_CLIENT_SECRET: string;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -61,8 +61,8 @@ export const SignInForm = ({ className }: SignInFormProps) => {
|
|||||||
|
|
||||||
const onSignInWithGoogleClick = async () => {
|
const onSignInWithGoogleClick = async () => {
|
||||||
try {
|
try {
|
||||||
// await signIn('google', { callbackUrl: '/dashboard' });
|
await signIn('google', { callbackUrl: '/dashboard' });
|
||||||
throw new Error('Not implemented');
|
// throw new Error('Not implemented');
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast({
|
toast({
|
||||||
title: 'An unknown error occurred',
|
title: 'An unknown error occurred',
|
||||||
|
|||||||
@ -1,7 +1,8 @@
|
|||||||
import { PrismaAdapter } from '@next-auth/prisma-adapter';
|
import { PrismaAdapter } from '@next-auth/prisma-adapter';
|
||||||
import { compare } from 'bcrypt';
|
import { compare } from 'bcrypt';
|
||||||
import { AuthOptions, User } from 'next-auth';
|
import { AuthOptions, Session, User } from 'next-auth';
|
||||||
import CredentialsProvider from 'next-auth/providers/credentials';
|
import CredentialsProvider from 'next-auth/providers/credentials';
|
||||||
|
import GoogleProvider from 'next-auth/providers/google';
|
||||||
|
|
||||||
import { prisma } from '@documenso/prisma';
|
import { prisma } from '@documenso/prisma';
|
||||||
|
|
||||||
@ -44,16 +45,59 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
|
|||||||
id: String(user.id) as any,
|
id: String(user.id) as any,
|
||||||
email: user.email,
|
email: user.email,
|
||||||
name: user.name,
|
name: user.name,
|
||||||
image: '',
|
|
||||||
} satisfies User;
|
} satisfies User;
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
|
GoogleProvider({
|
||||||
|
clientId: process.env.NEXT_PRIVATE_GOOGLE_CLIENT_ID ?? '',
|
||||||
|
clientSecret: process.env.NEXT_PRIVATE_GOOGLE_CLIENT_SECRET ?? '',
|
||||||
|
allowDangerousEmailAccountLinking: true,
|
||||||
|
profile(profile) {
|
||||||
|
return {
|
||||||
|
id: profile.sub as any,
|
||||||
|
name: profile.name,
|
||||||
|
email: profile.email,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
}),
|
||||||
],
|
],
|
||||||
// callbacks: {
|
callbacks: {
|
||||||
// jwt: async ({ token, user: _user }) => {
|
async jwt({ token, user, account, profile }) {
|
||||||
// return {
|
console.log('jwt', { token, user, account, profile });
|
||||||
// ...token,
|
const dbUser = await prisma.user.findFirst({
|
||||||
// };
|
where: {
|
||||||
// },
|
email: token.email as string,
|
||||||
// },
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!dbUser) {
|
||||||
|
if (user) {
|
||||||
|
token.id = user?.id;
|
||||||
|
}
|
||||||
|
return token;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: dbUser.id,
|
||||||
|
name: dbUser.name,
|
||||||
|
email: dbUser.email,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
async session({ token, session }) {
|
||||||
|
console.log('session', { token, session });
|
||||||
|
if (token) {
|
||||||
|
const documensoSession = {
|
||||||
|
...session,
|
||||||
|
user: {
|
||||||
|
id: Number(token.id),
|
||||||
|
name: token.name,
|
||||||
|
email: token.email,
|
||||||
|
},
|
||||||
|
} as Session;
|
||||||
|
|
||||||
|
return documensoSession;
|
||||||
|
}
|
||||||
|
return session;
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
23
packages/lib/types/next-auth.d.ts
vendored
Normal file
23
packages/lib/types/next-auth.d.ts
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import type { User as PrismaUser } from '@prisma/client';
|
||||||
|
import type { DefaultUser } from 'next-auth';
|
||||||
|
|
||||||
|
declare module 'next-auth' {
|
||||||
|
interface Session {
|
||||||
|
user: User;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface User extends Omit<DefaultUser, 'id' | 'image'> {
|
||||||
|
id: PrismaUser['id'];
|
||||||
|
email?: PrismaUser['email'];
|
||||||
|
name?: PrismaUser['name'];
|
||||||
|
emailVerified?: PrismaUser['emailVerified'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
declare module 'next-auth/jwt' {
|
||||||
|
interface JWT {
|
||||||
|
id: string | number;
|
||||||
|
name?: string | null;
|
||||||
|
email: string | null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -18,6 +18,8 @@
|
|||||||
"NEXT_PUBLIC_SITE_URL",
|
"NEXT_PUBLIC_SITE_URL",
|
||||||
"NEXT_PRIVATE_DATABASE_URL",
|
"NEXT_PRIVATE_DATABASE_URL",
|
||||||
"NEXT_PRIVATE_NEXT_AUTH_SECRET",
|
"NEXT_PRIVATE_NEXT_AUTH_SECRET",
|
||||||
"NEXT_PUBLIC_SUBSCRIPTIONS_ENABLED"
|
"NEXT_PUBLIC_SUBSCRIPTIONS_ENABLED",
|
||||||
|
"NEXT_PRIVATE_GOOGLE_CLIENT_ID",
|
||||||
|
"NEXT_PRIVATE_GOOGLE_CLIENT_SECRET"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user