Compare commits
152 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
84f4c39c1e | ||
|
|
bfef246d98 | ||
|
|
3b89fb950a | ||
|
|
7afda85f03 | ||
|
|
a3a7a5d9ab | ||
|
|
74cd520cb8 | ||
|
|
a511f24a6b | ||
|
|
b3862f3f3e | ||
|
|
d147614f76 | ||
|
|
c999df15e0 | ||
|
|
908d6e298f | ||
|
|
44c4a2e269 | ||
|
|
dc060f258b | ||
|
|
3b1c9f1efb | ||
|
|
a45184995f | ||
|
|
b717663b5c | ||
|
|
0e12ba87bc | ||
|
|
ec1feadee9 | ||
|
|
2e0d8d4fed | ||
|
|
b7f0f9d3ee | ||
|
|
c303454db3 | ||
|
|
3972589f76 | ||
|
|
3c5e0ad513 | ||
|
|
384fd19203 | ||
|
|
9d1a12b0d1 | ||
|
|
24e100bd7b | ||
|
|
1da4feeb89 | ||
|
|
c0a245e11b | ||
|
|
7a15fbb465 | ||
|
|
0bfbaea49a | ||
|
|
82871ce5dc | ||
|
|
593a65dac1 | ||
|
|
92ee1ab527 | ||
|
|
e71f6cd159 | ||
|
|
0b07bfbc14 | ||
|
|
63842cd0cc | ||
|
|
9f686c6ee3 | ||
|
|
c6d8188e4e | ||
|
|
6d87e20e29 | ||
|
|
b8efb9f54b | ||
|
|
013b9886af | ||
|
|
43bff91db2 | ||
|
|
1aa3d8e5e8 | ||
|
|
4dae7e250a | ||
|
|
7e91d83f9a | ||
|
|
e11dbfe893 | ||
|
|
ea83cf3876 | ||
|
|
5ca0bffc0a | ||
|
|
64515d77cf | ||
|
|
6058dca273 | ||
|
|
d01cba4a06 | ||
|
|
98aa9f97ea | ||
|
|
9c734ec439 | ||
|
|
e663da45b1 | ||
|
|
f52dffdaac | ||
|
|
e572506d4f | ||
|
|
416eba6ae6 | ||
|
|
3880854240 | ||
|
|
43d186a370 | ||
|
|
76df6f66d9 | ||
|
|
c189cd97a5 | ||
|
|
d83e28a1c3 | ||
|
|
3299f767d3 | ||
|
|
16a9724693 | ||
|
|
0ccb836444 | ||
|
|
067652aa80 | ||
|
|
1523d1b5b2 | ||
|
|
ea14e28dd8 | ||
|
|
d7750086b5 | ||
|
|
eb7216b4b1 | ||
|
|
1d62225019 | ||
|
|
bf5250c4a7 | ||
|
|
cdd0a864d1 | ||
|
|
692c1bef25 | ||
|
|
fe09d0e25f | ||
|
|
3ce18dc1dc | ||
|
|
6fb31abd84 | ||
|
|
7a301b455c | ||
|
|
5781a7b540 | ||
|
|
2efbeee5bf | ||
|
|
be4ff0f0f0 | ||
|
|
3ea52a24ef | ||
|
|
f179189b59 | ||
|
|
bc333f768f | ||
|
|
26c98e2b41 | ||
|
|
4b7732838d | ||
|
|
021b9ac5d5 | ||
|
|
5f94c7295a | ||
|
|
d9a9523c9a | ||
|
|
384d2343d5 | ||
|
|
7a387d86d6 | ||
|
|
330eef51e4 | ||
|
|
2e1a2b60c4 | ||
|
|
9896ca0e8c | ||
|
|
fd44f42f28 | ||
|
|
966ce261cb | ||
|
|
5503e7a54f | ||
|
|
b49ec93c54 | ||
|
|
e6584322fa | ||
|
|
1138cd02b0 | ||
|
|
1ba8d0cbd1 | ||
|
|
98380e2d48 | ||
|
|
e377ed10e1 | ||
|
|
acc35f4717 | ||
|
|
33742a043d | ||
|
|
5cee9cbbb9 | ||
|
|
e0fbbeca3c | ||
|
|
bbfc9d6f14 | ||
|
|
46b6e56c06 | ||
|
|
05f6582739 | ||
|
|
119b1ec840 | ||
|
|
e89e313712 | ||
|
|
c2ff658182 | ||
|
|
02cd98fa9c | ||
|
|
d327bc355c | ||
|
|
8ae631a626 | ||
|
|
1d8dc8fe5b | ||
|
|
688ae6c86e | ||
|
|
21809843cd | ||
|
|
b088a5ef2a | ||
|
|
c502cd58db | ||
|
|
97e7d7190d | ||
|
|
38919003e9 | ||
|
|
f15a8dc277 | ||
|
|
92927b1373 | ||
|
|
6a4108ed61 | ||
|
|
c9f1be2faf | ||
|
|
57be6945f2 | ||
|
|
82abe52ea5 | ||
|
|
6fa7af7905 | ||
|
|
13e7a30bb9 | ||
|
|
955af04e32 | ||
|
|
035e67f759 | ||
|
|
167ec782ef | ||
|
|
743c33475f | ||
|
|
3f1d3b7833 | ||
|
|
3d76e41cd8 | ||
|
|
e9efbc17bc | ||
|
|
307d176430 | ||
|
|
7e24ba9721 | ||
|
|
f9774d82d8 | ||
|
|
7647a9f620 | ||
|
|
d4e8d4f58b | ||
|
|
4df8dea5cc | ||
|
|
84aa100f84 | ||
|
|
bddb87b9b3 | ||
|
|
18c10c0ac6 | ||
|
|
f02e2979c4 | ||
|
|
7b34cb14cb | ||
|
|
019ef090ac | ||
|
|
7304b54125 | ||
|
|
ea0d5216e8 |
28
.github/workflows/build-docker-image.yml
vendored
28
.github/workflows/build-docker-image.yml
vendored
@@ -1,4 +1,4 @@
|
|||||||
name: Create Docker Image
|
name: Build and Push Docker Image
|
||||||
|
|
||||||
on:
|
on:
|
||||||
release:
|
release:
|
||||||
@@ -10,15 +10,25 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: checkout code
|
- name: checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v2
|
uses: docker/setup-qemu-action@v2
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
- name: login to docker registry
|
|
||||||
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
|
- name: Login to Docker registry
|
||||||
- name: Build the image
|
uses: docker/login-action@v2
|
||||||
run: |
|
with:
|
||||||
docker buildx build --push \
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
--tag stonith404/pingvin-share:latest \
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
--tag stonith404/pingvin-share:${{ github.ref_name }} \
|
|
||||||
--platform linux/amd64,linux/arm64 .
|
- name: Build and push
|
||||||
|
uses: docker/build-push-action@v4
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
push: true
|
||||||
|
tags: stonith404/pingvin-share:latest,stonith404/pingvin-share:${{ github.ref_name }}
|
||||||
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
|
|||||||
23
.github/workflows/close_inactive_issues.yml
vendored
23
.github/workflows/close_inactive_issues.yml
vendored
@@ -1,23 +0,0 @@
|
|||||||
name: Close inactive issues
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "00 00 * * *"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
close-issues:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
|
||||||
steps:
|
|
||||||
- uses: actions/stale@v4
|
|
||||||
with:
|
|
||||||
days-before-issue-stale: 30
|
|
||||||
days-before-issue-close: 14
|
|
||||||
exempt-issue-labels: "feature"
|
|
||||||
stale-issue-label: "stale"
|
|
||||||
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
|
|
||||||
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
|
|
||||||
days-before-pr-stale: -1
|
|
||||||
days-before-pr-close: -1
|
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/backend/src/constants.ts
|
|
||||||
229
CHANGELOG.md
229
CHANGELOG.md
@@ -1,3 +1,232 @@
|
|||||||
|
## [0.24.2](https://github.com/stonith404/pingvin-share/compare/v0.24.1...v0.24.2) (2024-05-22)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* admin couldn't delete shares created by anonymous users ([7afda85](https://github.com/stonith404/pingvin-share/commit/7afda85f03d410a6c611860d0c3fb2b88a2e3679))
|
||||||
|
* whitespace in title on homepage ([74cd520](https://github.com/stonith404/pingvin-share/commit/74cd520cb8c4ea87822ab6d54c0bf010455f401b))
|
||||||
|
|
||||||
|
## [0.24.1](https://github.com/stonith404/pingvin-share/compare/v0.24.0...v0.24.1) (2024-05-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* error on admin share management page if a share was created by an anonymous user ([c999df1](https://github.com/stonith404/pingvin-share/commit/c999df15e04a927f6e952db3c807b9591fb14894))
|
||||||
|
|
||||||
|
## [0.24.0](https://github.com/stonith404/pingvin-share/compare/v0.23.1...v0.24.0) (2024-05-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add admin-exclusive share-management page ([#461](https://github.com/stonith404/pingvin-share/issues/461)) ([3b1c9f1](https://github.com/stonith404/pingvin-share/commit/3b1c9f1efb7d02469e92537a2d1378b6cb412878))
|
||||||
|
* add name property to share ([#462](https://github.com/stonith404/pingvin-share/issues/462)) ([b717663](https://github.com/stonith404/pingvin-share/commit/b717663b5c3a4a98e361e7e39b680f4852537c59))
|
||||||
|
|
||||||
|
## [0.23.1](https://github.com/stonith404/pingvin-share/compare/v0.23.0...v0.23.1) (2024-04-05)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **backend:** crash on unhandled promise rejections ([1da4fee](https://github.com/stonith404/pingvin-share/commit/1da4feeb895a13d0a0ae754bd716a84e8186d081))
|
||||||
|
* changing the chunk size needed an app restart ([24e100b](https://github.com/stonith404/pingvin-share/commit/24e100bd7be8bf20778bdf2767aa35cae8d7e502))
|
||||||
|
* disable js execution on raw file view ([9d1a12b](https://github.com/stonith404/pingvin-share/commit/9d1a12b0d1812214f1fe6fa56e3848091ce4945c))
|
||||||
|
* incorrect layout on 404 page ([3c5e0ad](https://github.com/stonith404/pingvin-share/commit/3c5e0ad5134ee2d405ac420152b5825102f65bfc))
|
||||||
|
* normal shares were added to the previous reverse share ([3972589](https://github.com/stonith404/pingvin-share/commit/3972589f76519b03074d916fb2460c795b1f0737))
|
||||||
|
* redirect vulnerability on error, sign in and totp page ([384fd19](https://github.com/stonith404/pingvin-share/commit/384fd19203b63eeb4b952f83a9e1eaab1b19b90d))
|
||||||
|
|
||||||
|
## [0.23.0](https://github.com/stonith404/pingvin-share/compare/v0.22.2...v0.23.0) (2024-04-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add config variable to adjust chunk size ([0bfbaea](https://github.com/stonith404/pingvin-share/commit/0bfbaea49aad0c695fee6558c89c661687912e4f))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* delete share files if user gets deleted ([e71f6cd](https://github.com/stonith404/pingvin-share/commit/e71f6cd1598ed87366074398042a6b88675587ca))
|
||||||
|
* error in logs if "allow unauthenticated shares" is enabled ([c6d8188](https://github.com/stonith404/pingvin-share/commit/c6d8188e4e33ba682551a3ca79205ff5a6d7ead5))
|
||||||
|
* memory leak while uploading files by disabling base64 encoding of chunks ([7a15fbb](https://github.com/stonith404/pingvin-share/commit/7a15fbb4651c2fee32fb4c1ee2c9d7f12323feb0))
|
||||||
|
|
||||||
|
## [0.22.2](https://github.com/stonith404/pingvin-share/compare/v0.22.1...v0.22.2) (2024-02-29)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* extend access token cookie expiration ([013b988](https://github.com/stonith404/pingvin-share/commit/013b9886af5629b2ead6000b962267afc761c612))
|
||||||
|
* reduce refresh access token calls ([1aa3d8e](https://github.com/stonith404/pingvin-share/commit/1aa3d8e5e89b3696cc9554f41e9ce13806dde406))
|
||||||
|
* replace Nginx with Caddy to fix "premature close" error while downloading larger files ([43bff91](https://github.com/stonith404/pingvin-share/commit/43bff91db2ba4ec68d76e601f7bc42cb7a506bc5))
|
||||||
|
|
||||||
|
## [0.22.1](https://github.com/stonith404/pingvin-share/compare/v0.22.0...v0.22.1) (2024-02-18)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* back links on error modals ([f52dffd](https://github.com/stonith404/pingvin-share/commit/f52dffdaac5a893804525913943f3f4f99b7c55a))
|
||||||
|
* prevent zoom on input field click on mobile ([9c734ec](https://github.com/stonith404/pingvin-share/commit/9c734ec439aeaeebe172caa41bf531e6d8b3fac3))
|
||||||
|
* replace middleware backend url with local backend url ([76df6f6](https://github.com/stonith404/pingvin-share/commit/76df6f66d965dd751146468abfafb0c6acd46310))
|
||||||
|
* user `id` and `totpVerified` can't be changed by user ([e663da4](https://github.com/stonith404/pingvin-share/commit/e663da45b1d15f5e6e33118e6a28e1504688034c))
|
||||||
|
* user enumaration on forgot password page ([64515d7](https://github.com/stonith404/pingvin-share/commit/64515d77cfc116a243d78610395ccc383ba62940))
|
||||||
|
|
||||||
|
## [0.22.0](https://github.com/stonith404/pingvin-share/compare/v0.21.5...v0.22.0) (2024-02-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **translations:** typo in string ([c189cd9](https://github.com/stonith404/pingvin-share/commit/c189cd97a502cee8ea79e5187d9288d636d4983c))
|
||||||
|
|
||||||
|
## [0.21.5](https://github.com/stonith404/pingvin-share/compare/v0.21.4...v0.21.5) (2024-01-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* password can be changed with wrong password ([0ccb836](https://github.com/stonith404/pingvin-share/commit/0ccb8364448d27ea07c8b11972ff454d610893c6))
|
||||||
|
|
||||||
|
## [0.21.4](https://github.com/stonith404/pingvin-share/compare/v0.21.3...v0.21.4) (2024-01-09)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **frontend:** add navigateToLink button for CopyTextField. close [#372](https://github.com/stonith404/pingvin-share/issues/372). ([#376](https://github.com/stonith404/pingvin-share/issues/376)) ([d775008](https://github.com/stonith404/pingvin-share/commit/d7750086b5b796cfc70d8dc0c7d0ab4bd1996ca0))
|
||||||
|
|
||||||
|
## [0.21.3](https://github.com/stonith404/pingvin-share/compare/v0.21.2...v0.21.3) (2024-01-02)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* don't show validation error on upload modal if password or max views are empty ([fe09d0e](https://github.com/stonith404/pingvin-share/commit/fe09d0e25f6fbfc4e1c9302054d3387fe8b1f0ea))
|
||||||
|
|
||||||
|
## [0.21.2](https://github.com/stonith404/pingvin-share/compare/v0.21.1...v0.21.2) (2023-12-29)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* missing logo images on fresh installation ([6fb31ab](https://github.com/stonith404/pingvin-share/commit/6fb31abd84b22cd464b6b45bf7ca6f83853e8720))
|
||||||
|
* missing translations on reset password page ([7a301b4](https://github.com/stonith404/pingvin-share/commit/7a301b455cdea4b1dbc04cc6223e094fee9aca7b))
|
||||||
|
|
||||||
|
## [0.21.1](https://github.com/stonith404/pingvin-share/compare/v0.21.0...v0.21.1) (2023-12-20)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **oauth:** add oidc username claim ([#357](https://github.com/stonith404/pingvin-share/issues/357)) ([3ea52a2](https://github.com/stonith404/pingvin-share/commit/3ea52a24ef7c3b6845bc13382616ea0c8d784585))
|
||||||
|
|
||||||
|
## [0.21.0](https://github.com/stonith404/pingvin-share/compare/v0.20.3...v0.21.0) (2023-12-01)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **oauth:** limited discord server sign-in ([#346](https://github.com/stonith404/pingvin-share/issues/346)) ([5f94c72](https://github.com/stonith404/pingvin-share/commit/5f94c7295ab8594ed2ed615628214e869a02da2d))
|
||||||
|
|
||||||
|
## [0.20.3](https://github.com/stonith404/pingvin-share/compare/v0.20.2...v0.20.3) (2023-11-17)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* max expiration gets ignored if expiration is set to "never" ([330eef5](https://github.com/stonith404/pingvin-share/commit/330eef51e4f3f3fb29833bc9337e705553340aaa))
|
||||||
|
|
||||||
|
## [0.20.2](https://github.com/stonith404/pingvin-share/compare/v0.20.1...v0.20.2) (2023-11-11)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **oauth:** github and discord login error ([#323](https://github.com/stonith404/pingvin-share/issues/323)) ([fd44f42](https://github.com/stonith404/pingvin-share/commit/fd44f42f28c0fa2091876b138f170202d9fde04e)), closes [#322](https://github.com/stonith404/pingvin-share/issues/322) [#302](https://github.com/stonith404/pingvin-share/issues/302)
|
||||||
|
* reverse shares couldn't be created unauthenticated ([966ce26](https://github.com/stonith404/pingvin-share/commit/966ce261cb4ad99efaadef5c36564fdfaed0d5c4))
|
||||||
|
|
||||||
|
## [0.20.1](https://github.com/stonith404/pingvin-share/compare/v0.20.0...v0.20.1) (2023-11-05)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* share information text color in light mode ([1138cd0](https://github.com/stonith404/pingvin-share/commit/1138cd02b0b6ac1d71c4dbc2808110c672237190))
|
||||||
|
|
||||||
|
## [0.20.0](https://github.com/stonith404/pingvin-share/compare/v0.19.2...v0.20.0) (2023-11-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ability to add and delete files of existing share ([#306](https://github.com/stonith404/pingvin-share/issues/306)) ([98380e2](https://github.com/stonith404/pingvin-share/commit/98380e2d48cc8ffa831d9b69cf5c0e8a40e28862))
|
||||||
|
|
||||||
|
## [0.19.2](https://github.com/stonith404/pingvin-share/compare/v0.19.1...v0.19.2) (2023-11-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* ability to limit the max expiration of a share ([bbfc9d6](https://github.com/stonith404/pingvin-share/commit/bbfc9d6f147eea404f011c3af9d7dc7655c3d21d))
|
||||||
|
* change totp issuer to display logo in 2FAS app ([e0fbbec](https://github.com/stonith404/pingvin-share/commit/e0fbbeca3c1a858838b20aeead52694772b7d871))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* jwt secret changes on application restart ([33742a0](https://github.com/stonith404/pingvin-share/commit/33742a043d6549783984ae7e8a3c30f0fe3917de))
|
||||||
|
* wrong validation of setting max share expiration to `0` ([acc35f4](https://github.com/stonith404/pingvin-share/commit/acc35f47178e230f50ce54d6f1ad5370caa3382d))
|
||||||
|
|
||||||
|
## [0.19.1](https://github.com/stonith404/pingvin-share/compare/v0.19.0...v0.19.1) (2023-10-22)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **oauth:** fix wrong redirectUri in oidc after change appUrl ([#296](https://github.com/stonith404/pingvin-share/issues/296)) ([119b1ec](https://github.com/stonith404/pingvin-share/commit/119b1ec840ad7f4e1c7c4bb476bf1eeed91d9a1a))
|
||||||
|
|
||||||
|
## [0.19.0](https://github.com/stonith404/pingvin-share/compare/v0.18.2...v0.19.0) (2023-10-22)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **auth:** add OAuth2 login ([#276](https://github.com/stonith404/pingvin-share/issues/276)) ([02cd98f](https://github.com/stonith404/pingvin-share/commit/02cd98fa9cf9865d91494848aabaf42b19e4957b)), closes [#278](https://github.com/stonith404/pingvin-share/issues/278) [#279](https://github.com/stonith404/pingvin-share/issues/279) [#281](https://github.com/stonith404/pingvin-share/issues/281)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* delete unfinished shares after a day ([d327bc3](https://github.com/stonith404/pingvin-share/commit/d327bc355c8583231e058731934cf51ab25d9ce5))
|
||||||
|
|
||||||
|
## [0.18.2](https://github.com/stonith404/pingvin-share/compare/v0.18.1...v0.18.2) (2023-10-09)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* disable image optimizations for logo to prevent caching issues with custom logos ([3891900](https://github.com/stonith404/pingvin-share/commit/38919003e9091203b507d0f0b061f4a1835ff4f4))
|
||||||
|
* memory leak while downloading large files ([97e7d71](https://github.com/stonith404/pingvin-share/commit/97e7d7190dfe219caf441dffcd7830c304c3c939))
|
||||||
|
|
||||||
|
## [0.18.1](https://github.com/stonith404/pingvin-share/compare/v0.18.0...v0.18.1) (2023-09-22)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* permission changes of docker container brakes existing installations ([6a4108e](https://github.com/stonith404/pingvin-share/commit/6a4108ed6138e7297e66fd1e38450f23afe99aae))
|
||||||
|
|
||||||
|
## [0.18.0](https://github.com/stonith404/pingvin-share/compare/v0.17.5...v0.18.0) (2023-09-21)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* show upload modal on file drop ([13e7a30](https://github.com/stonith404/pingvin-share/commit/13e7a30bb96faeb25936ff08a107834fd7af5766))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **docker:** Updated to newest version of alpine linux and fixed missing dependencies ([#255](https://github.com/stonith404/pingvin-share/issues/255)) ([6fa7af7](https://github.com/stonith404/pingvin-share/commit/6fa7af79051c964060bd291c9faad90fc01a1b72))
|
||||||
|
* nextjs proxy warning ([e9efbc1](https://github.com/stonith404/pingvin-share/commit/e9efbc17bcf4827e935e2018dcdf3b70a9a49991))
|
||||||
|
|
||||||
|
## [0.17.5](https://github.com/stonith404/pingvin-share/compare/v0.17.4...v0.17.5) (2023-09-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **localization:** Added thai language ([#231](https://github.com/stonith404/pingvin-share/issues/231)) ([bddb87b](https://github.com/stonith404/pingvin-share/commit/bddb87b9b3ec5426a3c7a14a96caf2eb45b93ff7))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* autocomplete on create share modal ([d4e8d4f](https://github.com/stonith404/pingvin-share/commit/d4e8d4f58b9b7d10b865eff49aa784547891c4e8))
|
||||||
|
* missing translation ([7647a9f](https://github.com/stonith404/pingvin-share/commit/7647a9f620cbc5d38e019225a680a53bd3027698))
|
||||||
|
|
||||||
|
## [0.17.4](https://github.com/stonith404/pingvin-share/compare/v0.17.3...v0.17.4) (2023-08-01)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* redirection to `localhost:3000` ([ea0d521](https://github.com/stonith404/pingvin-share/commit/ea0d5216e89346b8d3ef0277b76fdc6302e9de15))
|
||||||
|
|
||||||
## [0.17.3](https://github.com/stonith404/pingvin-share/compare/v0.17.2...v0.17.3) (2023-07-31)
|
## [0.17.3](https://github.com/stonith404/pingvin-share/compare/v0.17.2...v0.17.3) (2023-07-31)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
15
Caddyfile
Normal file
15
Caddyfile
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
:3000 {
|
||||||
|
# Reverse proxy for /api
|
||||||
|
reverse_proxy /api/* http://localhost:8080 {
|
||||||
|
header_up X-Forwarded-Host {host}:{server_port}
|
||||||
|
header_up X-Forwarded-For {remote_host}
|
||||||
|
header_up X-Forwarded-Proto {scheme}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Reverse proxy for all other requests
|
||||||
|
reverse_proxy http://localhost:3333 {
|
||||||
|
header_up X-Forwarded-Host {host}:{server_port}
|
||||||
|
header_up X-Forwarded-For {remote_host}
|
||||||
|
header_up X-Forwarded-Proto {scheme}
|
||||||
|
}
|
||||||
|
}
|
||||||
39
Dockerfile
39
Dockerfile
@@ -1,37 +1,41 @@
|
|||||||
# Using node slim because prisma ORM needs libc for ARM builds
|
# Stage 1: Frontend dependencies
|
||||||
|
FROM node:20-alpine AS frontend-dependencies
|
||||||
# Stage 1: on frontend dependency change
|
|
||||||
FROM node:19-slim AS frontend-dependencies
|
|
||||||
WORKDIR /opt/app
|
WORKDIR /opt/app
|
||||||
COPY frontend/package.json frontend/package-lock.json ./
|
COPY frontend/package.json frontend/package-lock.json ./
|
||||||
RUN npm ci
|
RUN npm ci
|
||||||
|
|
||||||
# Stage 2: on frontend change
|
# Stage 2: Build frontend
|
||||||
FROM node:19-slim AS frontend-builder
|
FROM node:20-alpine AS frontend-builder
|
||||||
WORKDIR /opt/app
|
WORKDIR /opt/app
|
||||||
COPY ./frontend .
|
COPY ./frontend .
|
||||||
COPY --from=frontend-dependencies /opt/app/node_modules ./node_modules
|
COPY --from=frontend-dependencies /opt/app/node_modules ./node_modules
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# Stage 3: on backend dependency change
|
# Stage 3: Backend dependencies
|
||||||
FROM node:19-slim AS backend-dependencies
|
FROM node:20-alpine AS backend-dependencies
|
||||||
|
RUN apk add --no-cache python3
|
||||||
WORKDIR /opt/app
|
WORKDIR /opt/app
|
||||||
COPY backend/package.json backend/package-lock.json ./
|
COPY backend/package.json backend/package-lock.json ./
|
||||||
RUN npm ci
|
RUN npm ci
|
||||||
|
|
||||||
# Stage 4:on backend change
|
# Stage 4: Build backend
|
||||||
FROM node:19-slim AS backend-builder
|
FROM node:20-alpine AS backend-builder
|
||||||
RUN apt-get update && apt-get install -y openssl
|
|
||||||
WORKDIR /opt/app
|
WORKDIR /opt/app
|
||||||
COPY ./backend .
|
COPY ./backend .
|
||||||
COPY --from=backend-dependencies /opt/app/node_modules ./node_modules
|
COPY --from=backend-dependencies /opt/app/node_modules ./node_modules
|
||||||
RUN npx prisma generate
|
RUN npx prisma generate
|
||||||
RUN npm run build && npm prune --production
|
RUN npm run build && npm prune --production
|
||||||
|
|
||||||
# Stage 5: Final image
|
# Stage 5: Final image
|
||||||
FROM node:19-slim AS runner
|
FROM node:20-alpine AS runner
|
||||||
ENV NODE_ENV=docker
|
ENV NODE_ENV=docker
|
||||||
RUN apt-get update && apt-get install -y curl openssl
|
|
||||||
|
# Install Caddy
|
||||||
|
RUN apk update --no-cache \
|
||||||
|
&& apk upgrade --no-cache \
|
||||||
|
&& apk add --no-cache curl caddy
|
||||||
|
|
||||||
|
COPY ./Caddyfile /etc/caddy/Caddyfile
|
||||||
|
|
||||||
WORKDIR /opt/app/frontend
|
WORKDIR /opt/app/frontend
|
||||||
COPY --from=frontend-builder /opt/app/public ./public
|
COPY --from=frontend-builder /opt/app/public ./public
|
||||||
@@ -46,8 +50,11 @@ COPY --from=backend-builder /opt/app/prisma ./prisma
|
|||||||
COPY --from=backend-builder /opt/app/package.json ./
|
COPY --from=backend-builder /opt/app/package.json ./
|
||||||
|
|
||||||
WORKDIR /opt/app
|
WORKDIR /opt/app
|
||||||
|
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
|
|
||||||
|
# Health check remains unchanged
|
||||||
HEALTHCHECK --interval=10s --timeout=3s CMD curl -f http://localhost:3000/api/health || exit 1
|
HEALTHCHECK --interval=10s --timeout=3s CMD curl -f http://localhost:3000/api/health || exit 1
|
||||||
|
|
||||||
# HOSTNAME=127.0.0.1 fixes https://github.com/vercel/next.js/issues/51684. It can be removed as soon as the issue is fixed
|
# Application startup updated for Caddy
|
||||||
CMD cp -rn /tmp/img /opt/app/frontend/public && HOSTNAME=127.0.0.1 node frontend/server.js & cd backend && npm run prod
|
CMD cp -rn /tmp/img/* /opt/app/frontend/public/img && caddy run --config /etc/caddy/Caddyfile & PORT=3333 HOSTNAME=0.0.0.0 node frontend/server.js & cd backend && npm run prod
|
||||||
19
README.md
19
README.md
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
_Read this in another language: [Spanish](/docs/README.es.md), [English](/README.md), [Simplified Chinese](/docs/README.zh-cn.md)_
|
_Read this in another language: [Spanish](/docs/README.es.md), [English](/README.md), [简体中文](/docs/README.zh-cn.md), [日本語](/docs/README.ja-jp.md)_
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ Pingvin Share is self-hosted file sharing platform and an alternative for WeTran
|
|||||||
### Installation with Docker (recommended)
|
### Installation with Docker (recommended)
|
||||||
|
|
||||||
1. Download the `docker-compose.yml` file
|
1. Download the `docker-compose.yml` file
|
||||||
2. Run `docker-compose up -d`
|
2. Run `docker compose up -d`
|
||||||
|
|
||||||
The website is now listening on `http://localhost:3000`, have fun with Pingvin Share 🐧!
|
The website is now listening on `http://localhost:3000`, have fun with Pingvin Share 🐧!
|
||||||
|
|
||||||
@@ -60,9 +60,12 @@ pm2 start --name="pingvin-share-backend" npm -- run prod
|
|||||||
cd ../frontend
|
cd ../frontend
|
||||||
npm install
|
npm install
|
||||||
npm run build
|
npm run build
|
||||||
pm2 start --name="pingvin-share-frontend" npm -- run start
|
API_URL=http://localhost:8080 # Set the URL of the backend, default: http://localhost:8080
|
||||||
|
pm2 start --name="pingvin-share-frontend" .next/standalone/server.js
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**Uploading Large Files**: By default, Pingvin Share uses a built-in reverse proxy to reduce the installation steps. However, this reverse proxy is not optimized for uploading large files. If you wish to upload larger files, you can either use the Docker installation or set up your own reverse proxy. An example configuration for Caddy can be found in `./Caddyfile`.
|
||||||
|
|
||||||
The website is now listening on `http://localhost:3000`, have fun with Pingvin Share 🐧!
|
The website is now listening on `http://localhost:3000`, have fun with Pingvin Share 🐧!
|
||||||
|
|
||||||
### Integrations
|
### Integrations
|
||||||
@@ -77,9 +80,14 @@ ClamAV is used to scan shares for malicious files and remove them if found.
|
|||||||
|
|
||||||
Please note that ClamAV needs a lot of [ressources](https://docs.clamav.net/manual/Installing/Docker.html#memory-ram-requirements).
|
Please note that ClamAV needs a lot of [ressources](https://docs.clamav.net/manual/Installing/Docker.html#memory-ram-requirements).
|
||||||
|
|
||||||
|
#### OAuth 2 Login
|
||||||
|
|
||||||
|
View the [OAuth 2 guide](/docs/oauth2-guide.md) for more information.
|
||||||
|
|
||||||
### Additional resources
|
### Additional resources
|
||||||
|
|
||||||
- [Synology NAS installation](https://mariushosting.com/how-to-install-pingvin-share-on-your-synology-nas/)
|
- [Synology NAS installation](https://mariushosting.com/how-to-install-pingvin-share-on-your-synology-nas/)
|
||||||
|
- [Zeabur installation](https://zeabur.com/templates/19G6OK)
|
||||||
|
|
||||||
### Upgrade to a new version
|
### Upgrade to a new version
|
||||||
|
|
||||||
@@ -108,18 +116,21 @@ docker compose up -d
|
|||||||
|
|
||||||
# Start the backend
|
# Start the backend
|
||||||
cd backend
|
cd backend
|
||||||
|
npm install
|
||||||
npm run build
|
npm run build
|
||||||
pm2 restart pingvin-share-backend
|
pm2 restart pingvin-share-backend
|
||||||
|
|
||||||
# Start the frontend
|
# Start the frontend
|
||||||
cd ../frontend
|
cd ../frontend
|
||||||
|
npm install
|
||||||
npm run build
|
npm run build
|
||||||
|
API_URL=http://localhost:8080 # Set the URL of the backend, default: http://localhost:8080
|
||||||
pm2 restart pingvin-share-frontend
|
pm2 restart pingvin-share-frontend
|
||||||
```
|
```
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
||||||
You can customize Pingvin Share by going to the configuration page in your admin dashboard.
|
You can customize Pingvin Share like changing your domain by going to the configuration page in your admin dashboard `/admin/config`.
|
||||||
|
|
||||||
#### Environment variables
|
#### Environment variables
|
||||||
|
|
||||||
|
|||||||
1
backend/.prettierignore
Normal file
1
backend/.prettierignore
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/src/constants.ts
|
||||||
9514
backend/package-lock.json
generated
9514
backend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pingvin-share-backend",
|
"name": "pingvin-share-backend",
|
||||||
"version": "0.17.3",
|
"version": "0.24.2",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "nest build",
|
"build": "nest build",
|
||||||
"dev": "cross-env NODE_ENV=development nest start --watch",
|
"dev": "cross-env NODE_ENV=development nest start --watch",
|
||||||
@@ -13,68 +13,73 @@
|
|||||||
"seed": "ts-node prisma/seed/config.seed.ts"
|
"seed": "ts-node prisma/seed/config.seed.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nestjs/common": "^10.1.2",
|
"@nestjs/cache-manager": "^2.2.2",
|
||||||
"@nestjs/config": "^3.0.0",
|
"@nestjs/common": "^10.3.8",
|
||||||
"@nestjs/core": "^10.1.2",
|
"@nestjs/config": "^3.2.2",
|
||||||
"@nestjs/jwt": "^10.1.0",
|
"@nestjs/core": "^10.3.8",
|
||||||
"@nestjs/passport": "^10.0.0",
|
"@nestjs/jwt": "^10.2.0",
|
||||||
"@nestjs/platform-express": "^10.1.2",
|
"@nestjs/passport": "^10.0.3",
|
||||||
"@nestjs/schedule": "^3.0.1",
|
"@nestjs/platform-express": "^10.3.8",
|
||||||
"@nestjs/swagger": "^7.1.4",
|
"@nestjs/schedule": "^3.0.4",
|
||||||
|
"@nestjs/swagger": "^7.3.1",
|
||||||
"@nestjs/throttler": "^4.2.1",
|
"@nestjs/throttler": "^4.2.1",
|
||||||
"@prisma/client": "^5.0.0",
|
"@prisma/client": "^5.14.0",
|
||||||
"archiver": "^5.3.1",
|
"archiver": "^5.3.2",
|
||||||
"argon2": "^0.30.3",
|
"argon2": "^0.40.1",
|
||||||
"body-parser": "^1.20.2",
|
"body-parser": "^1.20.2",
|
||||||
"clamscan": "^2.1.2",
|
"cache-manager": "^5.5.2",
|
||||||
|
"clamscan": "^2.2.1",
|
||||||
"class-transformer": "^0.5.1",
|
"class-transformer": "^0.5.1",
|
||||||
"class-validator": "^0.14.0",
|
"class-validator": "^0.14.1",
|
||||||
"content-disposition": "^0.5.4",
|
"content-disposition": "^0.5.4",
|
||||||
"cookie-parser": "^1.4.6",
|
"cookie-parser": "^1.4.6",
|
||||||
"mime-types": "^2.1.35",
|
"mime-types": "^2.1.35",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.30.1",
|
||||||
"nodemailer": "^6.9.4",
|
"nanoid": "^3.3.7",
|
||||||
|
"node-fetch": "^2.7.0",
|
||||||
|
"nodemailer": "^6.9.13",
|
||||||
"otplib": "^12.0.1",
|
"otplib": "^12.0.1",
|
||||||
"passport": "^0.6.0",
|
"passport": "^0.7.0",
|
||||||
"passport-jwt": "^4.0.1",
|
"passport-jwt": "^4.0.1",
|
||||||
"passport-local": "^1.0.0",
|
"passport-local": "^1.0.0",
|
||||||
"qrcode-svg": "^1.1.0",
|
"qrcode-svg": "^1.1.0",
|
||||||
"reflect-metadata": "^0.1.13",
|
"reflect-metadata": "^0.1.12",
|
||||||
"rimraf": "^5.0.1",
|
"rimraf": "^5.0.7",
|
||||||
"rxjs": "^7.8.1",
|
"rxjs": "^7.8.1",
|
||||||
"sharp": "^0.32.4",
|
"sharp": "^0.32.4",
|
||||||
"ts-node": "^10.9.1"
|
"ts-node": "^10.9.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nestjs/cli": "^10.1.10",
|
"@nestjs/cli": "^10.3.2",
|
||||||
"@nestjs/schematics": "^10.0.1",
|
"@nestjs/schematics": "^10.1.1",
|
||||||
"@nestjs/testing": "^10.1.2",
|
"@nestjs/testing": "^10.3.8",
|
||||||
"@types/archiver": "^5.3.2",
|
"@types/archiver": "^5.3.4",
|
||||||
"@types/clamscan": "^2.0.4",
|
"@types/clamscan": "^2.0.8",
|
||||||
"@types/cookie-parser": "^1.4.3",
|
"@types/cookie-parser": "^1.4.7",
|
||||||
"@types/cron": "^2.0.1",
|
"@types/cron": "^2.0.1",
|
||||||
"@types/express": "^4.17.17",
|
"@types/express": "^4.17.21",
|
||||||
"@types/mime-types": "^2.1.1",
|
"@types/mime-types": "^2.1.4",
|
||||||
"@types/multer": "^1.4.7",
|
"@types/multer": "^1.4.11",
|
||||||
"@types/node": "^20.4.5",
|
"@types/node": "^20.12.12",
|
||||||
"@types/nodemailer": "^6.4.9",
|
"@types/node-fetch": "^2.6.11",
|
||||||
"@types/passport-jwt": "^3.0.9",
|
"@types/nodemailer": "^6.4.15",
|
||||||
"@types/qrcode-svg": "^1.1.1",
|
"@types/passport-jwt": "^3.0.13",
|
||||||
|
"@types/qrcode-svg": "^1.1.4",
|
||||||
"@types/sharp": "^0.31.1",
|
"@types/sharp": "^0.31.1",
|
||||||
"@types/supertest": "^2.0.12",
|
"@types/supertest": "^2.0.16",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.2.0",
|
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
||||||
"@typescript-eslint/parser": "^6.2.0",
|
"@typescript-eslint/parser": "^6.21.0",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"eslint": "^8.46.0",
|
"eslint": "^8.57.0",
|
||||||
"eslint-config-prettier": "^8.9.0",
|
"eslint-config-prettier": "^8.10.0",
|
||||||
"eslint-plugin-prettier": "^5.0.0",
|
"eslint-plugin-prettier": "^5.1.3",
|
||||||
"newman": "^5.3.2",
|
"newman": "^6.1.2",
|
||||||
"prettier": "^3.0.0",
|
"prettier": "^3.2.5",
|
||||||
"prisma": "^5.0.0",
|
"prisma": "^5.14.0",
|
||||||
"source-map-support": "^0.5.21",
|
"source-map-support": "^0.5.21",
|
||||||
"ts-loader": "^9.4.4",
|
"ts-loader": "^9.5.1",
|
||||||
"tsconfig-paths": "4.2.0",
|
"tsconfig-paths": "4.2.0",
|
||||||
"typescript": "^5.1.6",
|
"typescript": "^5.4.5",
|
||||||
"wait-on": "^7.0.1"
|
"wait-on": "^7.2.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
31
backend/prisma/migrations/20231021165436_oauth/migration.sql
Normal file
31
backend/prisma/migrations/20231021165436_oauth/migration.sql
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "OAuthUser" (
|
||||||
|
"id" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"provider" TEXT NOT NULL,
|
||||||
|
"providerUserId" TEXT NOT NULL,
|
||||||
|
"providerUsername" TEXT NOT NULL,
|
||||||
|
"userId" TEXT NOT NULL,
|
||||||
|
CONSTRAINT "OAuthUser_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
);
|
||||||
|
|
||||||
|
-- RedefineTables
|
||||||
|
PRAGMA foreign_keys=OFF;
|
||||||
|
CREATE TABLE "new_User" (
|
||||||
|
"id" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updatedAt" DATETIME NOT NULL,
|
||||||
|
"username" TEXT NOT NULL,
|
||||||
|
"email" TEXT NOT NULL,
|
||||||
|
"password" TEXT,
|
||||||
|
"isAdmin" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"totpEnabled" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"totpVerified" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"totpSecret" TEXT
|
||||||
|
);
|
||||||
|
INSERT INTO "new_User" ("createdAt", "email", "id", "isAdmin", "password", "totpEnabled", "totpSecret", "totpVerified", "updatedAt", "username") SELECT "createdAt", "email", "id", "isAdmin", "password", "totpEnabled", "totpSecret", "totpVerified", "updatedAt", "username" FROM "User";
|
||||||
|
DROP TABLE "User";
|
||||||
|
ALTER TABLE "new_User" RENAME TO "User";
|
||||||
|
CREATE UNIQUE INDEX "User_username_key" ON "User"("username");
|
||||||
|
CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
|
||||||
|
PRAGMA foreign_key_check;
|
||||||
|
PRAGMA foreign_keys=ON;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "Share" ADD COLUMN "name" TEXT;
|
||||||
@@ -14,7 +14,7 @@ model User {
|
|||||||
|
|
||||||
username String @unique
|
username String @unique
|
||||||
email String @unique
|
email String @unique
|
||||||
password String
|
password String?
|
||||||
isAdmin Boolean @default(false)
|
isAdmin Boolean @default(false)
|
||||||
|
|
||||||
shares Share[]
|
shares Share[]
|
||||||
@@ -26,6 +26,8 @@ model User {
|
|||||||
totpVerified Boolean @default(false)
|
totpVerified Boolean @default(false)
|
||||||
totpSecret String?
|
totpSecret String?
|
||||||
resetPasswordToken ResetPasswordToken?
|
resetPasswordToken ResetPasswordToken?
|
||||||
|
|
||||||
|
oAuthUsers OAuthUser[]
|
||||||
}
|
}
|
||||||
|
|
||||||
model RefreshToken {
|
model RefreshToken {
|
||||||
@@ -60,10 +62,20 @@ model ResetPasswordToken {
|
|||||||
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
model OAuthUser {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
provider String
|
||||||
|
providerUserId String
|
||||||
|
providerUsername String
|
||||||
|
userId String
|
||||||
|
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
||||||
|
}
|
||||||
|
|
||||||
model Share {
|
model Share {
|
||||||
id String @id @default(uuid())
|
id String @id @default(uuid())
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
|
|
||||||
|
name String?
|
||||||
uploadLocked Boolean @default(false)
|
uploadLocked Boolean @default(false)
|
||||||
isZipReady Boolean @default(false)
|
isZipReady Boolean @default(false)
|
||||||
views Int @default(0)
|
views Int @default(0)
|
||||||
@@ -134,7 +146,7 @@ model Config {
|
|||||||
name String
|
name String
|
||||||
category String
|
category String
|
||||||
type String
|
type String
|
||||||
defaultValue String @default("")
|
defaultValue String @default("")
|
||||||
value String?
|
value String?
|
||||||
obscured Boolean @default(false)
|
obscured Boolean @default(false)
|
||||||
secret Boolean @default(true)
|
secret Boolean @default(true)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ const configVariables: ConfigVariables = {
|
|||||||
internal: {
|
internal: {
|
||||||
jwtSecret: {
|
jwtSecret: {
|
||||||
type: "string",
|
type: "string",
|
||||||
defaultValue: crypto.randomBytes(256).toString("base64"),
|
value: crypto.randomBytes(256).toString("base64"),
|
||||||
locked: true,
|
locked: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -37,6 +37,11 @@ const configVariables: ConfigVariables = {
|
|||||||
defaultValue: "false",
|
defaultValue: "false",
|
||||||
secret: false,
|
secret: false,
|
||||||
},
|
},
|
||||||
|
maxExpiration: {
|
||||||
|
type: "number",
|
||||||
|
defaultValue: "0",
|
||||||
|
secret: false,
|
||||||
|
},
|
||||||
maxSize: {
|
maxSize: {
|
||||||
type: "number",
|
type: "number",
|
||||||
defaultValue: "1000000000",
|
defaultValue: "1000000000",
|
||||||
@@ -46,6 +51,11 @@ const configVariables: ConfigVariables = {
|
|||||||
type: "number",
|
type: "number",
|
||||||
defaultValue: "9",
|
defaultValue: "9",
|
||||||
},
|
},
|
||||||
|
chunkSize: {
|
||||||
|
type: "number",
|
||||||
|
defaultValue: "10000000",
|
||||||
|
secret: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
email: {
|
email: {
|
||||||
enableShareEmailRecipients: {
|
enableShareEmailRecipients: {
|
||||||
@@ -119,6 +129,97 @@ const configVariables: ConfigVariables = {
|
|||||||
obscured: true,
|
obscured: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
oauth: {
|
||||||
|
"allowRegistration": {
|
||||||
|
type: "boolean",
|
||||||
|
defaultValue: "true",
|
||||||
|
},
|
||||||
|
"ignoreTotp": {
|
||||||
|
type: "boolean",
|
||||||
|
defaultValue: "true",
|
||||||
|
},
|
||||||
|
"github-enabled": {
|
||||||
|
type: "boolean",
|
||||||
|
defaultValue: "false",
|
||||||
|
},
|
||||||
|
"github-clientId": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
},
|
||||||
|
"github-clientSecret": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
obscured: true,
|
||||||
|
},
|
||||||
|
"google-enabled": {
|
||||||
|
type: "boolean",
|
||||||
|
defaultValue: "false",
|
||||||
|
},
|
||||||
|
"google-clientId": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
},
|
||||||
|
"google-clientSecret": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
obscured: true,
|
||||||
|
},
|
||||||
|
"microsoft-enabled": {
|
||||||
|
type: "boolean",
|
||||||
|
defaultValue: "false",
|
||||||
|
},
|
||||||
|
"microsoft-tenant": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "common",
|
||||||
|
},
|
||||||
|
"microsoft-clientId": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
},
|
||||||
|
"microsoft-clientSecret": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
obscured: true,
|
||||||
|
},
|
||||||
|
"discord-enabled": {
|
||||||
|
type: "boolean",
|
||||||
|
defaultValue: "false",
|
||||||
|
},
|
||||||
|
"discord-limitedGuild": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
},
|
||||||
|
"discord-clientId": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
},
|
||||||
|
"discord-clientSecret": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
obscured: true,
|
||||||
|
},
|
||||||
|
"oidc-enabled": {
|
||||||
|
type: "boolean",
|
||||||
|
defaultValue: "false",
|
||||||
|
},
|
||||||
|
"oidc-discoveryUri": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
},
|
||||||
|
"oidc-usernameClaim": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
},
|
||||||
|
"oidc-clientId": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
},
|
||||||
|
"oidc-clientSecret": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
obscured: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
type ConfigVariables = {
|
type ConfigVariables = {
|
||||||
@@ -174,7 +275,7 @@ async function migrateConfigVariables() {
|
|||||||
for (const existingConfigVariable of existingConfigVariables) {
|
for (const existingConfigVariable of existingConfigVariables) {
|
||||||
const configVariable =
|
const configVariable =
|
||||||
configVariables[existingConfigVariable.category]?.[
|
configVariables[existingConfigVariable.category]?.[
|
||||||
existingConfigVariable.name
|
existingConfigVariable.name
|
||||||
];
|
];
|
||||||
if (!configVariable) {
|
if (!configVariable) {
|
||||||
await prisma.config.delete({
|
await prisma.config.delete({
|
||||||
|
|||||||
19
backend/src/app.controller.ts
Normal file
19
backend/src/app.controller.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { Controller, Get, Res } from "@nestjs/common";
|
||||||
|
import { Response } from "express";
|
||||||
|
import { PrismaService } from "./prisma/prisma.service";
|
||||||
|
|
||||||
|
@Controller("/")
|
||||||
|
export class AppController {
|
||||||
|
constructor(private prismaService: PrismaService) {}
|
||||||
|
|
||||||
|
@Get("health")
|
||||||
|
async health(@Res({ passthrough: true }) res: Response) {
|
||||||
|
try {
|
||||||
|
await this.prismaService.config.findMany();
|
||||||
|
return "OK";
|
||||||
|
} catch {
|
||||||
|
res.statusCode = 500;
|
||||||
|
return "ERROR";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,6 +14,9 @@ import { ShareModule } from "./share/share.module";
|
|||||||
import { UserModule } from "./user/user.module";
|
import { UserModule } from "./user/user.module";
|
||||||
import { ClamScanModule } from "./clamscan/clamscan.module";
|
import { ClamScanModule } from "./clamscan/clamscan.module";
|
||||||
import { ReverseShareModule } from "./reverseShare/reverseShare.module";
|
import { ReverseShareModule } from "./reverseShare/reverseShare.module";
|
||||||
|
import { AppController } from "./app.controller";
|
||||||
|
import { OAuthModule } from "./oauth/oauth.module";
|
||||||
|
import { CacheModule } from "@nestjs/cache-manager";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -32,7 +35,12 @@ import { ReverseShareModule } from "./reverseShare/reverseShare.module";
|
|||||||
ScheduleModule.forRoot(),
|
ScheduleModule.forRoot(),
|
||||||
ClamScanModule,
|
ClamScanModule,
|
||||||
ReverseShareModule,
|
ReverseShareModule,
|
||||||
|
OAuthModule,
|
||||||
|
CacheModule.register({
|
||||||
|
isGlobal: true,
|
||||||
|
}),
|
||||||
],
|
],
|
||||||
|
controllers: [AppController],
|
||||||
providers: [
|
providers: [
|
||||||
{
|
{
|
||||||
provide: APP_GUARD,
|
provide: APP_GUARD,
|
||||||
|
|||||||
@@ -33,24 +33,24 @@ export class AuthController {
|
|||||||
constructor(
|
constructor(
|
||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
private authTotpService: AuthTotpService,
|
private authTotpService: AuthTotpService,
|
||||||
private config: ConfigService
|
private config: ConfigService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@Post("signUp")
|
@Post("signUp")
|
||||||
@Throttle(10, 5 * 60)
|
@Throttle(10, 5 * 60)
|
||||||
async signUp(
|
async signUp(
|
||||||
@Body() dto: AuthRegisterDTO,
|
@Body() dto: AuthRegisterDTO,
|
||||||
@Res({ passthrough: true }) response: Response
|
@Res({ passthrough: true }) response: Response,
|
||||||
) {
|
) {
|
||||||
if (!this.config.get("share.allowRegistration"))
|
if (!this.config.get("share.allowRegistration"))
|
||||||
throw new ForbiddenException("Registration is not allowed");
|
throw new ForbiddenException("Registration is not allowed");
|
||||||
|
|
||||||
const result = await this.authService.signUp(dto);
|
const result = await this.authService.signUp(dto);
|
||||||
|
|
||||||
response = this.addTokensToResponse(
|
this.authService.addTokensToResponse(
|
||||||
response,
|
response,
|
||||||
result.refreshToken,
|
result.refreshToken,
|
||||||
result.accessToken
|
result.accessToken,
|
||||||
);
|
);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
@@ -61,15 +61,15 @@ export class AuthController {
|
|||||||
@HttpCode(200)
|
@HttpCode(200)
|
||||||
async signIn(
|
async signIn(
|
||||||
@Body() dto: AuthSignInDTO,
|
@Body() dto: AuthSignInDTO,
|
||||||
@Res({ passthrough: true }) response: Response
|
@Res({ passthrough: true }) response: Response,
|
||||||
) {
|
) {
|
||||||
const result = await this.authService.signIn(dto);
|
const result = await this.authService.signIn(dto);
|
||||||
|
|
||||||
if (result.accessToken && result.refreshToken) {
|
if (result.accessToken && result.refreshToken) {
|
||||||
response = this.addTokensToResponse(
|
this.authService.addTokensToResponse(
|
||||||
response,
|
response,
|
||||||
result.refreshToken,
|
result.refreshToken,
|
||||||
result.accessToken
|
result.accessToken,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,14 +81,14 @@ export class AuthController {
|
|||||||
@HttpCode(200)
|
@HttpCode(200)
|
||||||
async signInTotp(
|
async signInTotp(
|
||||||
@Body() dto: AuthSignInTotpDTO,
|
@Body() dto: AuthSignInTotpDTO,
|
||||||
@Res({ passthrough: true }) response: Response
|
@Res({ passthrough: true }) response: Response,
|
||||||
) {
|
) {
|
||||||
const result = await this.authTotpService.signInTotp(dto);
|
const result = await this.authTotpService.signInTotp(dto);
|
||||||
|
|
||||||
response = this.addTokensToResponse(
|
this.authService.addTokensToResponse(
|
||||||
response,
|
response,
|
||||||
result.refreshToken,
|
result.refreshToken,
|
||||||
result.accessToken
|
result.accessToken,
|
||||||
);
|
);
|
||||||
|
|
||||||
return new TokenDTO().from(result);
|
return new TokenDTO().from(result);
|
||||||
@@ -96,9 +96,9 @@ export class AuthController {
|
|||||||
|
|
||||||
@Post("resetPassword/:email")
|
@Post("resetPassword/:email")
|
||||||
@Throttle(5, 5 * 60)
|
@Throttle(5, 5 * 60)
|
||||||
@HttpCode(204)
|
@HttpCode(202)
|
||||||
async requestResetPassword(@Param("email") email: string) {
|
async requestResetPassword(@Param("email") email: string) {
|
||||||
return await this.authService.requestResetPassword(email);
|
this.authService.requestResetPassword(email);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("resetPassword")
|
@Post("resetPassword")
|
||||||
@@ -113,15 +113,15 @@ export class AuthController {
|
|||||||
async updatePassword(
|
async updatePassword(
|
||||||
@GetUser() user: User,
|
@GetUser() user: User,
|
||||||
@Res({ passthrough: true }) response: Response,
|
@Res({ passthrough: true }) response: Response,
|
||||||
@Body() dto: UpdatePasswordDTO
|
@Body() dto: UpdatePasswordDTO,
|
||||||
) {
|
) {
|
||||||
const result = await this.authService.updatePassword(
|
const result = await this.authService.updatePassword(
|
||||||
user,
|
user,
|
||||||
|
dto.password,
|
||||||
dto.oldPassword,
|
dto.oldPassword,
|
||||||
dto.password
|
|
||||||
);
|
);
|
||||||
|
|
||||||
response = this.addTokensToResponse(response, result.refreshToken);
|
this.authService.addTokensToResponse(response, result.refreshToken);
|
||||||
return new TokenDTO().from(result);
|
return new TokenDTO().from(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,21 +129,21 @@ export class AuthController {
|
|||||||
@HttpCode(200)
|
@HttpCode(200)
|
||||||
async refreshAccessToken(
|
async refreshAccessToken(
|
||||||
@Req() request: Request,
|
@Req() request: Request,
|
||||||
@Res({ passthrough: true }) response: Response
|
@Res({ passthrough: true }) response: Response,
|
||||||
) {
|
) {
|
||||||
if (!request.cookies.refresh_token) throw new UnauthorizedException();
|
if (!request.cookies.refresh_token) throw new UnauthorizedException();
|
||||||
|
|
||||||
const accessToken = await this.authService.refreshAccessToken(
|
const accessToken = await this.authService.refreshAccessToken(
|
||||||
request.cookies.refresh_token
|
request.cookies.refresh_token,
|
||||||
);
|
);
|
||||||
response = this.addTokensToResponse(response, undefined, accessToken);
|
this.authService.addTokensToResponse(response, undefined, accessToken);
|
||||||
return new TokenDTO().from({ accessToken });
|
return new TokenDTO().from({ accessToken });
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("signOut")
|
@Post("signOut")
|
||||||
async signOut(
|
async signOut(
|
||||||
@Req() request: Request,
|
@Req() request: Request,
|
||||||
@Res({ passthrough: true }) response: Response
|
@Res({ passthrough: true }) response: Response,
|
||||||
) {
|
) {
|
||||||
await this.authService.signOut(request.cookies.access_token);
|
await this.authService.signOut(request.cookies.access_token);
|
||||||
response.cookie("access_token", "accessToken", { maxAge: -1 });
|
response.cookie("access_token", "accessToken", { maxAge: -1 });
|
||||||
@@ -172,22 +172,4 @@ export class AuthController {
|
|||||||
// Note: We use VerifyTotpDTO here because it has both fields we need: password and totp code
|
// Note: We use VerifyTotpDTO here because it has both fields we need: password and totp code
|
||||||
return this.authTotpService.disableTotp(user, body.password, body.code);
|
return this.authTotpService.disableTotp(user, body.password, body.code);
|
||||||
}
|
}
|
||||||
|
|
||||||
private addTokensToResponse(
|
|
||||||
response: Response,
|
|
||||||
refreshToken?: string,
|
|
||||||
accessToken?: string
|
|
||||||
) {
|
|
||||||
if (accessToken)
|
|
||||||
response.cookie("access_token", accessToken, { sameSite: "lax" });
|
|
||||||
if (refreshToken)
|
|
||||||
response.cookie("refresh_token", refreshToken, {
|
|
||||||
path: "/api/auth/token",
|
|
||||||
httpOnly: true,
|
|
||||||
sameSite: "strict",
|
|
||||||
maxAge: 1000 * 60 * 60 * 24 * 30 * 3,
|
|
||||||
});
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,12 @@ import { AuthTotpService } from "./authTotp.service";
|
|||||||
import { JwtStrategy } from "./strategy/jwt.strategy";
|
import { JwtStrategy } from "./strategy/jwt.strategy";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [JwtModule.register({}), EmailModule],
|
imports: [
|
||||||
|
JwtModule.register({
|
||||||
|
global: true,
|
||||||
|
}),
|
||||||
|
EmailModule,
|
||||||
|
],
|
||||||
controllers: [AuthController],
|
controllers: [AuthController],
|
||||||
providers: [AuthService, AuthTotpService, JwtStrategy],
|
providers: [AuthService, AuthTotpService, JwtStrategy],
|
||||||
exports: [AuthService],
|
exports: [AuthService],
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { JwtService } from "@nestjs/jwt";
|
|||||||
import { User } from "@prisma/client";
|
import { User } from "@prisma/client";
|
||||||
import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
|
import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
|
||||||
import * as argon from "argon2";
|
import * as argon from "argon2";
|
||||||
|
import { Request, Response } from "express";
|
||||||
import * as moment from "moment";
|
import * as moment from "moment";
|
||||||
import { ConfigService } from "src/config/config.service";
|
import { ConfigService } from "src/config/config.service";
|
||||||
import { EmailService } from "src/email/email.service";
|
import { EmailService } from "src/email/email.service";
|
||||||
@@ -21,13 +22,13 @@ export class AuthService {
|
|||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
private jwtService: JwtService,
|
private jwtService: JwtService,
|
||||||
private config: ConfigService,
|
private config: ConfigService,
|
||||||
private emailService: EmailService
|
private emailService: EmailService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async signUp(dto: AuthRegisterDTO) {
|
async signUp(dto: AuthRegisterDTO) {
|
||||||
const isFirstUser = (await this.prisma.user.count()) == 0;
|
const isFirstUser = (await this.prisma.user.count()) == 0;
|
||||||
|
|
||||||
const hash = await argon.hash(dto.password);
|
const hash = dto.password ? await argon.hash(dto.password) : null;
|
||||||
try {
|
try {
|
||||||
const user = await this.prisma.user.create({
|
const user = await this.prisma.user.create({
|
||||||
data: {
|
data: {
|
||||||
@@ -39,17 +40,17 @@ export class AuthService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const { refreshToken, refreshTokenId } = await this.createRefreshToken(
|
const { refreshToken, refreshTokenId } = await this.createRefreshToken(
|
||||||
user.id
|
user.id,
|
||||||
);
|
);
|
||||||
const accessToken = await this.createAccessToken(user, refreshTokenId);
|
const accessToken = await this.createAccessToken(user, refreshTokenId);
|
||||||
|
|
||||||
return { accessToken, refreshToken };
|
return { accessToken, refreshToken, user };
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e instanceof PrismaClientKnownRequestError) {
|
if (e instanceof PrismaClientKnownRequestError) {
|
||||||
if (e.code == "P2002") {
|
if (e.code == "P2002") {
|
||||||
const duplicatedField: string = e.meta.target[0];
|
const duplicatedField: string = e.meta.target[0];
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
`A user with this ${duplicatedField} already exists`
|
`A user with this ${duplicatedField} already exists`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -69,16 +70,23 @@ export class AuthService {
|
|||||||
if (!user || !(await argon.verify(user.password, dto.password)))
|
if (!user || !(await argon.verify(user.password, dto.password)))
|
||||||
throw new UnauthorizedException("Wrong email or password");
|
throw new UnauthorizedException("Wrong email or password");
|
||||||
|
|
||||||
|
return this.generateToken(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
async generateToken(user: User, isOAuth = false) {
|
||||||
// TODO: Make all old loginTokens invalid when a new one is created
|
// TODO: Make all old loginTokens invalid when a new one is created
|
||||||
// Check if the user has TOTP enabled
|
// Check if the user has TOTP enabled
|
||||||
if (user.totpVerified) {
|
if (
|
||||||
|
user.totpVerified &&
|
||||||
|
!(isOAuth && this.config.get("oauth.ignoreTotp"))
|
||||||
|
) {
|
||||||
const loginToken = await this.createLoginToken(user.id);
|
const loginToken = await this.createLoginToken(user.id);
|
||||||
|
|
||||||
return { loginToken };
|
return { loginToken };
|
||||||
}
|
}
|
||||||
|
|
||||||
const { refreshToken, refreshTokenId } = await this.createRefreshToken(
|
const { refreshToken, refreshTokenId } = await this.createRefreshToken(
|
||||||
user.id
|
user.id,
|
||||||
);
|
);
|
||||||
const accessToken = await this.createAccessToken(user, refreshTokenId);
|
const accessToken = await this.createAccessToken(user, refreshTokenId);
|
||||||
|
|
||||||
@@ -91,7 +99,7 @@ export class AuthService {
|
|||||||
include: { resetPasswordToken: true },
|
include: { resetPasswordToken: true },
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!user) throw new BadRequestException("User not found");
|
if (!user) return;
|
||||||
|
|
||||||
// Delete old reset password token
|
// Delete old reset password token
|
||||||
if (user.resetPasswordToken) {
|
if (user.resetPasswordToken) {
|
||||||
@@ -129,9 +137,11 @@ export class AuthService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async updatePassword(user: User, oldPassword: string, newPassword: string) {
|
async updatePassword(user: User, newPassword: string, oldPassword?: string) {
|
||||||
if (!(await argon.verify(user.password, oldPassword)))
|
const isPasswordValid =
|
||||||
throw new ForbiddenException("Invalid password");
|
!user.password || (await argon.verify(user.password, oldPassword));
|
||||||
|
|
||||||
|
if (!isPasswordValid) throw new ForbiddenException("Invalid password");
|
||||||
|
|
||||||
const hash = await argon.hash(newPassword);
|
const hash = await argon.hash(newPassword);
|
||||||
|
|
||||||
@@ -158,7 +168,7 @@ export class AuthService {
|
|||||||
{
|
{
|
||||||
expiresIn: "15min",
|
expiresIn: "15min",
|
||||||
secret: this.config.get("internal.jwtSecret"),
|
secret: this.config.get("internal.jwtSecret"),
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -189,7 +199,7 @@ export class AuthService {
|
|||||||
|
|
||||||
return this.createAccessToken(
|
return this.createAccessToken(
|
||||||
refreshTokenMetaData.user,
|
refreshTokenMetaData.user,
|
||||||
refreshTokenMetaData.id
|
refreshTokenMetaData.id,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -210,4 +220,41 @@ export class AuthService {
|
|||||||
|
|
||||||
return loginToken;
|
return loginToken;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addTokensToResponse(
|
||||||
|
response: Response,
|
||||||
|
refreshToken?: string,
|
||||||
|
accessToken?: string,
|
||||||
|
) {
|
||||||
|
if (accessToken)
|
||||||
|
response.cookie("access_token", accessToken, {
|
||||||
|
sameSite: "lax",
|
||||||
|
maxAge: 1000 * 60 * 60 * 24 * 30 * 3, // 3 months
|
||||||
|
});
|
||||||
|
if (refreshToken)
|
||||||
|
response.cookie("refresh_token", refreshToken, {
|
||||||
|
path: "/api/auth/token",
|
||||||
|
httpOnly: true,
|
||||||
|
sameSite: "strict",
|
||||||
|
maxAge: 1000 * 60 * 60 * 24 * 30 * 3, // 3 months
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the user id if the user is logged in, null otherwise
|
||||||
|
*/
|
||||||
|
async getIdOfCurrentUser(request: Request): Promise<string | null> {
|
||||||
|
if (!request.cookies.access_token) return null;
|
||||||
|
try {
|
||||||
|
const payload = await this.jwtService.verifyAsync(
|
||||||
|
request.cookies.access_token,
|
||||||
|
{
|
||||||
|
secret: this.config.get("internal.jwtSecret"),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return payload.sub;
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import { User } from "@prisma/client";
|
|||||||
import * as argon from "argon2";
|
import * as argon from "argon2";
|
||||||
import { authenticator, totp } from "otplib";
|
import { authenticator, totp } from "otplib";
|
||||||
import * as qrcode from "qrcode-svg";
|
import * as qrcode from "qrcode-svg";
|
||||||
import { ConfigService } from "src/config/config.service";
|
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
import { AuthService } from "./auth.service";
|
import { AuthService } from "./auth.service";
|
||||||
import { AuthSignInTotpDTO } from "./dto/authSignInTotp.dto";
|
import { AuthSignInTotpDTO } from "./dto/authSignInTotp.dto";
|
||||||
@@ -18,47 +17,32 @@ export class AuthTotpService {
|
|||||||
constructor(
|
constructor(
|
||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
private config: ConfigService
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async signInTotp(dto: AuthSignInTotpDTO) {
|
async signInTotp(dto: AuthSignInTotpDTO) {
|
||||||
if (!dto.email && !dto.username)
|
|
||||||
throw new BadRequestException("Email or username is required");
|
|
||||||
|
|
||||||
const user = await this.prisma.user.findFirst({
|
|
||||||
where: {
|
|
||||||
OR: [{ email: dto.email }, { username: dto.username }],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!user || !(await argon.verify(user.password, dto.password)))
|
|
||||||
throw new UnauthorizedException("Wrong email or password");
|
|
||||||
|
|
||||||
const token = await this.prisma.loginToken.findFirst({
|
const token = await this.prisma.loginToken.findFirst({
|
||||||
where: {
|
where: {
|
||||||
token: dto.loginToken,
|
token: dto.loginToken,
|
||||||
},
|
},
|
||||||
|
include: {
|
||||||
|
user: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!token || token.userId != user.id || token.used)
|
if (!token || token.used)
|
||||||
throw new UnauthorizedException("Invalid login token");
|
throw new UnauthorizedException("Invalid login token");
|
||||||
|
|
||||||
if (token.expiresAt < new Date())
|
if (token.expiresAt < new Date())
|
||||||
throw new UnauthorizedException("Login token expired", "token_expired");
|
throw new UnauthorizedException("Login token expired", "token_expired");
|
||||||
|
|
||||||
// Check the TOTP code
|
// Check the TOTP code
|
||||||
const { totpSecret } = await this.prisma.user.findUnique({
|
const { totpSecret } = token.user;
|
||||||
where: { id: user.id },
|
|
||||||
select: { totpSecret: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!totpSecret) {
|
if (!totpSecret) {
|
||||||
throw new BadRequestException("TOTP is not enabled");
|
throw new BadRequestException("TOTP is not enabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
const expected = authenticator.generate(totpSecret);
|
if (!authenticator.check(dto.totp, totpSecret)) {
|
||||||
|
|
||||||
if (dto.totp !== expected) {
|
|
||||||
throw new BadRequestException("Invalid code");
|
throw new BadRequestException("Invalid code");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,10 +53,10 @@ export class AuthTotpService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const { refreshToken, refreshTokenId } =
|
const { refreshToken, refreshTokenId } =
|
||||||
await this.authService.createRefreshToken(user.id);
|
await this.authService.createRefreshToken(token.user.id);
|
||||||
const accessToken = await this.authService.createAccessToken(
|
const accessToken = await this.authService.createAccessToken(
|
||||||
user,
|
token.user,
|
||||||
refreshTokenId
|
refreshTokenId,
|
||||||
);
|
);
|
||||||
|
|
||||||
return { accessToken, refreshToken };
|
return { accessToken, refreshToken };
|
||||||
@@ -92,13 +76,12 @@ export class AuthTotpService {
|
|||||||
throw new BadRequestException("TOTP is already enabled");
|
throw new BadRequestException("TOTP is already enabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Maybe make the issuer configurable with env vars?
|
|
||||||
const secret = authenticator.generateSecret();
|
const secret = authenticator.generateSecret();
|
||||||
|
|
||||||
const otpURL = totp.keyuri(
|
const otpURL = totp.keyuri(
|
||||||
user.username || user.email,
|
user.username || user.email,
|
||||||
this.config.get("general.appName"),
|
"pingvin-share",
|
||||||
secret
|
secret,
|
||||||
);
|
);
|
||||||
|
|
||||||
await this.prisma.user.update({
|
await this.prisma.user.update({
|
||||||
|
|||||||
@@ -5,5 +5,5 @@ export const GetUser = createParamDecorator(
|
|||||||
const request = ctx.switchToHttp().getRequest();
|
const request = ctx.switchToHttp().getRequest();
|
||||||
const user = request.user;
|
const user = request.user;
|
||||||
return data ? user?.[data] : user;
|
return data ? user?.[data] : user;
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { IsString } from "class-validator";
|
import { IsString } from "class-validator";
|
||||||
import { AuthSignInDTO } from "./authSignIn.dto";
|
import { AuthSignInDTO } from "./authSignIn.dto";
|
||||||
|
|
||||||
export class AuthSignInTotpDTO extends AuthSignInDTO {
|
export class AuthSignInTotpDTO {
|
||||||
@IsString()
|
@IsString()
|
||||||
totp: string;
|
totp: string;
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { PickType } from "@nestjs/swagger";
|
import { PickType } from "@nestjs/swagger";
|
||||||
import { IsString } from "class-validator";
|
import { IsOptional, IsString } from "class-validator";
|
||||||
import { UserDTO } from "src/user/dto/user.dto";
|
import { UserDTO } from "src/user/dto/user.dto";
|
||||||
|
|
||||||
export class UpdatePasswordDTO extends PickType(UserDTO, ["password"]) {
|
export class UpdatePasswordDTO extends PickType(UserDTO, ["password"]) {
|
||||||
@IsString()
|
@IsString()
|
||||||
oldPassword: string;
|
@IsOptional()
|
||||||
|
oldPassword?: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,10 @@ import { PrismaService } from "src/prisma/prisma.service";
|
|||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class JwtStrategy extends PassportStrategy(Strategy) {
|
export class JwtStrategy extends PassportStrategy(Strategy) {
|
||||||
constructor(config: ConfigService, private prisma: PrismaService) {
|
constructor(
|
||||||
|
config: ConfigService,
|
||||||
|
private prisma: PrismaService,
|
||||||
|
) {
|
||||||
config.get("internal.jwtSecret");
|
config.get("internal.jwtSecret");
|
||||||
super({
|
super({
|
||||||
jwtFromRequest: JwtStrategy.extractJWT,
|
jwtFromRequest: JwtStrategy.extractJWT,
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export class ClamScanService {
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private fileService: FileService,
|
private fileService: FileService,
|
||||||
private prisma: PrismaService
|
private prisma: PrismaService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
private ClamScan: Promise<NodeClam | null> = new NodeClam()
|
private ClamScan: Promise<NodeClam | null> = new NodeClam()
|
||||||
@@ -81,7 +81,7 @@ export class ClamScanService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
this.logger.warn(
|
this.logger.warn(
|
||||||
`Share ${shareId} deleted because it contained ${infectedFiles.length} malicious file(s)`
|
`Share ${shareId} deleted because it contained ${infectedFiles.length} malicious file(s)`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ export class ConfigController {
|
|||||||
constructor(
|
constructor(
|
||||||
private configService: ConfigService,
|
private configService: ConfigService,
|
||||||
private logoService: LogoService,
|
private logoService: LogoService,
|
||||||
private emailService: EmailService
|
private emailService: EmailService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
@@ -41,7 +41,7 @@ export class ConfigController {
|
|||||||
@UseGuards(JwtGuard, AdministratorGuard)
|
@UseGuards(JwtGuard, AdministratorGuard)
|
||||||
async getByCategory(@Param("category") category: string) {
|
async getByCategory(@Param("category") category: string) {
|
||||||
return new AdminConfigDTO().fromList(
|
return new AdminConfigDTO().fromList(
|
||||||
await this.configService.getByCategory(category)
|
await this.configService.getByCategory(category),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ export class ConfigController {
|
|||||||
@UseGuards(JwtGuard, AdministratorGuard)
|
@UseGuards(JwtGuard, AdministratorGuard)
|
||||||
async updateMany(@Body() data: UpdateConfigDTO[]) {
|
async updateMany(@Body() data: UpdateConfigDTO[]) {
|
||||||
return new AdminConfigDTO().fromList(
|
return new AdminConfigDTO().fromList(
|
||||||
await this.configService.updateMany(data)
|
await this.configService.updateMany(data),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,9 +66,9 @@ export class ConfigController {
|
|||||||
@UploadedFile(
|
@UploadedFile(
|
||||||
new ParseFilePipe({
|
new ParseFilePipe({
|
||||||
validators: [new FileTypeValidator({ fileType: "image/png" })],
|
validators: [new FileTypeValidator({ fileType: "image/png" })],
|
||||||
})
|
}),
|
||||||
)
|
)
|
||||||
file: Express.Multer.File
|
file: Express.Multer.File,
|
||||||
) {
|
) {
|
||||||
return await this.logoService.create(file.buffer);
|
return await this.logoService.create(file.buffer);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,17 +6,24 @@ import {
|
|||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
import { Config } from "@prisma/client";
|
import { Config } from "@prisma/client";
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
import { EventEmitter } from "events";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ConfigService extends EventEmitter to allow listening for config updates,
|
||||||
|
* now only `update` event will be emitted.
|
||||||
|
*/
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ConfigService {
|
export class ConfigService extends EventEmitter {
|
||||||
constructor(
|
constructor(
|
||||||
@Inject("CONFIG_VARIABLES") private configVariables: Config[],
|
@Inject("CONFIG_VARIABLES") private configVariables: Config[],
|
||||||
private prisma: PrismaService
|
private prisma: PrismaService,
|
||||||
) {}
|
) {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
get(key: `${string}.${string}`): any {
|
get(key: `${string}.${string}`): any {
|
||||||
const configVariable = this.configVariables.filter(
|
const configVariable = this.configVariables.filter(
|
||||||
(variable) => `${variable.category}.${variable.name}` == key
|
(variable) => `${variable.category}.${variable.name}` == key,
|
||||||
)[0];
|
)[0];
|
||||||
|
|
||||||
if (!configVariable) throw new Error(`Config variable ${key} not found`);
|
if (!configVariable) throw new Error(`Config variable ${key} not found`);
|
||||||
@@ -89,7 +96,7 @@ export class ConfigService {
|
|||||||
configVariable.type != "text"
|
configVariable.type != "text"
|
||||||
) {
|
) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
`Config variable must be of type ${configVariable.type}`
|
`Config variable must be of type ${configVariable.type}`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,6 +112,8 @@ export class ConfigService {
|
|||||||
|
|
||||||
this.configVariables = await this.prisma.config.findMany();
|
this.configVariables = await this.prisma.config.findMany();
|
||||||
|
|
||||||
|
this.emit("update", key, value);
|
||||||
|
|
||||||
return updatedVariable;
|
return updatedVariable;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export class AdminConfigDTO extends ConfigDTO {
|
|||||||
|
|
||||||
fromList(partial: Partial<AdminConfigDTO>[]) {
|
fromList(partial: Partial<AdminConfigDTO>[]) {
|
||||||
return partial.map((part) =>
|
return partial.map((part) =>
|
||||||
plainToClass(AdminConfigDTO, part, { excludeExtraneousValues: true })
|
plainToClass(AdminConfigDTO, part, { excludeExtraneousValues: true }),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export class ConfigDTO {
|
|||||||
|
|
||||||
fromList(partial: Partial<ConfigDTO>[]) {
|
fromList(partial: Partial<ConfigDTO>[]) {
|
||||||
return partial.map((part) =>
|
return partial.map((part) =>
|
||||||
plainToClass(ConfigDTO, part, { excludeExtraneousValues: true })
|
plainToClass(ConfigDTO, part, { excludeExtraneousValues: true }),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ const IMAGES_PATH = "../frontend/public/img";
|
|||||||
@Injectable()
|
@Injectable()
|
||||||
export class LogoService {
|
export class LogoService {
|
||||||
async create(file: Buffer) {
|
async create(file: Buffer) {
|
||||||
fs.writeFileSync(`${IMAGES_PATH}/logo.png`, file, "binary");
|
const resized = await sharp(file).resize(900).toBuffer();
|
||||||
|
fs.writeFileSync(`${IMAGES_PATH}/logo.png`, resized, "binary");
|
||||||
this.createFavicon(file);
|
this.createFavicon(file);
|
||||||
this.createPWAIcons(file);
|
this.createPWAIcons(file);
|
||||||
}
|
}
|
||||||
@@ -25,7 +26,7 @@ export class LogoService {
|
|||||||
fs.promises.writeFile(
|
fs.promises.writeFile(
|
||||||
`${IMAGES_PATH}/icons/icon-${size}x${size}.png`,
|
`${IMAGES_PATH}/icons/icon-${size}x${size}.png`,
|
||||||
resized,
|
resized,
|
||||||
"binary"
|
"binary",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export class EmailService {
|
|||||||
await this.getTransporter()
|
await this.getTransporter()
|
||||||
.sendMail({
|
.sendMail({
|
||||||
from: `"${this.config.get("general.appName")}" <${this.config.get(
|
from: `"${this.config.get("general.appName")}" <${this.config.get(
|
||||||
"smtp.email"
|
"smtp.email",
|
||||||
)}>`,
|
)}>`,
|
||||||
to: email,
|
to: email,
|
||||||
subject,
|
subject,
|
||||||
@@ -49,7 +49,7 @@ export class EmailService {
|
|||||||
shareId: string,
|
shareId: string,
|
||||||
creator?: User,
|
creator?: User,
|
||||||
description?: string,
|
description?: string,
|
||||||
expiration?: Date
|
expiration?: Date,
|
||||||
) {
|
) {
|
||||||
if (!this.config.get("email.enableShareEmailRecipients"))
|
if (!this.config.get("email.enableShareEmailRecipients"))
|
||||||
throw new InternalServerErrorException("Email service disabled");
|
throw new InternalServerErrorException("Email service disabled");
|
||||||
@@ -69,8 +69,8 @@ export class EmailService {
|
|||||||
"{expires}",
|
"{expires}",
|
||||||
moment(expiration).unix() != 0
|
moment(expiration).unix() != 0
|
||||||
? moment(expiration).fromNow()
|
? moment(expiration).fromNow()
|
||||||
: "in: never"
|
: "in: never",
|
||||||
)
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,13 +83,13 @@ export class EmailService {
|
|||||||
this.config
|
this.config
|
||||||
.get("email.reverseShareMessage")
|
.get("email.reverseShareMessage")
|
||||||
.replaceAll("\\n", "\n")
|
.replaceAll("\\n", "\n")
|
||||||
.replaceAll("{shareUrl}", shareUrl)
|
.replaceAll("{shareUrl}", shareUrl),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async sendResetPasswordEmail(recipientEmail: string, token: string) {
|
async sendResetPasswordEmail(recipientEmail: string, token: string) {
|
||||||
const resetPasswordUrl = `${this.config.get(
|
const resetPasswordUrl = `${this.config.get(
|
||||||
"general.appUrl"
|
"general.appUrl",
|
||||||
)}/auth/resetPassword/${token}`;
|
)}/auth/resetPassword/${token}`;
|
||||||
|
|
||||||
await this.sendMail(
|
await this.sendMail(
|
||||||
@@ -98,7 +98,7 @@ export class EmailService {
|
|||||||
this.config
|
this.config
|
||||||
.get("email.resetPasswordMessage")
|
.get("email.resetPasswordMessage")
|
||||||
.replaceAll("\\n", "\n")
|
.replaceAll("\\n", "\n")
|
||||||
.replaceAll("{url}", resetPasswordUrl)
|
.replaceAll("{url}", resetPasswordUrl),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,7 +111,7 @@ export class EmailService {
|
|||||||
this.config
|
this.config
|
||||||
.get("email.inviteMessage")
|
.get("email.inviteMessage")
|
||||||
.replaceAll("{url}", loginUrl)
|
.replaceAll("{url}", loginUrl)
|
||||||
.replaceAll("{password}", password)
|
.replaceAll("{password}", password),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,7 +119,7 @@ export class EmailService {
|
|||||||
await this.getTransporter()
|
await this.getTransporter()
|
||||||
.sendMail({
|
.sendMail({
|
||||||
from: `"${this.config.get("general.appName")}" <${this.config.get(
|
from: `"${this.config.get("general.appName")}" <${this.config.get(
|
||||||
"smtp.email"
|
"smtp.email",
|
||||||
)}>`,
|
)}>`,
|
||||||
to: recipientEmail,
|
to: recipientEmail,
|
||||||
subject: "Test email",
|
subject: "Test email",
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import {
|
import {
|
||||||
Body,
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
|
Delete,
|
||||||
Get,
|
Get,
|
||||||
Param,
|
Param,
|
||||||
Post,
|
Post,
|
||||||
@@ -25,21 +26,24 @@ export class FileController {
|
|||||||
@SkipThrottle()
|
@SkipThrottle()
|
||||||
@UseGuards(CreateShareGuard, ShareOwnerGuard)
|
@UseGuards(CreateShareGuard, ShareOwnerGuard)
|
||||||
async create(
|
async create(
|
||||||
@Query() query: any,
|
@Query()
|
||||||
|
query: {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
chunkIndex: string;
|
||||||
|
totalChunks: string;
|
||||||
|
},
|
||||||
@Body() body: string,
|
@Body() body: string,
|
||||||
@Param("shareId") shareId: string
|
@Param("shareId") shareId: string,
|
||||||
) {
|
) {
|
||||||
const { id, name, chunkIndex, totalChunks } = query;
|
const { id, name, chunkIndex, totalChunks } = query;
|
||||||
|
|
||||||
// Data can be empty if the file is empty
|
// Data can be empty if the file is empty
|
||||||
const data = body.toString().split(",")[1] ?? "";
|
|
||||||
|
|
||||||
return await this.fileService.create(
|
return await this.fileService.create(
|
||||||
data,
|
body,
|
||||||
{ index: parseInt(chunkIndex), total: parseInt(totalChunks) },
|
{ index: parseInt(chunkIndex), total: parseInt(totalChunks) },
|
||||||
{ id, name },
|
{ id, name },
|
||||||
shareId
|
shareId,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,7 +51,7 @@ export class FileController {
|
|||||||
@UseGuards(FileSecurityGuard)
|
@UseGuards(FileSecurityGuard)
|
||||||
async getZip(
|
async getZip(
|
||||||
@Res({ passthrough: true }) res: Response,
|
@Res({ passthrough: true }) res: Response,
|
||||||
@Param("shareId") shareId: string
|
@Param("shareId") shareId: string,
|
||||||
) {
|
) {
|
||||||
const zip = this.fileService.getZip(shareId);
|
const zip = this.fileService.getZip(shareId);
|
||||||
res.set({
|
res.set({
|
||||||
@@ -64,13 +68,14 @@ export class FileController {
|
|||||||
@Res({ passthrough: true }) res: Response,
|
@Res({ passthrough: true }) res: Response,
|
||||||
@Param("shareId") shareId: string,
|
@Param("shareId") shareId: string,
|
||||||
@Param("fileId") fileId: string,
|
@Param("fileId") fileId: string,
|
||||||
@Query("download") download = "true"
|
@Query("download") download = "true",
|
||||||
) {
|
) {
|
||||||
const file = await this.fileService.get(shareId, fileId);
|
const file = await this.fileService.get(shareId, fileId);
|
||||||
|
|
||||||
const headers = {
|
const headers = {
|
||||||
"Content-Type": file.metaData.mimeType,
|
"Content-Type": file.metaData.mimeType,
|
||||||
"Content-Length": file.metaData.size,
|
"Content-Length": file.metaData.size,
|
||||||
|
"Content-Security-Policy": "script-src 'none'",
|
||||||
};
|
};
|
||||||
|
|
||||||
if (download === "true") {
|
if (download === "true") {
|
||||||
@@ -81,4 +86,14 @@ export class FileController {
|
|||||||
|
|
||||||
return new StreamableFile(file.file);
|
return new StreamableFile(file.file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Delete(":fileId")
|
||||||
|
@SkipThrottle()
|
||||||
|
@UseGuards(ShareOwnerGuard)
|
||||||
|
async remove(
|
||||||
|
@Param("fileId") fileId: string,
|
||||||
|
@Param("shareId") shareId: string,
|
||||||
|
) {
|
||||||
|
await this.fileService.remove(shareId, fileId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,14 +18,14 @@ export class FileService {
|
|||||||
constructor(
|
constructor(
|
||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
private jwtService: JwtService,
|
private jwtService: JwtService,
|
||||||
private config: ConfigService
|
private config: ConfigService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(
|
async create(
|
||||||
data: string,
|
data: string,
|
||||||
chunk: { index: number; total: number },
|
chunk: { index: number; total: number },
|
||||||
file: { id?: string; name: string },
|
file: { id?: string; name: string },
|
||||||
shareId: string
|
shareId: string,
|
||||||
) {
|
) {
|
||||||
if (!file.id) file.id = crypto.randomUUID();
|
if (!file.id) file.id = crypto.randomUUID();
|
||||||
|
|
||||||
@@ -40,14 +40,14 @@ export class FileService {
|
|||||||
let diskFileSize: number;
|
let diskFileSize: number;
|
||||||
try {
|
try {
|
||||||
diskFileSize = fs.statSync(
|
diskFileSize = fs.statSync(
|
||||||
`${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`
|
`${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`,
|
||||||
).size;
|
).size;
|
||||||
} catch {
|
} catch {
|
||||||
diskFileSize = 0;
|
diskFileSize = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the sent chunk index and the expected chunk index doesn't match throw an error
|
// If the sent chunk index and the expected chunk index doesn't match throw an error
|
||||||
const chunkSize = 10 * 1024 * 1024; // 10MB
|
const chunkSize = this.config.get("share.chunkSize");
|
||||||
const expectedChunkIndex = Math.ceil(diskFileSize / chunkSize);
|
const expectedChunkIndex = Math.ceil(diskFileSize / chunkSize);
|
||||||
|
|
||||||
if (expectedChunkIndex != chunk.index)
|
if (expectedChunkIndex != chunk.index)
|
||||||
@@ -62,7 +62,7 @@ export class FileService {
|
|||||||
// Check if share size limit is exceeded
|
// Check if share size limit is exceeded
|
||||||
const fileSizeSum = share.files.reduce(
|
const fileSizeSum = share.files.reduce(
|
||||||
(n, { size }) => n + parseInt(size),
|
(n, { size }) => n + parseInt(size),
|
||||||
0
|
0,
|
||||||
);
|
);
|
||||||
|
|
||||||
const shareSizeSum = fileSizeSum + diskFileSize + buffer.byteLength;
|
const shareSizeSum = fileSizeSum + diskFileSize + buffer.byteLength;
|
||||||
@@ -74,23 +74,23 @@ export class FileService {
|
|||||||
) {
|
) {
|
||||||
throw new HttpException(
|
throw new HttpException(
|
||||||
"Max share size exceeded",
|
"Max share size exceeded",
|
||||||
HttpStatus.PAYLOAD_TOO_LARGE
|
HttpStatus.PAYLOAD_TOO_LARGE,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
fs.appendFileSync(
|
fs.appendFileSync(
|
||||||
`${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`,
|
`${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`,
|
||||||
buffer
|
buffer,
|
||||||
);
|
);
|
||||||
|
|
||||||
const isLastChunk = chunk.index == chunk.total - 1;
|
const isLastChunk = chunk.index == chunk.total - 1;
|
||||||
if (isLastChunk) {
|
if (isLastChunk) {
|
||||||
fs.renameSync(
|
fs.renameSync(
|
||||||
`${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`,
|
`${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`,
|
||||||
`${SHARE_DIRECTORY}/${shareId}/${file.id}`
|
`${SHARE_DIRECTORY}/${shareId}/${file.id}`,
|
||||||
);
|
);
|
||||||
const fileSize = fs.statSync(
|
const fileSize = fs.statSync(
|
||||||
`${SHARE_DIRECTORY}/${shareId}/${file.id}`
|
`${SHARE_DIRECTORY}/${shareId}/${file.id}`,
|
||||||
).size;
|
).size;
|
||||||
await this.prisma.file.create({
|
await this.prisma.file.create({
|
||||||
data: {
|
data: {
|
||||||
@@ -124,6 +124,18 @@ export class FileService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async remove(shareId: string, fileId: string) {
|
||||||
|
const fileMetaData = await this.prisma.file.findUnique({
|
||||||
|
where: { id: fileId },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!fileMetaData) throw new NotFoundException("File not found");
|
||||||
|
|
||||||
|
fs.unlinkSync(`${SHARE_DIRECTORY}/${shareId}/${fileId}`);
|
||||||
|
|
||||||
|
await this.prisma.file.delete({ where: { id: fileId } });
|
||||||
|
}
|
||||||
|
|
||||||
async deleteAllFiles(shareId: string) {
|
async deleteAllFiles(shareId: string) {
|
||||||
await fs.promises.rm(`${SHARE_DIRECTORY}/${shareId}`, {
|
await fs.promises.rm(`${SHARE_DIRECTORY}/${shareId}`, {
|
||||||
recursive: true,
|
recursive: true,
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import { ShareService } from "src/share/share.service";
|
|||||||
export class FileSecurityGuard extends ShareSecurityGuard {
|
export class FileSecurityGuard extends ShareSecurityGuard {
|
||||||
constructor(
|
constructor(
|
||||||
private _shareService: ShareService,
|
private _shareService: ShareService,
|
||||||
private _prisma: PrismaService
|
private _prisma: PrismaService,
|
||||||
) {
|
) {
|
||||||
super(_shareService, _prisma);
|
super(_shareService, _prisma);
|
||||||
}
|
}
|
||||||
@@ -24,7 +24,7 @@ export class FileSecurityGuard extends ShareSecurityGuard {
|
|||||||
|
|
||||||
const shareId = Object.prototype.hasOwnProperty.call(
|
const shareId = Object.prototype.hasOwnProperty.call(
|
||||||
request.params,
|
request.params,
|
||||||
"shareId"
|
"shareId",
|
||||||
)
|
)
|
||||||
? request.params.shareId
|
? request.params.shareId
|
||||||
: request.params.id;
|
: request.params.id;
|
||||||
@@ -52,7 +52,7 @@ export class FileSecurityGuard extends ShareSecurityGuard {
|
|||||||
if (share.security?.maxViews && share.security.maxViews <= share.views) {
|
if (share.security?.maxViews && share.security.maxViews <= share.views) {
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
"Maximum views exceeded",
|
"Maximum views exceeded",
|
||||||
"share_max_views_exceeded"
|
"share_max_views_exceeded",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ export class JobsService {
|
|||||||
constructor(
|
constructor(
|
||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
private reverseShareService: ReverseShareService,
|
private reverseShareService: ReverseShareService,
|
||||||
private fileService: FileService
|
private fileService: FileService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@Cron("0 * * * *")
|
@Cron("0 * * * *")
|
||||||
@@ -56,11 +56,33 @@ export class JobsService {
|
|||||||
|
|
||||||
if (expiredReverseShares.length > 0) {
|
if (expiredReverseShares.length > 0) {
|
||||||
this.logger.log(
|
this.logger.log(
|
||||||
`Deleted ${expiredReverseShares.length} expired reverse shares`
|
`Deleted ${expiredReverseShares.length} expired reverse shares`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Cron("0 */6 * * *")
|
||||||
|
async deleteUnfinishedShares() {
|
||||||
|
const unfinishedShares = await this.prisma.share.findMany({
|
||||||
|
where: {
|
||||||
|
createdAt: { lt: moment().subtract(1, "day").toDate() },
|
||||||
|
uploadLocked: false,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const unfinishedShare of unfinishedShares) {
|
||||||
|
await this.prisma.share.delete({
|
||||||
|
where: { id: unfinishedShare.id },
|
||||||
|
});
|
||||||
|
|
||||||
|
await this.fileService.deleteAllFiles(unfinishedShare.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (unfinishedShares.length > 0) {
|
||||||
|
this.logger.log(`Deleted ${unfinishedShares.length} unfinished shares`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Cron("0 0 * * *")
|
@Cron("0 0 * * *")
|
||||||
deleteTemporaryFiles() {
|
deleteTemporaryFiles() {
|
||||||
let filesDeleted = 0;
|
let filesDeleted = 0;
|
||||||
@@ -77,7 +99,7 @@ export class JobsService {
|
|||||||
|
|
||||||
for (const file of temporaryFiles) {
|
for (const file of temporaryFiles) {
|
||||||
const stats = fs.statSync(
|
const stats = fs.statSync(
|
||||||
`${SHARE_DIRECTORY}/${shareDirectory}/${file}`
|
`${SHARE_DIRECTORY}/${shareDirectory}/${file}`,
|
||||||
);
|
);
|
||||||
const isOlderThanOneDay = moment(stats.mtime)
|
const isOlderThanOneDay = moment(stats.mtime)
|
||||||
.add(1, "day")
|
.add(1, "day")
|
||||||
@@ -93,7 +115,7 @@ export class JobsService {
|
|||||||
this.logger.log(`Deleted ${filesDeleted} temporary files`);
|
this.logger.log(`Deleted ${filesDeleted} temporary files`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Cron("0 * * * *")
|
@Cron("1 * * * *")
|
||||||
async deleteExpiredTokens() {
|
async deleteExpiredTokens() {
|
||||||
const { count: refreshTokenCount } =
|
const { count: refreshTokenCount } =
|
||||||
await this.prisma.refreshToken.deleteMany({
|
await this.prisma.refreshToken.deleteMany({
|
||||||
|
|||||||
@@ -1,11 +1,17 @@
|
|||||||
import { ClassSerializerInterceptor, ValidationPipe } from "@nestjs/common";
|
import {
|
||||||
|
ClassSerializerInterceptor,
|
||||||
|
Logger,
|
||||||
|
ValidationPipe,
|
||||||
|
} from "@nestjs/common";
|
||||||
import { NestFactory, Reflector } from "@nestjs/core";
|
import { NestFactory, Reflector } from "@nestjs/core";
|
||||||
import { NestExpressApplication } from "@nestjs/platform-express";
|
import { NestExpressApplication } from "@nestjs/platform-express";
|
||||||
import { DocumentBuilder, SwaggerModule } from "@nestjs/swagger";
|
import { DocumentBuilder, SwaggerModule } from "@nestjs/swagger";
|
||||||
import * as bodyParser from "body-parser";
|
import * as bodyParser from "body-parser";
|
||||||
import * as cookieParser from "cookie-parser";
|
import * as cookieParser from "cookie-parser";
|
||||||
|
import { NextFunction, Request, Response } from "express";
|
||||||
import * as fs from "fs";
|
import * as fs from "fs";
|
||||||
import { AppModule } from "./app.module";
|
import { AppModule } from "./app.module";
|
||||||
|
import { ConfigService } from "./config/config.service";
|
||||||
import { DATA_DIRECTORY } from "./constants";
|
import { DATA_DIRECTORY } from "./constants";
|
||||||
|
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
@@ -13,7 +19,16 @@ async function bootstrap() {
|
|||||||
app.useGlobalPipes(new ValidationPipe({ whitelist: true }));
|
app.useGlobalPipes(new ValidationPipe({ whitelist: true }));
|
||||||
app.useGlobalInterceptors(new ClassSerializerInterceptor(app.get(Reflector)));
|
app.useGlobalInterceptors(new ClassSerializerInterceptor(app.get(Reflector)));
|
||||||
|
|
||||||
app.use(bodyParser.raw({ type: "application/octet-stream", limit: "20mb" }));
|
const config = app.get<ConfigService>(ConfigService);
|
||||||
|
|
||||||
|
app.use((req: Request, res: Response, next: NextFunction) => {
|
||||||
|
const chunkSize = config.get("share.chunkSize");
|
||||||
|
bodyParser.raw({
|
||||||
|
type: "application/octet-stream",
|
||||||
|
limit: `${chunkSize}B`,
|
||||||
|
})(req, res, next);
|
||||||
|
});
|
||||||
|
|
||||||
app.use(cookieParser());
|
app.use(cookieParser());
|
||||||
app.set("trust proxy", true);
|
app.set("trust proxy", true);
|
||||||
|
|
||||||
@@ -34,5 +49,8 @@ async function bootstrap() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await app.listen(parseInt(process.env.PORT) || 8080);
|
await app.listen(parseInt(process.env.PORT) || 8080);
|
||||||
|
|
||||||
|
const logger = new Logger("UnhandledAsyncError");
|
||||||
|
process.on("unhandledRejection", (e) => logger.error(e));
|
||||||
}
|
}
|
||||||
bootstrap();
|
bootstrap();
|
||||||
|
|||||||
9
backend/src/oauth/dto/oauthCallback.dto.ts
Normal file
9
backend/src/oauth/dto/oauthCallback.dto.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { IsString } from "class-validator";
|
||||||
|
|
||||||
|
export class OAuthCallbackDto {
|
||||||
|
@IsString()
|
||||||
|
code: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
state: string;
|
||||||
|
}
|
||||||
6
backend/src/oauth/dto/oauthSignIn.dto.ts
Normal file
6
backend/src/oauth/dto/oauthSignIn.dto.ts
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
export interface OAuthSignInDto {
|
||||||
|
provider: "github" | "google" | "microsoft" | "discord" | "oidc";
|
||||||
|
providerId: string;
|
||||||
|
providerUsername: string;
|
||||||
|
email: string;
|
||||||
|
}
|
||||||
15
backend/src/oauth/exceptions/errorPage.exception.ts
Normal file
15
backend/src/oauth/exceptions/errorPage.exception.ts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
export class ErrorPageException extends Error {
|
||||||
|
/**
|
||||||
|
* Exception for redirecting to error page (all i18n key should omit `error.msg` and `error.param` prefix)
|
||||||
|
* @param key i18n key of message
|
||||||
|
* @param redirect redirect url
|
||||||
|
* @param params message params (key)
|
||||||
|
*/
|
||||||
|
constructor(
|
||||||
|
public readonly key: string = "default",
|
||||||
|
public readonly redirect?: string,
|
||||||
|
public readonly params?: string[],
|
||||||
|
) {
|
||||||
|
super("error");
|
||||||
|
}
|
||||||
|
}
|
||||||
39
backend/src/oauth/filter/errorPageException.filter.ts
Normal file
39
backend/src/oauth/filter/errorPageException.filter.ts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
import { ArgumentsHost, Catch, ExceptionFilter, Logger } from "@nestjs/common";
|
||||||
|
import { ConfigService } from "../../config/config.service";
|
||||||
|
import { ErrorPageException } from "../exceptions/errorPage.exception";
|
||||||
|
|
||||||
|
@Catch(ErrorPageException)
|
||||||
|
export class ErrorPageExceptionFilter implements ExceptionFilter {
|
||||||
|
private readonly logger = new Logger(ErrorPageExceptionFilter.name);
|
||||||
|
|
||||||
|
constructor(private config: ConfigService) {}
|
||||||
|
|
||||||
|
catch(exception: ErrorPageException, host: ArgumentsHost) {
|
||||||
|
this.logger.error(
|
||||||
|
JSON.stringify({
|
||||||
|
error: exception.key,
|
||||||
|
params: exception.params,
|
||||||
|
redirect: exception.redirect,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
const ctx = host.switchToHttp();
|
||||||
|
const response = ctx.getResponse();
|
||||||
|
|
||||||
|
const url = new URL(`${this.config.get("general.appUrl")}/error`);
|
||||||
|
url.searchParams.set("error", exception.key);
|
||||||
|
if (exception.redirect) {
|
||||||
|
url.searchParams.set("redirect", exception.redirect);
|
||||||
|
} else {
|
||||||
|
const redirect = ctx.getRequest().cookies.access_token
|
||||||
|
? "/account"
|
||||||
|
: "/auth/signIn";
|
||||||
|
url.searchParams.set("redirect", redirect);
|
||||||
|
}
|
||||||
|
if (exception.params) {
|
||||||
|
url.searchParams.set("params", exception.params.join(","));
|
||||||
|
}
|
||||||
|
|
||||||
|
response.redirect(url.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
38
backend/src/oauth/filter/oauthException.filter.ts
Normal file
38
backend/src/oauth/filter/oauthException.filter.ts
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
import {
|
||||||
|
ArgumentsHost,
|
||||||
|
Catch,
|
||||||
|
ExceptionFilter,
|
||||||
|
HttpException,
|
||||||
|
Logger,
|
||||||
|
} from "@nestjs/common";
|
||||||
|
import { ConfigService } from "../../config/config.service";
|
||||||
|
|
||||||
|
@Catch(HttpException)
|
||||||
|
export class OAuthExceptionFilter implements ExceptionFilter {
|
||||||
|
private errorKeys: Record<string, string> = {
|
||||||
|
access_denied: "access_denied",
|
||||||
|
expired_token: "expired_token",
|
||||||
|
};
|
||||||
|
private readonly logger = new Logger(OAuthExceptionFilter.name);
|
||||||
|
|
||||||
|
constructor(private config: ConfigService) {}
|
||||||
|
|
||||||
|
catch(exception: HttpException, host: ArgumentsHost) {
|
||||||
|
const ctx = host.switchToHttp();
|
||||||
|
const response = ctx.getResponse();
|
||||||
|
const request = ctx.getRequest();
|
||||||
|
|
||||||
|
this.logger.error(exception.message);
|
||||||
|
this.logger.error(
|
||||||
|
"Request query: " + JSON.stringify(request.query, null, 2),
|
||||||
|
);
|
||||||
|
|
||||||
|
const key = this.errorKeys[request.query.error] || "default";
|
||||||
|
|
||||||
|
const url = new URL(`${this.config.get("general.appUrl")}/error`);
|
||||||
|
url.searchParams.set("redirect", "/account");
|
||||||
|
url.searchParams.set("error", key);
|
||||||
|
|
||||||
|
response.redirect(url.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
12
backend/src/oauth/guard/oauth.guard.ts
Normal file
12
backend/src/oauth/guard/oauth.guard.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class OAuthGuard implements CanActivate {
|
||||||
|
constructor() {}
|
||||||
|
|
||||||
|
canActivate(context: ExecutionContext): boolean {
|
||||||
|
const request = context.switchToHttp().getRequest();
|
||||||
|
const provider = request.params.provider;
|
||||||
|
return request.query.state === request.cookies[`oauth_${provider}_state`];
|
||||||
|
}
|
||||||
|
}
|
||||||
24
backend/src/oauth/guard/provider.guard.ts
Normal file
24
backend/src/oauth/guard/provider.guard.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import {
|
||||||
|
CanActivate,
|
||||||
|
ExecutionContext,
|
||||||
|
Inject,
|
||||||
|
Injectable,
|
||||||
|
} from "@nestjs/common";
|
||||||
|
import { ConfigService } from "../../config/config.service";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ProviderGuard implements CanActivate {
|
||||||
|
constructor(
|
||||||
|
private config: ConfigService,
|
||||||
|
@Inject("OAUTH_PLATFORMS") private platforms: string[],
|
||||||
|
) {}
|
||||||
|
|
||||||
|
canActivate(context: ExecutionContext): boolean {
|
||||||
|
const request = context.switchToHttp().getRequest();
|
||||||
|
const provider = request.params.provider;
|
||||||
|
return (
|
||||||
|
this.platforms.includes(provider) &&
|
||||||
|
this.config.get(`oauth.${provider}-enabled`)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
110
backend/src/oauth/oauth.controller.ts
Normal file
110
backend/src/oauth/oauth.controller.ts
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
import {
|
||||||
|
Controller,
|
||||||
|
Get,
|
||||||
|
Inject,
|
||||||
|
Param,
|
||||||
|
Post,
|
||||||
|
Query,
|
||||||
|
Req,
|
||||||
|
Res,
|
||||||
|
UseFilters,
|
||||||
|
UseGuards,
|
||||||
|
} from "@nestjs/common";
|
||||||
|
import { User } from "@prisma/client";
|
||||||
|
import { Request, Response } from "express";
|
||||||
|
import { nanoid } from "nanoid";
|
||||||
|
import { AuthService } from "../auth/auth.service";
|
||||||
|
import { GetUser } from "../auth/decorator/getUser.decorator";
|
||||||
|
import { JwtGuard } from "../auth/guard/jwt.guard";
|
||||||
|
import { ConfigService } from "../config/config.service";
|
||||||
|
import { OAuthCallbackDto } from "./dto/oauthCallback.dto";
|
||||||
|
import { ErrorPageExceptionFilter } from "./filter/errorPageException.filter";
|
||||||
|
import { OAuthGuard } from "./guard/oauth.guard";
|
||||||
|
import { ProviderGuard } from "./guard/provider.guard";
|
||||||
|
import { OAuthService } from "./oauth.service";
|
||||||
|
import { OAuthProvider } from "./provider/oauthProvider.interface";
|
||||||
|
import { OAuthExceptionFilter } from "./filter/oauthException.filter";
|
||||||
|
|
||||||
|
@Controller("oauth")
|
||||||
|
export class OAuthController {
|
||||||
|
constructor(
|
||||||
|
private authService: AuthService,
|
||||||
|
private oauthService: OAuthService,
|
||||||
|
private config: ConfigService,
|
||||||
|
@Inject("OAUTH_PROVIDERS")
|
||||||
|
private providers: Record<string, OAuthProvider<unknown>>,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Get("available")
|
||||||
|
available() {
|
||||||
|
return this.oauthService.available();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get("status")
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
|
async status(@GetUser() user: User) {
|
||||||
|
return this.oauthService.status(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get("auth/:provider")
|
||||||
|
@UseGuards(ProviderGuard)
|
||||||
|
@UseFilters(ErrorPageExceptionFilter)
|
||||||
|
async auth(
|
||||||
|
@Param("provider") provider: string,
|
||||||
|
@Res({ passthrough: true }) response: Response,
|
||||||
|
) {
|
||||||
|
const state = nanoid(16);
|
||||||
|
const url = await this.providers[provider].getAuthEndpoint(state);
|
||||||
|
response.cookie(`oauth_${provider}_state`, state, { sameSite: "lax" });
|
||||||
|
response.redirect(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get("callback/:provider")
|
||||||
|
@UseGuards(ProviderGuard, OAuthGuard)
|
||||||
|
@UseFilters(ErrorPageExceptionFilter, OAuthExceptionFilter)
|
||||||
|
async callback(
|
||||||
|
@Param("provider") provider: string,
|
||||||
|
@Query() query: OAuthCallbackDto,
|
||||||
|
@Req() request: Request,
|
||||||
|
@Res({ passthrough: true }) response: Response,
|
||||||
|
) {
|
||||||
|
const oauthToken = await this.providers[provider].getToken(query);
|
||||||
|
const user = await this.providers[provider].getUserInfo(oauthToken, query);
|
||||||
|
const id = await this.authService.getIdOfCurrentUser(request);
|
||||||
|
|
||||||
|
if (id) {
|
||||||
|
await this.oauthService.link(
|
||||||
|
id,
|
||||||
|
provider,
|
||||||
|
user.providerId,
|
||||||
|
user.providerUsername,
|
||||||
|
);
|
||||||
|
response.redirect(this.config.get("general.appUrl") + "/account");
|
||||||
|
} else {
|
||||||
|
const token: {
|
||||||
|
accessToken?: string;
|
||||||
|
refreshToken?: string;
|
||||||
|
loginToken?: string;
|
||||||
|
} = await this.oauthService.signIn(user);
|
||||||
|
if (token.accessToken) {
|
||||||
|
this.authService.addTokensToResponse(
|
||||||
|
response,
|
||||||
|
token.refreshToken,
|
||||||
|
token.accessToken,
|
||||||
|
);
|
||||||
|
response.redirect(this.config.get("general.appUrl"));
|
||||||
|
} else {
|
||||||
|
response.redirect(
|
||||||
|
this.config.get("general.appUrl") + `/auth/totp/${token.loginToken}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post("unlink/:provider")
|
||||||
|
@UseGuards(JwtGuard, ProviderGuard)
|
||||||
|
@UseFilters(ErrorPageExceptionFilter)
|
||||||
|
unlink(@GetUser() user: User, @Param("provider") provider: string) {
|
||||||
|
return this.oauthService.unlink(user, provider);
|
||||||
|
}
|
||||||
|
}
|
||||||
56
backend/src/oauth/oauth.module.ts
Normal file
56
backend/src/oauth/oauth.module.ts
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import { Module } from "@nestjs/common";
|
||||||
|
import { OAuthController } from "./oauth.controller";
|
||||||
|
import { OAuthService } from "./oauth.service";
|
||||||
|
import { AuthModule } from "../auth/auth.module";
|
||||||
|
import { GitHubProvider } from "./provider/github.provider";
|
||||||
|
import { GoogleProvider } from "./provider/google.provider";
|
||||||
|
import { OAuthProvider } from "./provider/oauthProvider.interface";
|
||||||
|
import { OidcProvider } from "./provider/oidc.provider";
|
||||||
|
import { DiscordProvider } from "./provider/discord.provider";
|
||||||
|
import { MicrosoftProvider } from "./provider/microsoft.provider";
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
controllers: [OAuthController],
|
||||||
|
providers: [
|
||||||
|
OAuthService,
|
||||||
|
GitHubProvider,
|
||||||
|
GoogleProvider,
|
||||||
|
MicrosoftProvider,
|
||||||
|
DiscordProvider,
|
||||||
|
OidcProvider,
|
||||||
|
{
|
||||||
|
provide: "OAUTH_PROVIDERS",
|
||||||
|
useFactory(
|
||||||
|
github: GitHubProvider,
|
||||||
|
google: GoogleProvider,
|
||||||
|
microsoft: MicrosoftProvider,
|
||||||
|
discord: DiscordProvider,
|
||||||
|
oidc: OidcProvider,
|
||||||
|
): Record<string, OAuthProvider<unknown>> {
|
||||||
|
return {
|
||||||
|
github,
|
||||||
|
google,
|
||||||
|
microsoft,
|
||||||
|
discord,
|
||||||
|
oidc,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
inject: [
|
||||||
|
GitHubProvider,
|
||||||
|
GoogleProvider,
|
||||||
|
MicrosoftProvider,
|
||||||
|
DiscordProvider,
|
||||||
|
OidcProvider,
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: "OAUTH_PLATFORMS",
|
||||||
|
useFactory(providers: Record<string, OAuthProvider<unknown>>): string[] {
|
||||||
|
return Object.keys(providers);
|
||||||
|
},
|
||||||
|
inject: ["OAUTH_PROVIDERS"],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
imports: [AuthModule],
|
||||||
|
})
|
||||||
|
export class OAuthModule {}
|
||||||
171
backend/src/oauth/oauth.service.ts
Normal file
171
backend/src/oauth/oauth.service.ts
Normal file
@@ -0,0 +1,171 @@
|
|||||||
|
import { Inject, Injectable } from "@nestjs/common";
|
||||||
|
import { User } from "@prisma/client";
|
||||||
|
import { nanoid } from "nanoid";
|
||||||
|
import { AuthService } from "../auth/auth.service";
|
||||||
|
import { ConfigService } from "../config/config.service";
|
||||||
|
import { PrismaService } from "../prisma/prisma.service";
|
||||||
|
import { OAuthSignInDto } from "./dto/oauthSignIn.dto";
|
||||||
|
import { ErrorPageException } from "./exceptions/errorPage.exception";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class OAuthService {
|
||||||
|
constructor(
|
||||||
|
private prisma: PrismaService,
|
||||||
|
private config: ConfigService,
|
||||||
|
private auth: AuthService,
|
||||||
|
@Inject("OAUTH_PLATFORMS") private platforms: string[],
|
||||||
|
) {}
|
||||||
|
|
||||||
|
available(): string[] {
|
||||||
|
return this.platforms
|
||||||
|
.map((platform) => [
|
||||||
|
platform,
|
||||||
|
this.config.get(`oauth.${platform}-enabled`),
|
||||||
|
])
|
||||||
|
.filter(([_, enabled]) => enabled)
|
||||||
|
.map(([platform, _]) => platform);
|
||||||
|
}
|
||||||
|
|
||||||
|
async status(user: User) {
|
||||||
|
const oauthUsers = await this.prisma.oAuthUser.findMany({
|
||||||
|
select: {
|
||||||
|
provider: true,
|
||||||
|
providerUsername: true,
|
||||||
|
},
|
||||||
|
where: {
|
||||||
|
userId: user.id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return Object.fromEntries(oauthUsers.map((u) => [u.provider, u]));
|
||||||
|
}
|
||||||
|
|
||||||
|
async signIn(user: OAuthSignInDto) {
|
||||||
|
const oauthUser = await this.prisma.oAuthUser.findFirst({
|
||||||
|
where: {
|
||||||
|
provider: user.provider,
|
||||||
|
providerUserId: user.providerId,
|
||||||
|
},
|
||||||
|
include: {
|
||||||
|
user: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (oauthUser) {
|
||||||
|
return this.auth.generateToken(oauthUser.user, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.signUp(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
async link(
|
||||||
|
userId: string,
|
||||||
|
provider: string,
|
||||||
|
providerUserId: string,
|
||||||
|
providerUsername: string,
|
||||||
|
) {
|
||||||
|
const oauthUser = await this.prisma.oAuthUser.findFirst({
|
||||||
|
where: {
|
||||||
|
provider,
|
||||||
|
providerUserId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (oauthUser) {
|
||||||
|
throw new ErrorPageException("already_linked", "/account", [
|
||||||
|
`provider_${provider}`,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.prisma.oAuthUser.create({
|
||||||
|
data: {
|
||||||
|
userId,
|
||||||
|
provider,
|
||||||
|
providerUsername,
|
||||||
|
providerUserId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async unlink(user: User, provider: string) {
|
||||||
|
const oauthUser = await this.prisma.oAuthUser.findFirst({
|
||||||
|
where: {
|
||||||
|
userId: user.id,
|
||||||
|
provider,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (oauthUser) {
|
||||||
|
await this.prisma.oAuthUser.delete({
|
||||||
|
where: {
|
||||||
|
id: oauthUser.id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
throw new ErrorPageException("not_linked", "/account", [provider]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async getAvailableUsername(email: string) {
|
||||||
|
// only remove + and - from email for now (maybe not enough)
|
||||||
|
let username = email.split("@")[0].replace(/[+-]/g, "").substring(0, 20);
|
||||||
|
while (true) {
|
||||||
|
const user = await this.prisma.user.findFirst({
|
||||||
|
where: {
|
||||||
|
username: username,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (user) {
|
||||||
|
username = username + "_" + nanoid(10).replaceAll("-", "");
|
||||||
|
} else {
|
||||||
|
return username;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async signUp(user: OAuthSignInDto) {
|
||||||
|
// register
|
||||||
|
if (!this.config.get("oauth.allowRegistration")) {
|
||||||
|
throw new ErrorPageException("no_user", "/auth/signIn", [
|
||||||
|
`provider_${user.provider}`,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!user.email) {
|
||||||
|
throw new ErrorPageException("no_email", "/auth/signIn", [
|
||||||
|
`provider_${user.provider}`,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
const existingUser: User = await this.prisma.user.findFirst({
|
||||||
|
where: {
|
||||||
|
email: user.email,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (existingUser) {
|
||||||
|
await this.prisma.oAuthUser.create({
|
||||||
|
data: {
|
||||||
|
provider: user.provider,
|
||||||
|
providerUserId: user.providerId.toString(),
|
||||||
|
providerUsername: user.providerUsername,
|
||||||
|
userId: existingUser.id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return this.auth.generateToken(existingUser, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await this.auth.signUp({
|
||||||
|
email: user.email,
|
||||||
|
username: await this.getAvailableUsername(user.email),
|
||||||
|
password: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
await this.prisma.oAuthUser.create({
|
||||||
|
data: {
|
||||||
|
provider: user.provider,
|
||||||
|
providerUserId: user.providerId.toString(),
|
||||||
|
providerUsername: user.providerUsername,
|
||||||
|
userId: result.user.id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
136
backend/src/oauth/provider/discord.provider.ts
Normal file
136
backend/src/oauth/provider/discord.provider.ts
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
import { Injectable } from "@nestjs/common";
|
||||||
|
import fetch from "node-fetch";
|
||||||
|
import { ConfigService } from "../../config/config.service";
|
||||||
|
import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
|
||||||
|
import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
|
||||||
|
import { ErrorPageException } from "../exceptions/errorPage.exception";
|
||||||
|
import { OAuthProvider, OAuthToken } from "./oauthProvider.interface";
|
||||||
|
@Injectable()
|
||||||
|
export class DiscordProvider implements OAuthProvider<DiscordToken> {
|
||||||
|
constructor(private config: ConfigService) {}
|
||||||
|
|
||||||
|
getAuthEndpoint(state: string): Promise<string> {
|
||||||
|
let scope = "identify email";
|
||||||
|
if (this.config.get("oauth.discord-limitedGuild")) {
|
||||||
|
scope += " guilds";
|
||||||
|
}
|
||||||
|
return Promise.resolve(
|
||||||
|
"https://discord.com/api/oauth2/authorize?" +
|
||||||
|
new URLSearchParams({
|
||||||
|
client_id: this.config.get("oauth.discord-clientId"),
|
||||||
|
redirect_uri:
|
||||||
|
this.config.get("general.appUrl") + "/api/oauth/callback/discord",
|
||||||
|
response_type: "code",
|
||||||
|
state,
|
||||||
|
scope,
|
||||||
|
}).toString(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private getAuthorizationHeader() {
|
||||||
|
return (
|
||||||
|
"Basic " +
|
||||||
|
Buffer.from(
|
||||||
|
this.config.get("oauth.discord-clientId") +
|
||||||
|
":" +
|
||||||
|
this.config.get("oauth.discord-clientSecret"),
|
||||||
|
).toString("base64")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getToken(query: OAuthCallbackDto): Promise<OAuthToken<DiscordToken>> {
|
||||||
|
const res = await fetch("https://discord.com/api/v10/oauth2/token", {
|
||||||
|
method: "post",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/x-www-form-urlencoded",
|
||||||
|
Authorization: this.getAuthorizationHeader(),
|
||||||
|
},
|
||||||
|
body: new URLSearchParams({
|
||||||
|
code: query.code,
|
||||||
|
grant_type: "authorization_code",
|
||||||
|
redirect_uri:
|
||||||
|
this.config.get("general.appUrl") + "/api/oauth/callback/discord",
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
const token: DiscordToken = await res.json();
|
||||||
|
return {
|
||||||
|
accessToken: token.access_token,
|
||||||
|
refreshToken: token.refresh_token,
|
||||||
|
expiresIn: token.expires_in,
|
||||||
|
scope: token.scope,
|
||||||
|
tokenType: token.token_type,
|
||||||
|
rawToken: token,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async getUserInfo(token: OAuthToken<DiscordToken>): Promise<OAuthSignInDto> {
|
||||||
|
const res = await fetch("https://discord.com/api/v10/users/@me", {
|
||||||
|
method: "get",
|
||||||
|
headers: {
|
||||||
|
Accept: "application/json",
|
||||||
|
Authorization: `${token.tokenType || "Bearer"} ${token.accessToken}`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const user = (await res.json()) as DiscordUser;
|
||||||
|
if (user.verified === false) {
|
||||||
|
throw new ErrorPageException("unverified_account", undefined, [
|
||||||
|
"provider_discord",
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
const guild = this.config.get("oauth.discord-limitedGuild");
|
||||||
|
if (guild) {
|
||||||
|
await this.checkLimitedGuild(token, guild);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
provider: "discord",
|
||||||
|
providerId: user.id,
|
||||||
|
providerUsername: user.global_name ?? user.username,
|
||||||
|
email: user.email,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async checkLimitedGuild(token: OAuthToken<DiscordToken>, guildId: string) {
|
||||||
|
try {
|
||||||
|
const res = await fetch("https://discord.com/api/v10/users/@me/guilds", {
|
||||||
|
method: "get",
|
||||||
|
headers: {
|
||||||
|
Accept: "application/json",
|
||||||
|
Authorization: `${token.tokenType || "Bearer"} ${token.accessToken}`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const guilds = (await res.json()) as DiscordPartialGuild[];
|
||||||
|
if (!guilds.some((guild) => guild.id === guildId)) {
|
||||||
|
throw new ErrorPageException("discord_guild_permission_denied");
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
throw new ErrorPageException("discord_guild_permission_denied");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DiscordToken {
|
||||||
|
access_token: string;
|
||||||
|
token_type: string;
|
||||||
|
expires_in: number;
|
||||||
|
refresh_token: string;
|
||||||
|
scope: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DiscordUser {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
global_name: string;
|
||||||
|
email: string;
|
||||||
|
verified: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DiscordPartialGuild {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
icon: string;
|
||||||
|
owner: boolean;
|
||||||
|
permissions: string;
|
||||||
|
features: string[];
|
||||||
|
}
|
||||||
237
backend/src/oauth/provider/genericOidc.provider.ts
Normal file
237
backend/src/oauth/provider/genericOidc.provider.ts
Normal file
@@ -0,0 +1,237 @@
|
|||||||
|
import { Logger } from "@nestjs/common";
|
||||||
|
import fetch from "node-fetch";
|
||||||
|
import { ConfigService } from "../../config/config.service";
|
||||||
|
import { JwtService } from "@nestjs/jwt";
|
||||||
|
import { Cache } from "cache-manager";
|
||||||
|
import { nanoid } from "nanoid";
|
||||||
|
import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
|
||||||
|
import { OAuthProvider, OAuthToken } from "./oauthProvider.interface";
|
||||||
|
import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
|
||||||
|
import { ErrorPageException } from "../exceptions/errorPage.exception";
|
||||||
|
|
||||||
|
export abstract class GenericOidcProvider implements OAuthProvider<OidcToken> {
|
||||||
|
protected discoveryUri: string;
|
||||||
|
private configuration: OidcConfigurationCache;
|
||||||
|
private jwk: OidcJwkCache;
|
||||||
|
private logger: Logger = new Logger(
|
||||||
|
Object.getPrototypeOf(this).constructor.name,
|
||||||
|
);
|
||||||
|
|
||||||
|
protected constructor(
|
||||||
|
protected name: string,
|
||||||
|
protected keyOfConfigUpdateEvents: string[],
|
||||||
|
protected config: ConfigService,
|
||||||
|
protected jwtService: JwtService,
|
||||||
|
protected cache: Cache,
|
||||||
|
) {
|
||||||
|
this.discoveryUri = this.getDiscoveryUri();
|
||||||
|
this.config.addListener("update", (key: string, _: unknown) => {
|
||||||
|
if (this.keyOfConfigUpdateEvents.includes(key)) {
|
||||||
|
this.deinit();
|
||||||
|
this.discoveryUri = this.getDiscoveryUri();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected getRedirectUri(): string {
|
||||||
|
return `${this.config.get("general.appUrl")}/api/oauth/callback/${
|
||||||
|
this.name
|
||||||
|
}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getConfiguration(): Promise<OidcConfiguration> {
|
||||||
|
if (!this.configuration || this.configuration.expires < Date.now()) {
|
||||||
|
await this.fetchConfiguration();
|
||||||
|
}
|
||||||
|
return this.configuration.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getJwk(): Promise<OidcJwk[]> {
|
||||||
|
if (!this.jwk || this.jwk.expires < Date.now()) {
|
||||||
|
await this.fetchJwk();
|
||||||
|
}
|
||||||
|
return this.jwk.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getAuthEndpoint(state: string) {
|
||||||
|
const configuration = await this.getConfiguration();
|
||||||
|
const endpoint = configuration.authorization_endpoint;
|
||||||
|
|
||||||
|
const nonce = nanoid();
|
||||||
|
await this.cache.set(
|
||||||
|
`oauth-${this.name}-nonce-${state}`,
|
||||||
|
nonce,
|
||||||
|
1000 * 60 * 5,
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
endpoint +
|
||||||
|
"?" +
|
||||||
|
new URLSearchParams({
|
||||||
|
client_id: this.config.get(`oauth.${this.name}-clientId`),
|
||||||
|
response_type: "code",
|
||||||
|
scope: "openid profile email",
|
||||||
|
redirect_uri: this.getRedirectUri(),
|
||||||
|
state,
|
||||||
|
nonce,
|
||||||
|
}).toString()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getToken(query: OAuthCallbackDto): Promise<OAuthToken<OidcToken>> {
|
||||||
|
const configuration = await this.getConfiguration();
|
||||||
|
const endpoint = configuration.token_endpoint;
|
||||||
|
const res = await fetch(endpoint, {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/x-www-form-urlencoded",
|
||||||
|
},
|
||||||
|
body: new URLSearchParams({
|
||||||
|
client_id: this.config.get(`oauth.${this.name}-clientId`),
|
||||||
|
client_secret: this.config.get(`oauth.${this.name}-clientSecret`),
|
||||||
|
grant_type: "authorization_code",
|
||||||
|
code: query.code,
|
||||||
|
redirect_uri: this.getRedirectUri(),
|
||||||
|
}).toString(),
|
||||||
|
});
|
||||||
|
const token: OidcToken = await res.json();
|
||||||
|
return {
|
||||||
|
accessToken: token.access_token,
|
||||||
|
expiresIn: token.expires_in,
|
||||||
|
idToken: token.id_token,
|
||||||
|
refreshToken: token.refresh_token,
|
||||||
|
tokenType: token.token_type,
|
||||||
|
rawToken: token,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async getUserInfo(
|
||||||
|
token: OAuthToken<OidcToken>,
|
||||||
|
query: OAuthCallbackDto,
|
||||||
|
claim?: string,
|
||||||
|
): Promise<OAuthSignInDto> {
|
||||||
|
const idTokenData = this.decodeIdToken(token.idToken);
|
||||||
|
// maybe it's not necessary to verify the id token since it's directly obtained from the provider
|
||||||
|
|
||||||
|
const key = `oauth-${this.name}-nonce-${query.state}`;
|
||||||
|
const nonce = await this.cache.get(key);
|
||||||
|
await this.cache.del(key);
|
||||||
|
if (nonce !== idTokenData.nonce) {
|
||||||
|
this.logger.error(
|
||||||
|
`Invalid nonce. Expected ${nonce}, but got ${idTokenData.nonce}`,
|
||||||
|
);
|
||||||
|
throw new ErrorPageException("invalid_token");
|
||||||
|
}
|
||||||
|
|
||||||
|
const username = claim
|
||||||
|
? idTokenData[claim]
|
||||||
|
: idTokenData.name ||
|
||||||
|
idTokenData.nickname ||
|
||||||
|
idTokenData.preferred_username;
|
||||||
|
|
||||||
|
if (!username) {
|
||||||
|
this.logger.error(
|
||||||
|
`Can not get username from ID Token ${JSON.stringify(
|
||||||
|
idTokenData,
|
||||||
|
undefined,
|
||||||
|
2,
|
||||||
|
)}`,
|
||||||
|
);
|
||||||
|
throw new ErrorPageException("cannot_get_user_info", undefined, [
|
||||||
|
`provider_${this.name}`,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
provider: this.name as any,
|
||||||
|
email: idTokenData.email,
|
||||||
|
providerId: idTokenData.sub,
|
||||||
|
providerUsername: username,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract getDiscoveryUri(): string;
|
||||||
|
|
||||||
|
private async fetchConfiguration(): Promise<void> {
|
||||||
|
const res = await fetch(this.discoveryUri);
|
||||||
|
const expires = res.headers.has("expires")
|
||||||
|
? new Date(res.headers.get("expires")).getTime()
|
||||||
|
: Date.now() + 1000 * 60 * 60 * 24;
|
||||||
|
this.configuration = {
|
||||||
|
expires,
|
||||||
|
data: await res.json(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private async fetchJwk(): Promise<void> {
|
||||||
|
const configuration = await this.getConfiguration();
|
||||||
|
const res = await fetch(configuration.jwks_uri);
|
||||||
|
const expires = res.headers.has("expires")
|
||||||
|
? new Date(res.headers.get("expires")).getTime()
|
||||||
|
: Date.now() + 1000 * 60 * 60 * 24;
|
||||||
|
this.jwk = {
|
||||||
|
expires,
|
||||||
|
data: (await res.json())["keys"],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private deinit() {
|
||||||
|
this.discoveryUri = undefined;
|
||||||
|
this.configuration = undefined;
|
||||||
|
this.jwk = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
private decodeIdToken(idToken: string): OidcIdToken {
|
||||||
|
return this.jwtService.decode(idToken) as OidcIdToken;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface OidcCache<T> {
|
||||||
|
expires: number;
|
||||||
|
data: T;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface OidcConfiguration {
|
||||||
|
issuer: string;
|
||||||
|
authorization_endpoint: string;
|
||||||
|
token_endpoint: string;
|
||||||
|
userinfo_endpoint?: string;
|
||||||
|
jwks_uri: string;
|
||||||
|
response_types_supported: string[];
|
||||||
|
id_token_signing_alg_values_supported: string[];
|
||||||
|
scopes_supported?: string[];
|
||||||
|
claims_supported?: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface OidcJwk {
|
||||||
|
e: string;
|
||||||
|
alg: string;
|
||||||
|
kid: string;
|
||||||
|
use: string;
|
||||||
|
kty: string;
|
||||||
|
n: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type OidcConfigurationCache = OidcCache<OidcConfiguration>;
|
||||||
|
|
||||||
|
export type OidcJwkCache = OidcCache<OidcJwk[]>;
|
||||||
|
|
||||||
|
export interface OidcToken {
|
||||||
|
access_token: string;
|
||||||
|
refresh_token: string;
|
||||||
|
token_type: string;
|
||||||
|
expires_in: number;
|
||||||
|
id_token: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface OidcIdToken {
|
||||||
|
iss: string;
|
||||||
|
sub: string;
|
||||||
|
exp: number;
|
||||||
|
iat: number;
|
||||||
|
email: string;
|
||||||
|
name: string;
|
||||||
|
nickname: string;
|
||||||
|
preferred_username: string;
|
||||||
|
nonce: string;
|
||||||
|
}
|
||||||
112
backend/src/oauth/provider/github.provider.ts
Normal file
112
backend/src/oauth/provider/github.provider.ts
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
import { Injectable } from "@nestjs/common";
|
||||||
|
import fetch from "node-fetch";
|
||||||
|
import { ConfigService } from "../../config/config.service";
|
||||||
|
import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
|
||||||
|
import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
|
||||||
|
import { ErrorPageException } from "../exceptions/errorPage.exception";
|
||||||
|
import { OAuthProvider, OAuthToken } from "./oauthProvider.interface";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class GitHubProvider implements OAuthProvider<GitHubToken> {
|
||||||
|
constructor(private config: ConfigService) {}
|
||||||
|
|
||||||
|
getAuthEndpoint(state: string): Promise<string> {
|
||||||
|
return Promise.resolve(
|
||||||
|
"https://github.com/login/oauth/authorize?" +
|
||||||
|
new URLSearchParams({
|
||||||
|
client_id: this.config.get("oauth.github-clientId"),
|
||||||
|
redirect_uri:
|
||||||
|
this.config.get("general.appUrl") + "/api/oauth/callback/github",
|
||||||
|
state: state,
|
||||||
|
scope: "user:email",
|
||||||
|
}).toString(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getToken(query: OAuthCallbackDto): Promise<OAuthToken<GitHubToken>> {
|
||||||
|
const res = await fetch(
|
||||||
|
"https://github.com/login/oauth/access_token?" +
|
||||||
|
new URLSearchParams({
|
||||||
|
client_id: this.config.get("oauth.github-clientId"),
|
||||||
|
client_secret: this.config.get("oauth.github-clientSecret"),
|
||||||
|
code: query.code,
|
||||||
|
}).toString(),
|
||||||
|
{
|
||||||
|
method: "post",
|
||||||
|
headers: {
|
||||||
|
Accept: "application/json",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const token: GitHubToken = await res.json();
|
||||||
|
return {
|
||||||
|
accessToken: token.access_token,
|
||||||
|
tokenType: token.token_type,
|
||||||
|
scope: token.scope,
|
||||||
|
rawToken: token,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async getUserInfo(token: OAuthToken<GitHubToken>): Promise<OAuthSignInDto> {
|
||||||
|
if (!token.scope.includes("user:email")) {
|
||||||
|
throw new ErrorPageException("no_email", undefined, ["provider_github"]);
|
||||||
|
}
|
||||||
|
const user = await this.getGitHubUser(token);
|
||||||
|
const email = await this.getGitHubEmail(token);
|
||||||
|
if (!email) {
|
||||||
|
throw new ErrorPageException("no_email", undefined, ["provider_github"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
provider: "github",
|
||||||
|
providerId: user.id.toString(),
|
||||||
|
providerUsername: user.name ?? user.login,
|
||||||
|
email,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private async getGitHubUser(
|
||||||
|
token: OAuthToken<GitHubToken>,
|
||||||
|
): Promise<GitHubUser> {
|
||||||
|
const res = await fetch("https://api.github.com/user", {
|
||||||
|
headers: {
|
||||||
|
Accept: "application/vnd.github+json",
|
||||||
|
Authorization: `${token.tokenType ?? "Bearer"} ${token.accessToken}`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return (await res.json()) as GitHubUser;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async getGitHubEmail(
|
||||||
|
token: OAuthToken<GitHubToken>,
|
||||||
|
): Promise<string | undefined> {
|
||||||
|
const res = await fetch("https://api.github.com/user/public_emails", {
|
||||||
|
headers: {
|
||||||
|
Accept: "application/vnd.github+json",
|
||||||
|
Authorization: `${token.tokenType ?? "Bearer"} ${token.accessToken}`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const emails = (await res.json()) as GitHubEmail[];
|
||||||
|
return emails.find((e) => e.primary && e.verified)?.email;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GitHubToken {
|
||||||
|
access_token: string;
|
||||||
|
token_type: string;
|
||||||
|
scope: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GitHubUser {
|
||||||
|
login: string;
|
||||||
|
id: number;
|
||||||
|
name?: string;
|
||||||
|
email?: string; // this filed seems only return null
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GitHubEmail {
|
||||||
|
email: string;
|
||||||
|
primary: boolean;
|
||||||
|
verified: boolean;
|
||||||
|
visibility: string | null;
|
||||||
|
}
|
||||||
21
backend/src/oauth/provider/google.provider.ts
Normal file
21
backend/src/oauth/provider/google.provider.ts
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import { GenericOidcProvider } from "./genericOidc.provider";
|
||||||
|
import { ConfigService } from "../../config/config.service";
|
||||||
|
import { JwtService } from "@nestjs/jwt";
|
||||||
|
import { Inject, Injectable } from "@nestjs/common";
|
||||||
|
import { CACHE_MANAGER } from "@nestjs/cache-manager";
|
||||||
|
import { Cache } from "cache-manager";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class GoogleProvider extends GenericOidcProvider {
|
||||||
|
constructor(
|
||||||
|
config: ConfigService,
|
||||||
|
jwtService: JwtService,
|
||||||
|
@Inject(CACHE_MANAGER) cache: Cache,
|
||||||
|
) {
|
||||||
|
super("google", ["oauth.google-enabled"], config, jwtService, cache);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected getDiscoveryUri(): string {
|
||||||
|
return "https://accounts.google.com/.well-known/openid-configuration";
|
||||||
|
}
|
||||||
|
}
|
||||||
29
backend/src/oauth/provider/microsoft.provider.ts
Normal file
29
backend/src/oauth/provider/microsoft.provider.ts
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { GenericOidcProvider } from "./genericOidc.provider";
|
||||||
|
import { ConfigService } from "../../config/config.service";
|
||||||
|
import { JwtService } from "@nestjs/jwt";
|
||||||
|
import { Inject, Injectable } from "@nestjs/common";
|
||||||
|
import { CACHE_MANAGER } from "@nestjs/cache-manager";
|
||||||
|
import { Cache } from "cache-manager";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class MicrosoftProvider extends GenericOidcProvider {
|
||||||
|
constructor(
|
||||||
|
config: ConfigService,
|
||||||
|
jwtService: JwtService,
|
||||||
|
@Inject(CACHE_MANAGER) cache: Cache,
|
||||||
|
) {
|
||||||
|
super(
|
||||||
|
"microsoft",
|
||||||
|
["oauth.microsoft-enabled", "oauth.microsoft-tenant"],
|
||||||
|
config,
|
||||||
|
jwtService,
|
||||||
|
cache,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected getDiscoveryUri(): string {
|
||||||
|
return `https://login.microsoftonline.com/${this.config.get(
|
||||||
|
"oauth.microsoft-tenant",
|
||||||
|
)}/v2.0/.well-known/openid-configuration`;
|
||||||
|
}
|
||||||
|
}
|
||||||
24
backend/src/oauth/provider/oauthProvider.interface.ts
Normal file
24
backend/src/oauth/provider/oauthProvider.interface.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
|
||||||
|
import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @typeParam T - type of token
|
||||||
|
* @typeParam C - type of callback query
|
||||||
|
*/
|
||||||
|
export interface OAuthProvider<T, C = OAuthCallbackDto> {
|
||||||
|
getAuthEndpoint(state: string): Promise<string>;
|
||||||
|
|
||||||
|
getToken(query: C): Promise<OAuthToken<T>>;
|
||||||
|
|
||||||
|
getUserInfo(token: OAuthToken<T>, query: C): Promise<OAuthSignInDto>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface OAuthToken<T> {
|
||||||
|
accessToken: string;
|
||||||
|
expiresIn?: number;
|
||||||
|
refreshToken?: string;
|
||||||
|
tokenType?: string;
|
||||||
|
scope?: string;
|
||||||
|
idToken?: string;
|
||||||
|
rawToken: T;
|
||||||
|
}
|
||||||
39
backend/src/oauth/provider/oidc.provider.ts
Normal file
39
backend/src/oauth/provider/oidc.provider.ts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
import { GenericOidcProvider, OidcToken } from "./genericOidc.provider";
|
||||||
|
import { Inject, Injectable } from "@nestjs/common";
|
||||||
|
import { ConfigService } from "../../config/config.service";
|
||||||
|
import { JwtService } from "@nestjs/jwt";
|
||||||
|
import { CACHE_MANAGER } from "@nestjs/cache-manager";
|
||||||
|
import { Cache } from "cache-manager";
|
||||||
|
import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
|
||||||
|
import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
|
||||||
|
import { OAuthToken } from "./oauthProvider.interface";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class OidcProvider extends GenericOidcProvider {
|
||||||
|
constructor(
|
||||||
|
config: ConfigService,
|
||||||
|
jwtService: JwtService,
|
||||||
|
@Inject(CACHE_MANAGER) protected cache: Cache,
|
||||||
|
) {
|
||||||
|
super(
|
||||||
|
"oidc",
|
||||||
|
["oauth.oidc-enabled", "oauth.oidc-discoveryUri"],
|
||||||
|
config,
|
||||||
|
jwtService,
|
||||||
|
cache,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected getDiscoveryUri(): string {
|
||||||
|
return this.config.get("oauth.oidc-discoveryUri");
|
||||||
|
}
|
||||||
|
|
||||||
|
getUserInfo(
|
||||||
|
token: OAuthToken<OidcToken>,
|
||||||
|
query: OAuthCallbackDto,
|
||||||
|
_?: string,
|
||||||
|
): Promise<OAuthSignInDto> {
|
||||||
|
const claim = this.config.get("oauth.oidc-usernameClaim") || undefined;
|
||||||
|
return super.getUserInfo(token, query, claim);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,7 +13,7 @@ export class ReverseShareTokenWithShares extends OmitType(ReverseShareDTO, [
|
|||||||
@Type(() => OmitType(MyShareDTO, ["recipients", "hasPassword"] as const))
|
@Type(() => OmitType(MyShareDTO, ["recipients", "hasPassword"] as const))
|
||||||
shares: Omit<
|
shares: Omit<
|
||||||
MyShareDTO,
|
MyShareDTO,
|
||||||
"recipients" | "files" | "from" | "fromList" | "hasPassword"
|
"recipients" | "files" | "from" | "fromList" | "hasPassword" | "size"
|
||||||
>[];
|
>[];
|
||||||
|
|
||||||
@Expose()
|
@Expose()
|
||||||
@@ -23,7 +23,7 @@ export class ReverseShareTokenWithShares extends OmitType(ReverseShareDTO, [
|
|||||||
return partial.map((part) =>
|
return partial.map((part) =>
|
||||||
plainToClass(ReverseShareTokenWithShares, part, {
|
plainToClass(ReverseShareTokenWithShares, part, {
|
||||||
excludeExtraneousValues: true,
|
excludeExtraneousValues: true,
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import { ReverseShareService } from "./reverseShare.service";
|
|||||||
export class ReverseShareController {
|
export class ReverseShareController {
|
||||||
constructor(
|
constructor(
|
||||||
private reverseShareService: ReverseShareService,
|
private reverseShareService: ReverseShareService,
|
||||||
private config: ConfigService
|
private config: ConfigService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
@@ -44,7 +44,7 @@ export class ReverseShareController {
|
|||||||
if (!isValid) throw new NotFoundException("Reverse share token not found");
|
if (!isValid) throw new NotFoundException("Reverse share token not found");
|
||||||
|
|
||||||
return new ReverseShareDTO().from(
|
return new ReverseShareDTO().from(
|
||||||
await this.reverseShareService.getByToken(reverseShareToken)
|
await this.reverseShareService.getByToken(reverseShareToken),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,7 +52,7 @@ export class ReverseShareController {
|
|||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
async getAllByUser(@GetUser() user: User) {
|
async getAllByUser(@GetUser() user: User) {
|
||||||
return new ReverseShareTokenWithShares().fromList(
|
return new ReverseShareTokenWithShares().fromList(
|
||||||
await this.reverseShareService.getAllByUser(user.id)
|
await this.reverseShareService.getAllByUser(user.id),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import * as moment from "moment";
|
|||||||
import { ConfigService } from "src/config/config.service";
|
import { ConfigService } from "src/config/config.service";
|
||||||
import { FileService } from "src/file/file.service";
|
import { FileService } from "src/file/file.service";
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
import { parseRelativeDateToAbsolute } from "src/utils/date.util";
|
||||||
import { CreateReverseShareDTO } from "./dto/createReverseShare.dto";
|
import { CreateReverseShareDTO } from "./dto/createReverseShare.dto";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@@ -10,7 +11,7 @@ export class ReverseShareService {
|
|||||||
constructor(
|
constructor(
|
||||||
private config: ConfigService,
|
private config: ConfigService,
|
||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
private fileService: FileService
|
private fileService: FileService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(data: CreateReverseShareDTO, creatorId: string) {
|
async create(data: CreateReverseShareDTO, creatorId: string) {
|
||||||
@@ -19,16 +20,27 @@ export class ReverseShareService {
|
|||||||
.add(
|
.add(
|
||||||
data.shareExpiration.split("-")[0],
|
data.shareExpiration.split("-")[0],
|
||||||
data.shareExpiration.split(
|
data.shareExpiration.split(
|
||||||
"-"
|
"-",
|
||||||
)[1] as moment.unitOfTime.DurationConstructor
|
)[1] as moment.unitOfTime.DurationConstructor,
|
||||||
)
|
)
|
||||||
.toDate();
|
.toDate();
|
||||||
|
|
||||||
|
const parsedExpiration = parseRelativeDateToAbsolute(data.shareExpiration);
|
||||||
|
if (
|
||||||
|
this.config.get("share.maxExpiration") !== 0 &&
|
||||||
|
parsedExpiration >
|
||||||
|
moment().add(this.config.get("share.maxExpiration"), "hours").toDate()
|
||||||
|
) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
"Expiration date exceeds maximum expiration date",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const globalMaxShareSize = this.config.get("share.maxSize");
|
const globalMaxShareSize = this.config.get("share.maxSize");
|
||||||
|
|
||||||
if (globalMaxShareSize < data.maxShareSize)
|
if (globalMaxShareSize < data.maxShareSize)
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
`Max share size can't be greater than ${globalMaxShareSize} bytes.`
|
`Max share size can't be greater than ${globalMaxShareSize} bytes.`,
|
||||||
);
|
);
|
||||||
|
|
||||||
const reverseShare = await this.prisma.reverseShare.create({
|
const reverseShare = await this.prisma.reverseShare.create({
|
||||||
|
|||||||
27
backend/src/share/dto/adminShare.dto.ts
Normal file
27
backend/src/share/dto/adminShare.dto.ts
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import { OmitType } from "@nestjs/swagger";
|
||||||
|
import { Expose, plainToClass } from "class-transformer";
|
||||||
|
import { ShareDTO } from "./share.dto";
|
||||||
|
|
||||||
|
export class AdminShareDTO extends OmitType(ShareDTO, [
|
||||||
|
"files",
|
||||||
|
"from",
|
||||||
|
"fromList",
|
||||||
|
] as const) {
|
||||||
|
@Expose()
|
||||||
|
views: number;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
createdAt: Date;
|
||||||
|
|
||||||
|
from(partial: Partial<AdminShareDTO>) {
|
||||||
|
return plainToClass(AdminShareDTO, partial, {
|
||||||
|
excludeExtraneousValues: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fromList(partial: Partial<AdminShareDTO>[]) {
|
||||||
|
return partial.map((part) =>
|
||||||
|
plainToClass(AdminShareDTO, part, { excludeExtraneousValues: true }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,6 +18,10 @@ export class CreateShareDTO {
|
|||||||
@Length(3, 50)
|
@Length(3, 50)
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
|
@Length(3, 30)
|
||||||
|
@IsOptional()
|
||||||
|
name: string;
|
||||||
|
|
||||||
@IsString()
|
@IsString()
|
||||||
expiration: string;
|
expiration: string;
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ export class MyShareDTO extends OmitType(ShareDTO, [
|
|||||||
|
|
||||||
fromList(partial: Partial<MyShareDTO>[]) {
|
fromList(partial: Partial<MyShareDTO>[]) {
|
||||||
return partial.map((part) =>
|
return partial.map((part) =>
|
||||||
plainToClass(MyShareDTO, part, { excludeExtraneousValues: true })
|
plainToClass(MyShareDTO, part, { excludeExtraneousValues: true }),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ export class ShareDTO {
|
|||||||
@Expose()
|
@Expose()
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
name?: string;
|
||||||
|
|
||||||
@Expose()
|
@Expose()
|
||||||
expiration: Date;
|
expiration: Date;
|
||||||
|
|
||||||
@@ -23,13 +26,16 @@ export class ShareDTO {
|
|||||||
@Expose()
|
@Expose()
|
||||||
hasPassword: boolean;
|
hasPassword: boolean;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
size: number;
|
||||||
|
|
||||||
from(partial: Partial<ShareDTO>) {
|
from(partial: Partial<ShareDTO>) {
|
||||||
return plainToClass(ShareDTO, partial, { excludeExtraneousValues: true });
|
return plainToClass(ShareDTO, partial, { excludeExtraneousValues: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
fromList(partial: Partial<ShareDTO>[]) {
|
fromList(partial: Partial<ShareDTO>[]) {
|
||||||
return partial.map((part) =>
|
return partial.map((part) =>
|
||||||
plainToClass(ShareDTO, part, { excludeExtraneousValues: true })
|
plainToClass(ShareDTO, part, { excludeExtraneousValues: true }),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { ReverseShareService } from "src/reverseShare/reverseShare.service";
|
|||||||
export class CreateShareGuard extends JwtGuard {
|
export class CreateShareGuard extends JwtGuard {
|
||||||
constructor(
|
constructor(
|
||||||
configService: ConfigService,
|
configService: ConfigService,
|
||||||
private reverseShareService: ReverseShareService
|
private reverseShareService: ReverseShareService,
|
||||||
) {
|
) {
|
||||||
super(configService);
|
super(configService);
|
||||||
}
|
}
|
||||||
@@ -21,7 +21,7 @@ export class CreateShareGuard extends JwtGuard {
|
|||||||
if (!reverseShareTokenId) return false;
|
if (!reverseShareTokenId) return false;
|
||||||
|
|
||||||
const isReverseShareTokenValid = await this.reverseShareService.isValid(
|
const isReverseShareTokenValid = await this.reverseShareService.isValid(
|
||||||
reverseShareTokenId
|
reverseShareTokenId,
|
||||||
);
|
);
|
||||||
|
|
||||||
return isReverseShareTokenValid;
|
return isReverseShareTokenValid;
|
||||||
|
|||||||
@@ -1,22 +1,28 @@
|
|||||||
import {
|
import {
|
||||||
CanActivate,
|
|
||||||
ExecutionContext,
|
ExecutionContext,
|
||||||
Injectable,
|
Injectable,
|
||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
import { User } from "@prisma/client";
|
import { User } from "@prisma/client";
|
||||||
import { Request } from "express";
|
import { Request } from "express";
|
||||||
|
import { ConfigService } from "src/config/config.service";
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
import { JwtGuard } from "../../auth/guard/jwt.guard";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ShareOwnerGuard implements CanActivate {
|
export class ShareOwnerGuard extends JwtGuard {
|
||||||
constructor(private prisma: PrismaService) {}
|
constructor(
|
||||||
|
configService: ConfigService,
|
||||||
|
private prisma: PrismaService,
|
||||||
|
) {
|
||||||
|
super(configService);
|
||||||
|
}
|
||||||
|
|
||||||
async canActivate(context: ExecutionContext) {
|
async canActivate(context: ExecutionContext) {
|
||||||
const request: Request = context.switchToHttp().getRequest();
|
const request: Request = context.switchToHttp().getRequest();
|
||||||
const shareId = Object.prototype.hasOwnProperty.call(
|
const shareId = Object.prototype.hasOwnProperty.call(
|
||||||
request.params,
|
request.params,
|
||||||
"shareId"
|
"shareId",
|
||||||
)
|
)
|
||||||
? request.params.shareId
|
? request.params.shareId
|
||||||
: request.params.id;
|
: request.params.id;
|
||||||
@@ -28,8 +34,20 @@ export class ShareOwnerGuard implements CanActivate {
|
|||||||
|
|
||||||
if (!share) throw new NotFoundException("Share not found");
|
if (!share) throw new NotFoundException("Share not found");
|
||||||
|
|
||||||
|
// Run the JWTGuard to set the user
|
||||||
|
await super.canActivate(context);
|
||||||
|
const user = request.user as User;
|
||||||
|
|
||||||
|
// If the user is an admin, allow access
|
||||||
|
if (user?.isAdmin) return true;
|
||||||
|
|
||||||
|
// If it's a anonymous share, allow access
|
||||||
if (!share.creatorId) return true;
|
if (!share.creatorId) return true;
|
||||||
|
|
||||||
return share.creatorId == (request.user as User).id;
|
// If not signed in, deny access
|
||||||
|
if (!user) return false;
|
||||||
|
|
||||||
|
// If the user is the creator of the share, allow access
|
||||||
|
return share.creatorId == user.id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import { ShareService } from "src/share/share.service";
|
|||||||
export class ShareSecurityGuard implements CanActivate {
|
export class ShareSecurityGuard implements CanActivate {
|
||||||
constructor(
|
constructor(
|
||||||
private shareService: ShareService,
|
private shareService: ShareService,
|
||||||
private prisma: PrismaService
|
private prisma: PrismaService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async canActivate(context: ExecutionContext) {
|
async canActivate(context: ExecutionContext) {
|
||||||
@@ -22,7 +22,7 @@ export class ShareSecurityGuard implements CanActivate {
|
|||||||
|
|
||||||
const shareId = Object.prototype.hasOwnProperty.call(
|
const shareId = Object.prototype.hasOwnProperty.call(
|
||||||
request.params,
|
request.params,
|
||||||
"shareId"
|
"shareId",
|
||||||
)
|
)
|
||||||
? request.params.shareId
|
? request.params.shareId
|
||||||
: request.params.id;
|
: request.params.id;
|
||||||
@@ -44,13 +44,13 @@ export class ShareSecurityGuard implements CanActivate {
|
|||||||
if (share.security?.password && !shareToken)
|
if (share.security?.password && !shareToken)
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
"This share is password protected",
|
"This share is password protected",
|
||||||
"share_password_required"
|
"share_password_required",
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!(await this.shareService.verifyShareToken(shareId, shareToken)))
|
if (!(await this.shareService.verifyShareToken(shareId, shareToken)))
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
"Share token required",
|
"Share token required",
|
||||||
"share_token_required"
|
"share_token_required",
|
||||||
);
|
);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ export class ShareTokenSecurity implements CanActivate {
|
|||||||
const request: Request = context.switchToHttp().getRequest();
|
const request: Request = context.switchToHttp().getRequest();
|
||||||
const shareId = Object.prototype.hasOwnProperty.call(
|
const shareId = Object.prototype.hasOwnProperty.call(
|
||||||
request.params,
|
request.params,
|
||||||
"shareId"
|
"shareId",
|
||||||
)
|
)
|
||||||
? request.params.shareId
|
? request.params.shareId
|
||||||
: request.params.id;
|
: request.params.id;
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { Throttle } from "@nestjs/throttler";
|
|||||||
import { User } from "@prisma/client";
|
import { User } from "@prisma/client";
|
||||||
import { Request, Response } from "express";
|
import { Request, Response } from "express";
|
||||||
import { GetUser } from "src/auth/decorator/getUser.decorator";
|
import { GetUser } from "src/auth/decorator/getUser.decorator";
|
||||||
|
import { AdministratorGuard } from "src/auth/guard/isAdmin.guard";
|
||||||
import { JwtGuard } from "src/auth/guard/jwt.guard";
|
import { JwtGuard } from "src/auth/guard/jwt.guard";
|
||||||
import { CreateShareDTO } from "./dto/createShare.dto";
|
import { CreateShareDTO } from "./dto/createShare.dto";
|
||||||
import { MyShareDTO } from "./dto/myShare.dto";
|
import { MyShareDTO } from "./dto/myShare.dto";
|
||||||
@@ -25,15 +26,22 @@ import { ShareOwnerGuard } from "./guard/shareOwner.guard";
|
|||||||
import { ShareSecurityGuard } from "./guard/shareSecurity.guard";
|
import { ShareSecurityGuard } from "./guard/shareSecurity.guard";
|
||||||
import { ShareTokenSecurity } from "./guard/shareTokenSecurity.guard";
|
import { ShareTokenSecurity } from "./guard/shareTokenSecurity.guard";
|
||||||
import { ShareService } from "./share.service";
|
import { ShareService } from "./share.service";
|
||||||
|
import { AdminShareDTO } from "./dto/adminShare.dto";
|
||||||
@Controller("shares")
|
@Controller("shares")
|
||||||
export class ShareController {
|
export class ShareController {
|
||||||
constructor(private shareService: ShareService) {}
|
constructor(private shareService: ShareService) {}
|
||||||
|
|
||||||
|
@Get("all")
|
||||||
|
@UseGuards(JwtGuard, AdministratorGuard)
|
||||||
|
async getAllShares() {
|
||||||
|
return new AdminShareDTO().fromList(await this.shareService.getShares());
|
||||||
|
}
|
||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
async getMyShares(@GetUser() user: User) {
|
async getMyShares(@GetUser() user: User) {
|
||||||
return new MyShareDTO().fromList(
|
return new MyShareDTO().fromList(
|
||||||
await this.shareService.getSharesByUser(user.id)
|
await this.shareService.getSharesByUser(user.id),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,6 +51,12 @@ export class ShareController {
|
|||||||
return new ShareDTO().from(await this.shareService.get(id));
|
return new ShareDTO().from(await this.shareService.get(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get(":id/from-owner")
|
||||||
|
@UseGuards(ShareOwnerGuard)
|
||||||
|
async getFromOwner(@Param("id") id: string) {
|
||||||
|
return new ShareDTO().from(await this.shareService.get(id));
|
||||||
|
}
|
||||||
|
|
||||||
@Get(":id/metaData")
|
@Get(":id/metaData")
|
||||||
@UseGuards(ShareSecurityGuard)
|
@UseGuards(ShareSecurityGuard)
|
||||||
async getMetaData(@Param("id") id: string) {
|
async getMetaData(@Param("id") id: string) {
|
||||||
@@ -54,30 +68,37 @@ export class ShareController {
|
|||||||
async create(
|
async create(
|
||||||
@Body() body: CreateShareDTO,
|
@Body() body: CreateShareDTO,
|
||||||
@Req() request: Request,
|
@Req() request: Request,
|
||||||
@GetUser() user: User
|
@GetUser() user: User,
|
||||||
) {
|
) {
|
||||||
const { reverse_share_token } = request.cookies;
|
const { reverse_share_token } = request.cookies;
|
||||||
return new ShareDTO().from(
|
return new ShareDTO().from(
|
||||||
await this.shareService.create(body, user, reverse_share_token)
|
await this.shareService.create(body, user, reverse_share_token),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete(":id")
|
|
||||||
@UseGuards(JwtGuard, ShareOwnerGuard)
|
|
||||||
async remove(@Param("id") id: string) {
|
|
||||||
await this.shareService.remove(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post(":id/complete")
|
@Post(":id/complete")
|
||||||
@HttpCode(202)
|
@HttpCode(202)
|
||||||
@UseGuards(CreateShareGuard, ShareOwnerGuard)
|
@UseGuards(CreateShareGuard, ShareOwnerGuard)
|
||||||
async complete(@Param("id") id: string, @Req() request: Request) {
|
async complete(@Param("id") id: string, @Req() request: Request) {
|
||||||
const { reverse_share_token } = request.cookies;
|
const { reverse_share_token } = request.cookies;
|
||||||
return new ShareDTO().from(
|
return new ShareDTO().from(
|
||||||
await this.shareService.complete(id, reverse_share_token)
|
await this.shareService.complete(id, reverse_share_token),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Delete(":id/complete")
|
||||||
|
@UseGuards(ShareOwnerGuard)
|
||||||
|
async revertComplete(@Param("id") id: string) {
|
||||||
|
return new ShareDTO().from(await this.shareService.revertComplete(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete(":id")
|
||||||
|
@UseGuards(ShareOwnerGuard)
|
||||||
|
async remove(@Param("id") id: string, @GetUser() user: User) {
|
||||||
|
const isDeleterAdmin = user?.isAdmin === true;
|
||||||
|
await this.shareService.remove(id, isDeleterAdmin);
|
||||||
|
}
|
||||||
|
|
||||||
@Throttle(10, 60)
|
@Throttle(10, 60)
|
||||||
@Get("isShareIdAvailable/:id")
|
@Get("isShareIdAvailable/:id")
|
||||||
async isShareIdAvailable(@Param("id") id: string) {
|
async isShareIdAvailable(@Param("id") id: string) {
|
||||||
@@ -91,7 +112,7 @@ export class ShareController {
|
|||||||
async getShareToken(
|
async getShareToken(
|
||||||
@Param("id") id: string,
|
@Param("id") id: string,
|
||||||
@Res({ passthrough: true }) response: Response,
|
@Res({ passthrough: true }) response: Response,
|
||||||
@Body() body: SharePasswordDto
|
@Body() body: SharePasswordDto,
|
||||||
) {
|
) {
|
||||||
const token = await this.shareService.getShareToken(id, body.password);
|
const token = await this.shareService.getShareToken(id, body.password);
|
||||||
response.cookie(`share_${id}_token`, token, {
|
response.cookie(`share_${id}_token`, token, {
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import { EmailService } from "src/email/email.service";
|
|||||||
import { FileService } from "src/file/file.service";
|
import { FileService } from "src/file/file.service";
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
import { ReverseShareService } from "src/reverseShare/reverseShare.service";
|
import { ReverseShareService } from "src/reverseShare/reverseShare.service";
|
||||||
|
import { parseRelativeDateToAbsolute } from "src/utils/date.util";
|
||||||
import { SHARE_DIRECTORY } from "../constants";
|
import { SHARE_DIRECTORY } from "../constants";
|
||||||
import { CreateShareDTO } from "./dto/createShare.dto";
|
import { CreateShareDTO } from "./dto/createShare.dto";
|
||||||
|
|
||||||
@@ -28,7 +29,7 @@ export class ShareService {
|
|||||||
private config: ConfigService,
|
private config: ConfigService,
|
||||||
private jwtService: JwtService,
|
private jwtService: JwtService,
|
||||||
private reverseShareService: ReverseShareService,
|
private reverseShareService: ReverseShareService,
|
||||||
private clamScanService: ClamScanService
|
private clamScanService: ClamScanService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(share: CreateShareDTO, user?: User, reverseShareToken?: string) {
|
async create(share: CreateShareDTO, user?: User, reverseShareToken?: string) {
|
||||||
@@ -46,24 +47,29 @@ export class ShareService {
|
|||||||
|
|
||||||
// If share is created by a reverse share token override the expiration date
|
// If share is created by a reverse share token override the expiration date
|
||||||
const reverseShare = await this.reverseShareService.getByToken(
|
const reverseShare = await this.reverseShareService.getByToken(
|
||||||
reverseShareToken
|
reverseShareToken,
|
||||||
);
|
);
|
||||||
if (reverseShare) {
|
if (reverseShare) {
|
||||||
expirationDate = reverseShare.shareExpiration;
|
expirationDate = reverseShare.shareExpiration;
|
||||||
} else {
|
} else {
|
||||||
// We have to add an exception for "never" (since moment won't like that)
|
const parsedExpiration = parseRelativeDateToAbsolute(share.expiration);
|
||||||
if (share.expiration !== "never") {
|
|
||||||
expirationDate = moment()
|
const expiresNever = moment(0).toDate() == parsedExpiration;
|
||||||
.add(
|
|
||||||
share.expiration.split("-")[0],
|
if (
|
||||||
share.expiration.split(
|
this.config.get("share.maxExpiration") !== 0 &&
|
||||||
"-"
|
(expiresNever ||
|
||||||
)[1] as moment.unitOfTime.DurationConstructor
|
parsedExpiration >
|
||||||
)
|
moment()
|
||||||
.toDate();
|
.add(this.config.get("share.maxExpiration"), "hours")
|
||||||
} else {
|
.toDate())
|
||||||
expirationDate = moment(0).toDate();
|
) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
"Expiration date exceeds maximum expiration date",
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
expirationDate = parsedExpiration;
|
||||||
}
|
}
|
||||||
|
|
||||||
fs.mkdirSync(`${SHARE_DIRECTORY}/${share.id}`, {
|
fs.mkdirSync(`${SHARE_DIRECTORY}/${share.id}`, {
|
||||||
@@ -134,13 +140,13 @@ export class ShareService {
|
|||||||
|
|
||||||
if (share.files.length == 0)
|
if (share.files.length == 0)
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
"You need at least on file in your share to complete it."
|
"You need at least on file in your share to complete it.",
|
||||||
);
|
);
|
||||||
|
|
||||||
// Asynchronously create a zip of all files
|
// Asynchronously create a zip of all files
|
||||||
if (share.files.length > 1)
|
if (share.files.length > 1)
|
||||||
this.createZip(id).then(() =>
|
this.createZip(id).then(() =>
|
||||||
this.prisma.share.update({ where: { id }, data: { isZipReady: true } })
|
this.prisma.share.update({ where: { id }, data: { isZipReady: true } }),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Send email for each recipient
|
// Send email for each recipient
|
||||||
@@ -150,7 +156,7 @@ export class ShareService {
|
|||||||
share.id,
|
share.id,
|
||||||
share.creator,
|
share.creator,
|
||||||
share.description,
|
share.description,
|
||||||
share.expiration
|
share.expiration,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,7 +167,7 @@ export class ShareService {
|
|||||||
) {
|
) {
|
||||||
await this.emailService.sendMailToReverseShareCreator(
|
await this.emailService.sendMailToReverseShareCreator(
|
||||||
share.reverseShare.creator.email,
|
share.reverseShare.creator.email,
|
||||||
share.id
|
share.id,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,6 +187,29 @@ export class ShareService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async revertComplete(id: string) {
|
||||||
|
return this.prisma.share.update({
|
||||||
|
where: { id },
|
||||||
|
data: { uploadLocked: false, isZipReady: false },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async getShares() {
|
||||||
|
const shares = await this.prisma.share.findMany({
|
||||||
|
orderBy: {
|
||||||
|
expiration: "desc",
|
||||||
|
},
|
||||||
|
include: { files: true, creator: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
return shares.map((share) => {
|
||||||
|
return {
|
||||||
|
...share,
|
||||||
|
size: share.files.reduce((acc, file) => acc + parseInt(file.size), 0),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async getSharesByUser(userId: string) {
|
async getSharesByUser(userId: string) {
|
||||||
const shares = await this.prisma.share.findMany({
|
const shares = await this.prisma.share.findMany({
|
||||||
where: {
|
where: {
|
||||||
@@ -238,13 +267,14 @@ export class ShareService {
|
|||||||
return share;
|
return share;
|
||||||
}
|
}
|
||||||
|
|
||||||
async remove(shareId: string) {
|
async remove(shareId: string, isDeleterAdmin = false) {
|
||||||
const share = await this.prisma.share.findUnique({
|
const share = await this.prisma.share.findUnique({
|
||||||
where: { id: shareId },
|
where: { id: shareId },
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!share) throw new NotFoundException("Share not found");
|
if (!share) throw new NotFoundException("Share not found");
|
||||||
if (!share.creatorId)
|
|
||||||
|
if (!share.creatorId && !isDeleterAdmin)
|
||||||
throw new ForbiddenException("Anonymous shares can't be deleted");
|
throw new ForbiddenException("Anonymous shares can't be deleted");
|
||||||
|
|
||||||
await this.fileService.deleteAllFiles(shareId);
|
await this.fileService.deleteAllFiles(shareId);
|
||||||
@@ -285,7 +315,7 @@ export class ShareService {
|
|||||||
if (share.security?.maxViews && share.security.maxViews <= share.views) {
|
if (share.security?.maxViews && share.security.maxViews <= share.views) {
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
"Maximum views exceeded",
|
"Maximum views exceeded",
|
||||||
"share_max_views_exceeded"
|
"share_max_views_exceeded",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -305,7 +335,7 @@ export class ShareService {
|
|||||||
{
|
{
|
||||||
expiresIn: moment(expiration).diff(new Date(), "seconds") + "s",
|
expiresIn: moment(expiration).diff(new Date(), "seconds") + "s",
|
||||||
secret: this.config.get("internal.jwtSecret"),
|
secret: this.config.get("internal.jwtSecret"),
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { OmitType, PartialType } from "@nestjs/swagger";
|
import { PartialType, PickType } from "@nestjs/swagger";
|
||||||
import { UserDTO } from "./user.dto";
|
import { UserDTO } from "./user.dto";
|
||||||
|
|
||||||
export class UpdateOwnUserDTO extends PartialType(
|
export class UpdateOwnUserDTO extends PartialType(
|
||||||
OmitType(UserDTO, ["isAdmin", "password"] as const)
|
PickType(UserDTO, ["username", "email"] as const),
|
||||||
) {}
|
) {}
|
||||||
|
|||||||
@@ -16,6 +16,9 @@ export class UserDTO {
|
|||||||
@IsEmail()
|
@IsEmail()
|
||||||
email: string;
|
email: string;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
hasPassword: boolean;
|
||||||
|
|
||||||
@MinLength(8)
|
@MinLength(8)
|
||||||
password: string;
|
password: string;
|
||||||
|
|
||||||
@@ -31,7 +34,7 @@ export class UserDTO {
|
|||||||
|
|
||||||
fromList(partial: Partial<UserDTO>[]) {
|
fromList(partial: Partial<UserDTO>[]) {
|
||||||
return partial.map((part) =>
|
return partial.map((part) =>
|
||||||
plainToClass(UserDTO, part, { excludeExtraneousValues: true })
|
plainToClass(UserDTO, part, { excludeExtraneousValues: true }),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,15 +27,18 @@ export class UserController {
|
|||||||
// Own user operations
|
// Own user operations
|
||||||
@Get("me")
|
@Get("me")
|
||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
async getCurrentUser(@GetUser() user: User) {
|
async getCurrentUser(@GetUser() user?: User) {
|
||||||
return new UserDTO().from(user);
|
if (!user) return null;
|
||||||
|
const userDTO = new UserDTO().from(user);
|
||||||
|
userDTO.hasPassword = !!user.password;
|
||||||
|
return userDTO;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch("me")
|
@Patch("me")
|
||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
async updateCurrentUser(
|
async updateCurrentUser(
|
||||||
@GetUser() user: User,
|
@GetUser() user: User,
|
||||||
@Body() data: UpdateOwnUserDTO
|
@Body() data: UpdateOwnUserDTO,
|
||||||
) {
|
) {
|
||||||
return new UserDTO().from(await this.userService.update(user.id, data));
|
return new UserDTO().from(await this.userService.update(user.id, data));
|
||||||
}
|
}
|
||||||
@@ -44,7 +47,7 @@ export class UserController {
|
|||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
async deleteCurrentUser(
|
async deleteCurrentUser(
|
||||||
@GetUser() user: User,
|
@GetUser() user: User,
|
||||||
@Res({ passthrough: true }) response: Response
|
@Res({ passthrough: true }) response: Response,
|
||||||
) {
|
) {
|
||||||
response.cookie("access_token", "accessToken", { maxAge: -1 });
|
response.cookie("access_token", "accessToken", { maxAge: -1 });
|
||||||
response.cookie("refresh_token", "", {
|
response.cookie("refresh_token", "", {
|
||||||
|
|||||||
@@ -2,9 +2,10 @@ import { Module } from "@nestjs/common";
|
|||||||
import { EmailModule } from "src/email/email.module";
|
import { EmailModule } from "src/email/email.module";
|
||||||
import { UserController } from "./user.controller";
|
import { UserController } from "./user.controller";
|
||||||
import { UserSevice } from "./user.service";
|
import { UserSevice } from "./user.service";
|
||||||
|
import { FileModule } from "src/file/file.module";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [EmailModule],
|
imports: [EmailModule, FileModule],
|
||||||
providers: [UserSevice],
|
providers: [UserSevice],
|
||||||
controllers: [UserController],
|
controllers: [UserController],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import * as argon from "argon2";
|
|||||||
import * as crypto from "crypto";
|
import * as crypto from "crypto";
|
||||||
import { EmailService } from "src/email/email.service";
|
import { EmailService } from "src/email/email.service";
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
import { FileService } from "../file/file.service";
|
||||||
import { CreateUserDTO } from "./dto/createUser.dto";
|
import { CreateUserDTO } from "./dto/createUser.dto";
|
||||||
import { UpdateUserDto } from "./dto/updateUser.dto";
|
import { UpdateUserDto } from "./dto/updateUser.dto";
|
||||||
|
|
||||||
@@ -11,7 +12,8 @@ import { UpdateUserDto } from "./dto/updateUser.dto";
|
|||||||
export class UserSevice {
|
export class UserSevice {
|
||||||
constructor(
|
constructor(
|
||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
private emailService: EmailService
|
private emailService: EmailService,
|
||||||
|
private fileService: FileService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async list() {
|
async list() {
|
||||||
@@ -46,7 +48,7 @@ export class UserSevice {
|
|||||||
if (e.code == "P2002") {
|
if (e.code == "P2002") {
|
||||||
const duplicatedField: string = e.meta.target[0];
|
const duplicatedField: string = e.meta.target[0];
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
`A user with this ${duplicatedField} already exists`
|
`A user with this ${duplicatedField} already exists`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -66,7 +68,7 @@ export class UserSevice {
|
|||||||
if (e.code == "P2002") {
|
if (e.code == "P2002") {
|
||||||
const duplicatedField: string = e.meta.target[0];
|
const duplicatedField: string = e.meta.target[0];
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
`A user with this ${duplicatedField} already exists`
|
`A user with this ${duplicatedField} already exists`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,6 +76,16 @@ export class UserSevice {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async delete(id: string) {
|
async delete(id: string) {
|
||||||
|
const user = await this.prisma.user.findUnique({
|
||||||
|
where: { id },
|
||||||
|
include: { shares: true },
|
||||||
|
});
|
||||||
|
if (!user) throw new BadRequestException("User not found");
|
||||||
|
|
||||||
|
await Promise.all(
|
||||||
|
user.shares.map((share) => this.fileService.deleteAllFiles(share.id)),
|
||||||
|
);
|
||||||
|
|
||||||
return await this.prisma.user.delete({ where: { id } });
|
return await this.prisma.user.delete({ where: { id } });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
12
backend/src/utils/date.util.ts
Normal file
12
backend/src/utils/date.util.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import * as moment from "moment";
|
||||||
|
|
||||||
|
export function parseRelativeDateToAbsolute(relativeDate: string) {
|
||||||
|
if (relativeDate == "never") return moment(0).toDate();
|
||||||
|
|
||||||
|
return moment()
|
||||||
|
.add(
|
||||||
|
relativeDate.split("-")[0],
|
||||||
|
relativeDate.split("-")[1] as moment.unitOfTime.DurationConstructor,
|
||||||
|
)
|
||||||
|
.toDate();
|
||||||
|
}
|
||||||
@@ -432,7 +432,7 @@
|
|||||||
" const responseBody = pm.response.json();",
|
" const responseBody = pm.response.json();",
|
||||||
" pm.expect(responseBody).to.have.property(\"id\")",
|
" pm.expect(responseBody).to.have.property(\"id\")",
|
||||||
" pm.expect(responseBody).to.have.property(\"expiration\")",
|
" pm.expect(responseBody).to.have.property(\"expiration\")",
|
||||||
" pm.expect(Object.keys(responseBody).length).be.equal(3)",
|
" pm.expect(Object.keys(responseBody).length).be.equal(4)",
|
||||||
"});",
|
"});",
|
||||||
""
|
""
|
||||||
],
|
],
|
||||||
@@ -626,7 +626,7 @@
|
|||||||
" const responseBody = pm.response.json();",
|
" const responseBody = pm.response.json();",
|
||||||
" pm.expect(responseBody).to.have.property(\"id\")",
|
" pm.expect(responseBody).to.have.property(\"id\")",
|
||||||
" pm.expect(responseBody).to.have.property(\"expiration\")",
|
" pm.expect(responseBody).to.have.property(\"expiration\")",
|
||||||
" pm.expect(Object.keys(responseBody).length).be.equal(3)",
|
" pm.expect(Object.keys(responseBody).length).be.equal(4)",
|
||||||
"});",
|
"});",
|
||||||
""
|
""
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -6,7 +6,10 @@
|
|||||||
"emitDecoratorMetadata": true,
|
"emitDecoratorMetadata": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"allowSyntheticDefaultImports": true,
|
"allowSyntheticDefaultImports": true,
|
||||||
"target": "es2017",
|
"target": "es2021",
|
||||||
|
"lib": [
|
||||||
|
"ES2021"
|
||||||
|
],
|
||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
"outDir": "./dist",
|
"outDir": "./dist",
|
||||||
"baseUrl": "./",
|
"baseUrl": "./",
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
_Leer esto en otro idioma: [Inglés](/README.md), [Español](/docs/README.es.md), [Chino Simplificado](/docs/README.zh-cn.md)_
|
_Leer esto en otro idioma: [Inglés](/README.md), [Español](/docs/README.es.md), [Chino Simplificado](/docs/README.zh-cn.md), [日本語](/docs/README.ja-jp.md)_
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -20,7 +20,8 @@ Pingvin Share es una plataforma de intercambio de archivos autoalojada y una alt
|
|||||||
## 🐧 Conoce Pingvin Share
|
## 🐧 Conoce Pingvin Share
|
||||||
|
|
||||||
- [Demo](https://pingvin-share.dev.eliasschneider.com)
|
- [Demo](https://pingvin-share.dev.eliasschneider.com)
|
||||||
- [Reseña por DB Tech](https://www.youtube.com/watch?v=rWwNeZCOPJA)
|
- [Reseña realizada por No Solo Hacking (español)](https://www.youtube.com/watch?v=ocd4EpLTYkU)
|
||||||
|
- [Reseña por DB Tech (inglés)](https://www.youtube.com/watch?v=rWwNeZCOPJA)
|
||||||
|
|
||||||
<img src="https://user-images.githubusercontent.com/58886915/225038319-b2ef742c-3a74-4eb6-9689-4207a36842a4.png" width="700"/>
|
<img src="https://user-images.githubusercontent.com/58886915/225038319-b2ef742c-3a74-4eb6-9689-4207a36842a4.png" width="700"/>
|
||||||
|
|
||||||
|
|||||||
158
docs/README.ja-jp.md
Normal file
158
docs/README.ja-jp.md
Normal file
@@ -0,0 +1,158 @@
|
|||||||
|
# <div align="center"><img src="https://user-images.githubusercontent.com/58886915/166198400-c2134044-1198-4647-a8b6-da9c4a204c68.svg" width="40"/> </br>Pingvin Share</div>
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
_READMEを別の言語で読む: [Spanish](/docs/README.es.md), [English](/README.md), [Simplified Chinese](/docs/README.zh-cn.md), [日本語](/docs/README.ja-jp.md)_
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Pingvin Share は、セルフホスト型のファイル共有プラットフォームであり、WeTransfer、ギガファイル便などの代替プラットフォームです。
|
||||||
|
|
||||||
|
## ✨ 特徴的な機能
|
||||||
|
|
||||||
|
- リンクを用いたファイル共有
|
||||||
|
- ファイルサイズ無制限 (ストレージスペースの範囲内で)
|
||||||
|
- 共有への有効期限の設定
|
||||||
|
- 訪問回数の制限とパスワードの設定により共有を安全に保つ
|
||||||
|
- メールでリンクを共有
|
||||||
|
- ClamAVと連携して、ウイルスチェックが可能
|
||||||
|
|
||||||
|
## 🐧 Pingvin Shareについて知る
|
||||||
|
|
||||||
|
- [デモ](https://pingvin-share.dev.eliasschneider.com)
|
||||||
|
- [DB Techによるレビュー](https://www.youtube.com/watch?v=rWwNeZCOPJA)
|
||||||
|
|
||||||
|
<img src="https://user-images.githubusercontent.com/58886915/225038319-b2ef742c-3a74-4eb6-9689-4207a36842a4.png" width="700"/>
|
||||||
|
|
||||||
|
## ⌨️ セットアップ
|
||||||
|
|
||||||
|
> 注意: Pingvin Shareは、早期段階であり、バグが含まれている場合があります。
|
||||||
|
|
||||||
|
### Dockerでインストール (おすすめ)
|
||||||
|
|
||||||
|
1. `docker-compose.yml`ファイルをダウンロード
|
||||||
|
2. `docker-compose up -d`を実行
|
||||||
|
|
||||||
|
Webサイトは、`http://localhost:3000`でリッスンされます。これでPingvin Shareをお使い頂けます🐧!
|
||||||
|
|
||||||
|
### スタンドアローンインストール
|
||||||
|
|
||||||
|
必要なツール:
|
||||||
|
|
||||||
|
- [Node.js](https://nodejs.org/en/download/) >= 16
|
||||||
|
- [Git](https://git-scm.com/downloads)
|
||||||
|
- [pm2](https://pm2.keymetrics.io/) Pingvin Shareをバックグラウンドで動作させるために必要
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/stonith404/pingvin-share
|
||||||
|
cd pingvin-share
|
||||||
|
|
||||||
|
# 最新バージョンをチェックアウト
|
||||||
|
git fetch --tags && git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
|
||||||
|
|
||||||
|
# バックエンドを開始
|
||||||
|
cd backend
|
||||||
|
npm install
|
||||||
|
npm run build
|
||||||
|
pm2 start --name="pingvin-share-backend" npm -- run prod
|
||||||
|
|
||||||
|
#フロントエンドを開始
|
||||||
|
cd ../frontend
|
||||||
|
npm install
|
||||||
|
npm run build
|
||||||
|
pm2 start --name="pingvin-share-frontend" npm -- run start
|
||||||
|
```
|
||||||
|
|
||||||
|
Webサイトは、`http://localhost:3000`でリッスンされます。これでPingvin Shareをお使い頂けます🐧!
|
||||||
|
|
||||||
|
### 連携機能
|
||||||
|
|
||||||
|
#### ClamAV (Dockerのみ)
|
||||||
|
|
||||||
|
ClamAVは、共有されたファイルをスキャンし、感染したファイルを見つけた場合に削除するために使用されます。
|
||||||
|
|
||||||
|
1. ClamAVコンテナをDocker Composeの定義ファイル(`docker-compose.yml`を確認)に追加し、コンテナを開始してください。
|
||||||
|
2. Dockerは、Pingvin Shareを開始する前に、ClamAVの準備が整うまで待機します。これには、1分から2分ほどかかります。
|
||||||
|
3. Pingvin Shareのログに"ClamAV is active"というログが記録されます。
|
||||||
|
|
||||||
|
ClamAVは、非常に多くのリソースを必要とします、詳しくは[リソース](https://docs.clamav.net/manual/Installing/Docker.html#memory-ram-requirements)をご確認ください。
|
||||||
|
|
||||||
|
### 追加情報
|
||||||
|
|
||||||
|
- [Synology NASへのインストール方法](https://mariushosting.com/how-to-install-pingvin-share-on-your-synology-nas/)
|
||||||
|
|
||||||
|
### 新しいバージョンへのアップグレード
|
||||||
|
|
||||||
|
Pingvin Shareは早期段階のため、アップグレード前に必ずリリースノートを確認して、アップグレードしても問題ないかどうかご確認ください。
|
||||||
|
|
||||||
|
#### Docker
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose pull
|
||||||
|
docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
#### スタンドアローン
|
||||||
|
|
||||||
|
1. アプリを停止する
|
||||||
|
```bash
|
||||||
|
pm2 stop pingvin-share-backend pingvin-share-frontend
|
||||||
|
```
|
||||||
|
2. `git clone`のステップを除いて、[インストールガイド](#stand-alone-installation)をくり返してください。
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd pingvin-share
|
||||||
|
|
||||||
|
# 最新バージョンをチェックアウト
|
||||||
|
git fetch --tags && git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
|
||||||
|
|
||||||
|
# バックエンドを開始
|
||||||
|
cd backend
|
||||||
|
npm run build
|
||||||
|
pm2 restart pingvin-share-backend
|
||||||
|
|
||||||
|
#フロントエンドを開始
|
||||||
|
cd ../frontend
|
||||||
|
npm run build
|
||||||
|
pm2 restart pingvin-share-frontend
|
||||||
|
```
|
||||||
|
|
||||||
|
### 設定
|
||||||
|
|
||||||
|
管理者のダッシュボード内の「設定」ページから、Pingvin Shareをカスタマイズできます。
|
||||||
|
|
||||||
|
#### 環境変数
|
||||||
|
|
||||||
|
インストール時の特定の設定で、環境変数を使用できます。次の環境変数が使用可能です:
|
||||||
|
|
||||||
|
##### バックエンド
|
||||||
|
|
||||||
|
| 変数名 | デフォルト値 | 説明 |
|
||||||
|
| ---------------- | -------------------------------------------------- | -------------------------------------- |
|
||||||
|
| `PORT` | `8080` | バックエンドがリッスンするポート番号 |
|
||||||
|
| `DATABASE_URL` | `file:../data/pingvin-share.db?connection_limit=1` | SQLiteのURL |
|
||||||
|
| `DATA_DIRECTORY` | `./data` | データを保管するディレクトリ |
|
||||||
|
| `CLAMAV_HOST` | `127.0.0.1` | ClamAVサーバーのIPアドレス |
|
||||||
|
| `CLAMAV_PORT` | `3310` | ClamAVサーバーのポート番号 |
|
||||||
|
|
||||||
|
##### フロントエンド
|
||||||
|
|
||||||
|
| 変数名 | デフォルト値 | 説明 |
|
||||||
|
| --------- | ----------------------- | ---------------------------------------- |
|
||||||
|
| `PORT` | `3000` | フロントエンドがリッスンするポート番号 |
|
||||||
|
| `API_URL` | `http://localhost:8080` | フロントエンドからアクセスするバックエンドへのURL |
|
||||||
|
|
||||||
|
## 🖤 コントリビュート
|
||||||
|
|
||||||
|
### 翻訳
|
||||||
|
|
||||||
|
Pingvin Shareをあなたが使用している言語に翻訳するお手伝いを募集しています。
|
||||||
|
[Crowdin](https://crowdin.com/project/pingvin-share)上で、簡単にPingvin Shareの翻訳作業への参加が可能です。
|
||||||
|
|
||||||
|
あなたの言語がありませんか? 気軽に[リクエスト](https://github.com/stonith404/pingvin-share/issues/new?assignees=&labels=language-request&projects=&template=language-request.yml&title=%F0%9F%8C%90+Language+request%3A+%3Clanguage+name+in+english%3E)してください。
|
||||||
|
|
||||||
|
翻訳中に問題がありましたか? [ローカライズに関するディスカッション](https://github.com/stonith404/pingvin-share/discussions/198)に是非参加してください。
|
||||||
|
|
||||||
|
### プロジェクト
|
||||||
|
|
||||||
|
Pingvin Shareへのコントリビュートをいつでもお待ちしています! [コントリビューションガイド](/CONTRIBUTING.md)を確認して、是非参加してください。
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
_选择合适的语言阅读: [西班牙语](/docs/README.es.md), [英语](/README.md), [简体中文](/docs/README.zh-cn.md)_
|
_选择合适的语言阅读: [西班牙语](/docs/README.es.md), [英语](/README.md), [简体中文](/docs/README.zh-cn.md), [日本语](/docs/README.ja-jp.md)_
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
157
docs/oauth2-guide.md
Normal file
157
docs/oauth2-guide.md
Normal file
@@ -0,0 +1,157 @@
|
|||||||
|
# OAuth 2 Login Guide
|
||||||
|
|
||||||
|
## Config Built-in OAuth 2 Providers
|
||||||
|
|
||||||
|
- [GitHub](#github)
|
||||||
|
- [Google](#google)
|
||||||
|
- [Microsoft](#microsoft)
|
||||||
|
- [Discord](#discord)
|
||||||
|
- [OpenID Connect](#openid-connect)
|
||||||
|
|
||||||
|
### GitHub
|
||||||
|
|
||||||
|
Please follow the [official guide](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app) to create an OAuth app.
|
||||||
|
|
||||||
|
Redirect URL: `https://<your-domain>/api/oauth/callback/github`
|
||||||
|
|
||||||
|
### Google
|
||||||
|
|
||||||
|
Please follow the [official guide](https://developers.google.com/identity/protocols/oauth2/web-server#prerequisites) to create an OAuth 2.0 App.
|
||||||
|
|
||||||
|
Redirect URL: `https://<your-domain>/api/oauth/callback/google`
|
||||||
|
|
||||||
|
### Microsoft
|
||||||
|
|
||||||
|
Please follow the [official guide](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app) to register an application.
|
||||||
|
|
||||||
|
> [!IMPORTANT]
|
||||||
|
> **Microsoft Tenant** you set in the admin panel must match the **supported account types** you set in the Microsoft Entra admin center, otherwise the OAuth login will not work. Refer to the [official documentation](https://learn.microsoft.com/en-us/entra/identity-platform/v2-protocols-oidc#find-your-apps-openid-configuration-document-uri) for more details.
|
||||||
|
|
||||||
|
Redirect URL: `https://<your-domain>/api/oauth/callback/microsoft`
|
||||||
|
|
||||||
|
### Discord
|
||||||
|
|
||||||
|
Create an application on [Discord Developer Portal](https://discord.com/developers/applications).
|
||||||
|
|
||||||
|
Redirect URL: `https://<your-domain>/api/oauth/callback/discord`
|
||||||
|
|
||||||
|
### OpenID Connect
|
||||||
|
|
||||||
|
Generic OpenID Connect provider is also supported, we have tested it on Keycloak, Authentik and Casdoor.
|
||||||
|
|
||||||
|
Redirect URL: `https://<your-domain>/api/oauth/callback/oidc`
|
||||||
|
|
||||||
|
## Custom your OAuth 2 Provider
|
||||||
|
|
||||||
|
If our built-in providers don't meet your needs, you can create your own OAuth 2 provider.
|
||||||
|
|
||||||
|
### 1. Create config
|
||||||
|
|
||||||
|
Add your config (client id, client secret, etc.) in [`config.seed.ts`](../backend/prisma/seed/config.seed.ts):
|
||||||
|
|
||||||
|
```ts
|
||||||
|
const configVariables: ConfigVariables = {
|
||||||
|
// ...
|
||||||
|
oauth: {
|
||||||
|
// ...
|
||||||
|
"YOUR_PROVIDER_NAME-enabled": {
|
||||||
|
type: "boolean",
|
||||||
|
defaultValue: "false",
|
||||||
|
},
|
||||||
|
"YOUR_PROVIDER_NAME-clientId": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
},
|
||||||
|
"YOUR_PROVIDER_NAME-clientSecret": {
|
||||||
|
type: "string",
|
||||||
|
defaultValue: "",
|
||||||
|
obscured: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Create provider class
|
||||||
|
|
||||||
|
#### Generic OpenID Connect
|
||||||
|
|
||||||
|
If your provider supports OpenID connect, it's extremely easy to extend [`GenericOidcProvider`](../backend/src/oauth/provider/genericOidc.provider.ts) to add a new OpenID Connect provider.
|
||||||
|
|
||||||
|
The [Google provider](../backend/src/oauth/provider/google.provider.ts) and [Microsoft provider](../backend/src/oauth/provider/microsoft.provider.ts) are good examples.
|
||||||
|
|
||||||
|
Here are some discovery URIs for popular providers:
|
||||||
|
|
||||||
|
- Microsoft: `https://login.microsoftonline.com/{tenant}/v2.0/.well-known/openid-configuration`
|
||||||
|
- Google: `https://accounts.google.com/.well-known/openid-configuration`
|
||||||
|
- Apple: `https://appleid.apple.com/.well-known/openid-configuration`
|
||||||
|
- Gitlab: `https://gitlab.com/.well-known/openid-configuration`
|
||||||
|
- Huawei: `https://oauth-login.cloud.huawei.com/.well-known/openid-configuration`
|
||||||
|
- Paypal: `https://www.paypal.com/.well-known/openid-configuration`
|
||||||
|
- Yahoo: `https://api.login.yahoo.com/.well-known/openid-configuration`
|
||||||
|
|
||||||
|
#### OAuth 2
|
||||||
|
|
||||||
|
If your provider only supports OAuth 2, you can implement [`OAuthProvider`](../backend/src/oauth/provider/oauthProvider.interface.ts) interface to add a new OAuth 2 provider.
|
||||||
|
|
||||||
|
The [GitHub provider](../backend/src/oauth/provider/github.provider.ts) and [Discord provider](../backend/src/oauth/provider/discord.provider.ts) are good examples.
|
||||||
|
|
||||||
|
### 3. Register provider
|
||||||
|
|
||||||
|
Register your provider in [`OAuthModule`](../backend/src/oauth/oauth.module.ts) and [`OAuthSignInDto`](../backend/src/oauth/dto/oauthSignIn.dto.ts):
|
||||||
|
|
||||||
|
```ts
|
||||||
|
@Module({
|
||||||
|
providers: [
|
||||||
|
GitHubProvider,
|
||||||
|
// your provider
|
||||||
|
{
|
||||||
|
provide: "OAUTH_PROVIDERS",
|
||||||
|
useFactory(github: GitHubProvider, /* your provider */): Record<string, OAuthProvider<unknown>> {
|
||||||
|
return {
|
||||||
|
github,
|
||||||
|
/* your provider */
|
||||||
|
};
|
||||||
|
},
|
||||||
|
inject: [GitHubProvider, /* your provider */],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})
|
||||||
|
export class OAuthModule {
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
```ts
|
||||||
|
export interface OAuthSignInDto {
|
||||||
|
provider: 'github' | 'google' | 'microsoft' | 'discord' | 'oidc' /* your provider*/;
|
||||||
|
providerId: string;
|
||||||
|
providerUsername: string;
|
||||||
|
email: string;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. Add frontend icon
|
||||||
|
|
||||||
|
Add an icon in [`oauth.util.tsx`](../frontend/src/utils/oauth.util.tsx).
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const getOAuthIcon = (provider: string) => {
|
||||||
|
return {
|
||||||
|
'github': <SiGithub />,
|
||||||
|
/* your provider */
|
||||||
|
}[provider];
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Add i18n text
|
||||||
|
|
||||||
|
Add keys below to your i18n text in [locale file](../frontend/src/i18n/translations/en-US.ts).
|
||||||
|
|
||||||
|
- `signIn.oauth.YOUR_PROVIDER_NAME`
|
||||||
|
- `account.card.oauth.YOUR_PROVIDER_NAME`
|
||||||
|
- `admin.config.oauth.YOUR_PROVIDER_NAME-enabled`
|
||||||
|
- `admin.config.oauth.YOUR_PROVIDER_NAME-client-id`
|
||||||
|
- `admin.config.oauth.YOUR_PROVIDER_NAME-client-secret`
|
||||||
|
- `error.param.provider_YOUR_PROVIDER_NAME`
|
||||||
|
- Other config keys you defined in step 1
|
||||||
|
|
||||||
|
Congratulations! 🎉 You have successfully added a new OAuth 2 provider! Pull requests are welcome if you want to share your provider with others.
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
"react-hooks/exhaustive-deps": ["off"],
|
"react-hooks/exhaustive-deps": ["off"],
|
||||||
"import/no-anonymous-default-export": ["off"],
|
"import/no-anonymous-default-export": ["off"],
|
||||||
"no-unused-vars": ["warn"],
|
"no-unused-vars": ["warn"],
|
||||||
"react/no-unescaped-entities": ["off"]
|
"react/no-unescaped-entities": ["off"],
|
||||||
|
"@next/next/no-img-element": ["off"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1
frontend/.prettierignore
Normal file
1
frontend/.prettierignore
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/src/i18n/translations/*
|
||||||
5934
frontend/package-lock.json
generated
5934
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pingvin-share-frontend",
|
"name": "pingvin-share-frontend",
|
||||||
"version": "0.17.3",
|
"version": "0.24.2",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
@@ -9,45 +9,47 @@
|
|||||||
"format": "prettier --end-of-line=auto --write \"src/**/*.ts*\""
|
"format": "prettier --end-of-line=auto --write \"src/**/*.ts*\""
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.11.1",
|
"@emotion/react": "^11.11.4",
|
||||||
"@emotion/server": "^11.11.0",
|
"@emotion/server": "^11.11.0",
|
||||||
"@mantine/core": "^6.0.17",
|
"@mantine/core": "^6.0.21",
|
||||||
"@mantine/dropzone": "^6.0.17",
|
"@mantine/dropzone": "^6.0.21",
|
||||||
"@mantine/form": "^6.0.17",
|
"@mantine/form": "^6.0.21",
|
||||||
"@mantine/hooks": "^6.0.17",
|
"@mantine/hooks": "^6.0.21",
|
||||||
"@mantine/modals": "^6.0.17",
|
"@mantine/modals": "^6.0.21",
|
||||||
"@mantine/next": "^6.0.17",
|
"@mantine/next": "^6.0.21",
|
||||||
"@mantine/notifications": "^6.0.17",
|
"@mantine/notifications": "^6.0.21",
|
||||||
"axios": "^1.4.0",
|
"axios": "^1.7.2",
|
||||||
"cookies-next": "^2.1.2",
|
"cookies-next": "^2.1.2",
|
||||||
"file-saver": "^2.0.5",
|
"file-saver": "^2.0.5",
|
||||||
"jose": "^4.14.4",
|
"jose": "^4.15.5",
|
||||||
"jwt-decode": "^3.1.2",
|
"jwt-decode": "^3.1.2",
|
||||||
|
"markdown-to-jsx": "^7.4.7",
|
||||||
"mime-types": "^2.1.35",
|
"mime-types": "^2.1.35",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.30.1",
|
||||||
"next": "^13.4.12",
|
"next": "^14.2.3",
|
||||||
"next-cookies": "^2.0.3",
|
"next-cookies": "^2.0.3",
|
||||||
"next-http-proxy-middleware": "^1.2.5",
|
"next-http-proxy-middleware": "^1.2.6",
|
||||||
"next-pwa": "^5.6.0",
|
"next-pwa": "^5.6.0",
|
||||||
"p-limit": "^4.0.0",
|
"p-limit": "^4.0.0",
|
||||||
"react": "^18.2.0",
|
"react": "^18.3.1",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.3.1",
|
||||||
"react-icons": "^4.10.1",
|
"react-icons": "^4.12.0",
|
||||||
"react-intl": "^6.4.4",
|
"react-intl": "^6.6.8",
|
||||||
"sharp": "^0.32.4",
|
"sharp": "^0.33.4",
|
||||||
"yup": "^1.2.0"
|
"yup": "^1.4.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/mime-types": "^2.1.1",
|
"@types/mime-types": "^2.1.4",
|
||||||
"@types/node": "20.4.5",
|
"@types/node": "20.12.12",
|
||||||
"@types/react": "18.2.17",
|
"@types/react": "18.3.2",
|
||||||
"@types/react-dom": "18.2.7",
|
"@types/react-dom": "18.3.0",
|
||||||
"axios": "^1.4.0",
|
"@typescript-eslint/parser": "^7.10.0",
|
||||||
"eslint": "8.46.0",
|
"axios": "^1.7.2",
|
||||||
"eslint-config-next": "^13.4.12",
|
"eslint": "8.57.0",
|
||||||
"eslint-config-prettier": "^8.9.0",
|
"eslint-config-next": "^13.5.6",
|
||||||
"prettier": "^3.0.0",
|
"eslint-config-prettier": "^8.10.0",
|
||||||
"tar": "^6.1.15",
|
"prettier": "^3.2.5",
|
||||||
"typescript": "^5.1.6"
|
"tar": "^6.2.1",
|
||||||
|
"typescript": "^5.4.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 86 KiB |
@@ -1,6 +1,4 @@
|
|||||||
import Image from "next/image";
|
|
||||||
|
|
||||||
const Logo = ({ height, width }: { height: number; width: number }) => {
|
const Logo = ({ height, width }: { height: number; width: number }) => {
|
||||||
return <Image src="/img/logo.png" alt="logo" height={height} width={width} />;
|
return <img src="/img/logo.png" alt="logo" height={height} width={width} />;
|
||||||
};
|
};
|
||||||
export default Logo;
|
export default Logo;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { LOCALES } from "../../i18n/locales";
|
|||||||
const LanguagePicker = () => {
|
const LanguagePicker = () => {
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
const [selectedLanguage, setSelectedLanguage] = useState(
|
const [selectedLanguage, setSelectedLanguage] = useState(
|
||||||
getCookie("language")?.toString()
|
getCookie("language")?.toString(),
|
||||||
);
|
);
|
||||||
|
|
||||||
const languages = Object.values(LOCALES).map((locale) => ({
|
const languages = Object.values(LOCALES).map((locale) => ({
|
||||||
@@ -23,7 +23,7 @@ const LanguagePicker = () => {
|
|||||||
setCookie("language", value, {
|
setCookie("language", value, {
|
||||||
sameSite: "lax",
|
sameSite: "lax",
|
||||||
expires: new Date(
|
expires: new Date(
|
||||||
new Date().setFullYear(new Date().getFullYear() + 1)
|
new Date().setFullYear(new Date().getFullYear() + 1),
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
location.reload();
|
location.reload();
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import userPreferences from "../../utils/userPreferences.util";
|
|||||||
|
|
||||||
const ThemeSwitcher = () => {
|
const ThemeSwitcher = () => {
|
||||||
const [colorScheme, setColorScheme] = useState(
|
const [colorScheme, setColorScheme] = useState(
|
||||||
userPreferences.get("colorScheme")
|
userPreferences.get("colorScheme"),
|
||||||
);
|
);
|
||||||
const { toggleColorScheme } = useMantineColorScheme();
|
const { toggleColorScheme } = useMantineColorScheme();
|
||||||
const systemColorScheme = useColorScheme();
|
const systemColorScheme = useColorScheme();
|
||||||
@@ -26,7 +26,7 @@ const ThemeSwitcher = () => {
|
|||||||
userPreferences.set("colorScheme", value);
|
userPreferences.set("colorScheme", value);
|
||||||
setColorScheme(value);
|
setColorScheme(value);
|
||||||
toggleColorScheme(
|
toggleColorScheme(
|
||||||
value == "system" ? systemColorScheme : (value as ColorScheme)
|
value == "system" ? systemColorScheme : (value as ColorScheme),
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
data={[
|
data={[
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ const showEnableTotpModal = (
|
|||||||
qrCode: string;
|
qrCode: string;
|
||||||
secret: string;
|
secret: string;
|
||||||
password: string;
|
password: string;
|
||||||
}
|
},
|
||||||
) => {
|
) => {
|
||||||
const t = translateOutsideContext();
|
const t = translateOutsideContext();
|
||||||
return modals.openModal({
|
return modals.openModal({
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { translateOutsideContext } from "../../hooks/useTranslate.hook";
|
|||||||
const showReverseShareLinkModal = (
|
const showReverseShareLinkModal = (
|
||||||
modals: ModalsContextProps,
|
modals: ModalsContextProps,
|
||||||
reverseShareToken: string,
|
reverseShareToken: string,
|
||||||
appUrl: string
|
appUrl: string,
|
||||||
) => {
|
) => {
|
||||||
const t = translateOutsideContext();
|
const t = translateOutsideContext();
|
||||||
const link = `${appUrl}/upload/${reverseShareToken}`;
|
const link = `${appUrl}/upload/${reverseShareToken}`;
|
||||||
|
|||||||
@@ -12,18 +12,14 @@ const showShareInformationsModal = (
|
|||||||
modals: ModalsContextProps,
|
modals: ModalsContextProps,
|
||||||
share: MyShare,
|
share: MyShare,
|
||||||
appUrl: string,
|
appUrl: string,
|
||||||
maxShareSize: number
|
maxShareSize: number,
|
||||||
) => {
|
) => {
|
||||||
const t = translateOutsideContext();
|
const t = translateOutsideContext();
|
||||||
const link = `${appUrl}/s/${share.id}`;
|
const link = `${appUrl}/s/${share.id}`;
|
||||||
|
|
||||||
let shareSize: number = 0;
|
const formattedShareSize = byteToHumanSizeString(share.size);
|
||||||
for (let file of share.files as FileMetaData[])
|
|
||||||
shareSize += parseInt(file.size);
|
|
||||||
|
|
||||||
const formattedShareSize = byteToHumanSizeString(shareSize);
|
|
||||||
const formattedMaxShareSize = byteToHumanSizeString(maxShareSize);
|
const formattedMaxShareSize = byteToHumanSizeString(maxShareSize);
|
||||||
const shareSizeProgress = (shareSize / maxShareSize) * 100;
|
const shareSizeProgress = (share.size / maxShareSize) * 100;
|
||||||
|
|
||||||
const formattedCreatedAt = moment(share.createdAt).format("LLL");
|
const formattedCreatedAt = moment(share.createdAt).format("LLL");
|
||||||
const formattedExpiration =
|
const formattedExpiration =
|
||||||
@@ -36,28 +32,34 @@ const showShareInformationsModal = (
|
|||||||
|
|
||||||
children: (
|
children: (
|
||||||
<Stack align="stretch" spacing="md">
|
<Stack align="stretch" spacing="md">
|
||||||
<Text size="sm" color="lightgray">
|
<Text size="sm">
|
||||||
<b>
|
<b>
|
||||||
<FormattedMessage id="account.shares.table.id" />:{" "}
|
<FormattedMessage id="account.shares.table.id" />:{" "}
|
||||||
</b>
|
</b>
|
||||||
{share.id}
|
{share.id}
|
||||||
</Text>
|
</Text>
|
||||||
|
<Text size="sm">
|
||||||
|
<b>
|
||||||
|
<FormattedMessage id="account.shares.table.name" />:{" "}
|
||||||
|
</b>
|
||||||
|
{share.name || "-"}
|
||||||
|
</Text>
|
||||||
|
|
||||||
<Text size="sm" color="lightgray">
|
<Text size="sm">
|
||||||
<b>
|
<b>
|
||||||
<FormattedMessage id="account.shares.table.description" />:{" "}
|
<FormattedMessage id="account.shares.table.description" />:{" "}
|
||||||
</b>
|
</b>
|
||||||
{share.description || "No description"}
|
{share.description || "-"}
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
<Text size="sm" color="lightgray">
|
<Text size="sm">
|
||||||
<b>
|
<b>
|
||||||
<FormattedMessage id="account.shares.table.createdAt" />:{" "}
|
<FormattedMessage id="account.shares.table.createdAt" />:{" "}
|
||||||
</b>
|
</b>
|
||||||
{formattedCreatedAt}
|
{formattedCreatedAt}
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
<Text size="sm" color="lightgray">
|
<Text size="sm">
|
||||||
<b>
|
<b>
|
||||||
<FormattedMessage id="account.shares.table.expiresAt" />:{" "}
|
<FormattedMessage id="account.shares.table.expiresAt" />:{" "}
|
||||||
</b>
|
</b>
|
||||||
@@ -66,7 +68,7 @@ const showShareInformationsModal = (
|
|||||||
<Divider />
|
<Divider />
|
||||||
<CopyTextField link={link} />
|
<CopyTextField link={link} />
|
||||||
<Divider />
|
<Divider />
|
||||||
<Text size="sm" color="lightgray">
|
<Text size="sm">
|
||||||
<b>
|
<b>
|
||||||
<FormattedMessage id="account.shares.table.size" />:{" "}
|
<FormattedMessage id="account.shares.table.size" />:{" "}
|
||||||
</b>
|
</b>
|
||||||
@@ -75,19 +77,19 @@ const showShareInformationsModal = (
|
|||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
<Flex align="center" justify="center">
|
<Flex align="center" justify="center">
|
||||||
{shareSize / maxShareSize < 0.1 && (
|
{share.size / maxShareSize < 0.1 && (
|
||||||
<Text size="xs" color="lightgray" style={{ marginRight: "4px" }}>
|
<Text size="xs" style={{ marginRight: "4px" }}>
|
||||||
{formattedShareSize}
|
{formattedShareSize}
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
<Progress
|
<Progress
|
||||||
value={shareSizeProgress}
|
value={shareSizeProgress}
|
||||||
label={shareSize / maxShareSize >= 0.1 ? formattedShareSize : ""}
|
label={share.size / maxShareSize >= 0.1 ? formattedShareSize : ""}
|
||||||
style={{ width: shareSize / maxShareSize < 0.1 ? "70%" : "80%" }}
|
style={{ width: share.size / maxShareSize < 0.1 ? "70%" : "80%" }}
|
||||||
size="xl"
|
size="xl"
|
||||||
radius="xl"
|
radius="xl"
|
||||||
/>
|
/>
|
||||||
<Text size="xs" color="lightgray" style={{ marginLeft: "4px" }}>
|
<Text size="xs" style={{ marginLeft: "4px" }}>
|
||||||
{formattedMaxShareSize}
|
{formattedMaxShareSize}
|
||||||
</Text>
|
</Text>
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { translateOutsideContext } from "../../hooks/useTranslate.hook";
|
|||||||
const showShareLinkModal = (
|
const showShareLinkModal = (
|
||||||
modals: ModalsContextProps,
|
modals: ModalsContextProps,
|
||||||
shareId: string,
|
shareId: string,
|
||||||
appUrl: string
|
appUrl: string,
|
||||||
) => {
|
) => {
|
||||||
const t = translateOutsideContext();
|
const t = translateOutsideContext();
|
||||||
const link = `${appUrl}/s/${shareId}`;
|
const link = `${appUrl}/s/${shareId}`;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ const AdminConfigInput = ({
|
|||||||
stringValue: configVariable.value ?? configVariable.defaultValue,
|
stringValue: configVariable.value ?? configVariable.defaultValue,
|
||||||
textValue: configVariable.value ?? configVariable.defaultValue,
|
textValue: configVariable.value ?? configVariable.defaultValue,
|
||||||
numberValue: parseInt(
|
numberValue: parseInt(
|
||||||
configVariable.value ?? configVariable.defaultValue
|
configVariable.value ?? configVariable.defaultValue,
|
||||||
),
|
),
|
||||||
booleanValue:
|
booleanValue:
|
||||||
(configVariable.value ?? configVariable.defaultValue) == "true",
|
(configVariable.value ?? configVariable.defaultValue) == "true",
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import {
|
|||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { Dispatch, SetStateAction } from "react";
|
import { Dispatch, SetStateAction } from "react";
|
||||||
import { TbAt, TbMail, TbShare, TbSquare } from "react-icons/tb";
|
import { TbAt, TbMail, TbShare, TbSocial, TbSquare } from "react-icons/tb";
|
||||||
import { FormattedMessage } from "react-intl";
|
import { FormattedMessage } from "react-intl";
|
||||||
|
|
||||||
const categories = [
|
const categories = [
|
||||||
@@ -19,6 +19,7 @@ const categories = [
|
|||||||
{ name: "Email", icon: <TbMail /> },
|
{ name: "Email", icon: <TbMail /> },
|
||||||
{ name: "Share", icon: <TbShare /> },
|
{ name: "Share", icon: <TbShare /> },
|
||||||
{ name: "SMTP", icon: <TbAt /> },
|
{ name: "SMTP", icon: <TbAt /> },
|
||||||
|
{ name: "OAuth", icon: <TbSocial /> },
|
||||||
];
|
];
|
||||||
|
|
||||||
const useStyles = createStyles((theme) => ({
|
const useStyles = createStyles((theme) => ({
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ const LogoConfigInput = ({
|
|||||||
value={logo}
|
value={logo}
|
||||||
onChange={(v) => setLogo(v)}
|
onChange={(v) => setLogo(v)}
|
||||||
accept=".png"
|
accept=".png"
|
||||||
|
// @ts-ignore (https://github.com/mantinedev/mantine/issues/5401)
|
||||||
placeholder={t("admin.config.general.logo.placeholder")}
|
placeholder={t("admin.config.general.logo.placeholder")}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ const TestEmailButton = ({
|
|||||||
<Textarea minRows={4} readOnly value={e.response.data.message} />
|
<Textarea minRows={4} readOnly value={e.response.data.message} />
|
||||||
</Stack>
|
</Stack>
|
||||||
),
|
),
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
149
frontend/src/components/admin/shares/ManageShareTable.tsx
Normal file
149
frontend/src/components/admin/shares/ManageShareTable.tsx
Normal file
@@ -0,0 +1,149 @@
|
|||||||
|
import {
|
||||||
|
ActionIcon,
|
||||||
|
Box,
|
||||||
|
Group,
|
||||||
|
MediaQuery,
|
||||||
|
Skeleton,
|
||||||
|
Table,
|
||||||
|
Text,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { useClipboard } from "@mantine/hooks";
|
||||||
|
import { useModals } from "@mantine/modals";
|
||||||
|
import moment from "moment";
|
||||||
|
import { TbLink, TbTrash } from "react-icons/tb";
|
||||||
|
import { FormattedMessage } from "react-intl";
|
||||||
|
import useConfig from "../../../hooks/config.hook";
|
||||||
|
import useTranslate from "../../../hooks/useTranslate.hook";
|
||||||
|
import { MyShare } from "../../../types/share.type";
|
||||||
|
import { byteToHumanSizeString } from "../../../utils/fileSize.util";
|
||||||
|
import toast from "../../../utils/toast.util";
|
||||||
|
import showShareLinkModal from "../../account/showShareLinkModal";
|
||||||
|
|
||||||
|
const ManageShareTable = ({
|
||||||
|
shares,
|
||||||
|
deleteShare,
|
||||||
|
isLoading,
|
||||||
|
}: {
|
||||||
|
shares: MyShare[];
|
||||||
|
deleteShare: (share: MyShare) => void;
|
||||||
|
isLoading: boolean;
|
||||||
|
}) => {
|
||||||
|
const modals = useModals();
|
||||||
|
const clipboard = useClipboard();
|
||||||
|
const config = useConfig();
|
||||||
|
const t = useTranslate();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box sx={{ display: "block", overflowX: "auto" }}>
|
||||||
|
<Table verticalSpacing="sm">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>
|
||||||
|
<FormattedMessage id="account.shares.table.id" />
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<FormattedMessage id="account.shares.table.name" />
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<FormattedMessage id="admin.shares.table.username" />
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<FormattedMessage id="account.shares.table.visitors" />
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<FormattedMessage id="account.shares.table.size" />
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<FormattedMessage id="account.shares.table.expiresAt" />
|
||||||
|
</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{isLoading
|
||||||
|
? skeletonRows
|
||||||
|
: shares.map((share) => (
|
||||||
|
<tr key={share.id}>
|
||||||
|
<td>{share.id}</td>
|
||||||
|
<td>{share.name}</td>
|
||||||
|
<td>
|
||||||
|
{share.creator ? (
|
||||||
|
share.creator.username
|
||||||
|
) : (
|
||||||
|
<Text color="dimmed">Anonymous</Text>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
<td>{share.views}</td>
|
||||||
|
<td>{byteToHumanSizeString(share.size)}</td>
|
||||||
|
<td>
|
||||||
|
{moment(share.expiration).unix() === 0
|
||||||
|
? "Never"
|
||||||
|
: moment(share.expiration).format("LLL")}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<Group position="right">
|
||||||
|
<ActionIcon
|
||||||
|
color="victoria"
|
||||||
|
variant="light"
|
||||||
|
size={25}
|
||||||
|
onClick={() => {
|
||||||
|
if (window.isSecureContext) {
|
||||||
|
clipboard.copy(
|
||||||
|
`${config.get("general.appUrl")}/s/${share.id}`,
|
||||||
|
);
|
||||||
|
toast.success(t("common.notify.copied"));
|
||||||
|
} else {
|
||||||
|
showShareLinkModal(
|
||||||
|
modals,
|
||||||
|
share.id,
|
||||||
|
config.get("general.appUrl"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<TbLink />
|
||||||
|
</ActionIcon>
|
||||||
|
<ActionIcon
|
||||||
|
variant="light"
|
||||||
|
color="red"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => deleteShare(share)}
|
||||||
|
>
|
||||||
|
<TbTrash />
|
||||||
|
</ActionIcon>
|
||||||
|
</Group>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</Table>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const skeletonRows = [...Array(10)].map((v, i) => (
|
||||||
|
<tr key={i}>
|
||||||
|
<td>
|
||||||
|
<Skeleton key={i} height={20} />
|
||||||
|
</td>
|
||||||
|
<MediaQuery smallerThan="md" styles={{ display: "none" }}>
|
||||||
|
<td>
|
||||||
|
<Skeleton key={i} height={20} />
|
||||||
|
</td>
|
||||||
|
</MediaQuery>
|
||||||
|
<td>
|
||||||
|
<Skeleton key={i} height={20} />
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<Skeleton key={i} height={20} />
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<Skeleton key={i} height={20} />
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<Skeleton key={i} height={20} />
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
));
|
||||||
|
|
||||||
|
export default ManageShareTable;
|
||||||
@@ -17,7 +17,7 @@ import toast from "../../../utils/toast.util";
|
|||||||
const showCreateUserModal = (
|
const showCreateUserModal = (
|
||||||
modals: ModalsContextProps,
|
modals: ModalsContextProps,
|
||||||
smtpEnabled: boolean,
|
smtpEnabled: boolean,
|
||||||
getUsers: () => void
|
getUsers: () => void,
|
||||||
) => {
|
) => {
|
||||||
return modals.openModal({
|
return modals.openModal({
|
||||||
title: "Create user",
|
title: "Create user",
|
||||||
@@ -55,7 +55,7 @@ const Body = ({
|
|||||||
.string()
|
.string()
|
||||||
.min(8, t("common.error.too-short", { length: 8 }))
|
.min(8, t("common.error.too-short", { length: 8 }))
|
||||||
.optional(),
|
.optional(),
|
||||||
})
|
}),
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -87,7 +87,7 @@ const Body = ({
|
|||||||
labelPosition="left"
|
labelPosition="left"
|
||||||
label={t("admin.users.modal.create.manual-password")}
|
label={t("admin.users.modal.create.manual-password")}
|
||||||
description={t(
|
description={t(
|
||||||
"admin.users.modal.create.manual-password.description"
|
"admin.users.modal.create.manual-password.description",
|
||||||
)}
|
)}
|
||||||
{...form.getInputProps("setPasswordManually", {
|
{...form.getInputProps("setPasswordManually", {
|
||||||
type: "checkbox",
|
type: "checkbox",
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import toast from "../../../utils/toast.util";
|
|||||||
const showUpdateUserModal = (
|
const showUpdateUserModal = (
|
||||||
modals: ModalsContextProps,
|
modals: ModalsContextProps,
|
||||||
user: User,
|
user: User,
|
||||||
getUsers: () => void
|
getUsers: () => void,
|
||||||
) => {
|
) => {
|
||||||
const t = translateOutsideContext();
|
const t = translateOutsideContext();
|
||||||
return modals.openModal({
|
return modals.openModal({
|
||||||
@@ -53,7 +53,7 @@ const Body = ({
|
|||||||
username: yup
|
username: yup
|
||||||
.string()
|
.string()
|
||||||
.min(3, t("common.error.too-short", { length: 3 })),
|
.min(3, t("common.error.too-short", { length: 3 })),
|
||||||
})
|
}),
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@ const Body = ({
|
|||||||
password: yup
|
password: yup
|
||||||
.string()
|
.string()
|
||||||
.min(8, t("common.error.too-short", { length: 8 })),
|
.min(8, t("common.error.too-short", { length: 8 })),
|
||||||
})
|
}),
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -115,8 +115,8 @@ const Body = ({
|
|||||||
})
|
})
|
||||||
.then(() =>
|
.then(() =>
|
||||||
toast.success(
|
toast.success(
|
||||||
t("admin.users.edit.update.notify.password.success")
|
t("admin.users.edit.update.notify.password.success"),
|
||||||
)
|
),
|
||||||
)
|
)
|
||||||
.catch(toast.axiosError);
|
.catch(toast.axiosError);
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -2,9 +2,11 @@ import {
|
|||||||
Anchor,
|
Anchor,
|
||||||
Button,
|
Button,
|
||||||
Container,
|
Container,
|
||||||
|
createStyles,
|
||||||
Group,
|
Group,
|
||||||
Paper,
|
Paper,
|
||||||
PasswordInput,
|
PasswordInput,
|
||||||
|
Stack,
|
||||||
Text,
|
Text,
|
||||||
TextInput,
|
TextInput,
|
||||||
Title,
|
Title,
|
||||||
@@ -18,19 +20,48 @@ import { TbInfoCircle } from "react-icons/tb";
|
|||||||
import { FormattedMessage } from "react-intl";
|
import { FormattedMessage } from "react-intl";
|
||||||
import * as yup from "yup";
|
import * as yup from "yup";
|
||||||
import useConfig from "../../hooks/config.hook";
|
import useConfig from "../../hooks/config.hook";
|
||||||
import useTranslate from "../../hooks/useTranslate.hook";
|
|
||||||
import useUser from "../../hooks/user.hook";
|
import useUser from "../../hooks/user.hook";
|
||||||
|
import useTranslate from "../../hooks/useTranslate.hook";
|
||||||
import authService from "../../services/auth.service";
|
import authService from "../../services/auth.service";
|
||||||
|
import { getOAuthIcon, getOAuthUrl } from "../../utils/oauth.util";
|
||||||
import toast from "../../utils/toast.util";
|
import toast from "../../utils/toast.util";
|
||||||
|
import { safeRedirectPath } from "../../utils/router.util";
|
||||||
|
|
||||||
|
const useStyles = createStyles((theme) => ({
|
||||||
|
or: {
|
||||||
|
"&:before": {
|
||||||
|
content: "''",
|
||||||
|
flex: 1,
|
||||||
|
display: "block",
|
||||||
|
borderTopWidth: 1,
|
||||||
|
borderTopStyle: "solid",
|
||||||
|
borderColor:
|
||||||
|
theme.colorScheme === "dark"
|
||||||
|
? theme.colors.dark[3]
|
||||||
|
: theme.colors.gray[4],
|
||||||
|
},
|
||||||
|
"&:after": {
|
||||||
|
content: "''",
|
||||||
|
flex: 1,
|
||||||
|
display: "block",
|
||||||
|
borderTopWidth: 1,
|
||||||
|
borderTopStyle: "solid",
|
||||||
|
borderColor:
|
||||||
|
theme.colorScheme === "dark"
|
||||||
|
? theme.colors.dark[3]
|
||||||
|
: theme.colors.gray[4],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
|
const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
|
||||||
const config = useConfig();
|
const config = useConfig();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
const { refreshUser } = useUser();
|
const { refreshUser } = useUser();
|
||||||
|
const { classes } = useStyles();
|
||||||
|
|
||||||
const [showTotp, setShowTotp] = React.useState(false);
|
const [oauth, setOAuth] = React.useState<string[]>([]);
|
||||||
const [loginToken, setLoginToken] = React.useState("");
|
|
||||||
|
|
||||||
const validationSchema = yup.object().shape({
|
const validationSchema = yup.object().shape({
|
||||||
emailOrUsername: yup.string().required(t("common.error.field-required")),
|
emailOrUsername: yup.string().required(t("common.error.field-required")),
|
||||||
@@ -44,7 +75,6 @@ const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
|
|||||||
initialValues: {
|
initialValues: {
|
||||||
emailOrUsername: "",
|
emailOrUsername: "",
|
||||||
password: "",
|
password: "",
|
||||||
totp: "",
|
|
||||||
},
|
},
|
||||||
validate: yupResolver(validationSchema),
|
validate: yupResolver(validationSchema),
|
||||||
});
|
});
|
||||||
@@ -55,7 +85,6 @@ const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
|
|||||||
.then(async (response) => {
|
.then(async (response) => {
|
||||||
if (response.data["loginToken"]) {
|
if (response.data["loginToken"]) {
|
||||||
// Prompt the user to enter their totp code
|
// Prompt the user to enter their totp code
|
||||||
setShowTotp(true);
|
|
||||||
showNotification({
|
showNotification({
|
||||||
icon: <TbInfoCircle />,
|
icon: <TbInfoCircle />,
|
||||||
color: "blue",
|
color: "blue",
|
||||||
@@ -63,34 +92,28 @@ const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
|
|||||||
title: t("signIn.notify.totp-required.title"),
|
title: t("signIn.notify.totp-required.title"),
|
||||||
message: t("signIn.notify.totp-required.description"),
|
message: t("signIn.notify.totp-required.description"),
|
||||||
});
|
});
|
||||||
setLoginToken(response.data["loginToken"]);
|
router.push(
|
||||||
|
`/auth/totp/${
|
||||||
|
response.data["loginToken"]
|
||||||
|
}?redirect=${encodeURIComponent(redirectPath)}`,
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
await refreshUser();
|
await refreshUser();
|
||||||
router.replace(redirectPath);
|
router.replace(safeRedirectPath(redirectPath));
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(toast.axiosError);
|
.catch(toast.axiosError);
|
||||||
};
|
};
|
||||||
|
|
||||||
const signInTotp = (email: string, password: string, totp: string) => {
|
const getAvailableOAuth = async () => {
|
||||||
authService
|
const oauth = await authService.getAvailableOAuth();
|
||||||
.signInTotp(email, password, totp, loginToken)
|
setOAuth(oauth.data);
|
||||||
.then(async () => {
|
|
||||||
await refreshUser();
|
|
||||||
router.replace(redirectPath);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
if (error?.response?.data?.error == "share_password_required") {
|
|
||||||
toast.axiosError(error);
|
|
||||||
// Refresh the page to start over
|
|
||||||
window.location.reload();
|
|
||||||
}
|
|
||||||
|
|
||||||
toast.axiosError(error);
|
|
||||||
form.setValues({ totp: "" });
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
React.useEffect(() => {
|
||||||
|
getAvailableOAuth().catch(toast.axiosError);
|
||||||
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container size={420} my={40}>
|
<Container size={420} my={40}>
|
||||||
<Title order={2} align="center" weight={900}>
|
<Title order={2} align="center" weight={900}>
|
||||||
@@ -107,9 +130,7 @@ const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
|
|||||||
<Paper withBorder shadow="md" p={30} mt={30} radius="md">
|
<Paper withBorder shadow="md" p={30} mt={30} radius="md">
|
||||||
<form
|
<form
|
||||||
onSubmit={form.onSubmit((values) => {
|
onSubmit={form.onSubmit((values) => {
|
||||||
if (showTotp)
|
signIn(values.emailOrUsername, values.password);
|
||||||
signInTotp(values.emailOrUsername, values.password, values.totp);
|
|
||||||
else signIn(values.emailOrUsername, values.password);
|
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<TextInput
|
<TextInput
|
||||||
@@ -123,15 +144,6 @@ const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
|
|||||||
mt="md"
|
mt="md"
|
||||||
{...form.getInputProps("password")}
|
{...form.getInputProps("password")}
|
||||||
/>
|
/>
|
||||||
{showTotp && (
|
|
||||||
<TextInput
|
|
||||||
variant="filled"
|
|
||||||
label={t("account.modal.totp.code")}
|
|
||||||
placeholder="******"
|
|
||||||
mt="md"
|
|
||||||
{...form.getInputProps("totp")}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{config.get("smtp.enabled") && (
|
{config.get("smtp.enabled") && (
|
||||||
<Group position="right" mt="xs">
|
<Group position="right" mt="xs">
|
||||||
<Anchor component={Link} href="/auth/resetPassword" size="xs">
|
<Anchor component={Link} href="/auth/resetPassword" size="xs">
|
||||||
@@ -143,6 +155,27 @@ const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
|
|||||||
<FormattedMessage id="signin.button.submit" />
|
<FormattedMessage id="signin.button.submit" />
|
||||||
</Button>
|
</Button>
|
||||||
</form>
|
</form>
|
||||||
|
{oauth.length > 0 && (
|
||||||
|
<Stack mt="xl">
|
||||||
|
<Group align="center" className={classes.or}>
|
||||||
|
<Text>{t("signIn.oauth.or")}</Text>
|
||||||
|
</Group>
|
||||||
|
<Group position="center">
|
||||||
|
{oauth.map((provider) => (
|
||||||
|
<Button
|
||||||
|
key={provider}
|
||||||
|
component="a"
|
||||||
|
target="_blank"
|
||||||
|
title={t(`signIn.oauth.${provider}`)}
|
||||||
|
href={getOAuthUrl(config.get("general.appUrl"), provider)}
|
||||||
|
variant="light"
|
||||||
|
>
|
||||||
|
{getOAuthIcon(provider)}
|
||||||
|
</Button>
|
||||||
|
))}
|
||||||
|
</Group>
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
</Paper>
|
</Paper>
|
||||||
</Container>
|
</Container>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ const SignUpForm = () => {
|
|||||||
<Paper withBorder shadow="md" p={30} mt={30} radius="md">
|
<Paper withBorder shadow="md" p={30} mt={30} radius="md">
|
||||||
<form
|
<form
|
||||||
onSubmit={form.onSubmit((values) =>
|
onSubmit={form.onSubmit((values) =>
|
||||||
signUp(values.email, values.username, values.password)
|
signUp(values.email, values.username, values.password),
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<TextInput
|
<TextInput
|
||||||
|
|||||||
85
frontend/src/components/auth/TotpForm.tsx
Normal file
85
frontend/src/components/auth/TotpForm.tsx
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
import {
|
||||||
|
Button,
|
||||||
|
Container,
|
||||||
|
Group,
|
||||||
|
Paper,
|
||||||
|
PinInput,
|
||||||
|
Title,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { useForm, yupResolver } from "@mantine/form";
|
||||||
|
import { useRouter } from "next/router";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { FormattedMessage } from "react-intl";
|
||||||
|
import * as yup from "yup";
|
||||||
|
import useTranslate from "../../hooks/useTranslate.hook";
|
||||||
|
import useUser from "../../hooks/user.hook";
|
||||||
|
import authService from "../../services/auth.service";
|
||||||
|
import { safeRedirectPath } from "../../utils/router.util";
|
||||||
|
import toast from "../../utils/toast.util";
|
||||||
|
|
||||||
|
function TotpForm({ redirectPath }: { redirectPath: string }) {
|
||||||
|
const t = useTranslate();
|
||||||
|
const router = useRouter();
|
||||||
|
const { refreshUser } = useUser();
|
||||||
|
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
|
||||||
|
const validationSchema = yup.object().shape({
|
||||||
|
code: yup
|
||||||
|
.string()
|
||||||
|
.min(6, t("common.error.too-short", { length: 6 }))
|
||||||
|
.required(t("common.error.field-required")),
|
||||||
|
});
|
||||||
|
|
||||||
|
const form = useForm({
|
||||||
|
initialValues: {
|
||||||
|
code: "",
|
||||||
|
},
|
||||||
|
validate: yupResolver(validationSchema),
|
||||||
|
});
|
||||||
|
|
||||||
|
const onSubmit = async () => {
|
||||||
|
if (loading) return;
|
||||||
|
setLoading(true);
|
||||||
|
try {
|
||||||
|
await authService.signInTotp(
|
||||||
|
form.values.code,
|
||||||
|
router.query.loginToken as string,
|
||||||
|
);
|
||||||
|
await refreshUser();
|
||||||
|
await router.replace(safeRedirectPath(redirectPath));
|
||||||
|
} catch (e) {
|
||||||
|
toast.axiosError(e);
|
||||||
|
form.setFieldError("code", "error");
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Container size={420} my={40}>
|
||||||
|
<Title order={2} align="center" weight={900}>
|
||||||
|
<FormattedMessage id="totp.title" />
|
||||||
|
</Title>
|
||||||
|
<Paper withBorder shadow="md" p={30} mt={30} radius="md">
|
||||||
|
<form onSubmit={form.onSubmit(onSubmit)}>
|
||||||
|
<Group position="center">
|
||||||
|
<PinInput
|
||||||
|
length={6}
|
||||||
|
oneTimeCode
|
||||||
|
aria-label="One time code"
|
||||||
|
autoFocus={true}
|
||||||
|
onComplete={onSubmit}
|
||||||
|
{...form.getInputProps("code")}
|
||||||
|
/>
|
||||||
|
<Button mt="md" type="submit" loading={loading}>
|
||||||
|
{t("totp.button.signIn")}
|
||||||
|
</Button>
|
||||||
|
</Group>
|
||||||
|
</form>
|
||||||
|
</Paper>
|
||||||
|
</Container>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default TotpForm;
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user