updated

Author: wpcodevo

prisma/migrations/20220516201725_user_model/migration.sql

@@ -0,0 +1,30 @@
+-- CreateEnum
+CREATE TYPE "RoleEnumType" AS ENUM ('user', 'admin');
+
+-- CreateTable
+CREATE TABLE "users" (
+    "id" TEXT NOT NULL,
+    "name" VARCHAR(255) NOT NULL,
+    "email" TEXT NOT NULL,
+    "photo" TEXT DEFAULT E'default.png',
+    "verified" BOOLEAN DEFAULT false,
+    "password" TEXT NOT NULL,
+    "role" "RoleEnumType" DEFAULT E'user',
+    "verificationCode" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "users_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "users_email_key" ON "users"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "users_verificationCode_key" ON "users"("verificationCode");
+
+-- CreateIndex
+CREATE INDEX "users_email_verificationCode_idx" ON "users"("email", "verificationCode");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "users_email_verificationCode_key" ON "users"("email", "verificationCode");

src/controllers/auth.controller.ts

@@ -1,6 +1,5 @@
 import crypto from 'crypto';
 import { CookieOptions, NextFunction, Request, Response } from 'express';
-import crypto from 'crypto';
 import bcrypt from 'bcryptjs';
 import {
   LoginUserInput,
@@ -9,24 +8,16 @@ import {
 } from '../schemas/user.schema';
 import {
   createUser,
-<<<<<<< HEAD
-  findUser,
-  findUserByEmail,
-=======
   findUniqueUser,
   findUser,
->>>>>>> jwt_auth_verify_email
   signTokens,
   updateUser,
 } from '../services/user.service';
 import { Prisma } from '@prisma/client';
 import config from 'config';
 import AppError from '../utils/appError';
-<<<<<<< HEAD
-=======
 import redisClient from '../utils/connectRedis';
 import { signJwt, verifyJwt } from '../utils/jwt';
->>>>>>> jwt_auth_verify_email
 import Email from '../utils/email';
 
 const cookiesOptions: CookieOptions = {
@@ -73,33 +64,6 @@ export const registerUserHandler = async (
       verificationCode,
     });
 
-<<<<<<< HEAD
-    const hashedCode = crypto.randomBytes(32).toString('hex');
-    const verificationCode = crypto
-      .createHash('sha256')
-      .update(hashedCode)
-      .digest('hex');
-
-    // Send Verification Email
-    const redirectUrl = `${config.get<string>(
-      'origin'
-    )}/verifyemail/${hashedCode}`;
-
-    try {
-      await new Email(user, redirectUrl).sendVerificationCode();
-
-      await updateUser({ email: user.email }, { verificationCode });
-
-      res.status(201).json({
-        status: 'success',
-        message: 'Verification token has been sent to your email',
-      });
-    } catch (error) {
-      await updateUser({ email: user.email }, { verificationCode: null });
-      return res.status(500).json({
-        status: 'error',
-        message: 'There was a problem sending email, please try again',
-=======
     const redirectUrl = `${config.get<string>(
       'origin'
     )}/verifyemail/${verifyCode}`;
@@ -117,7 +81,6 @@ export const registerUserHandler = async (
       return res.status(500).json({
         status: 'error',
         message: 'There was an error sending email, please try again',
->>>>>>> jwt_auth_verify_email
       });
     }
   } catch (err: any) {
@@ -182,8 +145,6 @@ export const loginUserHandler = async (
   }
 };
 
-<<<<<<< HEAD
-=======
 export const refreshAccessTokenHandler = async (
   req: Request,
   res: Response,
@@ -267,7 +228,6 @@ export const logoutUserHandler = async (
   }
 };
 
->>>>>>> jwt_auth_verify_email
 export const verifyEmailHandler = async (
   req: Request<VerifyEmailInput>,
   res: Response,
@@ -279,12 +239,6 @@ export const verifyEmailHandler = async (
       .update(req.params.verificationCode)
       .digest('hex');
 
-<<<<<<< HEAD
-    const user = await updateUser({ verificationCode }, { verified: true });
-
-    if (!user) {
-      return next(new AppError(400, 'Could not verify email'));
-=======
     const user = await updateUser(
       { verificationCode },
       { verified: true, verificationCode: null },
@@ -293,23 +247,19 @@ export const verifyEmailHandler = async (
 
     if (!user) {
       return next(new AppError(401, 'Could not verify email'));
->>>>>>> jwt_auth_verify_email
     }
 
     res.status(200).json({
       status: 'success',
       message: 'Email verified successfully',
     });
   } catch (err: any) {
-<<<<<<< HEAD
-=======
     if (err.code === 'P2025') {
       return res.status(403).json({
         status: 'fail',
         message: `Verification code is invalid or user doesn't exist`,
       });
     }
->>>>>>> jwt_auth_verify_email
     next(err);
   }
 };

src/routes/auth.routes.ts

@@ -21,20 +21,14 @@ router.post('/register', validate(registerUserSchema), registerUserHandler);
 
 router.post('/login', validate(loginUserSchema), loginUserHandler);
 
-<<<<<<< HEAD
-=======
 router.get('/refresh', refreshAccessTokenHandler);
 
->>>>>>> jwt_auth_verify_email
 router.get(
   '/verifyemail/:verificationCode',
   validate(verifyEmailSchema),
   verifyEmailHandler
 );
 
-<<<<<<< HEAD
-=======
 router.get('/logout', deserializeUser, requireUser, logoutUserHandler);
 
->>>>>>> jwt_auth_verify_email
 export default router;

src/services/user.service.ts

@@ -1,5 +1,4 @@
 import { PrismaClient, Prisma, User } from '@prisma/client';
-import { omit } from 'lodash';
 import config from 'config';
 import redisClient from '../utils/connectRedis';
 import { signJwt } from '../utils/jwt';
@@ -9,31 +8,9 @@ export const excludedFields = ['password', 'verified', 'verificationCode'];
 const prisma = new PrismaClient();
 
 export const createUser = async (input: Prisma.UserCreateInput) => {
-<<<<<<< HEAD
-  return await prisma.user.create({
-    data: input,
-  });
-};
-
-export const updateUser = async (
-  where: Prisma.UserWhereUniqueInput,
-  data: Prisma.UserUpdateInput,
-  select?: Prisma.UserSelect
-) => {
-  return await prisma.user.update({
-    where,
-    select,
-    data,
-  });
-};
-
-export const findUser = async (where?: Prisma.UserWhereInput) => {
-  return await prisma.user.findFirst({ where });
-=======
   return (await prisma.user.create({
     data: input,
   })) as User;
->>>>>>> jwt_auth_verify_email
 };
 
 export const findUser = async (

src/utils/email.ts

@@ -12,31 +12,17 @@ const smtp = config.get<{
 }>('smtp');
 
 export default class Email {
-<<<<<<< HEAD
-  firstName: string;
-  to: string;
-  from: string;
-  constructor(public user: Prisma.UserCreateInput, public url: string) {
-    this.firstName = user.name.split(' ')[0];
-    this.to = user.email;
-    this.from = `Codevo ${config.get<string>('emailFrom')}`;
-=======
   #firstName: string;
   #to: string;
   #from: string;
   constructor(private user: Prisma.UserCreateInput, private url: string) {
     this.#firstName = user.name.split(' ')[0];
     this.#to = user.email;
     this.#from = `Codevo <admin@admin.com>`;
->>>>>>> jwt_auth_verify_email
   }
 
   private newTransport() {
     // if (process.env.NODE_ENV === 'production') {
-<<<<<<< HEAD
-    //   console.log('Hello')
-=======
->>>>>>> jwt_auth_verify_email
     // }
 
     return nodemailer.createTransport({
@@ -51,23 +37,14 @@ export default class Email {
   private async send(template: string, subject: string) {
     // Generate HTML template based on the template string
     const html = pug.renderFile(`${__dirname}/../views/${template}.pug`, {
-<<<<<<< HEAD
-      firstName: this.firstName,
-=======
       firstName: this.#firstName,
->>>>>>> jwt_auth_verify_email
       subject,
       url: this.url,
     });
     // Create mailOptions
     const mailOptions = {
-<<<<<<< HEAD
-      from: this.from,
-      to: this.to,
-=======
       from: this.#from,
       to: this.#to,
->>>>>>> jwt_auth_verify_email
       subject,
       text: convert(html),
       html,

yarn.lock

@@ -16,17 +16,6 @@
   version "7.17.10"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4"
   integrity sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==
-<<<<<<< HEAD
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@prisma/client@^3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-3.13.0.tgz#84511ebdf6ba75f77ca08495b9f73f22c4255654"
-  integrity sha512-lnEA2tTyVbO5mS1ehmHJQKBDiKB8shaR6s3azwj3Azfi5XHIfnqmkolLCvUeFYnkDCNVzGXJpUgKwQt/UOOYVQ==
-=======
->>>>>>> jwt_auth_verify_email
   dependencies:
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
@@ -115,16 +104,13 @@
   dependencies:
     "@types/node" "*"
 
-<<<<<<< HEAD
-=======
 "@types/cookie-parser@^1.4.3":
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/@types/cookie-parser/-/cookie-parser-1.4.3.tgz#3a01df117c5705cf89a84c876b50c5a1fd427a21"
   integrity sha512-CqSKwFwefj4PzZ5n/iwad/bow2hTCh0FlNAeWLtQM3JA/NX/iYagIpWG2cf1bQKQ2c9gU2log5VUCrn7LDOs0w==
   dependencies:
     "@types/express" "*"
 
->>>>>>> jwt_auth_verify_email
 "@types/cors@^2.8.12":
   version "2.8.12"
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
@@ -461,11 +447,7 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-<<<<<<< HEAD
-depd@2.0.0:
-=======
 depd@2.0.0, depd@~2.0.0:
->>>>>>> jwt_auth_verify_email
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -970,8 +952,6 @@ moo@^0.5.0, moo@^0.5.1:
   resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
   integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==
 
-<<<<<<< HEAD
-=======
 morgan@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
@@ -983,7 +963,6 @@ morgan@^1.10.0:
     on-finished "~2.3.0"
     on-headers "~1.0.2"
 
->>>>>>> jwt_auth_verify_email
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -1102,13 +1081,6 @@ promise@^7.0.1:
   dependencies:
     asap "~2.0.3"
 
-promise@^7.0.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"