mirror of
https://github.com/Portabase/portabase.git
synced 2026-07-14 11:16:13 +02:00
Working on project.
This commit is contained in:
+10
-12
@@ -6,6 +6,7 @@ import {env} from "@/env.mjs";
|
||||
import GoogleProvider from "next-auth/providers/google";
|
||||
|
||||
|
||||
|
||||
export const {handlers, auth: baseAuth, signIn, signOut} = NextAuth({
|
||||
adapter: PrismaAdapter(prisma),
|
||||
theme: {
|
||||
@@ -78,22 +79,20 @@ export const {handlers, auth: baseAuth, signIn, signOut} = NextAuth({
|
||||
// // session.user.authMethod = user.authMethod;
|
||||
// return session
|
||||
// },
|
||||
async jwt({token, trigger, session, user}) {
|
||||
async jwt({ token, trigger, session, user }) {
|
||||
if (trigger === "update" && session) {
|
||||
return {...session, user: {...token, ...session?.user}};
|
||||
// return {...token, ...session?.user};
|
||||
return { ...token, ...session?.user };
|
||||
}
|
||||
|
||||
return {...token, ...user};
|
||||
return { ...token, ...user };
|
||||
},
|
||||
async session({session, token, user}) {
|
||||
session.user = token.user;
|
||||
// session.user = token;
|
||||
async session({ session, token, user }) {
|
||||
session.user = token;
|
||||
return session;
|
||||
},
|
||||
async signIn({account, user, profile}) {
|
||||
async signIn({ account, user, profile }) {
|
||||
const existingUser = await prisma.user.findFirst({
|
||||
where: {email: user.email},
|
||||
where: { email: user.email },
|
||||
});
|
||||
|
||||
if (!existingUser) {
|
||||
@@ -126,7 +125,7 @@ export const {handlers, auth: baseAuth, signIn, signOut} = NextAuth({
|
||||
|
||||
// Update auth method if user exists
|
||||
await prisma.user.update({
|
||||
where: {id: existingUser.id},
|
||||
where: { id: existingUser.id },
|
||||
data: {
|
||||
authMethod: account.provider,
|
||||
},
|
||||
@@ -136,5 +135,4 @@ export const {handlers, auth: baseAuth, signIn, signOut} = NextAuth({
|
||||
},
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
@@ -3,7 +3,6 @@ import {User} from "@prisma/client";
|
||||
|
||||
export const currentUser = async () => {
|
||||
const session = await baseAuth();
|
||||
console.log("mysession", session)
|
||||
if (!session?.user) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user