Skip to content
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

Feature/forgot password #39

Merged
merged 32 commits into from
Dec 12, 2024
Merged

Feature/forgot password #39

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8ffe1a2
😶 began working on forgotten password backend 😶
Gyoumi Nov 18, 2024
ffa83ec
👾 updated github actions to run tests on push
Gyoumi Nov 18, 2024
506d35c
👷 fixed up schema to fix ci issues
Gyoumi Nov 18, 2024
b7185a1
👷 making adjustments to try to fix cron job issues
Gyoumi Nov 18, 2024
f5e26ff
👷 making adjustments to try to fix cron job issues part 2
Gyoumi Nov 18, 2024
a5cc8ef
👷 making adjustments to try to fix cron job issues part 3
Gyoumi Nov 18, 2024
1c6268c
👷 making adjustments to try to fix cron job issues part 4
Gyoumi Nov 18, 2024
5424380
👷 making adjustments to try to fix cron job issues part 5
Gyoumi Nov 18, 2024
4fea80f
rewrote otp to use redis > db, and added verification route
Gyoumi Nov 19, 2024
ad81fd1
rewrote tests for redis
Gyoumi Dec 3, 2024
f737b76
fixed otp test for redis
Gyoumi Dec 3, 2024
8a0eb32
added conditional for ci
Gyoumi Dec 3, 2024
7e5d5ef
🎊 forgot password backend complete
Gyoumi Dec 8, 2024
8217882
rebasing password reset
Gyoumi Dec 8, 2024
72245a0
👾 updated github actions to run tests on push
Gyoumi Nov 18, 2024
bd85f81
👷 fixed up schema to fix ci issues
Gyoumi Nov 18, 2024
a6c2c63
👷 making adjustments to try to fix cron job issues
Gyoumi Nov 18, 2024
6b08e79
👷 making adjustments to try to fix cron job issues part 2
Gyoumi Nov 18, 2024
ad99efa
👷 making adjustments to try to fix cron job issues part 3
Gyoumi Nov 18, 2024
49c3b5c
👷 making adjustments to try to fix cron job issues part 4
Gyoumi Nov 18, 2024
fd18e86
👷 making adjustments to try to fix cron job issues part 5
Gyoumi Nov 18, 2024
0bbf778
rewrote otp to use redis > db, and added verification route
Gyoumi Nov 19, 2024
475563f
rewrote tests for redis
Gyoumi Dec 3, 2024
84e42ad
fixed otp test for redis
Gyoumi Dec 3, 2024
c9cb27f
🎊 forgot password backend complete
Gyoumi Dec 8, 2024
a2710a1
🪡 fixed merge conflicts with main
Gyoumi Dec 8, 2024
cbca83f
removed prisma from devDependencies
Gyoumi Dec 8, 2024
5cce90b
merged schema
Gyoumi Dec 8, 2024
e10a3e9
Merge branch 'feature/forgot-password' of https://github.com/devsoc-u…
Gyoumi Dec 8, 2024
41895ea
👉👇👈 username and email should be unique for User
Gyoumi Dec 8, 2024
9bd5bdc
fixed conflicts when merging with main
Gyoumi Dec 11, 2024
b09acf1
🔑 created forgot-password and update-password routes. ⏰ updated otp t…
Gyoumi Dec 11, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- feature/login
- feature/event
- feature/societyJoin
- feature/forgot-password
pull_request:
branches:
- main
Expand Down
9 changes: 6 additions & 3 deletions backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@
"main": "index.js",
"scripts": {
"start": "NODE_ENV=dev ts-node src/index.ts",
"test": "vitest",
"test": "vitest --inspect-brk --no-file-parallelism --disable-console-intercept",
"test:int": "./scripts/run-integration.sh"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"@prisma/client": "^5.21.1",
"@prisma/client": "^5.22.0",
"bcrypt": "^5.1.1",
"connect-redis": "^7.1.1",
"cors": "^2.8.5",
"dayjs": "^1.11.13",
"express": "^4.21.1",
"express-session": "^1.18.1",
"prisma": "^5.21.1",
"form-data": "^4.0.1",
"mailgun.js": "^10.2.3",
"prisma": "^5.22.0",
"redis": "^4.7.0",
"zod": "^3.23.8",
"zod-prisma-types": "^3.1.8"
Expand All @@ -30,6 +32,7 @@
"@types/express": "4",
"@types/express-session": "^1.18.0",
"@types/node": "^22.7.7",
"@types/node-cron": "^3.0.11",
"jest-mock-extended": "2.0.4",
"supertest": "^7.0.0",
"sync-request-curl": "^3.0.0",
Expand Down
132 changes: 100 additions & 32 deletions backend/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 0 additions & 47 deletions backend/prisma/migrations/20241107041958_071124_update/migration.sql
View file
Open in desktop

This file was deleted.

Loading
Loading