Merge pull request #620 from ubc-biztech/email-bypass

Add more email bypasses; do direct user check to avoid pre-fill bug

Author: voctory

.github/workflows/firebase-hosting-merge.yml

@@ -36,6 +36,9 @@ jobs:
           REACT_APP_BYPASS_EMAIL_5: '${{ secrets.REACT_APP_BYPASS_EMAIL_5 }}'
           REACT_APP_BYPASS_EMAIL_6: '${{ secrets.REACT_APP_BYPASS_EMAIL_6 }}'
           REACT_APP_BYPASS_EMAIL_7: '${{ secrets.REACT_APP_BYPASS_EMAIL_7 }}'
+          REACT_APP_BYPASS_EMAIL_8: '${{ secrets.REACT_APP_BYPASS_EMAIL_8 }}'
+          REACT_APP_BYPASS_EMAIL_9: '${{ secrets.REACT_APP_BYPASS_EMAIL_9 }}'
+          REACT_APP_BYPASS_EMAIL_10: '${{ secrets.REACT_APP_BYPASS_EMAIL_10 }}'
 
       - name: Dev Firebase Deploy
         if: github.ref == 'refs/heads/dev'
@@ -68,6 +71,9 @@ jobs:
           REACT_APP_BYPASS_EMAIL_5: '${{ secrets.REACT_APP_BYPASS_EMAIL_5 }}'
           REACT_APP_BYPASS_EMAIL_6: '${{ secrets.REACT_APP_BYPASS_EMAIL_6 }}'
           REACT_APP_BYPASS_EMAIL_7: '${{ secrets.REACT_APP_BYPASS_EMAIL_7 }}'
+          REACT_APP_BYPASS_EMAIL_8: '${{ secrets.REACT_APP_BYPASS_EMAIL_8 }}'
+          REACT_APP_BYPASS_EMAIL_9: '${{ secrets.REACT_APP_BYPASS_EMAIL_9 }}'
+          REACT_APP_BYPASS_EMAIL_10: '${{ secrets.REACT_APP_BYPASS_EMAIL_10 }}'
 
       - name: Prod Firebase Deploy
         if: github.ref == 'refs/heads/master'

.github/workflows/firebase-hosting-pull-request.yml

@@ -35,6 +35,9 @@ jobs:
           REACT_APP_BYPASS_EMAIL_5: '${{ secrets.REACT_APP_BYPASS_EMAIL_5 }}'
           REACT_APP_BYPASS_EMAIL_6: '${{ secrets.REACT_APP_BYPASS_EMAIL_6 }}'
           REACT_APP_BYPASS_EMAIL_7: '${{ secrets.REACT_APP_BYPASS_EMAIL_7 }}'
+          REACT_APP_BYPASS_EMAIL_8: '${{ secrets.REACT_APP_BYPASS_EMAIL_8 }}'
+          REACT_APP_BYPASS_EMAIL_9: '${{ secrets.REACT_APP_BYPASS_EMAIL_9 }}'
+          REACT_APP_BYPASS_EMAIL_10: '${{ secrets.REACT_APP_BYPASS_EMAIL_10 }}'
 
       - name: Dev Firebase Preview
         if: github.event.pull_request.base.ref == 'dev'
@@ -66,6 +69,9 @@ jobs:
           REACT_APP_BYPASS_EMAIL_5: '${{ secrets.REACT_APP_BYPASS_EMAIL_5 }}'
           REACT_APP_BYPASS_EMAIL_6: '${{ secrets.REACT_APP_BYPASS_EMAIL_6 }}'
           REACT_APP_BYPASS_EMAIL_7: '${{ secrets.REACT_APP_BYPASS_EMAIL_7 }}'
+          REACT_APP_BYPASS_EMAIL_8: '${{ secrets.REACT_APP_BYPASS_EMAIL_8 }}'
+          REACT_APP_BYPASS_EMAIL_9: '${{ secrets.REACT_APP_BYPASS_EMAIL_9 }}'
+          REACT_APP_BYPASS_EMAIL_10: '${{ secrets.REACT_APP_BYPASS_EMAIL_10 }}'
 
       - name: Prod Firebase Preview
         if: github.event.pull_request.base.ref == 'master'

src/pages/admin/DynamicForm/FormRegister.js

@@ -1058,7 +1058,10 @@ const FormRegister = (props) => {
       process.env.REACT_APP_BYPASS_EMAIL_4,
       process.env.REACT_APP_BYPASS_EMAIL_5,
       process.env.REACT_APP_BYPASS_EMAIL_6,
-      process.env.REACT_APP_BYPASS_EMAIL_7
+      process.env.REACT_APP_BYPASS_EMAIL_7,
+      process.env.REACT_APP_BYPASS_EMAIL_8,
+      process.env.REACT_APP_BYPASS_EMAIL_9,
+      process.env.REACT_APP_BYPASS_EMAIL_10
     ].filter(Boolean);
     return bypassEmails.includes(email?.toLowerCase());
   };
@@ -1343,7 +1346,7 @@ const FormRegister = (props) => {
         <div style={styles.section}>{loadQuestions()}</div>
         <div style={styles.divider}></div>
         <div style={styles.submitSection}>
-          {!user?.admin && !isSpecialBypassEmail(responseData[0]) &&
+          {!user?.admin && !isSpecialBypassEmail(user?.email) && !isSpecialBypassEmail(responseData[0]) &&
             ((user?.isMember && currEvent.pricing?.members > 0) ||
               (!user?.isMember && currEvent.pricing?.nonMembers)) ? (
               currEvent.isApplicationBased ? (