{title}
+{description}
+ {children} +
+
+
+
A progressive Node.js framework for building efficient and scalable server-side applications.
+
+
+
+
+
+
+
+ 
+ 
+ 
+
Please activate your account by clicking the button below:
+ +If the button does not work, copy this URL:
+${activationLink}
+ `, + }); + } catch (error) { + this.logger.error(`Failed to send activation email to ${email}`, error); + throw new InternalServerErrorException('Failed to send activation email'); + } + } + + async sendActivationChangeEmail(email: string, activationLink: string): PromisePlease activate your new email by clicking the button below:
+ +If the button does not work, copy this URL:
+${activationLink}
+ `, + }); + } catch (error) { + this.logger.error(`Failed to send activation email to ${email}`, error); + throw new InternalServerErrorException('Failed to send activation email'); + } + } + async sendChangeEmailNotify(email: string): Promise+ Your account email address has been changed successfully. + + If this was not you, please contact support immediately and change your password. + + Best regards, + The Support Team +
+ `, + }); + } catch (error) { + this.logger.error(`Failed to send activation email to ${email}`, error); + throw new InternalServerErrorException('Failed to send activation email'); + } + } + async sendActivationResetPassword(email: string, resetLink: string): PromiseClick the link below to reset your password:
+ +If the button does not work, copy this URL:
+${resetLink}
+ `, + }); + } catch (error) { + this.logger.error(`Failed to send activation email to ${email}`, error); + throw new InternalServerErrorException('Failed to send activation email'); + } + } +} diff --git a/backend/src/main.ts b/backend/src/main.ts new file mode 100644 index 00000000..aa196968 --- /dev/null +++ b/backend/src/main.ts @@ -0,0 +1,26 @@ +import 'dotenv/config'; +import { NestFactory } from '@nestjs/core'; +import { AppModule } from './app.module'; +import cookieParser from 'cookie-parser'; +import { ValidationPipe } from '@nestjs/common'; + +async function bootstrap() { + const app = await NestFactory.create(AppModule); + app.enableCors({ + origin: [ + 'http://localhost:3000', + ], + methods: 'GET,HEAD,PUT,PATCH,POST,DELETE', + credentials: true, + }); + app.use(cookieParser()); + app.useGlobalPipes( + new ValidationPipe({ + whitelist: true, + forbidNonWhitelisted: true, + transform: true, + }), + ); + await app.listen(process.env.PORT ?? 3001); +} +bootstrap(); diff --git a/backend/src/prisma/prisma.controller.ts b/backend/src/prisma/prisma.controller.ts new file mode 100644 index 00000000..ed6d62be --- /dev/null +++ b/backend/src/prisma/prisma.controller.ts @@ -0,0 +1,7 @@ +import { Controller } from '@nestjs/common'; +import { PrismaService } from './prisma.service'; + +@Controller('prisma') +export class PrismaController { + constructor(private readonly prismaService: PrismaService) {} +} diff --git a/backend/src/prisma/prisma.module.ts b/backend/src/prisma/prisma.module.ts new file mode 100644 index 00000000..4aecb626 --- /dev/null +++ b/backend/src/prisma/prisma.module.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { PrismaService } from './prisma.service'; +import { PrismaController } from './prisma.controller'; + +@Module({ + controllers: [PrismaController], + providers: [PrismaService], + exports: [PrismaService], +}) +export class PrismaModule {} diff --git a/backend/src/prisma/prisma.service.ts b/backend/src/prisma/prisma.service.ts new file mode 100644 index 00000000..4cf36af6 --- /dev/null +++ b/backend/src/prisma/prisma.service.ts @@ -0,0 +1,28 @@ +import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common'; +import { PrismaPg } from '@prisma/adapter-pg'; +import 'dotenv/config'; +import { PrismaClient } from 'generated/prisma/client'; + +@Injectable() +export class PrismaService + extends PrismaClient + implements OnModuleInit, OnModuleDestroy +{ + constructor() { + const connectionString = process.env.DATABASE_URL; + if (!connectionString) { + throw new Error('DATABASE_URL is not set'); + } + + const adapter = new PrismaPg({ connectionString }); + super({ adapter }); + } + + async onModuleInit() { + await this.$connect(); + } + + async onModuleDestroy() { + await this.$disconnect(); + } +} diff --git a/backend/src/user/dto/data-for-update-dto.ts b/backend/src/user/dto/data-for-update-dto.ts new file mode 100644 index 00000000..a4713000 --- /dev/null +++ b/backend/src/user/dto/data-for-update-dto.ts @@ -0,0 +1,45 @@ +import { IsEmail, IsNotEmpty, IsString } from 'class-validator'; +import { IsStrongPassword } from 'src/common/validators/is-strong-password.decorator'; +import { MatchField } from 'src/common/validators/match-field.validator'; + +export class DataForUpdateNameDto { + @IsString() + @IsNotEmpty() + newName!: string; +} + +export class DataForUpdateEmailDto { + @IsString() + @IsNotEmpty() + password!: string; + + @IsEmail({}, { message: 'Invalid email address' }) + newEmail!: string; + + @IsEmail({}, { message: 'Invalid email address' }) + @MatchField('newEmail', { message: 'Emails do not match' }) + confirmNewEmail!: string; +} + +export class DataForActivateNewEmailDto { + @IsString() + @IsNotEmpty() + newName!: string; +} + +export class DataForUpdatePasswordDto { + @IsString() + @IsNotEmpty() + password!: string; + + @IsString() + @IsNotEmpty() + @IsStrongPassword() + newPassword!: string; + + @IsString() + @IsNotEmpty() + @IsStrongPassword() + @MatchField('newPassword', { message: 'Passwords do not match' }) + confirmNewPassword!: string; +} diff --git a/backend/src/user/user.controller.ts b/backend/src/user/user.controller.ts new file mode 100644 index 00000000..ff2c6173 --- /dev/null +++ b/backend/src/user/user.controller.ts @@ -0,0 +1,44 @@ +import { Body, Controller, Get, Put, Query, Request, UseGuards } from '@nestjs/common'; +import { UserService } from './user.service'; +import { + DataForUpdateEmailDto, + DataForUpdateNameDto, + DataForUpdatePasswordDto, +} from './dto/data-for-update-dto'; +import { JwtAuthGuard } from 'src/common/guards/jwt-auth.guard'; +import type { AuthenticatedRequest } from 'src/common/types/authenticated-request'; + +@UseGuards(JwtAuthGuard) +@Controller('user') +export class UserController { + constructor(private readonly userService: UserService) {} + + @Get() + findUser(@Request() req: AuthenticatedRequest) { + return this.userService.findUserById(req.user.id); + } + + @Put('update-user-name') + updateUserName( + @Request() req: AuthenticatedRequest, + @Body() dataForUpdate: DataForUpdateNameDto, + ) { + return this.userService.updateUserName(req.user.id, dataForUpdate); + } + + @Put('update-user-email') + updateUserEmail( + @Request() req: AuthenticatedRequest, + @Body() dataForUpdate: DataForUpdateEmailDto, + ) { + return this.userService.updateUserEmail(req.user.id, dataForUpdate); + } + + @Put('update-user-password') + updateUserPassword( + @Request() req: AuthenticatedRequest, + @Body() dataForUpdate: DataForUpdatePasswordDto, + ) { + return this.userService.updateUserPassword(req.user.id, dataForUpdate); + } +} diff --git a/backend/src/user/user.module.ts b/backend/src/user/user.module.ts new file mode 100644 index 00000000..f18eb73c --- /dev/null +++ b/backend/src/user/user.module.ts @@ -0,0 +1,22 @@ +import { Module } from '@nestjs/common'; +import { UserService } from './user.service'; +import { UserController } from './user.controller'; +import { JwtModule } from '@nestjs/jwt'; +import { PrismaModule } from 'src/prisma/prisma.module'; +import { MailModule } from 'src/mail/mail.module'; +import { JwtAuthGuard } from 'src/common/guards/jwt-auth.guard'; + +@Module({ + controllers: [UserController], + providers: [UserService, JwtAuthGuard], + imports: [ + JwtModule.registerAsync({ + useFactory: () => ({ + secret: process.env.JWT_ACCESS_SECRET, + }), + }), + PrismaModule, + MailModule, + ], +}) +export class UserModule {} diff --git a/backend/src/user/user.service.ts b/backend/src/user/user.service.ts new file mode 100644 index 00000000..92087468 --- /dev/null +++ b/backend/src/user/user.service.ts @@ -0,0 +1,158 @@ +import { + BadRequestException, + HttpException, + Injectable, + NotFoundException, + UnauthorizedException, +} from '@nestjs/common'; +import { + DataForUpdateEmailDto, + DataForUpdateNameDto, + DataForUpdatePasswordDto, +} from './dto/data-for-update-dto'; +import { PrismaService } from 'src/prisma/prisma.service'; +import { normalizeUser } from 'src/utils/normalizeUser'; +import { MailService } from 'src/mail/mail.service'; +import { createHash, randomBytes } from 'crypto'; +import bcrypt from 'bcrypt'; + +@Injectable() +export class UserService { + constructor( + private readonly prisma: PrismaService, + private readonly mailService: MailService, + ) {} + + async findUserById(userId: number) { + const user = await this.prisma.user.findUnique({ where: { id: userId } }); + + if (!user) { + throw new UnauthorizedException(); + } + + return normalizeUser(user); + } + + async updateUserName(userId: number, dataForUpdate: DataForUpdateNameDto) { + const newName = dataForUpdate.newName.trim(); + if (!newName) { + throw new BadRequestException({ message: 'Name is required' }); + } + + try { + const updateUser = await this.prisma.user.update({ + where: { id: userId }, + data: { name: newName }, + }); + return normalizeUser(updateUser); + } catch { + throw new BadRequestException({ message: 'Could not update name' }); + } + } + + async updateUserEmail(userId: number, dataForUpdate: DataForUpdateEmailDto) { + const user = await this.prisma.user.findUnique({ + where: { id: userId }, + }); + + if (!user) { + throw new NotFoundException('User not found'); + } + + const passwordValid = await bcrypt.compare( + dataForUpdate.password, + user.password || '', + ); + + if (!passwordValid) { + throw new BadRequestException({ + message: 'Invalid password', + code: 'INVALID_PASSWORD', + }); + } + + const emailTaken = await this.prisma.user.findUnique({ + where: { email: dataForUpdate.newEmail }, + }); + + if (emailTaken && emailTaken.id !== user.id) { + throw new BadRequestException({ + message: 'Email is already in use', + code: 'EMAIL_IN_USE', + }); + } + + const rawActivationToken = randomBytes(32).toString('hex'); + const activationTokenHash = createHash('sha256') + .update(rawActivationToken) + .digest('hex'); + const activationTokenExpiresAt = new Date(Date.now() + 24 * 60 * 60 * 1000); + const clientUrl = process.env.CLIENT_URL ?? 'http://localhost:3000'; + const activationLink = `${clientUrl}/activate-new-email?activateToken=${rawActivationToken}`; + const newEmail = dataForUpdate.newEmail; + + try { + await this.prisma.user.update({ + where: { id: userId }, + data: { + activationTokenHash, + activationTokenExpiresAt, + pendingNewEmail: newEmail, + }, + }); + + await this.mailService.sendActivationChangeEmail(newEmail, activationLink); + + return { + statusCode: 200, + message: 'ok', + }; + } catch (error) { + if (error instanceof HttpException) { + throw error; + } + throw new BadRequestException({ + message: 'Could not send activation email', + code: 'ACTIVATION_EMAIL_FAILED', + }); + } + } + + async updateUserPassword( + userId: number, + dataForUpdate: DataForUpdatePasswordDto, + ) { + const user = await this.prisma.user.findUnique({ + where: { id: userId }, + }); + + if (!user) { + throw new NotFoundException('User not found'); + } + + const passwordValid = await bcrypt.compare( + dataForUpdate.password, + user.password || '', + ); + + if (!passwordValid) { + throw new BadRequestException({ + message: 'Invalid password', + code: 'INVALID_PASSWORD', + }); + } + + const hashedPassword = await bcrypt.hash(dataForUpdate.newPassword, 10); + await this.prisma.user.update({ + where: { id: userId }, + data: { + password: hashedPassword, + }, + }); + + return { + statusCode: 200, + message: 'ok', + }; + } +} diff --git a/backend/src/utils/googleClient.ts b/backend/src/utils/googleClient.ts new file mode 100644 index 00000000..3de26533 --- /dev/null +++ b/backend/src/utils/googleClient.ts @@ -0,0 +1,5 @@ +import { OAuth2Client } from "google-auth-library"; + +const client = new OAuth2Client(process.env.GOOGLE_CLIENT_ID); + +export default client; \ No newline at end of file diff --git a/backend/src/utils/jwt.ts b/backend/src/utils/jwt.ts new file mode 100644 index 00000000..218fd02d --- /dev/null +++ b/backend/src/utils/jwt.ts @@ -0,0 +1,49 @@ +import jsonwebtoken from 'jsonwebtoken'; +import { NormalizedUser } from './normalizeUser'; + +function getAccessSecret(): string { + const secret = process.env.JWT_ACCESS_SECRET; + if (!secret) { + throw new Error('JWT_ACCESS_SECRET is not set'); + } + return secret; +} + +function getRefreshSecret(): string { + const secret = process.env.JWT_REFRESH_SECRET; + if (!secret) { + throw new Error('JWT_REFRESH_SECRET is not set'); + } + return secret; +} + +function generateAccessToken(user: NormalizedUser) { + return jsonwebtoken.sign(user, getAccessSecret(), { expiresIn: '15min' }); +} + +function generateRefreshToken(user: NormalizedUser) { + return jsonwebtoken.sign(user, getRefreshSecret(), { expiresIn: '7day' }); +} + +function validateAccessToken(token: string) { + try { + return jsonwebtoken.verify(token, getAccessSecret()); + } catch (error) { + return null; + } +} + +function validateRefreshToken(token: string) { + try { + return jsonwebtoken.verify(token, getRefreshSecret()); + } catch (error) { + return null; + } +} + +export const jwt = { + generateAccessToken, + generateRefreshToken, + validateAccessToken, + validateRefreshToken, +}; \ No newline at end of file diff --git a/backend/src/utils/normalizeUser.ts b/backend/src/utils/normalizeUser.ts new file mode 100644 index 00000000..328c33f0 --- /dev/null +++ b/backend/src/utils/normalizeUser.ts @@ -0,0 +1,5 @@ +export type NormalizedUser = ReturnType+ We sent you an email with a verification link. Open it to activate your + account. +
+ ++ Confirming your new email… +
+ ); +} + +export default function ActivateNewEmaiPage() { + return+ Activating your account… +
+ ); +} + +export default function ActivatePage() { + return+ {description} +
+ +{message}
; +} diff --git a/src/frontend/app/components/logoutButton.tsx b/src/frontend/app/components/logoutButton.tsx new file mode 100644 index 00000000..86d57951 --- /dev/null +++ b/src/frontend/app/components/logoutButton.tsx @@ -0,0 +1,37 @@ +"use client"; + +import { useUser } from "@/app/hooks/useUser"; +import { useQueryClient } from "@tanstack/react-query"; +import { api } from "@/app/lib/api"; +import { useRouter } from "next/navigation"; + +export default function LogoutButton() { + const router = useRouter(); + const queryClient = useQueryClient(); + const { data: user, isLoading } = useUser(); + + if (isLoading || !user || !user.id) { + return null; + } + + const handleLogout = async () => { + try { + await api.get("/api/auth/sign-out"); + queryClient.removeQueries({ queryKey: ["user"] }); + router.push("/sign-in"); + router.refresh(); + } catch(err){ + console.error(err) + } + }; + + return ( + + ); +} diff --git a/src/frontend/app/components/passwordRulesPopover.tsx b/src/frontend/app/components/passwordRulesPopover.tsx new file mode 100644 index 00000000..88eb2cd8 --- /dev/null +++ b/src/frontend/app/components/passwordRulesPopover.tsx @@ -0,0 +1,76 @@ +"use client"; + +import { PASSWORD_CHECKS, areAllPasswordRulesMet } from "@/app/lib/shema"; +import { type ReactNode, useMemo, useState } from "react"; + +type PasswordRulesPopoverProps = { + password: string; + inputId?: string; + children: (props: { + id: string; + onFocus: () => void; + onBlur: () => void; + }) => ReactNode; +}; + +export default function PasswordRulesPopover({ + password, + inputId = "password", + children, +}: PasswordRulesPopoverProps) { + const [focused, setFocused] = useState(false); + + const rules = useMemo( + () => PASSWORD_CHECKS.map((rule) => ({ ...rule, met: rule.test(password) })), + [password], + ); + + const allMet = areAllPasswordRulesMet(password); + const open = focused && !allMet; + + return ( ++ Password must include +
+{description}
+ {children} ++ Welcome +
++ It's a homework for topic: Node_Auth-APP. +
++ Node Auth App +
++ 404 +
+Hello, {user.name}
+ )} + {user?.email && ( +{user.email}
+ )} ++ If an account with that email exists, we've sent a password reset link. + + Please check your inbox and follow the instructions to reset your password. +
+ ++ You can sign in with your new password. +
+ ++ Welcome back. Enter your credentials to continue. +
+ + + +Don't have an account yet?
+ + Go to sign up + +Don't remember password?
+ + Reset password + ++ Create a new account to start using the app. +
+ + + +Already have an account?
+ + Go to sign in + +