Merge branch 'passport/facebook' into feat/logs-lib

src/modules/oauth/oauth.controller.ts

@@ -89,6 +89,19 @@ export class OauthController {
     return await this.callback(req, 'mailchimp');
   }
 
+  @Get('salesforce')
+  @UseGuards(AuthGuard('salesforce'))
+  async oauthSalesforce() {
+    return true;
+  }
+
+  @Get('salesforce/callback')
+  @UseGuards(AuthGuard('salesforce'))
+  @Redirect()
+  async oauthSalesforceCallback(@Req() req) {
+    return await this.callback(req, 'salesforce');
+  }
+
   async callback(@Req() req: Request, plugin) {
     const { error, state: customer_id } = req.query;
 

src/modules/oauth/passport-strategies/facebook-strategy.ts

@@ -1,12 +1,15 @@
 import {
   Profile,
   Strategy,
-  StrategyOptionWithRequest,
+  StrategyOption,
   VerifyFunction,
 } from 'passport-facebook';
 import { PassportStrategy } from '@nestjs/passport';
 import { Inject, Injectable } from '@nestjs/common';
 import { OauthSecrets } from 'src/utils/OauthSecrets';
+import { Request } from 'express';
+import { ParamsDictionary } from 'express-serve-static-core';
+import { ParsedQs } from 'qs';
 
 @Injectable()
 export class FacebookStrategy extends PassportStrategy(Strategy) {
@@ -14,19 +17,29 @@ export class FacebookStrategy extends PassportStrategy(Strategy) {
     @Inject('OAUTH_SECRETS')
     private readonly oauthSecrets: OauthSecrets,
   ) {
-    const options: StrategyOptionWithRequest = {
+    const options: StrategyOption = {
       clientID: oauthSecrets.facebook.client_id,
       clientSecret: oauthSecrets.facebook.client_secret,
       callbackURL: oauthSecrets.facebook.redirect_uri,
-      passReqToCallback: true,
     };
     const verify: VerifyFunction = (
       accessToken: string,
       refreshToken: string,
       profile: Profile,
       done: (error: any, user?: any, info?: any) => void,
-    ) => done(null, profile, { accessToken, refreshToken });
+    ) => {
+      return done(null, profile, { accessToken, refreshToken });
+    };
 
     super(options, verify);
   }
+  authenticate(
+    req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>,
+    options?: any,
+  ): void {
+    const { customer_id } = req.query;
+    options.state = customer_id;
+    options.scope = 'ads_read ads_management';
+    super.authenticate(req, options);
+  }
 }

src/modules/oauth/passport-strategies/hubspot-strategy.ts

@@ -14,7 +14,6 @@ export class HubspotStrategy extends PassportStrategy(Strategy) {
         clientID: oauthSecrets.hubspot.client_id,
         clientSecret: oauthSecrets.hubspot.client_secret,
         callbackURL: oauthSecrets.hubspot.redirect_uri,
-        redirectUri: oauthSecrets.hubspot.redirect_uri,
         scope:
           'automation business-intelligence oauth forms integration-sync sales-email-read crm.lists.read crm.objects.contacts.read crm.schemas.contacts.read crm.objects.companies.read crm.objects.deals.read crm.schemas.companies.read crm.schemas.deals.read crm.objects.owners.read crm.objects.quotes.read crm.schemas.quotes.read crm.objects.line_items.read crm.schemas.line_items.read',
         passReqToCallback: true,

src/modules/oauth/passport-strategies/salesforce-strategy.ts

@@ -0,0 +1,47 @@
+import { Strategy } from 'passport-forcedotcom';
+import { PassportStrategy } from '@nestjs/passport';
+import { Inject, Injectable } from '@nestjs/common';
+import { OauthSecrets } from 'src/utils/OauthSecrets';
+
+@Injectable()
+export class SalesforceStrategy extends PassportStrategy(
+  Strategy,
+  'salesforce',
+) {
+  constructor(
+    @Inject('OAUTH_SECRETS')
+    private readonly oauthSecrets: OauthSecrets,
+  ) {
+    const options = {
+      clientID: oauthSecrets.salesforce.client_id,
+      clientSecret: oauthSecrets.salesforce.client_secret,
+      callbackURL: oauthSecrets.salesforce.redirect_uri,
+      scope: [
+        'wave_api',
+        'chatter_api',
+        'chatbot_api',
+        'cdp_ingest_api',
+        'cdp_profile_api',
+        'api',
+        'pardot_api',
+        'cdp_segment_api',
+        'cdp_query_api',
+        'refresh_token',
+        'offline_access',
+      ],
+    };
+    const verify = ({ params }, refreshToken: string, profile: any, done) => {
+      return done(null, profile, {
+        accessToken: params.access_token,
+        refreshToken,
+      });
+    };
+    super(options, verify);
+  }
+
+  authenticate(req, options) {
+    const { customer_id } = req.query;
+    options.state = customer_id;
+    super.authenticate(req, options);
+  }
+}