@solidstarters/solid-core 1.2.10 → 1.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/controllers/google-authentication.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Inject, Query, Req, Res, UseGuards } from '@nestjs/common';
+import { Controller, Get, Inject, InternalServerErrorException, Query, Req, Res, UseGuards } from '@nestjs/common';
 import { AuthenticationService } from '../services/authentication.service';
 import { Auth } from '../decorators/auth.decorator';
 import { AuthType } from '../enums/auth-type.enum';
@@ -9,6 +9,7 @@ import { ConfigType } from '@nestjs/config';
 import { UserService } from '../services/user.service';
 import { Public } from '../decorators/public.decorator';
 import { iamConfig } from '../config/iam.config';
+import { isGoogleOAuthConfigured } from 'src/helpers/google-oauth.helper';
 
 
 @Auth(AuthType.None)
@@ -24,12 +25,21 @@ export class GoogleAuthenticationController {
     @Public()
     @UseGuards(GoogleOauthGuard)
     @Get('connect')
-    async connect() { }
+    async connect() {
+        this.validateConfiguration();
+    }
+
+    private validateConfiguration() {
+        if (!isGoogleOAuthConfigured(this.iamConfiguration)) {
+            throw new InternalServerErrorException('Google OAuth is not configured');
+        }
+    }
 
     @Public()
     @Get('connect/callback')
     @UseGuards(GoogleOauthGuard)
     googleAuthCallback(@Req() req: Request, @Res() res: Response) {
+        this.validateConfiguration();
         const user = req.user;
 
         // console.log(`Found user: ${JSON.stringify(user)}`);
@@ -55,6 +65,7 @@ export class GoogleAuthenticationController {
     @Public()
     @Get('dummy-redirect')
     async dummyGoogleAuthRedirect(@Query('accessCode') accessCode) {
+        this.validateConfiguration();
         const user = await this.userService.findOneByAccessCode(accessCode);
 
         delete user['password'];
@@ -73,6 +84,7 @@ export class GoogleAuthenticationController {
     @Get('authenticate')
     @ApiQuery({ name: 'accessCode', required: true, type: String })
     async googleAuth(@Query('accessCode') accessCode) {
+        this.validateConfiguration();
         return this.authService.signInUsingGoogle(accessCode);
     }
 }

package/src/helpers/google-oauth.helper.ts

@@ -0,0 +1,9 @@
+import { ConfigType } from "@nestjs/config";
+import { iamConfig } from "src/config/iam.config";
+
+export function isGoogleOAuthConfigured(iamConfiguration: ConfigType<typeof iamConfig>): boolean {
+    const googleOauthConfig = iamConfiguration.googleOauth;
+    
+    return !!googleOauthConfig.clientID  
+    && !!googleOauthConfig.clientSecret && !!googleOauthConfig.callbackURL && !!googleOauthConfig.redirectURL;
+  }

package/src/passport-strategies/google-oauth.strategy.ts

@@ -1,13 +1,15 @@
+import { Inject, Injectable, Logger } from '@nestjs/common';
 import { ConfigType } from '@nestjs/config';
-import { PassportStrategy } from '@nestjs/passport';
+import { AuthGuard, PassportStrategy } from '@nestjs/passport';
 import { Strategy, VerifyCallback } from 'passport-google-oauth2';
-import { Inject, Injectable } from '@nestjs/common';
-import { AuthGuard } from '@nestjs/passport';
+import { isGoogleOAuthConfigured } from 'src/helpers/google-oauth.helper';
 import { v4 as uuid } from 'uuid';
-import { AuthenticationService } from '../services/authentication.service';
-import { UserService } from '../services/user.service';
 import { iamConfig } from '../config/iam.config';
+import { UserService } from '../services/user.service';
 
+const DUMMY_CLIENT_ID = 'DUMMY_CLIENT_ID';
+const DUMMY_CLIENT_SECRET = 'DUMMY_CLIENT_SECRET';
+const DUMMY_CALLBACK_URL = 'DUMMY_CALLBACK_URL';
 
 @Injectable()
 export class GoogleOauthGuard extends AuthGuard('google') { }
@@ -15,17 +17,23 @@ export class GoogleOauthGuard extends AuthGuard('google') { }
 
 @Injectable()
 export class GoogleOauthStrategy extends PassportStrategy(Strategy, 'google') {
+  private readonly logger = new Logger(GoogleOauthStrategy.name);
   constructor(
     @Inject(iamConfig.KEY) private iamConfiguration: ConfigType<typeof iamConfig>,
-    private readonly authService: AuthenticationService,
     private readonly userService: UserService
   ) {
+    // TODO: Have added default dummy values for the configuration, since the configuration is not mandatory.
+    // Perhaps a cleaner way needs to be figured out
     super({
-      clientID: iamConfiguration.googleOauth.clientID,
-      clientSecret: iamConfiguration.googleOauth.clientSecret,
-      callbackURL: iamConfiguration.googleOauth.callbackURL,
+      clientID: iamConfiguration.googleOauth.clientID ?? DUMMY_CLIENT_ID,
+      clientSecret: iamConfiguration.googleOauth.clientSecret ?? DUMMY_CLIENT_SECRET,
+      callbackURL: iamConfiguration.googleOauth.callbackURL ?? DUMMY_CALLBACK_URL,
       scope: ['profile', 'email'],
     });
+
+    if (!isGoogleOAuthConfigured(iamConfiguration)) {
+      this.logger.debug('Google OAuth strategy is not configured');
+    }
   }
 
   async validate(
@@ -55,4 +63,5 @@ export class GoogleOauthStrategy extends PassportStrategy(Strategy, 'google') {
 
     done(null, user);
   }
+
 }