Skip to content

Add email bypass #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
voctory merged 11 commits into from
Jan 18, 2025
Merged

Add email bypass #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37606a0
Merge pull request #587 from ubc-biztech/dev
AllanT102 Nov 16, 2024
dfdd8cc
Merge pull request #614 from ubc-biztech/dev
mchlcui Nov 30, 2024
a044270
set end hard deadline to 3:15
liuisaac Nov 30, 2024
814d52c
Merge pull request #615 from ubc-biztech/dataverse-isaac
mchlcui Nov 30, 2024
c4338b8
updated tiem to 3:#5
liuisaac Nov 30, 2024
5ffbede
Merge pull request #616 from ubc-biztech/dataverse-isaac
mchlcui Nov 30, 2024
0addc03
changed time to 3:40
liuisaac Nov 30, 2024
8218e0f
Merge pull request #617 from ubc-biztech/dataverse-isaac
mchlcui Nov 30, 2024
b40d5b8
bruh i changed time to 3:45
liuisaac Nov 30, 2024
6ea1866
Merge pull request #618 from ubc-biztech/dataverse-isaac
AllanT102 Nov 30, 2024
8f96eb8
Add email bypasses
voctory Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/workflows/firebase-hosting-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ jobs:
REACT_APP_SHEET_ID: ${{ secrets.REACT_APP_SHEET_ID }}
REACT_APP_CLIENT_EMAIL: '${{ secrets.REACT_APP_CLIENT_EMAIL }}'
REACT_APP_PRIVATE_KEY: '${{ secrets.REACT_APP_PRIVATE_KEY }}'
REACT_APP_BYPASS_EMAIL_1: '${{ secrets.REACT_APP_BYPASS_EMAIL_1 }}'
REACT_APP_BYPASS_EMAIL_2: '${{ secrets.REACT_APP_BYPASS_EMAIL_2 }}'
REACT_APP_BYPASS_EMAIL_3: '${{ secrets.REACT_APP_BYPASS_EMAIL_3 }}'
REACT_APP_BYPASS_EMAIL_4: '${{ secrets.REACT_APP_BYPASS_EMAIL_4 }}'
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 }}'

- name: Dev Firebase Deploy
if: github.ref == 'refs/heads/dev'
Expand All @@ -54,6 +61,13 @@ jobs:
REACT_APP_SHEET_ID: ${{ secrets.REACT_APP_SHEET_ID }}
REACT_APP_CLIENT_EMAIL: '${{ secrets.REACT_APP_CLIENT_EMAIL }}'
REACT_APP_PRIVATE_KEY: '${{ secrets.REACT_APP_PRIVATE_KEY }}'
REACT_APP_BYPASS_EMAIL_1: '${{ secrets.REACT_APP_BYPASS_EMAIL_1 }}'
REACT_APP_BYPASS_EMAIL_2: '${{ secrets.REACT_APP_BYPASS_EMAIL_2 }}'
REACT_APP_BYPASS_EMAIL_3: '${{ secrets.REACT_APP_BYPASS_EMAIL_3 }}'
REACT_APP_BYPASS_EMAIL_4: '${{ secrets.REACT_APP_BYPASS_EMAIL_4 }}'
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 }}'

- name: Prod Firebase Deploy
if: github.ref == 'refs/heads/master'
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/firebase-hosting-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ jobs:
REACT_APP_SHEET_ID: ${{ secrets.REACT_APP_SHEET_ID }}
REACT_APP_CLIENT_EMAIL: '${{ secrets.REACT_APP_CLIENT_EMAIL }}'
REACT_APP_PRIVATE_KEY: '${{ secrets.REACT_APP_PRIVATE_KEY }}'
REACT_APP_BYPASS_EMAIL_1: '${{ secrets.REACT_APP_BYPASS_EMAIL_1 }}'
REACT_APP_BYPASS_EMAIL_2: '${{ secrets.REACT_APP_BYPASS_EMAIL_2 }}'
REACT_APP_BYPASS_EMAIL_3: '${{ secrets.REACT_APP_BYPASS_EMAIL_3 }}'
REACT_APP_BYPASS_EMAIL_4: '${{ secrets.REACT_APP_BYPASS_EMAIL_4 }}'
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 }}'

- name: Dev Firebase Preview
if: github.event.pull_request.base.ref == 'dev'
Expand All @@ -52,6 +59,13 @@ jobs:
REACT_APP_SHEET_ID: ${{ secrets.REACT_APP_SHEET_ID }}
REACT_APP_CLIENT_EMAIL: '${{ secrets.REACT_APP_CLIENT_EMAIL }}'
REACT_APP_PRIVATE_KEY: '${{ secrets.REACT_APP_PRIVATE_KEY }}'
REACT_APP_BYPASS_EMAIL_1: '${{ secrets.REACT_APP_BYPASS_EMAIL_1 }}'
REACT_APP_BYPASS_EMAIL_2: '${{ secrets.REACT_APP_BYPASS_EMAIL_2 }}'
REACT_APP_BYPASS_EMAIL_3: '${{ secrets.REACT_APP_BYPASS_EMAIL_3 }}'
REACT_APP_BYPASS_EMAIL_4: '${{ secrets.REACT_APP_BYPASS_EMAIL_4 }}'
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 }}'

- name: Prod Firebase Preview
if: github.event.pull_request.base.ref == 'master'
Expand Down
15 changes: 14 additions & 1 deletion src/pages/admin/DynamicForm/FormRegister.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,19 @@ const FormRegister = (props) => {
);
};

const isSpecialBypassEmail = (email) => {
const bypassEmails = [
process.env.REACT_APP_BYPASS_EMAIL_1,
process.env.REACT_APP_BYPASS_EMAIL_2,
process.env.REACT_APP_BYPASS_EMAIL_3,
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
].filter(Boolean);
return bypassEmails.includes(email?.toLowerCase());
};

const isDeadlinePassed = () => {
const deadline = new Date(event.deadline).getTime();
return deadline < new Date().getTime();
Expand Down Expand Up @@ -1330,7 +1343,7 @@ const FormRegister = (props) => {
<div style={styles.section}>{loadQuestions()}</div>
<div style={styles.divider}></div>
<div style={styles.submitSection}>
{!user?.admin &&
{!user?.admin && !isSpecialBypassEmail(responseData[0]) &&
((user?.isMember && currEvent.pricing?.members > 0) ||
(!user?.isMember && currEvent.pricing?.nonMembers)) ? (
currEvent.isApplicationBased ? (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/public/Companion/components/dataverse/Dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
const Dashboard = () => {
const startTime = new Date();
const endTimeAt3PM = new Date();
endTimeAt3PM.setHours(15, 0, 0, 0);
endTimeAt3PM.setHours(15, 45, 0, 0);
const endTimeIn50Minutes = new Date(startTime.getTime() + 50 * 60 * 1000);
const endTime = (endTimeIn50Minutes < endTimeAt3PM) ? endTimeIn50Minutes : endTimeAt3PM;
const location = useLocation();
Expand Down
Loading