update libs

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "grpc-server-and-client-nestjs-micro-pattern",
+  "name": "maestro",
   "version": "0.0.0",
   "description": "",
   "author": "",
@@ -25,58 +25,60 @@
   },
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.112.0",
-    "@grpc/grpc-js": "^1.5.10",
-    "@grpc/proto-loader": "^0.6.9",
-    "@nestjs/common": "^8.4.3",
+    "@grpc/grpc-js": "^1.6.7",
+    "@grpc/proto-loader": "^0.6.13",
+    "@nestjs/common": "^8.4.7",
     "@nestjs/config": "^1.2.1",
-    "@nestjs/core": "^8.4.3",
+    "@nestjs/core": "^8.4.7",
     "@nestjs/mapped-types": "*",
-    "@nestjs/microservices": "^8.4.3",
+    "@nestjs/microservices": "^8.4.7",
     "@nestjs/passport": "^8.2.2",
-    "@nestjs/platform-express": "^8.4.3",
+    "@nestjs/platform-express": "^8.4.7",
     "@nestjs/schedule": "^1.1.0",
     "@nestjs/swagger": "^5.2.1",
     "@victorradael/protospack": "2.5.0",
     "axios": "^0.25.0",
     "cron-parser": "^4.4.0",
-    "dotenv": "^14.2.0",
-    "helmet": "^5.0.2",
+    "dotenv": "^14.3.2",
+    "helmet": "^5.1.0",
     "jsonwebtoken": "^8.5.1",
     "jwk-to-pem": "^2.0.5",
     "passport": "^0.6.0",
-    "passport-hubspot": "^0.1.0",
+    "passport-google-oauth20": "^2.0.0",
     "passport-hubspot-oauth2": "^1.0.3",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.5.5",
-    "swagger-ui-express": "^4.3.0"
+    "swagger-ui-express": "^4.4.0"
   },
   "overrides": {
     "multer": "1.4.5-lts.1"
   },
   "devDependencies": {
-    "@nestjs/cli": "^8.2.4",
-    "@nestjs/schematics": "^8.0.8",
-    "@nestjs/testing": "^8.4.3",
+    "@nestjs/cli": "^8.2.8",
+    "@nestjs/schematics": "^8.0.11",
+    "@nestjs/testing": "^8.4.7",
     "@types/express": "^4.17.13",
     "@types/jest": "27.0.2",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/jwk-to-pem": "^2.0.1",
-    "@types/node": "^16.11.26",
+    "@types/node": "^16.11.41",
+    "@types/passport-google-oauth20": "^2.0.11",
+    "@types/passport-oauth2": "^1.4.11",
     "@types/supertest": "^2.0.12",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0",
-    "eslint": "^8.12.0",
+    "@typescript-eslint/eslint-plugin": "^5.29.0",
+    "@typescript-eslint/parser": "^5.29.0",
+    "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^27.5.1",
-    "nock": "^13.2.4",
-    "prettier": "^2.6.1",
+    "nock": "^13.2.7",
+    "prettier": "^2.7.1",
     "source-map-support": "^0.5.20",
-    "supertest": "^6.1.3",
-    "ts-jest": "^27.1.4",
-    "ts-loader": "^9.2.7",
-    "ts-node": "^10.7.0",
+    "supertest": "^6.2.3",
+    "ts-jest": "^27.1.5",
+    "ts-loader": "^9.3.1",
+    "ts-node": "^10.8.1",
     "tsconfig-paths": "^3.14.1",
     "typescript": "^4.6.3"
   },

src/modules/oauth/oauth.controller.ts

@@ -2,7 +2,6 @@ import {
   BadRequestException,
   Controller,
   Get,
-  Query,
   Redirect,
   Req,
   UseGuards,
@@ -11,6 +10,7 @@ import { ApiTags } from '@nestjs/swagger';
 import { AuthGuard } from '@nestjs/passport';
 import { InputsClientService } from 'src/clients/inputs/client.service';
 import { InputsService } from '../inputs/inputs.service';
+import { Request } from 'express';
 
 @ApiTags('oauth')
 @Controller('oauth')
@@ -40,15 +40,52 @@ export class OauthController {
   @Get('hubspot/callback')
   @UseGuards(AuthGuard('hubspot'))
   @Redirect()
-  async oauthHubspotCallback(@Req() req, @Query('state') customer_id) {
+  async oauthHubspotCallback(@Req() req) {
+    return await this.callback(req, 'hubspot');
+  }
+
+  @Get('google')
+  @UseGuards(AuthGuard('google'))
+  async oauthGoogle() {
+    return true;
+  }
+
+  @Get('google/callback')
+  @UseGuards(AuthGuard('google'))
+  @Redirect()
+  async oauthGoogleCallback(@Req() req) {
+    return await this.callback(req, 'google');
+  }
+
+  @Get('facebook')
+  @UseGuards(AuthGuard('facebook'))
+  async oauthFacebook() {
+    return true;
+  }
+
+  @Get('facebook/callback')
+  @UseGuards(AuthGuard('facebook'))
+  @Redirect()
+  async oauthFacebookCallback(@Req() req) {
+    return await this.callback(req, 'facebook');
+  }
+
+  async callback(@Req() req, plugin) {
     const { authInfo } = req;
+
+    const request: Request = req;
+
     if (!authInfo) throw new BadRequestException('Oauth tokens not found');
-    const { accessToken, refreshToken } = authInfo;
+
+    const { accessToken: access_token, refreshToken: refresh_token } = authInfo;
+    const { customer_id } = request.query;
+
     const response = await this.inputService.create({
       info: { customer_id, customer: 'customer', user_id: 'empty' },
-      plugin: 'hubspot',
-      credentials: { access_token: accessToken, refresh_token: refreshToken },
+      plugin,
+      credentials: { access_token, refresh_token },
     });
+
     return { url: `${this.frontendRedirectUri}?input_id=${response.input.id}` };
   }
 }