Skip to content

Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia

chore: changed the names of properties for User in prisma and user.model

Balu Babu8fdcc5dd50f2
diff --git a/packages/hoppscotch-backend/prisma/schema.prisma b/packages/hoppscotch-backend/prisma/schema.prisma
index ea4c57887..8f560678f 100644
--- a/packages/hoppscotch-backend/prisma/schema.prisma
+++ b/packages/hoppscotch-backend/prisma/schema.prisma
@@ -79,10 +79,10 @@ model TeamEnvironment {
}
model User {
- id String @id @default(cuid())
- name String?
+ uid String @id @default(cuid()) @map("id")
+ displayName String?
email String? @unique
- image String?
+ photoURL String?
isAdmin Boolean @default(false)
refreshToken String?
accounts Account[]
@@ -100,7 +100,7 @@ model Account {
providerScope String?
loggedIn DateTime @default(now()) @db.Timestamp(3)
- user User @relation(fields: [userId], references: [id], onDelete: Cascade)
+ user User @relation(fields: [userId], references: [uid], onDelete: Cascade)
@@unique(fields: [provider, providerAccountId], name: "verifyProviderAccount")
}
@@ -109,7 +109,7 @@ model PasswordlessVerification {
deviceIdentifier String
token String @unique @default(cuid())
userUid String
- user User @relation(fields: [userUid], references: [id], onDelete: Cascade)
+ user User @relation(fields: [userUid], references: [uid], onDelete: Cascade)
expiresOn DateTime @db.Timestamp(3)
@@unique(fields: [deviceIdentifier, token], name: "passwordless_deviceIdentifier_tokens")
diff --git a/packages/hoppscotch-backend/src/user/user.model.ts b/packages/hoppscotch-backend/src/user/user.model.ts
index f3c3ef786..2bacac70a 100644
--- a/packages/hoppscotch-backend/src/user/user.model.ts
+++ b/packages/hoppscotch-backend/src/user/user.model.ts
@@ -5,13 +5,13 @@ export class User {
@Field(() => ID, {
description: 'ID of the user',
})
- id: string;
+ uid: string;
@Field({
nullable: true,
description: 'Name of the user (if fetched)',
})
- name?: string;
+ displayName?: string;
@Field({
nullable: true,
@@ -23,7 +23,7 @@ export class User {
nullable: true,
description: 'URL to the profile photo of the user (if fetched)',
})
- image?: string;
+ photoURL?: string;
@Field({
description: 'Flag to determine if user is an Admin or not',