Revert "Centralise env variables handling"

Author: evanyan13

backend/auth-service/src/app.controller.spec.ts

@@ -13,4 +13,5 @@ describe('AppController', () => {
 
     appController = app.get<AppController>(AppController);
   });
+
 });

backend/auth-service/src/app.module.ts

@@ -3,9 +3,8 @@ import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { PassportModule } from '@nestjs/passport';
 import { JwtModule } from '@nestjs/jwt';
-import { ClientsModule } from '@nestjs/microservices';
+import { ClientsModule, Transport } from '@nestjs/microservices';
 import { HttpModule } from '@nestjs/axios';
-import { config } from './configs';
 import {
   AccessTokenStrategy,
   RefreshTokenStrategy,
@@ -15,18 +14,16 @@ import {
 
 @Module({
   imports: [
-    PassportModule.register({
-      defaultStrategy: config.strategies.accessTokenStrategy
-    }),
+    PassportModule.register({ defaultStrategy: 'jwt' }),
     HttpModule,
     JwtModule.register({}),
     ClientsModule.register([
       {
         name: 'USER_SERVICE',
-        transport: config.userService.transport,
+        transport: Transport.TCP,
         options: {
-          host: config.userService.host,
-          port: config.userService.port,
+          host: 'user-service',
+          port: 3001,
         },
       },
     ]),

backend/auth-service/src/app.service.ts

@@ -17,7 +17,6 @@ import axios, { AxiosResponse } from 'axios';
 import { Token, TokenPayload } from './interfaces';
 import { AccountProvider } from './constants/account-provider.enum';
 import * as nodemailer from 'nodemailer';
-import { config } from 'src/configs';
 
 const SALT_ROUNDS = 10;
 
@@ -31,9 +30,9 @@ export class AppService {
     @Inject('USER_SERVICE') private readonly userClient: ClientProxy,
   ) {
     this.oauthClient = new OAuth2Client({
-      clientId: config.auth.google.clientId,
-      clientSecret: config.auth.google.clientSecret,
-      redirectUri: config.auth.google.callbackUrl,
+      clientId: process.env.GOOGLE_CLIENT_ID,
+      clientSecret: process.env.GOOGLE_CLIENT_SECRET,
+      redirectUri: process.env.GOOGLE_CALLBACK_URL,
     });
   }
 
@@ -174,7 +173,7 @@ export class AppService {
     const resetToken = this.jwtService.sign(
       { userId: user._id.toString(), email: dto.email, type: 'reset-password' },
       {
-        secret: config.auth.local.jwtSecret,
+        secret: process.env.JWT_SECRET,
         expiresIn: '1hr',
       },
     );
@@ -207,7 +206,7 @@ export class AppService {
   public async validatePasswordResetToken(token: string): Promise<any> {
     try {
       const decoded = this.jwtService.verify(token, {
-        secret: config.auth.local.jwtSecret,
+        secret: process.env.JWT_SECRET,
       });
       const { userId, email, type } = decoded;
       if (type !== 'reset-password') {
@@ -226,16 +225,16 @@ export class AppService {
   }
 
   private async sendResetEmail(email: string, token: string) {
-    const resetUrl = `${config.frontendUrl}/reset-password?token=${token}`; // To change next time
+    const resetUrl = `${process.env.FRONTEND_URL}/reset-password?token=${token}`; // To change next time
 
     const transporter = nodemailer.createTransport({
       service: 'gmail',
       host: 'smtp.gmail.com',
       port: 465,
       secure: true,
       auth: {
-        user: config.mailer.user,
-        pass: config.mailer.password,
+        user: process.env.NODEMAILER_GMAIL_USER,
+        pass: process.env.NODEMAILER_GMAIL_PASSWORD,
       },
     });
 
@@ -256,7 +255,7 @@ export class AppService {
   public async validateAccessToken(accessToken: string): Promise<any> {
     try {
       const decoded = this.jwtService.verify(accessToken, {
-        secret: config.auth.local.jwtSecret,
+        secret: process.env.JWT_SECRET,
       });
       return decoded;
     } catch (error) {
@@ -267,7 +266,7 @@ export class AppService {
   public async validateRefreshToken(refreshToken: string): Promise<any> {
     try {
       const decoded = this.jwtService.verify(refreshToken, {
-        secret: config.auth.local.jwtRefreshSecret,
+        secret: process.env.JWT_REFRESH_SECRET,
       });
       return decoded;
     } catch (error) {
@@ -301,7 +300,7 @@ export class AppService {
           ...rest,
         },
         {
-          secret: config.auth.local.jwtSecret,
+          secret: process.env.JWT_SECRET,
           expiresIn: '1h', // 1 hour
         },
       ),
@@ -311,7 +310,7 @@ export class AppService {
           ...rest,
         },
         {
-          secret: config.auth.local.jwtRefreshSecret,
+          secret: process.env.JWT_REFRESH_SECRET,
           expiresIn: '7d', // 1 week
         },
       ),
@@ -324,8 +323,8 @@ export class AppService {
   }
 
   getGoogleOAuthUrl(): string {
-    const clientId = config.auth.google.clientId;
-    const redirectUri = config.auth.google.callbackUrl;
+    const clientId = process.env.GOOGLE_CLIENT_ID;
+    const redirectUri = process.env.GOOGLE_CALLBACK_URL;
     const scope = encodeURIComponent('email profile');
     const responseType = 'code';
     const state = 'secureRandomState';
@@ -405,7 +404,7 @@ export class AppService {
 
       const ticket = await this.oauthClient.verifyIdToken({
         idToken: tokens.id_token,
-        audience: config.auth.google.clientId,
+        audience: process.env.GOOGLE_CLIENT_ID,
       });
 
       const payload = ticket.getPayload();
@@ -429,8 +428,8 @@ export class AppService {
   }
 
   getGithubOAuthUrl(): string {
-    const clientId = config.auth.github.clientId;
-    const redirectUri = config.auth.github.callbackUrl;
+    const clientId = process.env.GITHUB_CLIENT_ID;
+    const redirectUri = process.env.GITHUB_CALLBACK_URL;
     const scope = 'user:email';
 
     const githubLoginUrl = `https://github.com/login/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(
@@ -487,10 +486,10 @@ export class AppService {
   private async exchangeGithubCodeForTokens(code: string) {
     try {
       const params = {
-        client_id: config.auth.github.clientId,
-        client_secret: config.auth.github.clientSecret,
+        client_id: process.env.GITHUB_CLIENT_ID,
+        client_secret: process.env.GITHUB_CLIENT_SECRET,
         code: code,
-        redirect_uri: config.auth.github.callbackUrl,
+        redirect_uri: process.env.GITHUB_CALLBACK_URL,
       };
       const headers = {
         Accept: 'application/json',

backend/auth-service/src/configs/env.config.ts

@@ -2,21 +2,20 @@ import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 import { MicroserviceOptions, Transport } from '@nestjs/microservices';
 import { ValidationPipe } from '@nestjs/common';
-import { config } from './configs';
 
 async function bootstrap() {
   const app = await NestFactory.createMicroservice<MicroserviceOptions>(
     AppModule,
     {
-      transport: config.authService.transport,
+      transport: Transport.TCP,
       options: {
-        host: config.authService.host,
-        port: config.authService.port,
+        host: '0.0.0.0',
+        port: 3003,
       },
     },
   );
   app.useGlobalPipes(new ValidationPipe());
   await app.listen();
-  console.log('Auth Service is listening on port', config.authService.port);
+  console.log('Auth Service is listening on port 3003');
 }
 bootstrap();

backend/auth-service/src/configs/index.ts

@@ -1,15 +1,14 @@
 import { Injectable } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { Strategy, ExtractJwt } from 'passport-jwt';
-import { config } from 'src/configs';
 
 @Injectable()
-export class AccessTokenStrategy extends PassportStrategy(Strategy, config.strategies.accessTokenStrategy) {
+export class AccessTokenStrategy extends PassportStrategy(Strategy, 'jwt') {
   constructor() {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
       ignoreExpiration: false,
-      secretOrKey: config.auth.local.jwtSecret,
+      secretOrKey: process.env.JWT_SECRET,
     });
   }
 

backend/auth-service/src/main.ts

@@ -1,18 +1,14 @@
 import { PassportStrategy } from '@nestjs/passport';
 import { Strategy, VerifyCallback } from 'passport-google-oauth20';
 import { Injectable } from '@nestjs/common';
-import { config } from 'src/configs';
 
 @Injectable()
-export class GithubStrategy extends PassportStrategy(
-  Strategy,
-  config.strategies.githubStrategy
-) {
+export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
   constructor() {
     super({
-      clientID: config.auth.github.clientId,
-      clientSecret: config.auth.github.clientSecret,
-      callbackURL: config.auth.github.callbackUrl,
+      clientID: process.env.GITHUB_CLIENT_ID,
+      clientSecret: process.env.GITHUB_CLIENT_SECRET,
+      callbackURL: process.env.GITHUB_CALLBACK_URL,
       scope: ['user:email'],
     });
   }

backend/auth-service/src/strategies/access-token.strategy.ts

@@ -1,18 +1,14 @@
 import { PassportStrategy } from '@nestjs/passport';
 import { Strategy, VerifyCallback } from 'passport-google-oauth20';
 import { Injectable } from '@nestjs/common';
-import { config } from 'src/configs';
 
 @Injectable()
-export class GoogleStrategy extends PassportStrategy(
-  Strategy,
-  config.strategies.googleStrategy
-) {
+export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
   constructor() {
     super({
-      clientID: config.auth.google.clientId,
-      clientSecret: config.auth.google.clientSecret,
-      callbackURL: config.auth.google.callbackUrl,
+      clientID: process.env.GOOGLE_CLIENT_ID,
+      clientSecret: process.env.GOOGLE_CLIENT_SECRET,
+      callbackURL: process.env.GOOGLE_CALLBACK_URL,
       scope: ['email', 'profile'],
     });
   }

backend/auth-service/src/strategies/github.strategy.ts

@@ -2,18 +2,17 @@ import { PassportStrategy } from '@nestjs/passport';
 import { Strategy, ExtractJwt } from 'passport-jwt';
 import { Request } from 'express';
 import { Injectable } from '@nestjs/common';
-import { config } from 'src/configs';
 
 @Injectable()
 export class RefreshTokenStrategy extends PassportStrategy(
   Strategy,
-  config.strategies.refreshTokenStrategy,
+  'jwt-refresh',
 ) {
   constructor() {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
       ignoreExpiration: false,
-      secretOrKey: config.auth.local.jwtRefreshSecret,
+      secretOrKey: process.env.JWT_REFRESH_SECRET,
       passReqToCallback: true, // Pass the token back to the callback
     });
   }