fix: fixed minor errors

Author: shanuvr

backend/src/Services/authToken.ts

@@ -1,30 +1,28 @@
-import { appDataSouce } from "../data-source";
-import { RefreshTokenEntity } from "../entities/refreshToken";
-import { User } from "../entities/User";
-import { generateRefreshToken,hashRefreshToken } from "./refreshToken";
+import { appDataSouce } from '../data-source';
+import { RefreshTokenEntity } from '../entities/refreshToken';
+import { User } from '../entities/User';
+import { generateRefreshToken, hashRefreshToken } from './refreshToken';
 const REFRESH_TOKEN_DAYS = 30;
 
-export const createRefreshTokenSession = async(user:User)=>{
-    const refreshToken = generateRefreshToken();
-     console.log("Raw refresh token generated");
+export const createRefreshTokenSession = async (user: User) => {
+  const refreshToken = generateRefreshToken();
+  console.log('Raw refresh token generated');
 
-    const tokenHash = hashRefreshToken(refreshToken);
-    console.log("Token hashed");
+  const tokenHash = hashRefreshToken(refreshToken);
+  console.log('Token hashed');
 
-   
+  const expiresAt = new Date();
 
-    const expiresAt = new Date();
+  expiresAt.setDate(expiresAt.getDate() + REFRESH_TOKEN_DAYS);
 
-    expiresAt.setDate(expiresAt.getDate()+REFRESH_TOKEN_DAYS);
+  const repo = appDataSouce.getRepository(RefreshTokenEntity);
+  console.log('Got refresh token repository');
 
-    const repo = appDataSouce.getRepository(RefreshTokenEntity)
-     console.log("Got refresh token repository");
-
-    await repo.save({
-        tokenHash,
-        user,
-        expiresAt
-    })
-     console.log("Refresh token saved");
-    return refreshToken
-}
+  await repo.save({
+    tokenHash,
+    user,
+    expiresAt,
+  });
+  console.log('Refresh token saved');
+  return refreshToken;
+};

backend/src/Services/jwt.service.ts

@@ -1,9 +1,10 @@
-import jwt from 'jsonwebtoken'
+import jwt from 'jsonwebtoken';
 
-
- export const signAccessToken = (payload:{userId:string})=>{
-    return jwt.sign(payload,process.env.ACCESS_TOKEN_SECRET!,{expiresIn:"15m"})
- }
- export const verifyAccessToken = (token:string)=>{
-    return jwt.verify(token,process.env.ACCESS_TOKEN_SECRET!)
- }
+export const signAccessToken = (payload: { userId: string }) => {
+  return jwt.sign(payload, process.env.ACCESS_TOKEN_SECRET!, {
+    expiresIn: '15m',
+  });
+};
+export const verifyAccessToken = (token: string) => {
+  return jwt.verify(token, process.env.ACCESS_TOKEN_SECRET!);
+};

backend/src/Services/refreshToken.ts

@@ -1,7 +1,7 @@
-import crypto from 'crypto'
-export const generateRefreshToken = ():string=>{
-    return crypto.randomBytes(64).toString()
-}
-export const hashRefreshToken = (token:string)=>{
-    return crypto.createHash("sha256").update(token).digest("hex")
-}
+import crypto from 'crypto';
+export const generateRefreshToken = (): string => {
+  return crypto.randomBytes(64).toString();
+};
+export const hashRefreshToken = (token: string) => {
+  return crypto.createHash('sha256').update(token).digest('hex');
+};

backend/src/Services/sms.service.ts

@@ -1,19 +1,18 @@
-import Twilio from 'twilio'
+import Twilio from 'twilio';
 import { logger } from '../utils/logger';
 const accountSid = process.env.TWILIO_ACCOUNT_SID!;
 const authToken = process.env.TWILIO_AUTH_TOKEN!;
 const fromNumber = process.env.TWILIO_FROM_NUMBER!;
-const client = Twilio(accountSid,authToken)
-export const sendOtpSms = async(phoneNumber:string,otp:string)=>{
-    try{
-        await client.messages.create({
-            body:`otp is ${otp}`,
-            from:fromNumber,
-            to:phoneNumber
-        })
-
-    }catch(err){
-        logger.error({err},"failed to send otp")
-        throw new Error('failed to send')
-    }
-}
+const client = Twilio(accountSid, authToken);
+export const sendOtpSms = async (phoneNumber: string, otp: string) => {
+  try {
+    await client.messages.create({
+      body: `otp is ${otp}`,
+      from: fromNumber,
+      to: phoneNumber,
+    });
+  } catch (err) {
+    logger.error({ err }, 'failed to send otp');
+    throw new Error('failed to send');
+  }
+};

backend/src/app.ts

@@ -1,5 +1,5 @@
 import express from 'express';
-import cors from "cors"
+import cors from 'cors';
 import { pinoHttp } from 'pino-http';
 import { logger } from './utils/logger';
 import { notFound } from './middleware/notFound';
@@ -9,7 +9,7 @@ import authRouter from './modules/auth/auth.routes';
 import userRouter from './modules/user/user.routes';
 
 const app = express();
-app.use(cors())
+app.use(cors());
 app.use(express.json());
 app.use(
   pinoHttp({ logger, autoLogging: { ignore: (req) => req.url === 'health' } }),

backend/src/data-source.ts

@@ -12,6 +12,6 @@ export const appDataSouce = new DataSource({
   ssl: {
     rejectUnauthorized: false,
   },
-  entities: [User, Otp,RefreshTokenEntity],
+  entities: [User, Otp, RefreshTokenEntity],
   synchronize: true,
 });

backend/src/entities/User.ts

@@ -10,11 +10,11 @@ export class User {
   @PrimaryGeneratedColumn('uuid')
   id!: string;
 
-  @Column({ unique: true,nullable:true })
+  @Column({ unique: true, nullable: true })
   email!: string;
 
-  @Column({unique:true,nullable:true})
-  phoneNumber!:string
+  @Column({ unique: true, nullable: true })
+  phoneNumber!: string;
 
   @Column()
   name!: string;
@@ -31,8 +31,8 @@ export class User {
   @Column({ nullable: true })
   profileImageUrl?: string;
 
-  @Column({nullable:true})
-  password?:string;
+  @Column({ nullable: true })
+  password?: string;
 
   @CreateDateColumn()
   createdAt!: Date;

backend/src/entities/refreshToken.ts

@@ -1,25 +1,28 @@
-import { Entity,PrimaryGeneratedColumn,Column,CreateDateColumn,ManyToOne } from "typeorm";
- import { User } from "./User";
- @Entity()
- export class RefreshTokenEntity{
-    @PrimaryGeneratedColumn("uuid")
-    id!:string;
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  CreateDateColumn,
+  ManyToOne,
+} from 'typeorm';
+import { User } from './User';
+@Entity()
+export class RefreshTokenEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id!: string;
 
-    @Column()
-    tokenHash!:string;
+  @Column()
+  tokenHash!: string;
 
-    @Column()
-    expiresAt!:Date;
+  @Column()
+  expiresAt!: Date;
 
-    @Column({default:false})
-    revoked!:boolean
+  @Column({ default: false })
+  revoked!: boolean;
 
-    @ManyToOne(()=>User,{onDelete:"CASCADE"})
-    user!:User;
+  @ManyToOne(() => User, { onDelete: 'CASCADE' })
+  user!: User;
 
-    @CreateDateColumn()
-    createdAt!:Date
-
-
- }
- 
+  @CreateDateColumn()
+  createdAt!: Date;
+}

backend/src/modules/auth/auth.controller.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from 'express';
 import { logger } from '../../utils/logger';
-import {  registerSchema,phoneSchema } from './auth.schema';
+import { registerSchema, phoneSchema } from './auth.schema';
 import { sendOtpSms } from '../../Services/sms.service';
 import { generateotp } from '../../utils/otp';
 import { appDataSouce } from '../../data-source';
@@ -27,7 +27,7 @@ export const sendOtp = async (
     logger.debug({ otpcode }, 'otp is');
     const phoneNumber = result.data?.phoneNumber;
     await sendOtpSms(phoneNumber, otpcode.toString());
-    await otpRep.delete({ phoneNumber })
+    await otpRep.delete({ phoneNumber });
     await otpRep.save({
       phoneNumber,
       otp: otpcode.toString(),
@@ -46,16 +46,17 @@ export const verifyotp = async (
   next: NextFunction,
 ) => {
   console.log(req.body);
-  
-  
+
   try {
     const { phoneNumber, otp } = req.body;
     if (!otp || !phoneNumber) {
-      return res.status(400).json({ message: ' otp and phoneNumber are required' });
+      return res
+        .status(400)
+        .json({ message: ' otp and phoneNumber are required' });
     }
 
     const otpRepo = appDataSouce.getRepository(Otp);
-    const userRepo = appDataSouce.getRepository(User)
+    const userRepo = appDataSouce.getRepository(User);
     const otpRecord = await otpRepo.findOne({
       where: {
         phoneNumber,
@@ -78,28 +79,28 @@ export const verifyotp = async (
       return res.status(400).json({ message: 'Invalid OTP' });
     }
     otpRecord.verified = true;
-    const  existingUser = await userRepo.findOne({
-      where:{phoneNumber}
-    })
+    const existingUser = await userRepo.findOne({
+      where: { phoneNumber },
+    });
     await otpRepo.save(otpRecord);
-    console.log("ACCESS_TOKEN_SECRET:", process.env.ACCESS_TOKEN_SECRET);
+    console.log('ACCESS_TOKEN_SECRET:', process.env.ACCESS_TOKEN_SECRET);
 
     if (existingUser) {
-  const accessToken = signAccessToken({
-    userId: existingUser.id,
-  });
+      const accessToken = signAccessToken({
+        userId: existingUser.id,
+      });
 
-  const refreshToken = await createRefreshTokenSession(existingUser);
+      const refreshToken = await createRefreshTokenSession(existingUser);
 
-  return res.status(200).json({
-    success: true,
-    userExists: true,
-    accessToken,
-    refreshToken,
-  });
-}
+      return res.status(200).json({
+        success: true,
+        userExists: true,
+        accessToken,
+        refreshToken,
+      });
+    }
 
-     return res.status(200).json({
+    return res.status(200).json({
       success: true,
       userExists: false,
       message: 'OTP verified, new user',
@@ -124,7 +125,7 @@ export const register = async (
         errors: result.error.format(),
       });
     }
-    const { otpId, name, age, gender, interests,email } = result.data;
+    const { otpId, name, age, gender, interests, email } = result.data;
     if (!otpId) {
       return res.status(400).json({ message: 'otpid requuired' });
     }
@@ -154,24 +155,30 @@ export const register = async (
     }
     // const hashedPassword = await bcrypt.hash(password,10)
 
-    const user = userRepo.create({ phoneNumber, name, age, gender, interests,email });
-
-  await userRepo.save(user);
-await otpRepo.delete({ id: otpId });
+    const user = userRepo.create({
+      phoneNumber,
+      name,
+      age,
+      gender,
+      interests,
+      email,
+    });
 
-const accessToken = signAccessToken({
-  userId: user.id,
-});
+    await userRepo.save(user);
+    await otpRepo.delete({ id: otpId });
 
-const refreshToken = await createRefreshTokenSession(user);
+    const accessToken = signAccessToken({
+      userId: user.id,
+    });
 
-return res.status(201).json({
-  success: true,
-  message: 'User registered successfully',
-  accessToken,
-  refreshToken,
-});
+    const refreshToken = await createRefreshTokenSession(user);
 
+    return res.status(201).json({
+      success: true,
+      message: 'User registered successfully',
+      accessToken,
+      refreshToken,
+    });
   } catch (err) {
     logger.error({ err }, 'error in register');
     next(err);

backend/src/modules/auth/auth.schema.ts

@@ -3,7 +3,6 @@ export const phoneSchema = z.object({
   phoneNumber: z.string().min(10, 'Invalid phone number'),
 });
 
-
 export const registerSchema = z.object({
   otpId: z.string().uuid(),
   name: z.string().min(1, 'name is required'),