0.3.0.0
This commit is contained in:
+18
-1
@@ -45,10 +45,13 @@ export const authOptions: NextAuthOptions = {
|
||||
}
|
||||
})
|
||||
|
||||
const hasSeenHelp = (user as { hasSeenHelp?: boolean }).hasSeenHelp ?? false
|
||||
|
||||
return {
|
||||
id: user.id,
|
||||
email: user.email,
|
||||
name: user.name,
|
||||
hasSeenHelp,
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -60,15 +63,29 @@ export const authOptions: NextAuthOptions = {
|
||||
signIn: "/auth/signin",
|
||||
},
|
||||
callbacks: {
|
||||
async jwt({ token, user }) {
|
||||
async jwt({ token, user, trigger, session }) {
|
||||
if (user) {
|
||||
token.id = user.id
|
||||
token.hasSeenHelp = (user as any).hasSeenHelp ?? token.hasSeenHelp
|
||||
}
|
||||
|
||||
if (trigger === 'update' && session?.user?.hasSeenHelp !== undefined) {
|
||||
token.hasSeenHelp = session.user.hasSeenHelp
|
||||
}
|
||||
|
||||
if (token.id && token.hasSeenHelp === undefined) {
|
||||
const dbUser = await prisma.user.findUnique({
|
||||
where: { id: token.id as string },
|
||||
}) as { hasSeenHelp?: boolean } | null
|
||||
|
||||
token.hasSeenHelp = dbUser?.hasSeenHelp ?? false
|
||||
}
|
||||
return token
|
||||
},
|
||||
async session({ session, token }) {
|
||||
if (session.user) {
|
||||
session.user.id = token.id as string
|
||||
session.user.hasSeenHelp = (token as any).hasSeenHelp ?? false
|
||||
}
|
||||
return session
|
||||
}
|
||||
|
||||
@@ -33,7 +33,8 @@ export async function recordMemberHistory(params: {
|
||||
'birthPlace', 'ancestralHome', 'generation', 'bio', 'phone', 'email',
|
||||
'address', 'photoIds', 'spouseIds', 'childrenIds', 'motherId', 'fatherId',
|
||||
'generationName', 'courtesyName', 'artName', 'posthumousName', 'rank',
|
||||
'isFounder', 'isLunarDate', 'burialPlace', 'telephone', 'tags'
|
||||
'isFounder', 'isLunarDate', 'burialPlace', 'telephone', 'tags',
|
||||
'avatarUrl', 'stories'
|
||||
]
|
||||
|
||||
for (const field of fieldsToTrack) {
|
||||
|
||||
Reference in New Issue
Block a user