From ef0a801c908f8cc512a9babc57982b2fee95d306 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <me@raisedadead.com>
Date: Thu, 14 Nov 2019 01:33:53 +0530
Subject: [PATCH] feat(donate): remove unauthenticated routes

---
 api-server/server/boot/donate.js              | 46 +++++++------------
 .../components/DonateFormChildViewForHOC.js   |  8 ++--
 client/src/utils/ajax.js                      |  7 +--
 3 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/api-server/server/boot/donate.js b/api-server/server/boot/donate.js
index 2f6d751614..c0c044ff7b 100644
--- a/api-server/server/boot/donate.js
+++ b/api-server/server/boot/donate.js
@@ -8,7 +8,6 @@ const log = debug('fcc:boot:donate');
 
 export default function donateBoot(app, done) {
   let stripe = false;
-  const { User } = app.models;
   const api = app.loopback.Router();
   const donateRouter = app.loopback.Router();
 
@@ -105,8 +104,16 @@ export default function donateBoot(app, done) {
   function createStripeDonation(req, res) {
     const { user, body } = req;
 
+    if (!user) {
+      return res
+        .status(500)
+        .send({ error: 'User must be signed in for this request.' });
+    }
+
     if (!body || !body.amount || !body.duration) {
-      return res.status(400).send({ error: 'Amount and duration Required.' });
+      return res.status(500).send({
+        error: 'The donation form had invalid values for this submission.'
+      });
     }
 
     const {
@@ -116,29 +123,11 @@ export default function donateBoot(app, done) {
     } = body;
 
     if (!validStripeForm(amount, duration, email)) {
-      return res
-        .status(500)
-        .send({ error: 'Invalid donation form values submitted' });
+      return res.status(500).send({
+        error: 'The donation form had invalid values for this submission.'
+      });
     }
 
-    const isOneTime = duration === 'onetime' ? true : false;
-
-    const fccUser = user
-      ? Promise.resolve(user)
-      : new Promise((resolve, reject) =>
-          User.findOrCreate(
-            { where: { email } },
-            { email },
-            (err, instance, isNew) => {
-              log('is new user instance: ', isNew);
-              if (err) {
-                return reject(err);
-              }
-              return resolve(instance);
-            }
-          )
-        );
-
     let donatingUser = {};
     let donation = {
       email,
@@ -188,20 +177,20 @@ export default function donateBoot(app, done) {
         });
     };
 
-    return fccUser
-      .then(user => {
-        const { isDonating } = user;
+    return Promise.resolve(user)
+      .then(nonDonatingUser => {
+        const { isDonating } = nonDonatingUser;
         if (isDonating) {
           throw {
             message: `User already has active donation(s).`,
             type: 'AlreadyDonatingError'
           };
         }
-        return user;
+        return nonDonatingUser;
       })
       .then(createCustomer)
       .then(customer => {
-        return isOneTime
+        return duration === 'onetime'
           ? createOneTimeCharge(customer).then(charge => {
               donation.subscriptionId = 'one-time-charge-prefix-' + charge.id;
               return res.send(charge);
@@ -241,7 +230,6 @@ export default function donateBoot(app, done) {
     donateRouter.use('/donate', api);
     app.use(donateRouter);
     app.use('/internal', donateRouter);
-    app.use('/unauthenticated', donateRouter);
     connectToStripe().then(done);
   }
 }
diff --git a/client/src/components/Donation/components/DonateFormChildViewForHOC.js b/client/src/components/Donation/components/DonateFormChildViewForHOC.js
index dd040493ae..888159ffac 100644
--- a/client/src/components/Donation/components/DonateFormChildViewForHOC.js
+++ b/client/src/components/Donation/components/DonateFormChildViewForHOC.js
@@ -15,7 +15,7 @@ import { injectStripe } from 'react-stripe-elements';
 import StripeCardForm from './StripeCardForm';
 import DonateCompletion from './DonateCompletion';
 import { postChargeStripe } from '../../../utils/ajax';
-import { userSelector, isSignedInSelector } from '../../../redux';
+import { userSelector } from '../../../redux';
 
 const propTypes = {
   donationAmount: PropTypes.number.isRequired,
@@ -39,8 +39,7 @@ const initialState = {
 
 const mapStateToProps = createSelector(
   userSelector,
-  isSignedInSelector,
-  ({ email, theme }, isSignedIn) => ({ email, theme, isSignedIn })
+  ({ email, theme }) => ({ email, theme })
 );
 
 class DonateFormChildViewForHOC extends Component {
@@ -122,7 +121,6 @@ class DonateFormChildViewForHOC extends Component {
 
   postDonation(token) {
     const { donationAmount: amount, donationDuration: duration } = this.state;
-    const { isSignedIn } = this.props;
     this.setState(state => ({
       ...state,
       donationState: {
@@ -131,7 +129,7 @@ class DonateFormChildViewForHOC extends Component {
       }
     }));
 
-    return postChargeStripe(isSignedIn, {
+    return postChargeStripe({
       token,
       amount,
       duration
diff --git a/client/src/utils/ajax.js b/client/src/utils/ajax.js
index b21a80cdc1..17f8a6149d 100644
--- a/client/src/utils/ajax.js
+++ b/client/src/utils/ajax.js
@@ -50,11 +50,8 @@ export function getArticleById(shortId) {
 }
 
 /** POST **/
-export function postChargeStripe(isSignedIn, body) {
-  const donatePath = '/donate/charge-stripe';
-  return isSignedIn
-    ? post(donatePath, body)
-    : postUnauthenticated(donatePath, body);
+export function postChargeStripe(body) {
+  return post(`/donate/charge-stripe`, body);
 }
 
 export function putUpdateLegacyCert(body) {