chore : added otp mail functionality and files renamed

p-society · Dec 23, 2024 · 4284ed3 · 4284ed3
1 parent 3cff959
commit 4284ed3
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 36 deletions.
diff --git a/src/app.module.ts b/src/app.module.ts
@@ -14,7 +14,8 @@ import { ReactionsModule } from './services/apis/reactions/reactions.module';
 import { ProfilesModule } from './services/apis/profiles/profiles.module';
 import { QueueModule } from './services/bullmq/queue.module';
 import { BullModule } from '@nestjs/bullmq';
-import { GenerateOtpModule } from './services/apis/generateOtp/generateOtp.module';
+import { GenerateOtpModule } from './services/apis/otp/generateOtp.module';
+import { MailerModule } from './services/apis/mailer/mailer.module';
 
 @Module({
   imports: [
@@ -45,6 +46,7 @@ import { GenerateOtpModule } from './services/apis/generateOtp/generateOtp.modul
     ProfilesModule,
     ReactionsModule,
     GenerateOtpModule,
+    MailerModule,
   ],
   controllers: [AppController],
   providers: [

diff --git a/src/services/apis/mailer/mailer.controller.ts b/src/services/apis/mailer/mailer.controller.ts
@@ -1,22 +1,22 @@
-import { Controller, Post } from '@nestjs/common';
-import { MailerService } from './mailer.service';
+// import { Controller, Post } from '@nestjs/common';
+// import { MailerService } from './mailer.service';
 
-@Controller('mail')
-export class MailerController {
-  constructor(private mailerService: MailerService) {}
+// @Controller('mail')
+// export class MailerController {
+//   constructor(private mailerService: MailerService) {}
 
-  // @Public()
-  // @Post()
-  // async sendMail() {
-  //   await this.mailerService.sendMPassGenerationEmail(
-  //     '[email protected]',
-  //     'Saswat',
-  //     'XYZ'
-  //   )
-  //   await this.mailerService.sendSupportTicketResolvedEmail(
-  //     '[email protected]',
-  //     'Saswat',
-  //     '123456'
-  //   )
-  // }
-}
+//   // @Public()
+//   // @Post()
+//   // async sendMail() {
+//   //   await this.mailerService.sendMPassGenerationEmail(
+//   //     '[email protected]',
+//   //     'Saswat',
+//   //     'XYZ'
+//   //   )
+//   //   await this.mailerService.sendSupportTicketResolvedEmail(
+//   //     '[email protected]',
+//   //     'Saswat',
+//   //     '123456'
+//   //   )
+//   // }
+// }
diff --git a/src/services/apis/mailer/mailer.module.ts b/src/services/apis/mailer/mailer.module.ts
@@ -4,7 +4,7 @@ import { MailerService } from './mailer.service';
 import { MailerModule as NestMailerModule } from '@nestjs-modules/mailer';
 import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
 import * as path from 'path';
-import { MailerController } from './mailer.controller';
+// import { MailerController } from './mailer.controller';
 
 @Global()
 @Module({
@@ -41,7 +41,7 @@ import { MailerController } from './mailer.controller';
       }),
     }),
   ],
-  controllers: [MailerController],
+  controllers: [],
   providers: [MailerService],
   exports: [MailerService],
 })

diff --git a/src/services/apis/mailer/mailer.service.ts b/src/services/apis/mailer/mailer.service.ts
@@ -9,17 +9,20 @@ export class MailerService {
 
   async sendMail(
     to: string,
-    subject: string,
-    content: string,
+    // subject: string,
+    // content: string,
+    otp: string,
     template?: string,
-    context?: Record<string, any>,
+    //context?: Record<string, any>,
   ) {
     await this.mailerService.sendMail({
       to,
-      subject,
-      text: content,
+      subject: 'OTP for your account',
       template: template ? `./${template}` : undefined,
-      context: context || {},
+      context: {
+        otp,
+        supportEmail: '[email protected]',
+      },
     });
   }
 }
diff --git a/src/services/apis/mailer/templates/partials/otp.hbs b/src/services/apis/mailer/templates/partials/otp.hbs
@@ -1,6 +1,68 @@
-<p> Use
-  the OTP below to complete the process:</p>
-<div class='otp'> {{otp}} </div>
-<p>This OTP is valid for 15 minutes. If you didn’t request this, please ignore
-  this email or contact support at
-  {{supportEmail}}</p>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <style>
+    body {
+      font-family: Arial, sans-serif;
+      background-color: #f4f4f4;
+      margin: 0;
+      padding: 0;
+    }
+    .container {
+      max-width: 600px;
+      margin: 20px auto;
+      background-color: #ffffff;
+      padding: 20px;
+      border-radius: 8px;
+      box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    }
+    .header {
+      text-align: center;
+      padding-bottom: 20px;
+      border-bottom: 1px solid #dddddd;
+    }
+    .header h1 {
+      margin: 0;
+      color: #333333;
+    }
+    .content {
+      padding: 20px 0;
+    }
+    .otp {
+      font-size: 24px;
+      font-weight: bold;
+      color: #333333;
+      text-align: center;
+      margin: 20px 0;
+    }
+    .footer {
+      text-align: center;
+      padding-top: 20px;
+      border-top: 1px solid #dddddd;
+      color: #777777;
+    }
+    .footer a {
+      color: #007BFF;
+      text-decoration: none;
+    }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <div class="header">
+      <h1>Programming Society</h1>
+    </div>
+    <div class="content">
+      <p>Dear Member,</p>
+      <p>Use the OTP below to complete the process:</p>
+      <div class="otp">{{otp}}</div>
+      <p>This OTP is valid for 10 minutes. If you didn’t request this, please ignore this email or contact support at <a href="mailto:{{supportEmail}}">{{supportEmail}}</a>.</p>
+    </div>
+    <div class="footer">
+      <p>Thank you,<br>Programming Society Team</p>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/...es/apis/generateOtp/dto/genrateOtp.dto.ts → src/services/apis/otp/dto/genrateOtp.dto.ts b/...es/apis/generateOtp/dto/genrateOtp.dto.ts → src/services/apis/otp/dto/genrateOtp.dto.ts
diff --git a/...pis/generateOtp/generateOtp.controller.ts → ...rvices/apis/otp/generateOtp.controller.ts b/...pis/generateOtp/generateOtp.controller.ts → ...rvices/apis/otp/generateOtp.controller.ts
diff --git a/...es/apis/generateOtp/generateOtp.module.ts → src/services/apis/otp/generateOtp.module.ts b/...es/apis/generateOtp/generateOtp.module.ts → src/services/apis/otp/generateOtp.module.ts
diff --git a/...ces/apis/generateOtp/genrateOtp.helper.ts → src/services/apis/otp/genrateOtp.helper.ts b/...ces/apis/generateOtp/genrateOtp.helper.ts → src/services/apis/otp/genrateOtp.helper.ts
diff --git a/...es/apis/generateOtp/genrateOtp.service.ts → src/services/apis/otp/genrateOtp.service.ts b/...es/apis/generateOtp/genrateOtp.service.ts → src/services/apis/otp/genrateOtp.service.ts
diff --git a/src/services/bullmq/processors/otp.processor.ts b/src/services/bullmq/processors/otp.processor.ts
@@ -7,11 +7,15 @@ import { hashString } from 'src/common/hashing';
 import { OtpJob } from '../jobs/otp.jobs';
 import generateRandomNumber from 'src/common/generate-random-number';
 import { Injectable } from '@nestjs/common';
+import { MailerService } from 'src/services/apis/mailer/mailer.service';
 
 @Injectable()
 @Processor(OTP_QUEUE)
 export class OtpQueueProcessor extends WorkerHost {
-  constructor(private readonly redisService: RedisService) {
+  constructor(
+    private readonly redisService: RedisService,
+    private readonly mailerService: MailerService,
+  ) {
     super();
   }
   otp: string = generateRandomNumber();
@@ -22,6 +26,12 @@ export class OtpQueueProcessor extends WorkerHost {
       } = job as { data: OtpJob };
       await this.storeOtpWithTTL(email, parseInt(this.otp));
       console.log(`OTP for ${email} is ${this.otp} and stored in Redis`);
+      await this.mailerService.sendMail(
+        email,
+        this.otp,
+        'templates/partials/otp.hbs',
+      );
+      console.log(`OTP email sent to ${email}`);
     } catch (error) {
       console.error('Error in processing OTP job', error);
     }

diff --git a/src/services/bullmq/queue.module.ts b/src/services/bullmq/queue.module.ts
@@ -6,6 +6,7 @@ import { ReactionStreamProcessor } from './processors/reaction-stream.processor'
 import { OtpProducer } from './producers/otp.producer';
 import { PresenceModule } from '../gateways/presence/presence.module';
 import { OtpQueueProcessor } from './processors/otp.processor';
+import { MailerModule } from '../apis/mailer/mailer.module';
 
 @Global()
 @Module({
@@ -15,6 +16,7 @@ import { OtpQueueProcessor } from './processors/otp.processor';
       { name: OTP_QUEUE },
     ),
     PresenceModule,
+    MailerModule,
   ],
   providers: [
     ReactionStreamProcessor,