From 0ae8b0c0e80b7bcb26233e640c1b2945306ec480 Mon Sep 17 00:00:00 2001
From: Tom <20648924+moT01@users.noreply.github.com>
Date: Mon, 9 Aug 2021 13:27:14 -0500
Subject: [PATCH] chore: clean-up unsed things in stripe integration (#43156)

* chore: clean-up unsed things in stripe integration

* fix: use logged in users email over email given to payment form
---
 api-server/src/server/middlewares/csurf.js                  | 4 +---
 api-server/src/server/middlewares/request-authorization.js  | 6 ++----
 .../src/server/middlewares/request-authorization.test.js    | 4 +---
 client/src/components/Donation/DonateForm.tsx               | 3 ++-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/api-server/src/server/middlewares/csurf.js b/api-server/src/server/middlewares/csurf.js
index cd886dd386..50b0cdafd3 100644
--- a/api-server/src/server/middlewares/csurf.js
+++ b/api-server/src/server/middlewares/csurf.js
@@ -14,9 +14,7 @@ export default function getCsurf() {
     const { path } = req;
     if (
       // eslint-disable-next-line max-len
-      /^\/hooks\/update-paypal$|^\/hooks\/update-stripe$|^\/donate\/charge-stripe$/.test(
-        path
-      )
+      /^\/hooks\/update-paypal$|^\/donate\/charge-stripe$/.test(path)
     ) {
       next();
     } else {
diff --git a/api-server/src/server/middlewares/request-authorization.js b/api-server/src/server/middlewares/request-authorization.js
index 9b3485112d..d1dc353810 100644
--- a/api-server/src/server/middlewares/request-authorization.js
+++ b/api-server/src/server/middlewares/request-authorization.js
@@ -23,8 +23,7 @@ const signinRE = /^\/signin/;
 const statusRE = /^\/status\/ping$/;
 const unsubscribedRE = /^\/unsubscribed\//;
 const unsubscribeRE = /^\/u\/|^\/unsubscribe\/|^\/ue\//;
-const updateHooksRE = /^\/hooks\/update-paypal$|^\/hooks\/update-stripe$/;
-const createStripeSession = /^\/donate\/create-stripe-session/;
+const updateHooksRE = /^\/hooks\/update-paypal$/;
 // note: this would be replaced by webhooks later
 const donateRE = /^\/donate\/charge-stripe$/;
 
@@ -41,8 +40,7 @@ const _pathsAllowedREs = [
   unsubscribedRE,
   unsubscribeRE,
   updateHooksRE,
-  donateRE,
-  createStripeSession
+  donateRE
 ];
 
 export function isAllowedPath(path, pathsAllowedREs = _pathsAllowedREs) {
diff --git a/api-server/src/server/middlewares/request-authorization.test.js b/api-server/src/server/middlewares/request-authorization.test.js
index 14d600e201..593d5930ed 100644
--- a/api-server/src/server/middlewares/request-authorization.test.js
+++ b/api-server/src/server/middlewares/request-authorization.test.js
@@ -45,7 +45,7 @@ describe('request-authorization', () => {
     const statusRE = /^\/status\/ping$/;
     const unsubscribedRE = /^\/unsubscribed\//;
     const unsubscribeRE = /^\/u\/|^\/unsubscribe\/|^\/ue\//;
-    const updateHooksRE = /^\/hooks\/update-paypal$|^\/hooks\/update-stripe$/;
+    const updateHooksRE = /^\/hooks\/update-paypal$/;
 
     const allowedPathsList = [
       authRE,
@@ -77,11 +77,9 @@ describe('request-authorization', () => {
         allowedPathsList
       );
       const resultC = isAllowedPath('/hooks/update-paypal', allowedPathsList);
-      const resultD = isAllowedPath('/hooks/update-stripe', allowedPathsList);
       expect(resultA).toBe(true);
       expect(resultB).toBe(true);
       expect(resultC).toBe(true);
-      expect(resultD).toBe(true);
     });
 
     it('returns false for a non-white-listed path', () => {
diff --git a/client/src/components/Donation/DonateForm.tsx b/client/src/components/Donation/DonateForm.tsx
index 202d58c252..99374cd156 100644
--- a/client/src/components/Donation/DonateForm.tsx
+++ b/client/src/components/Donation/DonateForm.tsx
@@ -191,9 +191,10 @@ class DonateForm extends Component<DonateFormProps, DonateFormState> {
     payerEmail: string | undefined,
     payerName: string | undefined
   ) {
+    const { email } = this.props;
     const { donationAmount: amount, donationDuration: duration } = this.state;
+    payerEmail = email ? email : payerEmail;
     window.scrollTo(0, 0);
-
     // change the donation modal button label to close
     // or display the close button for the cert donation section
     if (this.props.handleProcessing) {