Merge pull request #5736 from topcoder-platform/develop

luizrrodrigues · web-flow · commit 243cbbe657a8 · 2021-10-07T04:20:03.000-03:00
Release v1.13.3
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -350,14 +350,14 @@ workflows:
           filters:
             branches:
               only:                
-                - gig-apply-new-options-dropdown
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
           filters:
             branches:
               only:
-                - member-path-component
+                - ref-email-tracking
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
diff --git a/src/server/routes/growsurf.js b/src/server/routes/growsurf.js
@@ -2,19 +2,26 @@
  * The routes related to Growsurf integration
  */
 
+import _ from 'lodash';
 import express from 'express';
+import { middleware } from 'tc-core-library-js';
+import config from 'config';
 import GrowsurfService from '../services/growsurf';
 
 const cors = require('cors');
 
+const authenticator = middleware.jwtAuthenticator;
+const authenticatorOptions = _.pick(config.SECRET.JWT_AUTH, ['AUTH_SECRET', 'VALID_ISSUERS']);
 const routes = express.Router();
 
 // Enables CORS on those routes according config above
 // ToDo configure CORS for set of our trusted domains
 routes.use(cors());
 routes.options('*', cors());
 
-routes.get('/participants', (req, res) => new GrowsurfService().getParticipant(req, res).then(res.send.bind(res)));
-routes.post('/participants', (req, res) => new GrowsurfService().getOrCreateParticipant(req, res).then(res.send.bind(res)));
+routes.get('/participant/:emailOrId', (req, res) => new GrowsurfService().getParticipantController(req, res).then(res.send.bind(res)));
+routes.get('/participants', (req, res) => new GrowsurfService().getParticipantsController(req, res).then(res.send.bind(res)));
+routes.post('/participants', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res) => new GrowsurfService().getOrCreateParticipantController(req, res).then(res.send.bind(res)));
+routes.patch('/participant/:emailOrId', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res) => new GrowsurfService().updateParticipantController(req, res).then(res.send.bind(res)));
 
 export default routes;
diff --git a/src/server/services/growsurf.js b/src/server/services/growsurf.js
@@ -21,7 +21,7 @@ export default class GrowsurfService {
   }
 
   /**
-   * Gets get participant.
+   * Gets participant by email or id
    * @return {Promise}
    * @param {String} idOrEmail growsurf id or email
    */
@@ -45,14 +45,28 @@ export default class GrowsurfService {
   }
 
   /**
-   * Gets get participant by email or id.
+   * Controller - Gets get participant by email or id
    * @return {Promise}
    * @param {Object} req the request.
    * @param {Object} res the response.
    */
-  async getParticipant(req, res) {
-    const { participantId } = req.query;
-    const response = await fetch(`${this.private.baseUrl}/campaign/${config.GROWSURF_CAMPAIGN_ID}/participant/${participantId}`, {
+  async getParticipantController(req, res) {
+    const { emailOrId } = req.params;
+    const growSurfData = await this.getParticipantByIdOREmail(emailOrId);
+    if (growSurfData.error) {
+      res.status(growSurfData.code);
+    }
+    return growSurfData;
+  }
+
+  /**
+   * Controller - Gets get participants in the campaign
+   * @return {Promise}
+   * @param {Object} req the request.
+   * @param {Object} res the response.
+   */
+  async getParticipantsController(req, res) {
+    const response = await fetch(`${this.private.baseUrl}/campaign/${config.GROWSURF_CAMPAIGN_ID}/participants`, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -64,7 +78,7 @@ export default class GrowsurfService {
       return {
         error: await response.json(),
         code: response.status,
-        url: `${this.private.baseUrl}/campaign/${config.GROWSURF_CAMPAIGN_ID}/participant/${participantId}`,
+        url: `${this.private.baseUrl}/campaign/${config.GROWSURF_CAMPAIGN_ID}/participants`,
       };
     }
     const data = await response.json();
@@ -98,13 +112,13 @@ export default class GrowsurfService {
   }
 
   /**
-   * Gets get participant by email or id
+   * Controller - Gets get participant by email or id
    * if not exxists create it
    * @return {Promise}
    * @param {Object} req the request.
    * @param {Object} res the response.
    */
-  async getOrCreateParticipant(req, res) {
+  async getOrCreateParticipantController(req, res) {
     const { body } = req;
     const result = await this.addParticipant(JSON.stringify({
       email: body.email,
@@ -133,7 +147,7 @@ export default class GrowsurfService {
         'Content-Type': 'application/json',
         Authorization: this.private.authorization,
       },
-      body,
+      body: JSON.stringify(body),
     });
     if (response.status >= 300) {
       return {
@@ -146,4 +160,18 @@ export default class GrowsurfService {
     const data = await response.json();
     return data;
   }
+
+  /**
+   * Controller - update participant in the system
+   * @param {Object} req request
+   * @param {Object} res respons
+   */
+  async updateParticipantController(req, res) {
+    const { emailOrId } = req.params;
+    const updateGrowRes = await this.updateParticipant(emailOrId, req.body);
+    if (updateGrowRes.error) {
+      res.status(updateGrowRes.code);
+    }
+    return updateGrowRes;
+  }
 }
diff --git a/src/shared/actions/growSurf.js b/src/shared/actions/growSurf.js
@@ -18,8 +18,10 @@ function getReferralIdInit() {
 /**
  * Get referral id for the logged user
  * if this member does not exist in growsurf it creates it in the system
+ * @param {Object} profile the member auth profile
+ * @param {String} token the auth token
  */
-async function getReferralIdDone(profile) {
+async function getReferralIdDone(profile, tokenV3) {
   if (profile.email) {
     const res = await fetch(`${PROXY_ENDPOINT}/growsurf/participants?participantId=${profile.email}`, {
       method: 'POST',
@@ -31,6 +33,7 @@ async function getReferralIdDone(profile) {
       }),
       headers: {
         'Content-Type': 'application/json',
+        Authorization: `Bearer ${tokenV3}`,
       },
     });
     if (res.status >= 300) {
diff --git a/src/shared/components/Gigs/GigDetails/index.jsx b/src/shared/components/Gigs/GigDetails/index.jsx
@@ -262,12 +262,15 @@ function GigDetails(props) {
                     && (
                     <ReferralModal
                       profile={profile}
-                      onCloseButton={() => setModalOpen(false)}
+                      onCloseButton={() => {
+                        onReferralDone();
+                        setModalOpen(false);
+                      }}
                       isReferrSucess={isReferrSucess}
                       isReferrError={isReferrError}
                       referralId={growSurf && growSurf.data ? growSurf.data.id : null}
                       onReferralDone={() => {
-                        onReferralDone();
+                        onReferralDone(true);
                         setModalOpen(false);
                       }}
                     />
diff --git a/src/shared/components/Gigs/ReferralModal/index.jsx b/src/shared/components/Gigs/ReferralModal/index.jsx
@@ -73,7 +73,13 @@ function ReferralModal({
               <div className={modalStyle.referrSucess}>
                 <h3 className={modalStyle.title}>OOPS!</h3>
                 <p className={modalStyle.loginMsg}>{isReferrError.message}</p>
-                <p>Looks like there is a problem on our end. Please try again.<br />If this persists please contact <a href="mailto:support@topcoder.com">support@topcoder.com</a>.</p>
+                {
+                  isReferrError.userError ? (
+                    <p>If you think this is an error please contact <a href="mailto:support@topcoder.com">support@topcoder.com</a>.</p>
+                  ) : (
+                    <p>Looks like there is a problem on our end. Please try again.<br />If this persists please contact <a href="mailto:support@topcoder.com">support@topcoder.com</a>.</p>
+                  )
+                }
                 <div className={modalStyle.ctaButtons}>
                   <PrimaryButton
                     onClick={onCloseButton}
diff --git a/src/shared/components/Gigs/ReferralModal/modal.scss b/src/shared/components/Gigs/ReferralModal/modal.scss
@@ -1,3 +1,4 @@
+/* stylelint-disable no-descending-specificity */
 @import "~styles/mixins";
 @import "~components/Contentful/default";
 
@@ -105,10 +106,24 @@
       padding: 50px 40px;
     }
 
+    .loginMsg {
+      font-size: 20px;
+    }
+
     .regTxt {
       font-size: 14px;
       margin: 10px 0 0;
     }
+
+    .ctaButtons {
+      @include xs-to-sm {
+        flex-direction: column;
+
+        > button {
+          margin: 0 0 20px !important;
+        }
+      }
+    }
   }
 }
 
diff --git a/src/shared/components/MemberPath/PathSelector/index.jsx b/src/shared/components/MemberPath/PathSelector/index.jsx
@@ -101,7 +101,7 @@ export default function PathSelector({
         </div>
         <a
           href={data.items[activeItemIndex].btnURL}
-          target="_blank"
+          target={data.items[activeItemIndex].btnNewTab ? '_blank' : '_self'}
           rel="noopener noreferrer"
           className={styles.contentButton}
         >
diff --git a/src/shared/containers/Gigs/RecruitCRMJobDetails.jsx b/src/shared/containers/Gigs/RecruitCRMJobDetails.jsx
@@ -53,9 +53,52 @@ ${config.URL.BASE}${config.GIGS_PAGES_PATH}/${props.id}`,
    * Send gig referral invite
    */
   async onSendClick(email) {
-    const { profile, growSurf } = this.props;
+    const {
+      profile, growSurf, tokenV3,
+    } = this.props;
     const { formData } = this.state;
-    // email the invite
+    // should not be able to send emails to themselves
+    if (profile.email === email) {
+      this.setState({
+        isReferrError: {
+          message: 'You are not allowed to send to yourself.',
+          userError: true,
+        },
+      });
+      // exit no email sending
+      return;
+    }
+    // process sent log
+    let { emailInvitesLog, emailInvitesStatus } = growSurf.data.metadata;
+    if (!emailInvitesLog) emailInvitesLog = '';
+    // check if email is in sent log alredy?
+    const foundInLog = emailInvitesLog.indexOf(email);
+    if (foundInLog !== -1) {
+      this.setState({
+        isReferrError: {
+          message: `${email} was already invited.`,
+          userError: true,
+        },
+      });
+      // exit no email sending
+      return;
+    }
+    // check if email is already referred?
+    const growCheck = await fetch(`${PROXY_ENDPOINT}/growsurf/participant/${email}`);
+    if (growCheck.status === 200) {
+      const growCheckData = await growCheck.json();
+      if (growCheckData.referrer) {
+        this.setState({
+          isReferrError: {
+            message: `${email} has already been referred.`,
+            userError: true,
+          },
+        });
+        // exit no email sending
+        return;
+      }
+    }
+    // // email the invite
     const res = await fetch(`${PROXY_ENDPOINT}/mailchimp/email`, {
       method: 'POST',
       body: JSON.stringify({
@@ -79,21 +122,66 @@ ${config.URL.BASE}${config.GIGS_PAGES_PATH}/${props.id}`,
       this.setState({
         isReferrError: await res.json(),
       });
-    } else {
+      // exit no email tracking due to the error
+      return;
+    }
+    // parse the log to array of emails
+    if (emailInvitesLog.length) {
+      emailInvitesLog = emailInvitesLog.split(',');
+    } else emailInvitesLog = [];
+    // prepare growSurf update payload
+    // we keep only 10 emails in the log to justify program rules
+    if (emailInvitesLog.length < 10) {
+      emailInvitesLog.push(email);
+    }
+    // Auto change status when 10 emails sent
+    if (emailInvitesLog.length === 10 && emailInvitesStatus !== 'Paid' && emailInvitesStatus !== 'Payment Pending') {
+      emailInvitesStatus = 'Payment Pending';
+    }
+    // put the tracking update in growsurf
+    const updateRed = await fetch(`${PROXY_ENDPOINT}/growsurf/participant/${growSurf.data.id}`, {
+      method: 'PATCH',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${tokenV3}`,
+      },
+      body: JSON.stringify({
+        ...growSurf.data,
+        metadata: {
+          ...growSurf.data.metadata,
+          emailInvitesSent: Number(growSurf.data.metadata.emailInvitesSent || 0) + 1,
+          emailInvitesLog: emailInvitesLog.join(),
+          emailInvitesStatus,
+        },
+      }),
+    });
+    if (updateRed.status >= 300) {
       this.setState({
-        isReferrSucess: true,
+        isReferrError: await updateRed.json(),
       });
+      // exit no email tracking due to the error
+      // just notify the user about it
+      return;
     }
+    // finally do:
+    this.setState({
+      isReferrSucess: true,
+    });
   }
 
   /**
    * Reset the form when referral done
    */
-  onReferralDone() {
+  onReferralDone(refresh = false) {
+    if (refresh) {
+      window.location.reload(false);
+      return;
+    }
     const { formData } = this.state;
     delete formData.email;
     this.setState({
       isReferrSucess: false,
+      isReferrError: false,
       formData,
     });
   }
@@ -143,6 +231,7 @@ RecruitCRMJobDetailsContainer.defaultProps = {
   application: null,
   profile: {},
   growSurf: {},
+  tokenV3: null,
 };
 
 RecruitCRMJobDetailsContainer.propTypes = {
@@ -154,6 +243,7 @@ RecruitCRMJobDetailsContainer.propTypes = {
   application: PT.shape(),
   profile: PT.shape(),
   growSurf: PT.shape(),
+  tokenV3: PT.string,
 };
 
 function mapStateToProps(state, ownProps) {
@@ -166,6 +256,7 @@ function mapStateToProps(state, ownProps) {
     application: data ? data.application : null,
     profile,
     growSurf,
+    tokenV3: state.auth ? state.auth.tokenV3 : null,
   };
 }
 
diff --git a/src/shared/containers/GigsPages.jsx b/src/shared/containers/GigsPages.jsx

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ export default function PathSelector({`
`101`	`101`	`</div>`
`102`	`102`	`<a`
`103`	`103`	`href={data.items[activeItemIndex].btnURL}`
`104`		`- target="_blank"`
	`104`	`+ target={data.items[activeItemIndex].btnNewTab ? '_blank' : '_self'}`
`105`	`105`	`rel="noopener noreferrer"`
`106`	`106`	`className={styles.contentButton}`
`107`	`107`	`>`