refactor: remove providerId from User

prisma/schema.prisma

@@ -8,11 +8,10 @@ datasource db {
 }
 
 model User {
-    id         String   @id @default(cuid())
+    id         String   @id
-    username   String?  @unique
+    username   String
     role       Role     @default(STUDENT)
     createdAt  DateTime @default(now())
-    providerId String   @unique
 
     Class                Class[]
     SentMessages         UserMessage[]          @relation("SentMessages")

src/modules/auth/guards/jwt.guard.ts

@@ -27,9 +27,10 @@ export class JwtAuthGuard implements CanActivate {
 		try {
 			const jwtPayload = await this.authService.checkToken(token);
 
-			let user = await this.userService.findOrCreateByProviderId({
+			let user = await this.userService.findOrCreate({
-				providerId: jwtPayload.sub.toString(),
+				id: jwtPayload.sub.toString(),
-				username: jwtPayload[this.configService.get("auth.usernameField")],
+				username:
+					jwtPayload[this.configService.get("auth.usernameField")],
 			});
 
 			request.user = user;

src/modules/user/dto/create-user.dto.ts

@@ -1,12 +1,17 @@
 import { ApiProperty } from "@nestjs/swagger";
+import { Role } from "@prisma/client";
 import { IsString } from "class-validator";
 
 export class CreateUserDTO {
+	@IsString()
+	@ApiProperty()
+	id: string;
+
 	@IsString()
 	@ApiProperty()
 	username: string;
 
 	@IsString()
 	@ApiProperty()
-	providerId: string;
+	role: Role;
 }

src/modules/user/user.gateway.ts

@@ -35,8 +35,8 @@ export class UserGateway implements OnGatewayConnection, OnGatewayDisconnect {
 			return client.disconnect();
 		}
 
-		const user = await this.userService.findOrCreateByProviderId({
+		const user = await this.userService.findOrCreate({
-			providerId: jwtPayload.sub.toString(),
+			id: jwtPayload.sub.toString(),
 			username: jwtPayload[this.configService.get("auth.usernameField")],
 		});
 

src/modules/user/user.service.ts

@@ -37,24 +37,11 @@ export class UserService {
 		});
 	}
 
-	async findByProviderId(providerId: string) {
+	async findOrCreate({ id, username }: { id: string; username: string }) {
-		return await this.prisma.user.findUniqueOrThrow({
-			where: {
-				providerId,
-			},
-		});
-	}
-
-	async findOrCreateByProviderId({
-		providerId,
-		username,
-	}: {
-		providerId: string;
-		username: string;
-	}) {
 		let user = await this.prisma.user.findFirst({
 			where: {
-				OR: [{ providerId }, { username }],
+				id,
+				username,
 			},
 		});
 
@@ -63,8 +50,8 @@ export class UserService {
 
 			user = await this.prisma.user.create({
 				data: {
+					id,
 					username,
-					providerId,
 					role: isFirstUser ? "ADMIN" : "STUDENT",
 				},
 			});
@@ -76,8 +63,8 @@ export class UserService {
 	async create(createUserDto: CreateUserDTO) {
 		return await this.prisma.user.create({
 			data: {
+				id: createUserDto.id,
 				username: createUserDto.username,
-				providerId: createUserDto.providerId,
 			},
 		});
 	}