Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-10 04:22:32 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat: add user schema timestamps

Browse Source
This commit is contained in:
Mythie
2023-10-28 20:57:26 +11:00
parent 9b5af329a8
commit ec1f61faa0
5 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
packages/lib/next-auth/auth-options.ts
View File

@ -1,5 +1,6 @@
import { PrismaAdapter } from '@next-auth/prisma-adapter';
import { compare } from 'bcrypt';
import { DateTime } from 'luxon';
import { AuthOptions, Session, User } from 'next-auth';
import CredentialsProvider from 'next-auth/providers/credentials';
import GoogleProvider, { GoogleProfile } from 'next-auth/providers/google';
@ -54,6 +55,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
clientId: process.env.NEXT_PRIVATE_GOOGLE_CLIENT_ID ?? '',
clientSecret: process.env.NEXT_PRIVATE_GOOGLE_CLIENT_SECRET ?? '',
allowDangerousEmailAccountLinking: true,
profile(profile) {
return {
id: Number(profile.sub),
@ -65,27 +67,50 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
],
callbacks: {
async jwt({ token, user }) {
if (!token.email) {
throw new Error('No email in token');
const merged = {
...token,
...user,
};
if (!merged.email) {
const userId = Number(merged.id ?? token.sub);
const retrieved = await prisma.user.findFirst({
where: {
id: userId,
},
});
if (!retrieved) {
return token;
}
merged.id = retrieved.id;
merged.name = retrieved.name;
merged.email = retrieved.email;
}
const retrievedUser = await prisma.user.findFirst({
where: {
email: token.email,
},
});
if (
!merged.lastSignedIn ||
DateTime.fromISO(merged.lastSignedIn).plus({ hours: 1 }) <= DateTime.now()
) {
merged.lastSignedIn = new Date().toISOString();
if (!retrievedUser) {
return {
...token,
id: user.id,
};
await prisma.user.update({
where: {
id: Number(merged.id),
},
data: {
lastSignedIn: merged.lastSignedIn,
},
});
}
return {
id: retrievedUser.id,
name: retrievedUser.name,
email: retrievedUser.email,
id: merged.id,
name: merged.name,
email: merged.email,
lastSignedIn: merged.lastSignedIn,
};
},

1
packages/lib/types/next-auth.d.ts vendored
View File

@ -19,5 +19,6 @@ declare module 'next-auth/jwt' {
id: string | number;
name?: string | null;
email: string | null;
lastSignedIn?: string | null;
}
}

4
packages/prisma/migrations/20231028094931_add_user_timestamp_columns/migration.sql Normal file
View File

@ -0,0 +1,4 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
ADD COLUMN "lastSignedIn" TIMESTAMP(3) NOT NULL DEFAULT '1970-01-01 00:00:00 +00:00',
ADD COLUMN "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;

2
packages/prisma/migrations/20231028095542_use_now_for_last_signed_in/migration.sql Normal file
View File

@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ALTER COLUMN "lastSignedIn" SET DEFAULT CURRENT_TIMESTAMP;

19
packages/prisma/schema.prisma
View File

@ -26,6 +26,9 @@ model User {
password String?
source String?
signature String?
createdAt DateTime @default(now())
updatedAt DateTime @default(now()) @updatedAt
lastSignedIn DateTime @default(now())
roles Role[] @default([USER])
identityProvider IdentityProvider @default(DOCUMENSO)
accounts Account[]
@ -111,10 +114,10 @@ model Document {
Field Field[]
ShareLink DocumentShareLink[]
documentDataId String
documentData DocumentData @relation(fields: [documentDataId], references: [id], onDelete: Cascade)
documentData DocumentData @relation(fields: [documentDataId], references: [id], onDelete: Cascade)
documentMeta DocumentMeta?
createdAt DateTime @default(now())
updatedAt DateTime @default(now()) @updatedAt
createdAt DateTime @default(now())
updatedAt DateTime @default(now()) @updatedAt
@@unique([documentDataId])
}
@ -134,11 +137,11 @@ model DocumentData {
}
model DocumentMeta {
id String @id @default(cuid())
subject String?
message String?
documentId Int @unique
document Document @relation(fields: [documentId], references: [id], onDelete: Cascade)
id String @id @default(cuid())
subject String?
message String?
documentId Int @unique
document Document @relation(fields: [documentId], references: [id], onDelete: Cascade)
}
enum ReadStatus {