Compare commits
63 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
edb511252f | ||
|
|
c3af0fe097 | ||
|
|
6419da07fb | ||
|
|
7cd9dff637 | ||
|
|
2a826f7941 | ||
|
|
8720232755 | ||
|
|
dc8cf3d5ca | ||
|
|
979b882150 | ||
|
|
c55019f71b | ||
|
|
4c6ef52a17 | ||
|
|
b9662701c4 | ||
|
|
e3f88d0826 | ||
|
|
86a7379519 | ||
|
|
ccdf8ea3ae | ||
|
|
edc10b72b7 | ||
|
|
5d1a7f0310 | ||
|
|
8ab359b71d | ||
|
|
38de022215 | ||
|
|
82f204e8a9 | ||
|
|
4e840ecd29 | ||
|
|
064ef38d78 | ||
|
|
b14e931d8d | ||
|
|
3d5c919110 | ||
|
|
008df06b5c | ||
|
|
cd9d828686 | ||
|
|
233c26e5cf | ||
|
|
91a6b3f716 | ||
|
|
0a2b7b1243 | ||
|
|
b98fe7911f | ||
|
|
ad92cfc852 | ||
|
|
7e91038a24 | ||
|
|
4a5fb549c6 | ||
|
|
1ceb07b89e | ||
|
|
bb64f6c33f | ||
|
|
61c48d57b8 | ||
|
|
2a7587ed78 | ||
|
|
e09213a295 | ||
|
|
fc116d65c0 | ||
|
|
76088cc76a | ||
|
|
16b697053a | ||
|
|
349bf475cc | ||
|
|
fccc4cbc02 | ||
|
|
f1b44f87fa | ||
|
|
02e41e2437 | ||
|
|
74e8956106 | ||
|
|
dc9ec429c6 | ||
|
|
653d72bcb9 | ||
|
|
a5bef5d4a4 | ||
|
|
c8ad2225e3 | ||
|
|
72c8081e7c | ||
|
|
f2d4895e50 | ||
|
|
54f591cd60 | ||
|
|
f836a0a3cd | ||
|
|
11174656e4 | ||
|
|
faea1abcc4 | ||
|
|
71658ad39d | ||
|
|
167f0f8c7a | ||
|
|
85551dc3d3 | ||
|
|
5bc4f902f6 | ||
|
|
e5b50f855c | ||
|
|
b73144295b | ||
|
|
ef21bac59b | ||
|
|
cabaee588b |
17
.github/ISSUE_TEMPLATE/question.yml
vendored
Normal file
17
.github/ISSUE_TEMPLATE/question.yml
vendored
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
name: ❓ Question
|
||||||
|
description: "Submit a question"
|
||||||
|
title: "❓ Question:"
|
||||||
|
labels: [question]
|
||||||
|
body:
|
||||||
|
- type: textarea
|
||||||
|
id: feature-description
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
attributes:
|
||||||
|
label: "🙋♂️ Question"
|
||||||
|
description: "A clear question. Please provide as much detail as possible."
|
||||||
|
placeholder: "How do I ...?"
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: |
|
||||||
|
Before submitting, please check if the question hasn't been asked before.
|
||||||
2
.github/workflows/backend-system-tests.yml
vendored
2
.github/workflows/backend-system-tests.yml
vendored
@@ -13,7 +13,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container: node:18
|
container: node:18
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
working-directory: ./backend
|
working-directory: ./backend
|
||||||
run: npm install
|
run: npm install
|
||||||
|
|||||||
6
.github/workflows/build-docker-image.yml
vendored
6
.github/workflows/build-docker-image.yml
vendored
@@ -9,11 +9,11 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: checkout code
|
- name: checkout code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v1
|
uses: docker/setup-qemu-action@v2
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v2
|
||||||
- name: login to docker registry
|
- name: login to docker registry
|
||||||
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
|
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
|
||||||
- name: Build the image
|
- name: Build the image
|
||||||
|
|||||||
1
.github/workflows/close_inactive_issues.yml
vendored
1
.github/workflows/close_inactive_issues.yml
vendored
@@ -14,6 +14,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
days-before-issue-stale: 30
|
days-before-issue-stale: 30
|
||||||
days-before-issue-close: 14
|
days-before-issue-close: 14
|
||||||
|
exempt-issue-labels: "feature"
|
||||||
stale-issue-label: "stale"
|
stale-issue-label: "stale"
|
||||||
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
|
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."
|
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
|
||||||
|
|||||||
130
CHANGELOG.md
130
CHANGELOG.md
@@ -1,3 +1,133 @@
|
|||||||
|
### [0.10.2](https://github.com/stonith404/pingvin-share/compare/v0.10.1...v0.10.2) (2023-02-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* pdf preview tries to render on server ([c3af0fe](https://github.com/stonith404/pingvin-share/commit/c3af0fe097582f69b63ed1ad18fb71bff334d32a))
|
||||||
|
|
||||||
|
### [0.10.1](https://github.com/stonith404/pingvin-share/compare/v0.10.0...v0.10.1) (2023-02-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* non administrator user redirection error while setup isn't finished ([dc8cf3d](https://github.com/stonith404/pingvin-share/commit/dc8cf3d5ca6b4f8a8f243b8e0b05e09738cf8b61))
|
||||||
|
* setup wizard doesn't redirect after completion ([7cd9dff](https://github.com/stonith404/pingvin-share/commit/7cd9dff637900098c9f6e46ccade37283d47321b))
|
||||||
|
|
||||||
|
## [0.10.0](https://github.com/stonith404/pingvin-share/compare/v0.9.0...v0.10.0) (2023-02-10)
|
||||||
|
|
||||||
|
|
||||||
|
### ⚠ BREAKING CHANGES
|
||||||
|
|
||||||
|
* reset password with email
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* allow multiple shares with one reverse share link ([ccdf8ea](https://github.com/stonith404/pingvin-share/commit/ccdf8ea3ae1e7b8520c5b1dd9bea18b1b3305f35))
|
||||||
|
* **frontend:** server side rendering to improve performance ([38de022](https://github.com/stonith404/pingvin-share/commit/38de022215a9b99c2eb36654f8dbb1e17ca87aba))
|
||||||
|
* reset password with email ([5d1a7f0](https://github.com/stonith404/pingvin-share/commit/5d1a7f0310df2643213affd2a0d1785b7e0af398))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* delete all shares of reverse share ([86a7379](https://github.com/stonith404/pingvin-share/commit/86a737951951c911abd7967d76cb253c4335cb0c))
|
||||||
|
* invalid redirection after jwt expiry ([82f204e](https://github.com/stonith404/pingvin-share/commit/82f204e8a93e3113dcf65b1881d4943a898602eb))
|
||||||
|
* setup status doesn't change ([064ef38](https://github.com/stonith404/pingvin-share/commit/064ef38d783b3f351535c2911eb451efd9526d71))
|
||||||
|
* share creation without reverseShareToken ([b966270](https://github.com/stonith404/pingvin-share/commit/b9662701c42fe6771c07acb869564031accb2932))
|
||||||
|
* share fails if a share was created with a reverse share link recently ([edc10b7](https://github.com/stonith404/pingvin-share/commit/edc10b72b7884c629a8417c3c82222b135ef7653))
|
||||||
|
|
||||||
|
## [0.9.0](https://github.com/stonith404/pingvin-share/compare/v0.8.0...v0.9.0) (2023-01-31)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* direct file link ([008df06](https://github.com/stonith404/pingvin-share/commit/008df06b5cf48872d4dd68df813370596a4fd468))
|
||||||
|
* file preview ([91a6b3f](https://github.com/stonith404/pingvin-share/commit/91a6b3f716d37d7831e17a7be1cdb35cb23da705))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* improve send test email UX ([233c26e](https://github.com/stonith404/pingvin-share/commit/233c26e5cfde59e7d51023ef9901dec2b84a4845))
|
||||||
|
|
||||||
|
## [0.8.0](https://github.com/stonith404/pingvin-share/compare/v0.7.0...v0.8.0) (2023-01-26)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* reverse shares ([#86](https://github.com/stonith404/pingvin-share/issues/86)) ([4a5fb54](https://github.com/stonith404/pingvin-share/commit/4a5fb549c6ac808261eb65d28db69510a82efd00))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Add meta tags to new pages ([bb64f6c](https://github.com/stonith404/pingvin-share/commit/bb64f6c33fc5c5e11f2c777785c96a74b57dfabc))
|
||||||
|
* admin users were created while the setup wizard wasn't finished ([ad92cfc](https://github.com/stonith404/pingvin-share/commit/ad92cfc852ca6aa121654d747a02628492ae5b89))
|
||||||
|
|
||||||
|
## [0.7.0](https://github.com/stonith404/pingvin-share/compare/v0.6.1...v0.7.0) (2023-01-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add ClamAV to scan for malicious files ([76088cc](https://github.com/stonith404/pingvin-share/commit/76088cc76aedae709f06deaee2244efcf6a22bed))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* invalid github release link on admin page ([349bf47](https://github.com/stonith404/pingvin-share/commit/349bf475cc7fc1141dbd2a9bd2f63153c4d5b41b))
|
||||||
|
|
||||||
|
### [0.6.1](https://github.com/stonith404/pingvin-share/compare/v0.6.0...v0.6.1) (2023-01-11)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* delete all sessions if password was changed ([02e41e2](https://github.com/stonith404/pingvin-share/commit/02e41e243768de34de1bdc8833e83f60db530e55))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* shareUrl uses wrong origin ([f1b44f8](https://github.com/stonith404/pingvin-share/commit/f1b44f87fa64d3b21ca92c9068cb352d0ad51bc0))
|
||||||
|
* update password doesn't work ([74e8956](https://github.com/stonith404/pingvin-share/commit/74e895610642552c98c0015d0f8347735aaed457))
|
||||||
|
|
||||||
|
## [0.6.0](https://github.com/stonith404/pingvin-share/compare/v0.5.1...v0.6.0) (2023-01-09)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* chunk uploads ([#76](https://github.com/stonith404/pingvin-share/issues/76)) ([653d72b](https://github.com/stonith404/pingvin-share/commit/653d72bcb958268e2f23efae94cccb72faa745af))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* access token refreshes even it is still valid ([c8ad222](https://github.com/stonith404/pingvin-share/commit/c8ad2225e3c9ca79fea494d538b67797fbc7f6ae))
|
||||||
|
* error message typo ([72c8081](https://github.com/stonith404/pingvin-share/commit/72c8081e7c135ab1f600ed7e3d7a0bf03dabde34))
|
||||||
|
* migration for v0.5.1 ([f2d4895](https://github.com/stonith404/pingvin-share/commit/f2d4895e50d3da82cef68858752fb7f6293e7a20))
|
||||||
|
* refresh token expires after 1 day instead of 3 months ([a5bef5d](https://github.com/stonith404/pingvin-share/commit/a5bef5d4a4ae75447ca1f65259c5541edfc87dd8))
|
||||||
|
|
||||||
|
### [0.5.1](https://github.com/stonith404/pingvin-share/compare/v0.5.0...v0.5.1) (2023-01-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* show version and show button if new release is available on admin page ([71658ad](https://github.com/stonith404/pingvin-share/commit/71658ad39d7e3638de659e8230fad4e05f60fdd8))
|
||||||
|
* use cookies for authentication ([faea1ab](https://github.com/stonith404/pingvin-share/commit/faea1abcc4b533f391feaed427e211fef9166fe4))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* email configuration updated without restart ([1117465](https://github.com/stonith404/pingvin-share/commit/11174656e425c4be60e4f7b1ea8463678e5c60d2))
|
||||||
|
|
||||||
|
## [0.5.0](https://github.com/stonith404/pingvin-share/compare/v0.4.0...v0.5.0) (2022-12-30)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* custom mail subject ([cabaee5](https://github.com/stonith404/pingvin-share/commit/cabaee588b50877872d210c870bfb9c95b541921))
|
||||||
|
* improve config UI ([#69](https://github.com/stonith404/pingvin-share/issues/69)) ([5bc4f90](https://github.com/stonith404/pingvin-share/commit/5bc4f902f6218a09423491404806a4b7fb865c98))
|
||||||
|
* manually switch color scheme ([ef21bac](https://github.com/stonith404/pingvin-share/commit/ef21bac59b11dc68649ab3b195dcb89d2b192e7b))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* refresh token gets deleted on session end ([e5b50f8](https://github.com/stonith404/pingvin-share/commit/e5b50f855c02aa4b5c9ee873dd5a7ab25759972d))
|
||||||
|
|
||||||
## [0.4.0](https://github.com/stonith404/pingvin-share/compare/v0.3.6...v0.4.0) (2022-12-21)
|
## [0.4.0](https://github.com/stonith404/pingvin-share/compare/v0.3.6...v0.4.0) (2022-12-21)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -8,62 +8,55 @@ You've found a bug, have suggestion or something else, just create an issue on G
|
|||||||
|
|
||||||
## Submit a Pull Request
|
## Submit a Pull Request
|
||||||
|
|
||||||
Once you created a issue and you want to create a pull request, follow this guide.
|
Before you submit the pull request for review please ensure that
|
||||||
|
|
||||||
Branch naming convention is as following
|
- The pull request naming follows the [Conventional Commits specification](https://www.conventionalcommits.org):
|
||||||
|
|
||||||
`TYPE-ISSUE_ID-DESCRIPTION`
|
`<type>[optional scope]: <description>`
|
||||||
|
|
||||||
example:
|
example:
|
||||||
|
|
||||||
|
```
|
||||||
|
feat(share): add password protection
|
||||||
|
```
|
||||||
|
|
||||||
|
When `TYPE` can be:
|
||||||
|
|
||||||
|
- **feat** - is a new feature
|
||||||
|
- **doc** - documentation only changes
|
||||||
|
- **fix** - a bug fix
|
||||||
|
- **refactor** - code change that neither fixes a bug nor adds a feature
|
||||||
|
|
||||||
|
- Your pull request has a detailed description
|
||||||
|
- You run `npm run format` to format the code
|
||||||
|
|
||||||
|
<details>
|
||||||
|
<summary>Don't know how to create a pull request? Learn how to create a pull request</summary>
|
||||||
|
|
||||||
|
1. Create a fork of the repository by clicking on the `Fork` button in the Pingvin Share repository
|
||||||
|
|
||||||
|
2. Clone your fork to your machine with `git clone`
|
||||||
|
|
||||||
```
|
```
|
||||||
feat-69-ability-to-set-share-expiration-to-never
|
$ git clone https://github.com/[your_username]/pingvin-share
|
||||||
```
|
|
||||||
|
|
||||||
When `TYPE` can be:
|
|
||||||
|
|
||||||
- **feat** - is a new feature
|
|
||||||
- **doc** - documentation only changes
|
|
||||||
- **fix** - a bug fix
|
|
||||||
- **refactor** - code change that neither fixes a bug nor adds a feature
|
|
||||||
|
|
||||||
**All PRs must include a commit message with the changes description!**
|
|
||||||
|
|
||||||
For the initial start, fork the project and use the `git clone` command to download the repository to your computer. A standard procedure for working on an issue would be to:
|
|
||||||
|
|
||||||
1. `git pull`, before creating a new branch, pull the changes from upstream. Your master needs to be up to date.
|
|
||||||
|
|
||||||
```
|
|
||||||
$ git pull
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Create new branch from `main` like: `feat-69-ability-to-set-share-expiration-to-never`<br/>
|
|
||||||
|
|
||||||
```
|
|
||||||
$ git checkout -b [name_of_your_new_branch]
|
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Work - commit - repeat
|
3. Work - commit - repeat
|
||||||
|
|
||||||
4. Before you push your changes, make sure you run the linter and format the code.
|
4. Push changes to GitHub
|
||||||
|
|
||||||
```bash
|
|
||||||
npm run lint
|
|
||||||
npm run format
|
|
||||||
```
|
|
||||||
|
|
||||||
5. Push changes to GitHub
|
|
||||||
|
|
||||||
```
|
```
|
||||||
$ git push origin [name_of_your_new_branch]
|
$ git push origin [name_of_your_new_branch]
|
||||||
```
|
```
|
||||||
|
|
||||||
6. Submit your changes for review
|
5. Submit your changes for review
|
||||||
If you go to your repository on GitHub, you'll see a `Compare & pull request` button. Click on that button.
|
If you go to your repository on GitHub, you'll see a `Compare & pull request` button. Click on that button.
|
||||||
7. Start a Pull Request
|
6. Start a Pull Request
|
||||||
Now submit the pull request and click on `Create pull request`.
|
7. Now submit the pull request and click on `Create pull request`.
|
||||||
8. Get a code review approval/reject
|
8. Get a code review approval/reject
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
## Setup project
|
## Setup project
|
||||||
|
|
||||||
Pingvin Share consists of a frontend and a backend.
|
Pingvin Share consists of a frontend and a backend.
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ RUN npm run build && npm prune --production
|
|||||||
|
|
||||||
# Stage 5: Final image
|
# Stage 5: Final image
|
||||||
FROM node:18-slim AS runner
|
FROM node:18-slim AS runner
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=docker
|
||||||
RUN apt-get update && apt-get install -y openssl
|
RUN apt-get update && apt-get install -y openssl
|
||||||
|
|
||||||
WORKDIR /opt/app/frontend
|
WORKDIR /opt/app/frontend
|
||||||
|
|||||||
72
README.md
72
README.md
@@ -4,13 +4,12 @@ Pingvin Share is self-hosted file sharing platform and an alternative for WeTran
|
|||||||
|
|
||||||
## ✨ Features
|
## ✨ Features
|
||||||
|
|
||||||
- Spin up your instance within 2 minutes
|
- Share files using a link
|
||||||
- Create a share with files that you can access with a link
|
- Unlimited file size (restricted only by disk space)
|
||||||
- No file size limit, only your disk will be your limit
|
- Set an expiration date for shares
|
||||||
- Set a share expiration
|
- Secure shares with visitor limits and passwords
|
||||||
- Optionally secure your share with a visitor limit and a password
|
- Email recipients
|
||||||
- Email recepients
|
- Integration with ClamAV for security scans
|
||||||
- Light & dark mode
|
|
||||||
|
|
||||||
## 🐧 Get to know Pingvin Share
|
## 🐧 Get to know Pingvin Share
|
||||||
|
|
||||||
@@ -21,22 +20,75 @@ Pingvin Share is self-hosted file sharing platform and an alternative for WeTran
|
|||||||
|
|
||||||
## ⌨️ Setup
|
## ⌨️ Setup
|
||||||
|
|
||||||
> Pleas note that Pingvin Share is in early stage and could include some bugs
|
> Note: Pingvin Share is in its early stages and may contain bugs.
|
||||||
|
|
||||||
### Recommended installation
|
### 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 available on `http://localhost:3000`, have fun with Pingvin Share 🐧!
|
The website is now listening available on `http://localhost:3000`, have fun with Pingvin Share 🐧!
|
||||||
|
|
||||||
|
### Stand-alone Installation
|
||||||
|
|
||||||
|
Required tools:
|
||||||
|
|
||||||
|
- [Node.js](https://nodejs.org/en/download/) >= 14
|
||||||
|
- [Git](https://git-scm.com/downloads)
|
||||||
|
- [pm2](https://pm2.keymetrics.io/) for running Pingvin Share in the background
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/stonith404/pingvin-share
|
||||||
|
cd pingvin-share
|
||||||
|
|
||||||
|
# Checkout the latest version
|
||||||
|
git fetch --tags && git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
|
||||||
|
|
||||||
|
# Start the backend
|
||||||
|
cd ../backend
|
||||||
|
npm install
|
||||||
|
npm run build
|
||||||
|
pm2 start --name="pingvin-share-backend" npm -- run prod
|
||||||
|
|
||||||
|
# Start the frontend
|
||||||
|
cd frontend
|
||||||
|
npm install
|
||||||
|
npm run build
|
||||||
|
pm2 start --name="pingvin-share-frontend" npm -- run start
|
||||||
|
```
|
||||||
|
|
||||||
|
The website is now listening available on `http://localhost:3000`, have fun with Pingvin Share 🐧!
|
||||||
|
|
||||||
|
### Integrations
|
||||||
|
|
||||||
|
#### ClamAV (Docker only)
|
||||||
|
|
||||||
|
ClamAV is used to scan shares for malicious files and remove them if found.
|
||||||
|
|
||||||
|
1. Add the ClamAV container to the Docker Compose stack (see `docker-compose.yml`) and start the container.
|
||||||
|
2. Docker will wait for ClamAV to start before starting Pingvin Share. This may take a minute or two.
|
||||||
|
3. The Pingvin Share logs should now log "ClamAV is active"
|
||||||
|
|
||||||
|
Please note that ClamAV needs a lot of [ressources](https://docs.clamav.net/manual/Installing/Docker.html#memory-ram-requirements).
|
||||||
|
|
||||||
### 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/)
|
||||||
|
|
||||||
### Upgrade to a new version
|
### Upgrade to a new version
|
||||||
|
|
||||||
Run `docker compose pull && docker compose up -d` to update your docker container
|
As Pingvin Share is in early stage, see the release notes for breaking changes before upgrading.
|
||||||
|
|
||||||
|
#### Docker
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose pull
|
||||||
|
docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Stand-alone
|
||||||
|
|
||||||
|
Repeat the steps from the [installation guide](#stand-alone-installation) except the `git clone` step.
|
||||||
|
|
||||||
## 🖤 Contribute
|
## 🖤 Contribute
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json.schemastore.org/nest-cli",
|
"$schema": "https://json.schemastore.org/nest-cli",
|
||||||
"collection": "@nestjs/schematics",
|
"collection": "@nestjs/schematics",
|
||||||
"sourceRoot": "src"
|
"sourceRoot": "src",
|
||||||
|
"compilerOptions": {
|
||||||
|
"plugins": ["@nestjs/swagger"]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1528
backend/package-lock.json
generated
1528
backend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "pingvin-share-backend",
|
"name": "pingvin-share-backend",
|
||||||
"version": "0.0.1",
|
"version": "0.10.2",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "nest build",
|
"build": "nest build",
|
||||||
"dev": "nest start --watch",
|
"dev": "cross-env NODE_ENV=development nest start --watch",
|
||||||
"prod": "prisma migrate deploy && prisma db seed && node dist/src/main",
|
"prod": "prisma migrate deploy && prisma db seed && node dist/src/main",
|
||||||
"lint": "eslint 'src/**/*.ts'",
|
"lint": "eslint 'src/**/*.ts'",
|
||||||
"format": "prettier --write 'src/**/*.ts'",
|
"format": "prettier --write 'src/**/*.ts'",
|
||||||
"test:system": "prisma migrate reset -f && nest start & wait-on http://localhost:8080/api/configs && newman run ./test/system/newman-system-tests.json"
|
"test:system": "prisma migrate reset -f && nest start & wait-on http://localhost:8080/api/configs && newman run ./test/newman-system-tests.json"
|
||||||
},
|
},
|
||||||
"prisma": {
|
"prisma": {
|
||||||
"seed": "ts-node prisma/seed/config.seed.ts"
|
"seed": "ts-node prisma/seed/config.seed.ts"
|
||||||
@@ -16,59 +16,62 @@
|
|||||||
"@nestjs/common": "^9.2.1",
|
"@nestjs/common": "^9.2.1",
|
||||||
"@nestjs/config": "^2.2.0",
|
"@nestjs/config": "^2.2.0",
|
||||||
"@nestjs/core": "^9.2.1",
|
"@nestjs/core": "^9.2.1",
|
||||||
"@nestjs/jwt": "^9.0.0",
|
"@nestjs/jwt": "^10.0.1",
|
||||||
"@nestjs/mapped-types": "^1.2.0",
|
|
||||||
"@nestjs/passport": "^9.0.0",
|
"@nestjs/passport": "^9.0.0",
|
||||||
"@nestjs/platform-express": "^9.2.1",
|
"@nestjs/platform-express": "^9.2.1",
|
||||||
"@nestjs/schedule": "^2.1.0",
|
"@nestjs/schedule": "^2.1.0",
|
||||||
|
"@nestjs/swagger": "^6.2.1",
|
||||||
"@nestjs/throttler": "^3.1.0",
|
"@nestjs/throttler": "^3.1.0",
|
||||||
"@prisma/client": "^4.7.1",
|
"@prisma/client": "^4.8.1",
|
||||||
"archiver": "^5.3.1",
|
"archiver": "^5.3.1",
|
||||||
"argon2": "^0.30.2",
|
"argon2": "^0.30.3",
|
||||||
|
"body-parser": "^1.20.1",
|
||||||
|
"clamscan": "^2.1.2",
|
||||||
"class-transformer": "^0.5.1",
|
"class-transformer": "^0.5.1",
|
||||||
"class-validator": "^0.13.2",
|
"class-validator": "^0.13.2",
|
||||||
"content-disposition": "^0.5.4",
|
"content-disposition": "^0.5.4",
|
||||||
|
"cookie-parser": "^1.4.6",
|
||||||
"mime-types": "^2.1.35",
|
"mime-types": "^2.1.35",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
"multer": "^1.4.5-lts.1",
|
"nodemailer": "^6.9.0",
|
||||||
"nodemailer": "^6.8.0",
|
|
||||||
"otplib": "^12.0.1",
|
"otplib": "^12.0.1",
|
||||||
"passport": "^0.6.0",
|
"passport": "^0.6.0",
|
||||||
"passport-jwt": "^4.0.0",
|
"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.13",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^4.0.4",
|
||||||
"rxjs": "^7.6.0",
|
"rxjs": "^7.8.0",
|
||||||
"ts-node": "^10.9.1"
|
"ts-node": "^10.9.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nestjs/cli": "^9.1.5",
|
"@nestjs/cli": "^9.1.8",
|
||||||
"@nestjs/schematics": "^9.0.3",
|
"@nestjs/schematics": "^9.0.4",
|
||||||
"@nestjs/testing": "^9.2.1",
|
"@nestjs/testing": "^9.2.1",
|
||||||
"@types/archiver": "^5.3.1",
|
"@types/archiver": "^5.3.1",
|
||||||
|
"@types/clamscan": "^2.0.4",
|
||||||
|
"@types/cookie-parser": "^1.4.3",
|
||||||
"@types/cron": "^2.0.0",
|
"@types/cron": "^2.0.0",
|
||||||
"@types/express": "^4.17.14",
|
"@types/express": "^4.17.15",
|
||||||
"@types/mime-types": "^2.1.1",
|
"@types/mime-types": "^2.1.1",
|
||||||
"@types/multer": "^1.4.7",
|
"@types/node": "^18.11.18",
|
||||||
"@types/node": "^18.11.10",
|
"@types/nodemailer": "^6.4.7",
|
||||||
"@types/nodemailer": "^6.4.6",
|
"@types/passport-jwt": "^3.0.8",
|
||||||
"@types/passport-jwt": "^3.0.7",
|
|
||||||
"@types/qrcode-svg": "^1.1.1",
|
"@types/qrcode-svg": "^1.1.1",
|
||||||
"@types/supertest": "^2.0.12",
|
"@types/supertest": "^2.0.12",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.45.0",
|
"@typescript-eslint/eslint-plugin": "^5.48.1",
|
||||||
"@typescript-eslint/parser": "^5.45.0",
|
"@typescript-eslint/parser": "^5.48.1",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"eslint": "^8.29.0",
|
"eslint": "^8.31.0",
|
||||||
"eslint-config-prettier": "^8.5.0",
|
"eslint-config-prettier": "^8.6.0",
|
||||||
"eslint-plugin-prettier": "^4.2.1",
|
"eslint-plugin-prettier": "^4.2.1",
|
||||||
"newman": "^5.3.2",
|
"newman": "^5.3.2",
|
||||||
"prettier": "^2.8.0",
|
"prettier": "^2.8.2",
|
||||||
"prisma": "^4.7.1",
|
"prisma": "^4.9.0",
|
||||||
"source-map-support": "^0.5.21",
|
"source-map-support": "^0.5.21",
|
||||||
"ts-loader": "^9.4.2",
|
"ts-loader": "^9.4.2",
|
||||||
"tsconfig-paths": "4.1.1",
|
"tsconfig-paths": "4.1.2",
|
||||||
"typescript": "^4.9.3",
|
"typescript": "^4.9.4",
|
||||||
"wait-on": "^6.0.1"
|
"wait-on": "^7.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
/*
|
||||||
|
Warnings:
|
||||||
|
|
||||||
|
- Added the required column `category` to the `Config` table without a default value. This is not possible if the table is not empty.
|
||||||
|
|
||||||
|
*/
|
||||||
|
-- RedefineTables
|
||||||
|
PRAGMA foreign_keys=OFF;
|
||||||
|
CREATE TABLE "new_Config" (
|
||||||
|
"updatedAt" DATETIME NOT NULL,
|
||||||
|
"key" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"type" TEXT NOT NULL,
|
||||||
|
"value" TEXT NOT NULL,
|
||||||
|
"description" TEXT NOT NULL,
|
||||||
|
"category" TEXT,
|
||||||
|
"obscured" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"secret" BOOLEAN NOT NULL DEFAULT true,
|
||||||
|
"locked" BOOLEAN NOT NULL DEFAULT false
|
||||||
|
);
|
||||||
|
INSERT INTO "new_Config" ("description", "key", "locked", "obscured", "secret", "type", "updatedAt", "value") SELECT "description", "key", "locked", "obscured", "secret", "type", "updatedAt", "value" FROM "Config";
|
||||||
|
DROP TABLE "Config";
|
||||||
|
ALTER TABLE "new_Config" RENAME TO "Config";
|
||||||
|
|
||||||
|
UPDATE config SET category = "internal" WHERE key = "SETUP_FINISHED";
|
||||||
|
UPDATE config SET category = "internal" WHERE key = "TOTP_SECRET";
|
||||||
|
UPDATE config SET category = "internal" WHERE key = "JWT_SECRET";
|
||||||
|
UPDATE config SET category = "general" WHERE key = "APP_URL";
|
||||||
|
UPDATE config SET category = "general" WHERE key = "SHOW_HOME_PAGE";
|
||||||
|
UPDATE config SET category = "share" WHERE key = "ALLOW_REGISTRATION";
|
||||||
|
UPDATE config SET category = "share" WHERE key = "ALLOW_UNAUTHENTICATED_SHARES";
|
||||||
|
UPDATE config SET category = "share" WHERE key = "MAX_FILE_SIZE";
|
||||||
|
UPDATE config SET category = "email" WHERE key = "ENABLE_EMAIL_RECIPIENTS";
|
||||||
|
UPDATE config SET category = "email" WHERE key = "EMAIL_MESSAGE";
|
||||||
|
UPDATE config SET category = "email" WHERE key = "EMAIL_SUBJECT";
|
||||||
|
UPDATE config SET category = "email" WHERE key = "SMTP_HOST";
|
||||||
|
UPDATE config SET category = "email" WHERE key = "SMTP_PORT";
|
||||||
|
UPDATE config SET category = "email" WHERE key = "SMTP_EMAIL";
|
||||||
|
UPDATE config SET category = "email" WHERE key = "SMTP_USERNAME";
|
||||||
|
UPDATE config SET category = "email" WHERE key = "SMTP_PASSWORD";
|
||||||
|
|
||||||
|
CREATE TABLE "new_Config" (
|
||||||
|
"updatedAt" DATETIME NOT NULL,
|
||||||
|
"key" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"type" TEXT NOT NULL,
|
||||||
|
"value" TEXT NOT NULL,
|
||||||
|
"description" TEXT NOT NULL,
|
||||||
|
"category" TEXT NOT NULL,
|
||||||
|
"obscured" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"secret" BOOLEAN NOT NULL DEFAULT true,
|
||||||
|
"locked" BOOLEAN NOT NULL DEFAULT false
|
||||||
|
);
|
||||||
|
INSERT INTO "new_Config" ("description", "key", "locked", "obscured", "secret", "type", "updatedAt", "value", "category") SELECT "description", "key", "locked", "obscured", "secret", "type", "updatedAt", "value", "category" FROM "Config";
|
||||||
|
DROP TABLE "Config";
|
||||||
|
ALTER TABLE "new_Config" RENAME TO "Config";
|
||||||
|
PRAGMA foreign_key_check;
|
||||||
|
PRAGMA foreign_keys=ON;
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
/*
|
||||||
|
Warnings:
|
||||||
|
|
||||||
|
- The primary key for the `RefreshToken` table will be changed. If it partially fails, the table could be left without primary key constraint.
|
||||||
|
- The required column `id` was added to the `RefreshToken` table with a prisma-level default value. This is not possible if the table is not empty. Please add this column as optional, then populate it before making it required.
|
||||||
|
|
||||||
|
*/
|
||||||
|
-- RedefineTables
|
||||||
|
PRAGMA foreign_keys=OFF;
|
||||||
|
DROP TABLE "RefreshToken";
|
||||||
|
CREATE TABLE "RefreshToken" (
|
||||||
|
"id" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"token" TEXT NOT NULL,
|
||||||
|
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"expiresAt" DATETIME NOT NULL,
|
||||||
|
"userId" TEXT NOT NULL,
|
||||||
|
CONSTRAINT "RefreshToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
);
|
||||||
|
CREATE UNIQUE INDEX "RefreshToken_token_key" ON "RefreshToken"("token");
|
||||||
|
PRAGMA foreign_key_check;
|
||||||
|
PRAGMA foreign_keys=ON;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "Share" ADD COLUMN "removedReason" TEXT;
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
Warnings:
|
||||||
|
|
||||||
|
- Added the required column `order` to the `Config` table without a default value. This is not possible if the table is not empty.
|
||||||
|
|
||||||
|
*/
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "ReverseShare" (
|
||||||
|
"id" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"token" TEXT NOT NULL,
|
||||||
|
"shareExpiration" DATETIME NOT NULL,
|
||||||
|
"maxShareSize" TEXT NOT NULL,
|
||||||
|
"sendEmailNotification" BOOLEAN NOT NULL,
|
||||||
|
"used" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"creatorId" TEXT NOT NULL,
|
||||||
|
"shareId" TEXT,
|
||||||
|
CONSTRAINT "ReverseShare_creatorId_fkey" FOREIGN KEY ("creatorId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
|
||||||
|
CONSTRAINT "ReverseShare_shareId_fkey" FOREIGN KEY ("shareId") REFERENCES "Share" ("id") ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
);
|
||||||
|
|
||||||
|
-- RedefineTables
|
||||||
|
PRAGMA foreign_keys=OFF;
|
||||||
|
CREATE TABLE "new_Config" (
|
||||||
|
"updatedAt" DATETIME NOT NULL,
|
||||||
|
"key" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"type" TEXT NOT NULL,
|
||||||
|
"value" TEXT NOT NULL,
|
||||||
|
"description" TEXT NOT NULL,
|
||||||
|
"category" TEXT NOT NULL,
|
||||||
|
"obscured" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"secret" BOOLEAN NOT NULL DEFAULT true,
|
||||||
|
"locked" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"order" INTEGER NOT NULL
|
||||||
|
);
|
||||||
|
INSERT INTO "new_Config" ("category", "description", "key", "locked", "obscured", "secret", "type", "updatedAt", "value", "order") SELECT "category", "description", "key", "locked", "obscured", "secret", "type", "updatedAt", "value", 0 FROM "Config";
|
||||||
|
DROP TABLE "Config";
|
||||||
|
ALTER TABLE "new_Config" RENAME TO "Config";
|
||||||
|
PRAGMA foreign_key_check;
|
||||||
|
PRAGMA foreign_keys=ON;
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "ReverseShare_token_key" ON "ReverseShare"("token");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "ReverseShare_shareId_key" ON "ReverseShare"("shareId");
|
||||||
|
|
||||||
|
-- Custom migration
|
||||||
|
UPDATE Config SET `order` = 0 WHERE key = "JWT_SECRET";
|
||||||
|
UPDATE Config SET `order` = 0 WHERE key = "TOTP_SECRET";
|
||||||
|
|
||||||
|
UPDATE Config SET `order` = 1 WHERE key = "APP_URL";
|
||||||
|
UPDATE Config SET `order` = 2 WHERE key = "SHOW_HOME_PAGE";
|
||||||
|
UPDATE Config SET `order` = 3 WHERE key = "ALLOW_REGISTRATION";
|
||||||
|
UPDATE Config SET `order` = 4 WHERE key = "ALLOW_UNAUTHENTICATED_SHARES";
|
||||||
|
UPDATE Config SET `order` = 5 WHERE key = "MAX_SHARE_SIZE";
|
||||||
|
UPDATE Config SET `order` = 6, key = "ENABLE_SHARE_EMAIL_RECIPIENTS" WHERE key = "ENABLE_EMAIL_RECIPIENTS";
|
||||||
|
UPDATE Config SET `order` = 7, key = "SHARE_RECEPIENTS_EMAIL_MESSAGE" WHERE key = "EMAIL_MESSAGE";
|
||||||
|
UPDATE Config SET `order` = 8, key = "SHARE_RECEPIENTS_EMAIL_SUBJECT" WHERE key = "EMAIL_SUBJECT";
|
||||||
|
UPDATE Config SET `order` = 12 WHERE key = "SMTP_HOST";
|
||||||
|
UPDATE Config SET `order` = 13 WHERE key = "SMTP_PORT";
|
||||||
|
UPDATE Config SET `order` = 14 WHERE key = "SMTP_EMAIL";
|
||||||
|
UPDATE Config SET `order` = 15 WHERE key = "SMTP_USERNAME";
|
||||||
|
UPDATE Config SET `order` = 16 WHERE key = "SMTP_PASSWORD";
|
||||||
|
|
||||||
|
INSERT INTO Config (`order`, `key`, `description`, `type`, `value`, `category`, `secret`, `updatedAt`) VALUES (11, "SMTP_ENABLED", "Whether SMTP is enabled. Only set this to true if you entered the host, port, email, user and password of your SMTP server.", "boolean", IFNULL((SELECT value FROM Config WHERE key="ENABLE_SHARE_EMAIL_RECIPIENTS"), "false"), "smtp", 0, strftime('%s', 'now'));
|
||||||
|
INSERT INTO Config (`order`, `key`, `description`, `type`, `value`, `category`, `secret`, `updatedAt`, `locked`) VALUES (0, "SETUP_STATUS", "Status of the setup wizard", "string", IIF((SELECT value FROM Config WHERE key="SETUP_FINISHED") == "true", "FINISHED", "STARTED"), "internal", 0, strftime('%s', 'now'), 1);
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
/*
|
||||||
|
Warnings:
|
||||||
|
|
||||||
|
- You are about to drop the column `shareId` on the `ReverseShare` table. All the data in the column will be lost.
|
||||||
|
- You are about to drop the column `used` on the `ReverseShare` table. All the data in the column will be lost.
|
||||||
|
- Added the required column `remainingUses` to the `ReverseShare` table without a default value. This is not possible if the table is not empty.
|
||||||
|
|
||||||
|
*/
|
||||||
|
-- CreateTable
|
||||||
|
PRAGMA foreign_keys=OFF;
|
||||||
|
CREATE TABLE "ResetPasswordToken" (
|
||||||
|
"token" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"expiresAt" DATETIME NOT NULL,
|
||||||
|
"userId" TEXT NOT NULL,
|
||||||
|
CONSTRAINT "ResetPasswordToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Disable TOTP as secret isn't encrypted anymore
|
||||||
|
UPDATE User SET totpEnabled=false, totpSecret=null, totpVerified=false WHERE totpSecret IS NOT NULL;
|
||||||
|
|
||||||
|
-- RedefineTables
|
||||||
|
CREATE TABLE "new_Share" (
|
||||||
|
"id" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"uploadLocked" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"isZipReady" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"views" INTEGER NOT NULL DEFAULT 0,
|
||||||
|
"expiration" DATETIME NOT NULL,
|
||||||
|
"description" TEXT,
|
||||||
|
"removedReason" TEXT,
|
||||||
|
"creatorId" TEXT,
|
||||||
|
"reverseShareId" TEXT,
|
||||||
|
CONSTRAINT "Share_creatorId_fkey" FOREIGN KEY ("creatorId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
|
||||||
|
CONSTRAINT "Share_reverseShareId_fkey" FOREIGN KEY ("reverseShareId") REFERENCES "ReverseShare" ("id") ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO "new_Share" ("createdAt", "creatorId", "description", "expiration", "id", "isZipReady", "removedReason", "uploadLocked", "views", "reverseShareId")
|
||||||
|
SELECT "createdAt", "creatorId", "description", "expiration", "id", "isZipReady", "removedReason", "uploadLocked", "views", (SELECT id FROM ReverseShare WHERE shareId=Share.id)
|
||||||
|
FROM "Share";
|
||||||
|
|
||||||
|
|
||||||
|
DROP TABLE "Share";
|
||||||
|
ALTER TABLE "new_Share" RENAME TO "Share";
|
||||||
|
CREATE TABLE "new_ReverseShare" (
|
||||||
|
"id" TEXT NOT NULL PRIMARY KEY,
|
||||||
|
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"token" TEXT NOT NULL,
|
||||||
|
"shareExpiration" DATETIME NOT NULL,
|
||||||
|
"maxShareSize" TEXT NOT NULL,
|
||||||
|
"sendEmailNotification" BOOLEAN NOT NULL,
|
||||||
|
"remainingUses" INTEGER NOT NULL,
|
||||||
|
"creatorId" TEXT NOT NULL,
|
||||||
|
CONSTRAINT "ReverseShare_creatorId_fkey" FOREIGN KEY ("creatorId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
);
|
||||||
|
INSERT INTO "new_ReverseShare" ("createdAt", "creatorId", "id", "maxShareSize", "sendEmailNotification", "shareExpiration", "token", "remainingUses") SELECT "createdAt", "creatorId", "id", "maxShareSize", "sendEmailNotification", "shareExpiration", "token", iif("ReverseShare".used, 0, 1) FROM "ReverseShare";
|
||||||
|
DROP TABLE "ReverseShare";
|
||||||
|
ALTER TABLE "new_ReverseShare" RENAME TO "ReverseShare";
|
||||||
|
CREATE UNIQUE INDEX "ReverseShare_token_key" ON "ReverseShare"("token");
|
||||||
|
PRAGMA foreign_key_check;
|
||||||
|
PRAGMA foreign_keys=ON;
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "ResetPasswordToken_userId_key" ON "ResetPasswordToken"("userId");
|
||||||
@@ -20,14 +20,17 @@ model User {
|
|||||||
shares Share[]
|
shares Share[]
|
||||||
refreshTokens RefreshToken[]
|
refreshTokens RefreshToken[]
|
||||||
loginTokens LoginToken[]
|
loginTokens LoginToken[]
|
||||||
|
reverseShares ReverseShare[]
|
||||||
|
|
||||||
totpEnabled Boolean @default(false)
|
totpEnabled Boolean @default(false)
|
||||||
totpVerified Boolean @default(false)
|
totpVerified Boolean @default(false)
|
||||||
totpSecret String?
|
totpSecret String?
|
||||||
|
resetPasswordToken ResetPasswordToken?
|
||||||
}
|
}
|
||||||
|
|
||||||
model RefreshToken {
|
model RefreshToken {
|
||||||
token String @id @default(uuid())
|
id String @id @default(uuid())
|
||||||
|
token String @unique @default(uuid())
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
|
|
||||||
expiresAt DateTime
|
expiresAt DateTime
|
||||||
@@ -47,23 +50,54 @@ model LoginToken {
|
|||||||
used Boolean @default(false)
|
used Boolean @default(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
model ResetPasswordToken {
|
||||||
|
token String @id @default(uuid())
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
|
||||||
|
expiresAt DateTime
|
||||||
|
|
||||||
|
userId String @unique
|
||||||
|
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())
|
||||||
|
|
||||||
uploadLocked Boolean @default(false)
|
uploadLocked Boolean @default(false)
|
||||||
isZipReady Boolean @default(false)
|
isZipReady Boolean @default(false)
|
||||||
views Int @default(0)
|
views Int @default(0)
|
||||||
expiration DateTime
|
expiration DateTime
|
||||||
description String?
|
description String?
|
||||||
|
removedReason String?
|
||||||
|
|
||||||
|
creatorId String?
|
||||||
|
creator User? @relation(fields: [creatorId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
reverseShareId String?
|
||||||
|
reverseShare ReverseShare? @relation(fields: [reverseShareId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
creatorId String?
|
|
||||||
creator User? @relation(fields: [creatorId], references: [id], onDelete: Cascade)
|
|
||||||
security ShareSecurity?
|
security ShareSecurity?
|
||||||
recipients ShareRecipient[]
|
recipients ShareRecipient[]
|
||||||
files File[]
|
files File[]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
model ReverseShare {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
|
||||||
|
token String @unique @default(uuid())
|
||||||
|
shareExpiration DateTime
|
||||||
|
maxShareSize String
|
||||||
|
sendEmailNotification Boolean
|
||||||
|
remainingUses Int
|
||||||
|
|
||||||
|
creatorId String
|
||||||
|
creator User @relation(fields: [creatorId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
shares Share[]
|
||||||
|
}
|
||||||
|
|
||||||
model ShareRecipient {
|
model ShareRecipient {
|
||||||
id String @id @default(uuid())
|
id String @id @default(uuid())
|
||||||
email String
|
email String
|
||||||
@@ -101,7 +135,9 @@ model Config {
|
|||||||
type String
|
type String
|
||||||
value String
|
value String
|
||||||
description String
|
description String
|
||||||
|
category String
|
||||||
obscured Boolean @default(false)
|
obscured Boolean @default(false)
|
||||||
secret Boolean @default(true)
|
secret Boolean @default(true)
|
||||||
locked Boolean @default(false)
|
locked Boolean @default(false)
|
||||||
|
order Int
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,106 +3,189 @@ import * as crypto from "crypto";
|
|||||||
|
|
||||||
const configVariables: Prisma.ConfigCreateInput[] = [
|
const configVariables: Prisma.ConfigCreateInput[] = [
|
||||||
{
|
{
|
||||||
key: "SETUP_FINISHED",
|
order: 0,
|
||||||
description: "Whether the setup has been finished",
|
key: "SETUP_STATUS",
|
||||||
type: "boolean",
|
description: "Status of the setup wizard",
|
||||||
value: "false",
|
type: "string",
|
||||||
|
value: "STARTED", // STARTED, REGISTERED, FINISHED
|
||||||
|
category: "internal",
|
||||||
secret: false,
|
secret: false,
|
||||||
locked: true,
|
locked: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: "APP_URL",
|
order: 0,
|
||||||
description: "On which URL Pingvin Share is available",
|
|
||||||
type: "string",
|
|
||||||
value: "http://localhost:3000",
|
|
||||||
secret: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "SHOW_HOME_PAGE",
|
|
||||||
description: "Whether to show the home page",
|
|
||||||
type: "boolean",
|
|
||||||
value: "true",
|
|
||||||
secret: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "ALLOW_REGISTRATION",
|
|
||||||
description: "Whether registration is allowed",
|
|
||||||
type: "boolean",
|
|
||||||
value: "true",
|
|
||||||
secret: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "ALLOW_UNAUTHENTICATED_SHARES",
|
|
||||||
description: "Whether unauthorized users can create shares",
|
|
||||||
type: "boolean",
|
|
||||||
value: "false",
|
|
||||||
secret: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "MAX_FILE_SIZE",
|
|
||||||
description: "Maximum file size in bytes",
|
|
||||||
type: "number",
|
|
||||||
value: "1000000000",
|
|
||||||
secret: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "JWT_SECRET",
|
key: "JWT_SECRET",
|
||||||
description: "Long random string used to sign JWT tokens",
|
description: "Long random string used to sign JWT tokens",
|
||||||
type: "string",
|
type: "string",
|
||||||
value: crypto.randomBytes(256).toString("base64"),
|
value: crypto.randomBytes(256).toString("base64"),
|
||||||
|
category: "internal",
|
||||||
locked: true,
|
locked: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: "TOTP_SECRET",
|
order: 1,
|
||||||
description: "A 16 byte random string used to generate TOTP secrets",
|
key: "APP_URL",
|
||||||
|
description: "On which URL Pingvin Share is available",
|
||||||
type: "string",
|
type: "string",
|
||||||
value: crypto.randomBytes(16).toString("base64"),
|
value: "http://localhost:3000",
|
||||||
locked: true,
|
category: "general",
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "ENABLE_EMAIL_RECIPIENTS",
|
|
||||||
description:
|
|
||||||
"Whether to send emails to recipients. Only set this to true if you entered the host, port, email, user and password of your SMTP server.",
|
|
||||||
type: "boolean",
|
|
||||||
value: "false",
|
|
||||||
secret: false,
|
secret: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: "EMAIL_MESSAGE",
|
order: 2,
|
||||||
description: "Message which gets sent to the recipients. {creator} and {shareUrl} will be replaced with the creator's name and the share URL.",
|
key: "SHOW_HOME_PAGE",
|
||||||
type: "text",
|
description: "Whether to show the home page",
|
||||||
value: "Hey!\n{creator} shared some files with you. View or download the files with this link: {shareUrl}\nShared securely with Pingvin Share 🐧",
|
type: "boolean",
|
||||||
|
value: "true",
|
||||||
|
category: "general",
|
||||||
|
secret: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
order: 3,
|
||||||
|
key: "ALLOW_REGISTRATION",
|
||||||
|
description: "Whether registration is allowed",
|
||||||
|
type: "boolean",
|
||||||
|
value: "true",
|
||||||
|
category: "share",
|
||||||
|
secret: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
order: 4,
|
||||||
|
key: "ALLOW_UNAUTHENTICATED_SHARES",
|
||||||
|
description: "Whether unauthorized users can create shares",
|
||||||
|
type: "boolean",
|
||||||
|
value: "false",
|
||||||
|
category: "share",
|
||||||
|
secret: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
order: 5,
|
||||||
|
|
||||||
|
key: "MAX_SHARE_SIZE",
|
||||||
|
description: "Maximum share size in bytes",
|
||||||
|
type: "number",
|
||||||
|
value: "1073741824",
|
||||||
|
category: "share",
|
||||||
|
secret: false,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
order: 6,
|
||||||
|
key: "ENABLE_SHARE_EMAIL_RECIPIENTS",
|
||||||
|
description:
|
||||||
|
"Whether to allow emails to share recipients. Only enable this if you have enabled SMTP.",
|
||||||
|
type: "boolean",
|
||||||
|
value: "false",
|
||||||
|
category: "email",
|
||||||
|
secret: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
order: 7,
|
||||||
|
key: "SHARE_RECEPIENTS_EMAIL_SUBJECT",
|
||||||
|
description:
|
||||||
|
"Subject of the email which gets sent to the share recipients.",
|
||||||
|
type: "string",
|
||||||
|
value: "Files shared with you",
|
||||||
|
category: "email",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
order: 8,
|
||||||
|
key: "SHARE_RECEPIENTS_EMAIL_MESSAGE",
|
||||||
|
description:
|
||||||
|
"Message which gets sent to the share recipients. {creator} and {shareUrl} will be replaced with the creator's name and the share URL.",
|
||||||
|
type: "text",
|
||||||
|
value:
|
||||||
|
"Hey!\n{creator} shared some files with you. View or download the files with this link: {shareUrl}\nShared securely with Pingvin Share 🐧",
|
||||||
|
category: "email",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
order: 9,
|
||||||
|
key: "REVERSE_SHARE_EMAIL_SUBJECT",
|
||||||
|
description:
|
||||||
|
"Subject of the email which gets sent when someone created a share with your reverse share link.",
|
||||||
|
type: "string",
|
||||||
|
value: "Reverse share link used",
|
||||||
|
category: "email",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
order: 10,
|
||||||
|
key: "REVERSE_SHARE_EMAIL_MESSAGE",
|
||||||
|
description:
|
||||||
|
"Message which gets sent when someone created a share with your reverse share link. {shareUrl} will be replaced with the creator's name and the share URL.",
|
||||||
|
type: "text",
|
||||||
|
value:
|
||||||
|
"Hey!\nA share was just created with your reverse share link: {shareUrl}\nShared securely with Pingvin Share 🐧",
|
||||||
|
category: "email",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
order: 11,
|
||||||
|
key: "RESET_PASSWORD_EMAIL_SUBJECT",
|
||||||
|
description:
|
||||||
|
"Subject of the email which gets sent when a user requests a password reset.",
|
||||||
|
type: "string",
|
||||||
|
value: "Pingvin Share password reset",
|
||||||
|
category: "email",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
order: 12,
|
||||||
|
key: "RESET_PASSWORD_EMAIL_MESSAGE",
|
||||||
|
description:
|
||||||
|
"Message which gets sent when a user requests a password reset. {url} will be replaced with the reset password URL.",
|
||||||
|
type: "text",
|
||||||
|
value:
|
||||||
|
"Hey!\nYou requested a password reset. Click this link to reset your password: {url}\nThe link expires in a hour.\nPingvin Share 🐧",
|
||||||
|
category: "email",
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
order: 13,
|
||||||
|
key: "SMTP_ENABLED",
|
||||||
|
description:
|
||||||
|
"Whether SMTP is enabled. Only set this to true if you entered the host, port, email, user and password of your SMTP server.",
|
||||||
|
type: "boolean",
|
||||||
|
value: "false",
|
||||||
|
category: "smtp",
|
||||||
|
secret: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
order: 14,
|
||||||
key: "SMTP_HOST",
|
key: "SMTP_HOST",
|
||||||
description: "Host of the SMTP server",
|
description: "Host of the SMTP server",
|
||||||
type: "string",
|
type: "string",
|
||||||
value: "",
|
value: "",
|
||||||
|
category: "smtp",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
order: 15,
|
||||||
key: "SMTP_PORT",
|
key: "SMTP_PORT",
|
||||||
description: "Port of the SMTP server",
|
description: "Port of the SMTP server",
|
||||||
type: "number",
|
type: "number",
|
||||||
value: "",
|
value: "0",
|
||||||
|
category: "smtp",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
order: 16,
|
||||||
key: "SMTP_EMAIL",
|
key: "SMTP_EMAIL",
|
||||||
description: "Email address which the emails get sent from",
|
description: "Email address which the emails get sent from",
|
||||||
type: "string",
|
type: "string",
|
||||||
value: "",
|
value: "",
|
||||||
|
category: "smtp",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
order: 17,
|
||||||
key: "SMTP_USERNAME",
|
key: "SMTP_USERNAME",
|
||||||
description: "Username of the SMTP server",
|
description: "Username of the SMTP server",
|
||||||
type: "string",
|
type: "string",
|
||||||
value: "",
|
value: "",
|
||||||
|
category: "smtp",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
order: 18,
|
||||||
key: "SMTP_PASSWORD",
|
key: "SMTP_PASSWORD",
|
||||||
description: "Password of the SMTP server",
|
description: "Password of the SMTP server",
|
||||||
type: "string",
|
type: "string",
|
||||||
value: "",
|
value: "",
|
||||||
obscured: true,
|
obscured: true,
|
||||||
|
category: "smtp",
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,19 @@
|
|||||||
import { HttpException, HttpStatus, Module } from "@nestjs/common";
|
import { Module } from "@nestjs/common";
|
||||||
|
|
||||||
import { ScheduleModule } from "@nestjs/schedule";
|
import { ScheduleModule } from "@nestjs/schedule";
|
||||||
import { AuthModule } from "./auth/auth.module";
|
import { AuthModule } from "./auth/auth.module";
|
||||||
|
|
||||||
import { MulterModule } from "@nestjs/platform-express";
|
import { APP_GUARD } from "@nestjs/core";
|
||||||
import { ThrottlerModule } from "@nestjs/throttler";
|
import { ThrottlerGuard, ThrottlerModule } from "@nestjs/throttler";
|
||||||
import { Request } from "express";
|
|
||||||
import { ConfigModule } from "./config/config.module";
|
import { ConfigModule } from "./config/config.module";
|
||||||
import { ConfigService } from "./config/config.service";
|
|
||||||
import { EmailModule } from "./email/email.module";
|
import { EmailModule } from "./email/email.module";
|
||||||
import { FileModule } from "./file/file.module";
|
import { FileModule } from "./file/file.module";
|
||||||
|
import { JobsModule } from "./jobs/jobs.module";
|
||||||
import { PrismaModule } from "./prisma/prisma.module";
|
import { PrismaModule } from "./prisma/prisma.module";
|
||||||
import { ShareModule } from "./share/share.module";
|
import { ShareModule } from "./share/share.module";
|
||||||
import { UserModule } from "./user/user.module";
|
import { UserModule } from "./user/user.module";
|
||||||
import { JobsModule } from "./jobs/jobs.module";
|
import { ClamScanModule } from "./clamscan/clamscan.module";
|
||||||
|
import { ReverseShareModule } from "./reverseShare/reverseShare.module";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -25,29 +25,19 @@ import { JobsModule } from "./jobs/jobs.module";
|
|||||||
ConfigModule,
|
ConfigModule,
|
||||||
JobsModule,
|
JobsModule,
|
||||||
UserModule,
|
UserModule,
|
||||||
MulterModule.registerAsync({
|
|
||||||
useFactory: (config: ConfigService) => ({
|
|
||||||
fileFilter: (req: Request, file, cb) => {
|
|
||||||
const MAX_FILE_SIZE = config.get("MAX_FILE_SIZE");
|
|
||||||
const requestFileSize = parseInt(req.headers["content-length"]);
|
|
||||||
const isValidFileSize = requestFileSize <= MAX_FILE_SIZE;
|
|
||||||
cb(
|
|
||||||
!isValidFileSize &&
|
|
||||||
new HttpException(
|
|
||||||
`File must be smaller than ${MAX_FILE_SIZE} bytes`,
|
|
||||||
HttpStatus.PAYLOAD_TOO_LARGE
|
|
||||||
),
|
|
||||||
isValidFileSize
|
|
||||||
);
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
inject: [ConfigService],
|
|
||||||
}),
|
|
||||||
ThrottlerModule.forRoot({
|
ThrottlerModule.forRoot({
|
||||||
ttl: 60,
|
ttl: 60,
|
||||||
limit: 100,
|
limit: 100,
|
||||||
}),
|
}),
|
||||||
ScheduleModule.forRoot(),
|
ScheduleModule.forRoot(),
|
||||||
|
ClamScanModule,
|
||||||
|
ReverseShareModule,
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: APP_GUARD,
|
||||||
|
useClass: ThrottlerGuard,
|
||||||
|
},
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class AppModule {}
|
export class AppModule {}
|
||||||
|
|||||||
@@ -3,20 +3,27 @@ import {
|
|||||||
Controller,
|
Controller,
|
||||||
ForbiddenException,
|
ForbiddenException,
|
||||||
HttpCode,
|
HttpCode,
|
||||||
|
Param,
|
||||||
Patch,
|
Patch,
|
||||||
Post,
|
Post,
|
||||||
|
Req,
|
||||||
|
Res,
|
||||||
|
UnauthorizedException,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
import { Throttle } from "@nestjs/throttler";
|
import { Throttle } from "@nestjs/throttler";
|
||||||
import { User } from "@prisma/client";
|
import { User } from "@prisma/client";
|
||||||
|
import { Request, Response } from "express";
|
||||||
import { ConfigService } from "src/config/config.service";
|
import { ConfigService } from "src/config/config.service";
|
||||||
import { AuthService } from "./auth.service";
|
import { AuthService } from "./auth.service";
|
||||||
|
import { AuthTotpService } from "./authTotp.service";
|
||||||
import { GetUser } from "./decorator/getUser.decorator";
|
import { GetUser } from "./decorator/getUser.decorator";
|
||||||
import { AuthRegisterDTO } from "./dto/authRegister.dto";
|
import { AuthRegisterDTO } from "./dto/authRegister.dto";
|
||||||
import { AuthSignInDTO } from "./dto/authSignIn.dto";
|
import { AuthSignInDTO } from "./dto/authSignIn.dto";
|
||||||
import { AuthSignInTotpDTO } from "./dto/authSignInTotp.dto";
|
import { AuthSignInTotpDTO } from "./dto/authSignInTotp.dto";
|
||||||
import { EnableTotpDTO } from "./dto/enableTotp.dto";
|
import { EnableTotpDTO } from "./dto/enableTotp.dto";
|
||||||
import { RefreshAccessTokenDTO } from "./dto/refreshAccessToken.dto";
|
import { ResetPasswordDTO } from "./dto/resetPassword.dto";
|
||||||
|
import { TokenDTO } from "./dto/token.dto";
|
||||||
import { UpdatePasswordDTO } from "./dto/updatePassword.dto";
|
import { UpdatePasswordDTO } from "./dto/updatePassword.dto";
|
||||||
import { VerifyTotpDTO } from "./dto/verifyTotp.dto";
|
import { VerifyTotpDTO } from "./dto/verifyTotp.dto";
|
||||||
import { JwtGuard } from "./guard/jwt.guard";
|
import { JwtGuard } from "./guard/jwt.guard";
|
||||||
@@ -25,63 +32,162 @@ import { JwtGuard } from "./guard/jwt.guard";
|
|||||||
export class AuthController {
|
export class AuthController {
|
||||||
constructor(
|
constructor(
|
||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
|
private authTotpService: AuthTotpService,
|
||||||
private config: ConfigService
|
private config: ConfigService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@Throttle(10, 5 * 60)
|
|
||||||
@Post("signUp")
|
@Post("signUp")
|
||||||
async signUp(@Body() dto: AuthRegisterDTO) {
|
@Throttle(10, 5 * 60)
|
||||||
|
async signUp(
|
||||||
|
@Body() dto: AuthRegisterDTO,
|
||||||
|
@Res({ passthrough: true }) response: Response
|
||||||
|
) {
|
||||||
if (!this.config.get("ALLOW_REGISTRATION"))
|
if (!this.config.get("ALLOW_REGISTRATION"))
|
||||||
throw new ForbiddenException("Registration is not allowed");
|
throw new ForbiddenException("Registration is not allowed");
|
||||||
return this.authService.signUp(dto);
|
|
||||||
|
const result = await this.authService.signUp(dto);
|
||||||
|
|
||||||
|
response = this.addTokensToResponse(
|
||||||
|
response,
|
||||||
|
result.refreshToken,
|
||||||
|
result.accessToken
|
||||||
|
);
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Throttle(10, 5 * 60)
|
|
||||||
@Post("signIn")
|
@Post("signIn")
|
||||||
|
@Throttle(10, 5 * 60)
|
||||||
@HttpCode(200)
|
@HttpCode(200)
|
||||||
signIn(@Body() dto: AuthSignInDTO) {
|
async signIn(
|
||||||
return this.authService.signIn(dto);
|
@Body() dto: AuthSignInDTO,
|
||||||
|
@Res({ passthrough: true }) response: Response
|
||||||
|
) {
|
||||||
|
const result = await this.authService.signIn(dto);
|
||||||
|
|
||||||
|
if (result.accessToken && result.refreshToken) {
|
||||||
|
response = this.addTokensToResponse(
|
||||||
|
response,
|
||||||
|
result.refreshToken,
|
||||||
|
result.accessToken
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Throttle(10, 5 * 60)
|
|
||||||
@Post("signIn/totp")
|
@Post("signIn/totp")
|
||||||
|
@Throttle(10, 5 * 60)
|
||||||
@HttpCode(200)
|
@HttpCode(200)
|
||||||
signInTotp(@Body() dto: AuthSignInTotpDTO) {
|
async signInTotp(
|
||||||
return this.authService.signInTotp(dto);
|
@Body() dto: AuthSignInTotpDTO,
|
||||||
|
@Res({ passthrough: true }) response: Response
|
||||||
|
) {
|
||||||
|
const result = await this.authTotpService.signInTotp(dto);
|
||||||
|
|
||||||
|
response = this.addTokensToResponse(
|
||||||
|
response,
|
||||||
|
result.refreshToken,
|
||||||
|
result.accessToken
|
||||||
|
);
|
||||||
|
|
||||||
|
return new TokenDTO().from(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post("resetPassword/:email")
|
||||||
|
@Throttle(5, 5 * 60)
|
||||||
|
@HttpCode(204)
|
||||||
|
async requestResetPassword(@Param("email") email: string) {
|
||||||
|
return await this.authService.requestResetPassword(email);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post("resetPassword")
|
||||||
|
@Throttle(5, 5 * 60)
|
||||||
|
@HttpCode(204)
|
||||||
|
async resetPassword(@Body() dto: ResetPasswordDTO) {
|
||||||
|
return await this.authService.resetPassword(dto.token, dto.password);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch("password")
|
@Patch("password")
|
||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
async updatePassword(@GetUser() user: User, @Body() dto: UpdatePasswordDTO) {
|
async updatePassword(
|
||||||
await this.authService.updatePassword(user, dto.oldPassword, dto.password);
|
@GetUser() user: User,
|
||||||
|
@Res({ passthrough: true }) response: Response,
|
||||||
|
@Body() dto: UpdatePasswordDTO
|
||||||
|
) {
|
||||||
|
const result = await this.authService.updatePassword(
|
||||||
|
user,
|
||||||
|
dto.oldPassword,
|
||||||
|
dto.password
|
||||||
|
);
|
||||||
|
|
||||||
|
response = this.addTokensToResponse(response, result.refreshToken);
|
||||||
|
return new TokenDTO().from(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("token")
|
@Post("token")
|
||||||
@HttpCode(200)
|
@HttpCode(200)
|
||||||
async refreshAccessToken(@Body() body: RefreshAccessTokenDTO) {
|
async refreshAccessToken(
|
||||||
|
@Req() request: Request,
|
||||||
|
@Res({ passthrough: true }) response: Response
|
||||||
|
) {
|
||||||
|
if (!request.cookies.refresh_token) throw new UnauthorizedException();
|
||||||
|
|
||||||
const accessToken = await this.authService.refreshAccessToken(
|
const accessToken = await this.authService.refreshAccessToken(
|
||||||
body.refreshToken
|
request.cookies.refresh_token
|
||||||
);
|
);
|
||||||
return { accessToken };
|
response = this.addTokensToResponse(response, undefined, accessToken);
|
||||||
|
return new TokenDTO().from({ accessToken });
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post("signOut")
|
||||||
|
async signOut(
|
||||||
|
@Req() request: Request,
|
||||||
|
@Res({ passthrough: true }) response: Response
|
||||||
|
) {
|
||||||
|
await this.authService.signOut(request.cookies.access_token);
|
||||||
|
response.cookie("access_token", "accessToken", { maxAge: -1 });
|
||||||
|
response.cookie("refresh_token", "", {
|
||||||
|
path: "/api/auth/token",
|
||||||
|
httpOnly: true,
|
||||||
|
maxAge: -1,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Implement recovery codes to disable 2FA just in case someone gets locked out
|
|
||||||
@Post("totp/enable")
|
@Post("totp/enable")
|
||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
async enableTotp(@GetUser() user: User, @Body() body: EnableTotpDTO) {
|
async enableTotp(@GetUser() user: User, @Body() body: EnableTotpDTO) {
|
||||||
return this.authService.enableTotp(user, body.password);
|
return this.authTotpService.enableTotp(user, body.password);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("totp/verify")
|
@Post("totp/verify")
|
||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
async verifyTotp(@GetUser() user: User, @Body() body: VerifyTotpDTO) {
|
async verifyTotp(@GetUser() user: User, @Body() body: VerifyTotpDTO) {
|
||||||
return this.authService.verifyTotp(user, body.password, body.code);
|
return this.authTotpService.verifyTotp(user, body.password, body.code);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("totp/disable")
|
@Post("totp/disable")
|
||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
async disableTotp(@GetUser() user: User, @Body() body: VerifyTotpDTO) {
|
async disableTotp(@GetUser() user: User, @Body() body: VerifyTotpDTO) {
|
||||||
// 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.authService.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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
import { Module } from "@nestjs/common";
|
import { Module } from "@nestjs/common";
|
||||||
import { JwtModule } from "@nestjs/jwt";
|
import { JwtModule } from "@nestjs/jwt";
|
||||||
|
import { EmailModule } from "src/email/email.module";
|
||||||
import { AuthController } from "./auth.controller";
|
import { AuthController } from "./auth.controller";
|
||||||
import { AuthService } from "./auth.service";
|
import { AuthService } from "./auth.service";
|
||||||
|
import { AuthTotpService } from "./authTotp.service";
|
||||||
import { JwtStrategy } from "./strategy/jwt.strategy";
|
import { JwtStrategy } from "./strategy/jwt.strategy";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [JwtModule.register({})],
|
imports: [JwtModule.register({}), EmailModule],
|
||||||
controllers: [AuthController],
|
controllers: [AuthController],
|
||||||
providers: [AuthService, JwtStrategy],
|
providers: [AuthService, AuthTotpService, JwtStrategy],
|
||||||
exports: [AuthService],
|
exports: [AuthService],
|
||||||
})
|
})
|
||||||
export class AuthModule {}
|
export class AuthModule {}
|
||||||
|
|||||||
@@ -10,23 +10,23 @@ import { PrismaClientKnownRequestError } from "@prisma/client/runtime";
|
|||||||
import * as argon from "argon2";
|
import * as argon from "argon2";
|
||||||
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 { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
import { AuthRegisterDTO } from "./dto/authRegister.dto";
|
import { AuthRegisterDTO } from "./dto/authRegister.dto";
|
||||||
import { AuthSignInDTO } from "./dto/authSignIn.dto";
|
import { AuthSignInDTO } from "./dto/authSignIn.dto";
|
||||||
import { authenticator, totp } from "otplib";
|
|
||||||
import * as qrcode from "qrcode-svg";
|
|
||||||
import * as crypto from "crypto";
|
|
||||||
import { AuthSignInTotpDTO } from "./dto/authSignInTotp.dto";
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class AuthService {
|
export class AuthService {
|
||||||
constructor(
|
constructor(
|
||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
private jwtService: JwtService,
|
private jwtService: JwtService,
|
||||||
private config: ConfigService
|
private config: ConfigService,
|
||||||
|
private emailService: EmailService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async signUp(dto: AuthRegisterDTO) {
|
async signUp(dto: AuthRegisterDTO) {
|
||||||
|
const isFirstUser = this.config.get("SETUP_STATUS") == "STARTED";
|
||||||
|
|
||||||
const hash = await argon.hash(dto.password);
|
const hash = await argon.hash(dto.password);
|
||||||
try {
|
try {
|
||||||
const user = await this.prisma.user.create({
|
const user = await this.prisma.user.create({
|
||||||
@@ -34,12 +34,18 @@ export class AuthService {
|
|||||||
email: dto.email,
|
email: dto.email,
|
||||||
username: dto.username,
|
username: dto.username,
|
||||||
password: hash,
|
password: hash,
|
||||||
isAdmin: !this.config.get("SETUP_FINISHED"),
|
isAdmin: isFirstUser,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const accessToken = await this.createAccessToken(user);
|
if (isFirstUser) {
|
||||||
const refreshToken = await this.createRefreshToken(user.id);
|
await this.config.changeSetupStatus("REGISTERED");
|
||||||
|
}
|
||||||
|
|
||||||
|
const { refreshToken, refreshTokenId } = await this.createRefreshToken(
|
||||||
|
user.id
|
||||||
|
);
|
||||||
|
const accessToken = await this.createAccessToken(user, refreshTokenId);
|
||||||
|
|
||||||
return { accessToken, refreshToken };
|
return { accessToken, refreshToken };
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -75,65 +81,56 @@ export class AuthService {
|
|||||||
return { loginToken };
|
return { loginToken };
|
||||||
}
|
}
|
||||||
|
|
||||||
const accessToken = await this.createAccessToken(user);
|
const { refreshToken, refreshTokenId } = await this.createRefreshToken(
|
||||||
const refreshToken = await this.createRefreshToken(user.id);
|
user.id
|
||||||
|
);
|
||||||
|
const accessToken = await this.createAccessToken(user, refreshTokenId);
|
||||||
|
|
||||||
return { accessToken, refreshToken };
|
return { accessToken, refreshToken };
|
||||||
}
|
}
|
||||||
|
|
||||||
async signInTotp(dto: AuthSignInTotpDTO) {
|
async requestResetPassword(email: string) {
|
||||||
if (!dto.email && !dto.username)
|
|
||||||
throw new BadRequestException("Email or username is required");
|
|
||||||
|
|
||||||
const user = await this.prisma.user.findFirst({
|
const user = await this.prisma.user.findFirst({
|
||||||
where: {
|
where: { email },
|
||||||
OR: [{ email: dto.email }, { username: dto.username }],
|
include: { resetPasswordToken: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!user) throw new BadRequestException("User not found");
|
||||||
|
|
||||||
|
// Delete old reset password token
|
||||||
|
if (user.resetPasswordToken) {
|
||||||
|
await this.prisma.resetPasswordToken.delete({
|
||||||
|
where: { token: user.resetPasswordToken.token },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const { token } = await this.prisma.resetPasswordToken.create({
|
||||||
|
data: {
|
||||||
|
expiresAt: moment().add(1, "hour").toDate(),
|
||||||
|
user: { connect: { id: user.id } },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!user || !(await argon.verify(user.password, dto.password)))
|
await this.emailService.sendResetPasswordEmail(user.email, token);
|
||||||
throw new UnauthorizedException("Wrong email or password");
|
}
|
||||||
|
|
||||||
const token = await this.prisma.loginToken.findFirst({
|
async resetPassword(token: string, newPassword: string) {
|
||||||
where: {
|
const user = await this.prisma.user.findFirst({
|
||||||
token: dto.loginToken,
|
where: { resetPasswordToken: { token } },
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!token || token.userId != user.id || token.used)
|
if (!user) throw new BadRequestException("Token invalid or expired");
|
||||||
throw new UnauthorizedException("Invalid login token");
|
|
||||||
|
|
||||||
if (token.expiresAt < new Date())
|
const newPasswordHash = await argon.hash(newPassword);
|
||||||
throw new UnauthorizedException("Login token expired");
|
|
||||||
|
|
||||||
// Check the TOTP code
|
await this.prisma.resetPasswordToken.delete({
|
||||||
const { totpSecret } = await this.prisma.user.findUnique({
|
where: { token },
|
||||||
|
});
|
||||||
|
|
||||||
|
await this.prisma.user.update({
|
||||||
where: { id: user.id },
|
where: { id: user.id },
|
||||||
select: { totpSecret: true },
|
data: { password: newPasswordHash },
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!totpSecret) {
|
|
||||||
throw new BadRequestException("TOTP is not enabled");
|
|
||||||
}
|
|
||||||
|
|
||||||
const decryptedSecret = this.decryptTotpSecret(totpSecret, dto.password);
|
|
||||||
|
|
||||||
const expected = authenticator.generate(decryptedSecret);
|
|
||||||
|
|
||||||
if (dto.totp !== expected) {
|
|
||||||
throw new BadRequestException("Invalid code");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set the login token to used
|
|
||||||
await this.prisma.loginToken.update({
|
|
||||||
where: { token: token.token },
|
|
||||||
data: { used: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
const accessToken = await this.createAccessToken(user);
|
|
||||||
const refreshToken = await this.createRefreshToken(user.id);
|
|
||||||
|
|
||||||
return { accessToken, refreshToken };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async updatePassword(user: User, oldPassword: string, newPassword: string) {
|
async updatePassword(user: User, oldPassword: string, newPassword: string) {
|
||||||
@@ -142,17 +139,25 @@ export class AuthService {
|
|||||||
|
|
||||||
const hash = await argon.hash(newPassword);
|
const hash = await argon.hash(newPassword);
|
||||||
|
|
||||||
this.prisma.user.update({
|
await this.prisma.refreshToken.deleteMany({
|
||||||
|
where: { userId: user.id },
|
||||||
|
});
|
||||||
|
|
||||||
|
await this.prisma.user.update({
|
||||||
where: { id: user.id },
|
where: { id: user.id },
|
||||||
data: { password: hash },
|
data: { password: hash },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return this.createRefreshToken(user.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
async createAccessToken(user: User) {
|
async createAccessToken(user: User, refreshTokenId: string) {
|
||||||
return this.jwtService.sign(
|
return this.jwtService.sign(
|
||||||
{
|
{
|
||||||
sub: user.id,
|
sub: user.id,
|
||||||
email: user.email,
|
email: user.email,
|
||||||
|
isAdmin: user.isAdmin,
|
||||||
|
refreshTokenId,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expiresIn: "15min",
|
expiresIn: "15min",
|
||||||
@@ -161,6 +166,22 @@ export class AuthService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async signOut(accessToken: string) {
|
||||||
|
const { refreshTokenId } =
|
||||||
|
(this.jwtService.decode(accessToken) as {
|
||||||
|
refreshTokenId: string;
|
||||||
|
}) || {};
|
||||||
|
|
||||||
|
if (refreshTokenId) {
|
||||||
|
await this.prisma.refreshToken
|
||||||
|
.delete({ where: { id: refreshTokenId } })
|
||||||
|
.catch((e) => {
|
||||||
|
// Ignore error if refresh token doesn't exist
|
||||||
|
if (e.code != "P2025") throw e;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async refreshAccessToken(refreshToken: string) {
|
async refreshAccessToken(refreshToken: string) {
|
||||||
const refreshTokenMetaData = await this.prisma.refreshToken.findUnique({
|
const refreshTokenMetaData = await this.prisma.refreshToken.findUnique({
|
||||||
where: { token: refreshToken },
|
where: { token: refreshToken },
|
||||||
@@ -170,17 +191,18 @@ export class AuthService {
|
|||||||
if (!refreshTokenMetaData || refreshTokenMetaData.expiresAt < new Date())
|
if (!refreshTokenMetaData || refreshTokenMetaData.expiresAt < new Date())
|
||||||
throw new UnauthorizedException();
|
throw new UnauthorizedException();
|
||||||
|
|
||||||
return this.createAccessToken(refreshTokenMetaData.user);
|
return this.createAccessToken(
|
||||||
|
refreshTokenMetaData.user,
|
||||||
|
refreshTokenMetaData.id
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async createRefreshToken(userId: string) {
|
async createRefreshToken(userId: string) {
|
||||||
const refreshToken = (
|
const { id, token } = await this.prisma.refreshToken.create({
|
||||||
await this.prisma.refreshToken.create({
|
data: { userId, expiresAt: moment().add(3, "months").toDate() },
|
||||||
data: { userId, expiresAt: moment().add(3, "months").toDate() },
|
});
|
||||||
})
|
|
||||||
).token;
|
|
||||||
|
|
||||||
return refreshToken;
|
return { refreshTokenId: id, refreshToken: token };
|
||||||
}
|
}
|
||||||
|
|
||||||
async createLoginToken(userId: string) {
|
async createLoginToken(userId: string) {
|
||||||
@@ -192,151 +214,4 @@ export class AuthService {
|
|||||||
|
|
||||||
return loginToken;
|
return loginToken;
|
||||||
}
|
}
|
||||||
|
|
||||||
encryptTotpSecret(totpSecret: string, password: string) {
|
|
||||||
let iv = this.config.get("TOTP_SECRET");
|
|
||||||
iv = Buffer.from(iv, "base64");
|
|
||||||
const key = crypto
|
|
||||||
.createHash("sha256")
|
|
||||||
.update(String(password))
|
|
||||||
.digest("base64")
|
|
||||||
.substr(0, 32);
|
|
||||||
|
|
||||||
const cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
|
|
||||||
|
|
||||||
let encrypted = cipher.update(totpSecret);
|
|
||||||
|
|
||||||
encrypted = Buffer.concat([encrypted, cipher.final()]);
|
|
||||||
|
|
||||||
return encrypted.toString("base64");
|
|
||||||
}
|
|
||||||
|
|
||||||
decryptTotpSecret(encryptedTotpSecret: string, password: string) {
|
|
||||||
let iv = this.config.get("TOTP_SECRET");
|
|
||||||
iv = Buffer.from(iv, "base64");
|
|
||||||
const key = crypto
|
|
||||||
.createHash("sha256")
|
|
||||||
.update(String(password))
|
|
||||||
.digest("base64")
|
|
||||||
.substr(0, 32);
|
|
||||||
|
|
||||||
const encryptedText = Buffer.from(encryptedTotpSecret, "base64");
|
|
||||||
const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
|
|
||||||
let decrypted = decipher.update(encryptedText);
|
|
||||||
decrypted = Buffer.concat([decrypted, decipher.final()]);
|
|
||||||
|
|
||||||
return decrypted.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
async enableTotp(user: User, password: string) {
|
|
||||||
if (!(await argon.verify(user.password, password)))
|
|
||||||
throw new ForbiddenException("Invalid password");
|
|
||||||
|
|
||||||
// Check if we have a secret already
|
|
||||||
const { totpVerified } = await this.prisma.user.findUnique({
|
|
||||||
where: { id: user.id },
|
|
||||||
select: { totpVerified: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (totpVerified) {
|
|
||||||
throw new BadRequestException("TOTP is already enabled");
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Maybe make the issuer configurable with env vars?
|
|
||||||
const secret = authenticator.generateSecret();
|
|
||||||
const encryptedSecret = this.encryptTotpSecret(secret, password);
|
|
||||||
|
|
||||||
const otpURL = totp.keyuri(
|
|
||||||
user.username || user.email,
|
|
||||||
"pingvin-share",
|
|
||||||
secret
|
|
||||||
);
|
|
||||||
|
|
||||||
await this.prisma.user.update({
|
|
||||||
where: { id: user.id },
|
|
||||||
data: {
|
|
||||||
totpEnabled: true,
|
|
||||||
totpSecret: encryptedSecret,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// TODO: Maybe we should generate the QR code on the client rather than the server?
|
|
||||||
const qrCode = new qrcode({
|
|
||||||
content: otpURL,
|
|
||||||
container: "svg-viewbox",
|
|
||||||
join: true,
|
|
||||||
}).svg();
|
|
||||||
|
|
||||||
return {
|
|
||||||
totpAuthUrl: otpURL,
|
|
||||||
totpSecret: secret,
|
|
||||||
qrCode:
|
|
||||||
"data:image/svg+xml;base64," + Buffer.from(qrCode).toString("base64"),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Maybe require a token to verify that the user who started enabling totp is the one who is verifying it?
|
|
||||||
async verifyTotp(user: User, password: string, code: string) {
|
|
||||||
if (!(await argon.verify(user.password, password)))
|
|
||||||
throw new ForbiddenException("Invalid password");
|
|
||||||
|
|
||||||
const { totpSecret } = await this.prisma.user.findUnique({
|
|
||||||
where: { id: user.id },
|
|
||||||
select: { totpSecret: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!totpSecret) {
|
|
||||||
throw new BadRequestException("TOTP is not in progress");
|
|
||||||
}
|
|
||||||
|
|
||||||
const decryptedSecret = this.decryptTotpSecret(totpSecret, password);
|
|
||||||
|
|
||||||
const expected = authenticator.generate(decryptedSecret);
|
|
||||||
|
|
||||||
if (code !== expected) {
|
|
||||||
throw new BadRequestException("Invalid code");
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.prisma.user.update({
|
|
||||||
where: { id: user.id },
|
|
||||||
data: {
|
|
||||||
totpVerified: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async disableTotp(user: User, password: string, code: string) {
|
|
||||||
if (!(await argon.verify(user.password, password)))
|
|
||||||
throw new ForbiddenException("Invalid password");
|
|
||||||
|
|
||||||
const { totpSecret } = await this.prisma.user.findUnique({
|
|
||||||
where: { id: user.id },
|
|
||||||
select: { totpSecret: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!totpSecret) {
|
|
||||||
throw new BadRequestException("TOTP is not enabled");
|
|
||||||
}
|
|
||||||
|
|
||||||
const decryptedSecret = this.decryptTotpSecret(totpSecret, password);
|
|
||||||
|
|
||||||
const expected = authenticator.generate(decryptedSecret);
|
|
||||||
|
|
||||||
if (code !== expected) {
|
|
||||||
throw new BadRequestException("Invalid code");
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.prisma.user.update({
|
|
||||||
where: { id: user.id },
|
|
||||||
data: {
|
|
||||||
totpVerified: false,
|
|
||||||
totpEnabled: false,
|
|
||||||
totpSecret: null,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
185
backend/src/auth/authTotp.service.ts
Normal file
185
backend/src/auth/authTotp.service.ts
Normal file
@@ -0,0 +1,185 @@
|
|||||||
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
ForbiddenException,
|
||||||
|
Injectable,
|
||||||
|
UnauthorizedException,
|
||||||
|
} from "@nestjs/common";
|
||||||
|
import { User } from "@prisma/client";
|
||||||
|
import * as argon from "argon2";
|
||||||
|
import { authenticator, totp } from "otplib";
|
||||||
|
import * as qrcode from "qrcode-svg";
|
||||||
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
import { AuthService } from "./auth.service";
|
||||||
|
import { AuthSignInTotpDTO } from "./dto/authSignInTotp.dto";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuthTotpService {
|
||||||
|
constructor(
|
||||||
|
private prisma: PrismaService,
|
||||||
|
private authService: AuthService
|
||||||
|
) {}
|
||||||
|
|
||||||
|
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({
|
||||||
|
where: {
|
||||||
|
token: dto.loginToken,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!token || token.userId != user.id || token.used)
|
||||||
|
throw new UnauthorizedException("Invalid login token");
|
||||||
|
|
||||||
|
if (token.expiresAt < new Date())
|
||||||
|
throw new UnauthorizedException("Login token expired");
|
||||||
|
|
||||||
|
// Check the TOTP code
|
||||||
|
const { totpSecret } = await this.prisma.user.findUnique({
|
||||||
|
where: { id: user.id },
|
||||||
|
select: { totpSecret: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!totpSecret) {
|
||||||
|
throw new BadRequestException("TOTP is not enabled");
|
||||||
|
}
|
||||||
|
|
||||||
|
const expected = authenticator.generate(totpSecret);
|
||||||
|
|
||||||
|
if (dto.totp !== expected) {
|
||||||
|
throw new BadRequestException("Invalid code");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the login token to used
|
||||||
|
await this.prisma.loginToken.update({
|
||||||
|
where: { token: token.token },
|
||||||
|
data: { used: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
const { refreshToken, refreshTokenId } =
|
||||||
|
await this.authService.createRefreshToken(user.id);
|
||||||
|
const accessToken = await this.authService.createAccessToken(
|
||||||
|
user,
|
||||||
|
refreshTokenId
|
||||||
|
);
|
||||||
|
|
||||||
|
return { accessToken, refreshToken };
|
||||||
|
}
|
||||||
|
|
||||||
|
async enableTotp(user: User, password: string) {
|
||||||
|
if (!(await argon.verify(user.password, password)))
|
||||||
|
throw new ForbiddenException("Invalid password");
|
||||||
|
|
||||||
|
// Check if we have a secret already
|
||||||
|
const { totpVerified } = await this.prisma.user.findUnique({
|
||||||
|
where: { id: user.id },
|
||||||
|
select: { totpVerified: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (totpVerified) {
|
||||||
|
throw new BadRequestException("TOTP is already enabled");
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Maybe make the issuer configurable with env vars?
|
||||||
|
const secret = authenticator.generateSecret();
|
||||||
|
|
||||||
|
const otpURL = totp.keyuri(
|
||||||
|
user.username || user.email,
|
||||||
|
"pingvin-share",
|
||||||
|
secret
|
||||||
|
);
|
||||||
|
|
||||||
|
await this.prisma.user.update({
|
||||||
|
where: { id: user.id },
|
||||||
|
data: {
|
||||||
|
totpEnabled: true,
|
||||||
|
totpSecret: secret,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// TODO: Maybe we should generate the QR code on the client rather than the server?
|
||||||
|
const qrCode = new qrcode({
|
||||||
|
content: otpURL,
|
||||||
|
container: "svg-viewbox",
|
||||||
|
join: true,
|
||||||
|
}).svg();
|
||||||
|
|
||||||
|
return {
|
||||||
|
totpAuthUrl: otpURL,
|
||||||
|
totpSecret: secret,
|
||||||
|
qrCode:
|
||||||
|
"data:image/svg+xml;base64," + Buffer.from(qrCode).toString("base64"),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Maybe require a token to verify that the user who started enabling totp is the one who is verifying it?
|
||||||
|
async verifyTotp(user: User, password: string, code: string) {
|
||||||
|
if (!(await argon.verify(user.password, password)))
|
||||||
|
throw new ForbiddenException("Invalid password");
|
||||||
|
|
||||||
|
const { totpSecret } = await this.prisma.user.findUnique({
|
||||||
|
where: { id: user.id },
|
||||||
|
select: { totpSecret: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!totpSecret) {
|
||||||
|
throw new BadRequestException("TOTP is not in progress");
|
||||||
|
}
|
||||||
|
|
||||||
|
const expected = authenticator.generate(totpSecret);
|
||||||
|
|
||||||
|
if (code !== expected) {
|
||||||
|
throw new BadRequestException("Invalid code");
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.prisma.user.update({
|
||||||
|
where: { id: user.id },
|
||||||
|
data: {
|
||||||
|
totpVerified: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
async disableTotp(user: User, password: string, code: string) {
|
||||||
|
if (!(await argon.verify(user.password, password)))
|
||||||
|
throw new ForbiddenException("Invalid password");
|
||||||
|
|
||||||
|
const { totpSecret } = await this.prisma.user.findUnique({
|
||||||
|
where: { id: user.id },
|
||||||
|
select: { totpSecret: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!totpSecret) {
|
||||||
|
throw new BadRequestException("TOTP is not enabled");
|
||||||
|
}
|
||||||
|
|
||||||
|
const expected = authenticator.generate(totpSecret);
|
||||||
|
|
||||||
|
if (code !== expected) {
|
||||||
|
throw new BadRequestException("Invalid code");
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.prisma.user.update({
|
||||||
|
where: { id: user.id },
|
||||||
|
data: {
|
||||||
|
totpVerified: false,
|
||||||
|
totpEnabled: false,
|
||||||
|
totpSecret: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { PickType } from "@nestjs/mapped-types";
|
import { PickType } from "@nestjs/swagger";
|
||||||
import { UserDTO } from "src/user/dto/user.dto";
|
import { UserDTO } from "src/user/dto/user.dto";
|
||||||
|
|
||||||
export class AuthRegisterDTO extends PickType(UserDTO, [
|
export class AuthRegisterDTO extends PickType(UserDTO, [
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { PickType } from "@nestjs/mapped-types";
|
import { PickType } from "@nestjs/swagger";
|
||||||
import { IsEmail, IsOptional, IsString } from "class-validator";
|
import { IsEmail, IsOptional, IsString } from "class-validator";
|
||||||
import { UserDTO } from "src/user/dto/user.dto";
|
import { UserDTO } from "src/user/dto/user.dto";
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +1,7 @@
|
|||||||
import { PickType } from "@nestjs/mapped-types";
|
import { IsString } from "class-validator";
|
||||||
import { IsEmail, IsOptional, IsString } from "class-validator";
|
import { AuthSignInDTO } from "./authSignIn.dto";
|
||||||
import { UserDTO } from "src/user/dto/user.dto";
|
|
||||||
|
|
||||||
export class AuthSignInTotpDTO extends PickType(UserDTO, [
|
|
||||||
"password",
|
|
||||||
] as const) {
|
|
||||||
@IsEmail()
|
|
||||||
@IsOptional()
|
|
||||||
email: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
username: string;
|
|
||||||
|
|
||||||
|
export class AuthSignInTotpDTO extends AuthSignInDTO {
|
||||||
@IsString()
|
@IsString()
|
||||||
totp: string;
|
totp: string;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { PickType } from "@nestjs/mapped-types";
|
import { PickType } from "@nestjs/swagger";
|
||||||
import { IsEmail, IsOptional, IsString } from "class-validator";
|
|
||||||
import { UserDTO } from "src/user/dto/user.dto";
|
import { UserDTO } from "src/user/dto/user.dto";
|
||||||
|
|
||||||
export class EnableTotpDTO extends PickType(UserDTO, ["password"] as const) {}
|
export class EnableTotpDTO extends PickType(UserDTO, ["password"] as const) {}
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
import { IsNotEmpty } from "class-validator";
|
|
||||||
|
|
||||||
export class RefreshAccessTokenDTO {
|
|
||||||
@IsNotEmpty()
|
|
||||||
refreshToken: string;
|
|
||||||
}
|
|
||||||
8
backend/src/auth/dto/resetPassword.dto.ts
Normal file
8
backend/src/auth/dto/resetPassword.dto.ts
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
import { PickType } from "@nestjs/swagger";
|
||||||
|
import { IsString } from "class-validator";
|
||||||
|
import { UserDTO } from "src/user/dto/user.dto";
|
||||||
|
|
||||||
|
export class ResetPasswordDTO extends PickType(UserDTO, ["password"]) {
|
||||||
|
@IsString()
|
||||||
|
token: string;
|
||||||
|
}
|
||||||
15
backend/src/auth/dto/token.dto.ts
Normal file
15
backend/src/auth/dto/token.dto.ts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
import { Expose, plainToClass } from "class-transformer";
|
||||||
|
|
||||||
|
export class TokenDTO {
|
||||||
|
@Expose()
|
||||||
|
accessToken: string;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
refreshToken: string;
|
||||||
|
|
||||||
|
from(partial: Partial<TokenDTO>) {
|
||||||
|
return plainToClass(TokenDTO, partial, {
|
||||||
|
excludeExtraneousValues: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { PickType } from "@nestjs/mapped-types";
|
import { PickType } from "@nestjs/swagger";
|
||||||
import { IsString } from "class-validator";
|
import { IsString } from "class-validator";
|
||||||
import { UserDTO } from "src/user/dto/user.dto";
|
import { UserDTO } from "src/user/dto/user.dto";
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { PickType } from "@nestjs/mapped-types";
|
import { PickType } from "@nestjs/swagger";
|
||||||
import { IsEmail, IsOptional, IsString } from "class-validator";
|
import { IsString } from "class-validator";
|
||||||
import { UserDTO } from "src/user/dto/user.dto";
|
import { UserDTO } from "src/user/dto/user.dto";
|
||||||
|
|
||||||
export class VerifyTotpDTO extends PickType(UserDTO, ["password"] as const) {
|
export class VerifyTotpDTO extends PickType(UserDTO, ["password"] as const) {
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import { Injectable } from "@nestjs/common";
|
import { Injectable } from "@nestjs/common";
|
||||||
import { PassportStrategy } from "@nestjs/passport";
|
import { PassportStrategy } from "@nestjs/passport";
|
||||||
import { User } from "@prisma/client";
|
import { User } from "@prisma/client";
|
||||||
import { ExtractJwt, Strategy } from "passport-jwt";
|
import { Request } from "express";
|
||||||
|
import { Strategy } from "passport-jwt";
|
||||||
import { ConfigService } from "src/config/config.service";
|
import { ConfigService } from "src/config/config.service";
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
|
||||||
@@ -10,11 +11,16 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
|
|||||||
constructor(config: ConfigService, private prisma: PrismaService) {
|
constructor(config: ConfigService, private prisma: PrismaService) {
|
||||||
config.get("JWT_SECRET");
|
config.get("JWT_SECRET");
|
||||||
super({
|
super({
|
||||||
jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
|
jwtFromRequest: JwtStrategy.extractJWT,
|
||||||
secretOrKey: config.get("JWT_SECRET"),
|
secretOrKey: config.get("JWT_SECRET"),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static extractJWT(req: Request) {
|
||||||
|
if (!req.cookies.access_token) return null;
|
||||||
|
return req.cookies.access_token;
|
||||||
|
}
|
||||||
|
|
||||||
async validate(payload: { sub: string }) {
|
async validate(payload: { sub: string }) {
|
||||||
const user: User = await this.prisma.user.findUnique({
|
const user: User = await this.prisma.user.findUnique({
|
||||||
where: { id: payload.sub },
|
where: { id: payload.sub },
|
||||||
|
|||||||
10
backend/src/clamscan/clamscan.module.ts
Normal file
10
backend/src/clamscan/clamscan.module.ts
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
import { forwardRef, Module } from "@nestjs/common";
|
||||||
|
import { FileModule } from "src/file/file.module";
|
||||||
|
import { ClamScanService } from "./clamscan.service";
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [forwardRef(() => FileModule)],
|
||||||
|
providers: [ClamScanService],
|
||||||
|
exports: [ClamScanService],
|
||||||
|
})
|
||||||
|
export class ClamScanModule {}
|
||||||
86
backend/src/clamscan/clamscan.service.ts
Normal file
86
backend/src/clamscan/clamscan.service.ts
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
import { Injectable } from "@nestjs/common";
|
||||||
|
import * as NodeClam from "clamscan";
|
||||||
|
import * as fs from "fs";
|
||||||
|
import { FileService } from "src/file/file.service";
|
||||||
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
|
||||||
|
const clamscanConfig = {
|
||||||
|
clamdscan: {
|
||||||
|
host: process.env.NODE_ENV == "docker" ? "clamav" : "127.0.0.1",
|
||||||
|
port: 3310,
|
||||||
|
localFallback: false,
|
||||||
|
},
|
||||||
|
preference: "clamdscan",
|
||||||
|
};
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ClamScanService {
|
||||||
|
constructor(
|
||||||
|
private fileService: FileService,
|
||||||
|
private prisma: PrismaService
|
||||||
|
) {}
|
||||||
|
|
||||||
|
private ClamScan: Promise<NodeClam | null> = new NodeClam()
|
||||||
|
.init(clamscanConfig)
|
||||||
|
.then((res) => {
|
||||||
|
console.log("ClamAV is active");
|
||||||
|
return res;
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
console.log("ClamAV is not active");
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
|
||||||
|
async check(shareId: string) {
|
||||||
|
const clamScan = await this.ClamScan;
|
||||||
|
|
||||||
|
if (!clamScan) return [];
|
||||||
|
|
||||||
|
const infectedFiles = [];
|
||||||
|
|
||||||
|
const files = fs
|
||||||
|
.readdirSync(`./data/uploads/shares/${shareId}`)
|
||||||
|
.filter((file) => file != "archive.zip");
|
||||||
|
|
||||||
|
for (const fileId of files) {
|
||||||
|
const { isInfected } = await clamScan
|
||||||
|
.isInfected(`./data/uploads/shares/${shareId}/${fileId}`)
|
||||||
|
.catch(() => {
|
||||||
|
console.log("ClamAV is not active");
|
||||||
|
return { isInfected: false };
|
||||||
|
});
|
||||||
|
|
||||||
|
const fileName = (
|
||||||
|
await this.prisma.file.findUnique({ where: { id: fileId } })
|
||||||
|
).name;
|
||||||
|
|
||||||
|
if (isInfected) {
|
||||||
|
infectedFiles.push({ id: fileId, name: fileName });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return infectedFiles;
|
||||||
|
}
|
||||||
|
|
||||||
|
async checkAndRemove(shareId: string) {
|
||||||
|
const infectedFiles = await this.check(shareId);
|
||||||
|
|
||||||
|
if (infectedFiles.length > 0) {
|
||||||
|
await this.fileService.deleteAllFiles(shareId);
|
||||||
|
await this.prisma.file.deleteMany({ where: { shareId } });
|
||||||
|
|
||||||
|
const fileNames = infectedFiles.map((file) => file.name).join(", ");
|
||||||
|
|
||||||
|
await this.prisma.share.update({
|
||||||
|
where: { id: shareId },
|
||||||
|
data: {
|
||||||
|
removedReason: `Your share got removed because the file(s) ${fileNames} are malicious.`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`Share ${shareId} deleted because it contained ${infectedFiles.length} malicious file(s)`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,24 +1,23 @@
|
|||||||
import {
|
import { Body, Controller, Get, Patch, Post, UseGuards } from "@nestjs/common";
|
||||||
Body,
|
import { SkipThrottle } from "@nestjs/throttler";
|
||||||
Controller,
|
|
||||||
Get,
|
|
||||||
Param,
|
|
||||||
Patch,
|
|
||||||
Post,
|
|
||||||
UseGuards,
|
|
||||||
} from "@nestjs/common";
|
|
||||||
import { AdministratorGuard } from "src/auth/guard/isAdmin.guard";
|
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 { EmailService } from "src/email/email.service";
|
||||||
import { ConfigService } from "./config.service";
|
import { ConfigService } from "./config.service";
|
||||||
import { AdminConfigDTO } from "./dto/adminConfig.dto";
|
import { AdminConfigDTO } from "./dto/adminConfig.dto";
|
||||||
import { ConfigDTO } from "./dto/config.dto";
|
import { ConfigDTO } from "./dto/config.dto";
|
||||||
|
import { TestEmailDTO } from "./dto/testEmail.dto";
|
||||||
import UpdateConfigDTO from "./dto/updateConfig.dto";
|
import UpdateConfigDTO from "./dto/updateConfig.dto";
|
||||||
|
|
||||||
@Controller("configs")
|
@Controller("configs")
|
||||||
export class ConfigController {
|
export class ConfigController {
|
||||||
constructor(private configService: ConfigService) {}
|
constructor(
|
||||||
|
private configService: ConfigService,
|
||||||
|
private emailService: EmailService
|
||||||
|
) {}
|
||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
|
@SkipThrottle()
|
||||||
async list() {
|
async list() {
|
||||||
return new ConfigDTO().fromList(await this.configService.list());
|
return new ConfigDTO().fromList(await this.configService.list());
|
||||||
}
|
}
|
||||||
@@ -31,17 +30,21 @@ export class ConfigController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch("admin/:key")
|
@Patch("admin")
|
||||||
@UseGuards(JwtGuard, AdministratorGuard)
|
@UseGuards(JwtGuard, AdministratorGuard)
|
||||||
async update(@Param("key") key: string, @Body() data: UpdateConfigDTO) {
|
async updateMany(@Body() data: UpdateConfigDTO[]) {
|
||||||
return new AdminConfigDTO().from(
|
await this.configService.updateMany(data);
|
||||||
await this.configService.update(key, data.value)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post("admin/finishSetup")
|
@Post("admin/finishSetup")
|
||||||
@UseGuards(JwtGuard, AdministratorGuard)
|
@UseGuards(JwtGuard, AdministratorGuard)
|
||||||
async finishSetup() {
|
async finishSetup() {
|
||||||
return await this.configService.finishSetup();
|
return await this.configService.changeSetupStatus("FINISHED");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post("admin/testEmail")
|
||||||
|
@UseGuards(JwtGuard, AdministratorGuard)
|
||||||
|
async testEmail(@Body() { email }: TestEmailDTO) {
|
||||||
|
await this.emailService.sendTestMail(email);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import { Global, Module } from "@nestjs/common";
|
import { Global, Module } from "@nestjs/common";
|
||||||
|
import { EmailModule } from "src/email/email.module";
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
import { ConfigController } from "./config.controller";
|
import { ConfigController } from "./config.controller";
|
||||||
import { ConfigService } from "./config.service";
|
import { ConfigService } from "./config.service";
|
||||||
|
|
||||||
@Global()
|
@Global()
|
||||||
@Module({
|
@Module({
|
||||||
|
imports: [EmailModule],
|
||||||
providers: [
|
providers: [
|
||||||
{
|
{
|
||||||
provide: "CONFIG_VARIABLES",
|
provide: "CONFIG_VARIABLES",
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ export class ConfigService {
|
|||||||
|
|
||||||
async listForAdmin() {
|
async listForAdmin() {
|
||||||
return await this.prisma.config.findMany({
|
return await this.prisma.config.findMany({
|
||||||
|
orderBy: { order: "asc" },
|
||||||
where: { locked: { equals: false } },
|
where: { locked: { equals: false } },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -39,6 +40,14 @@ export class ConfigService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async updateMany(data: { key: string; value: string | number | boolean }[]) {
|
||||||
|
for (const variable of data) {
|
||||||
|
await this.update(variable.key, variable.value);
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
async update(key: string, value: string | number | boolean) {
|
async update(key: string, value: string | number | boolean) {
|
||||||
const configVariable = await this.prisma.config.findUnique({
|
const configVariable = await this.prisma.config.findUnique({
|
||||||
where: { key },
|
where: { key },
|
||||||
@@ -67,10 +76,14 @@ export class ConfigService {
|
|||||||
return updatedVariable;
|
return updatedVariable;
|
||||||
}
|
}
|
||||||
|
|
||||||
async finishSetup() {
|
async changeSetupStatus(status: "STARTED" | "REGISTERED" | "FINISHED") {
|
||||||
return await this.prisma.config.update({
|
const updatedVariable = await this.prisma.config.update({
|
||||||
where: { key: "SETUP_FINISHED" },
|
where: { key: "SETUP_STATUS" },
|
||||||
data: { value: "true" },
|
data: { value: status },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.configVariables = await this.prisma.config.findMany();
|
||||||
|
|
||||||
|
return updatedVariable;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ export class AdminConfigDTO extends ConfigDTO {
|
|||||||
@Expose()
|
@Expose()
|
||||||
obscured: boolean;
|
obscured: boolean;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
category: string;
|
||||||
|
|
||||||
from(partial: Partial<AdminConfigDTO>) {
|
from(partial: Partial<AdminConfigDTO>) {
|
||||||
return plainToClass(AdminConfigDTO, partial, {
|
return plainToClass(AdminConfigDTO, partial, {
|
||||||
excludeExtraneousValues: true,
|
excludeExtraneousValues: true,
|
||||||
|
|||||||
7
backend/src/config/dto/testEmail.dto.ts
Normal file
7
backend/src/config/dto/testEmail.dto.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import { IsEmail, IsNotEmpty } from "class-validator";
|
||||||
|
|
||||||
|
export class TestEmailDTO {
|
||||||
|
@IsEmail()
|
||||||
|
@IsNotEmpty()
|
||||||
|
email: string;
|
||||||
|
}
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
import { IsNotEmpty, ValidateIf } from "class-validator";
|
import { IsNotEmpty, IsString, ValidateIf } from "class-validator";
|
||||||
|
|
||||||
class UpdateConfigDTO {
|
class UpdateConfigDTO {
|
||||||
|
@IsString()
|
||||||
|
key: string;
|
||||||
|
|
||||||
@IsNotEmpty()
|
@IsNotEmpty()
|
||||||
@ValidateIf((dto) => dto.value !== "")
|
@ValidateIf((dto) => dto.value !== "")
|
||||||
value: string | number | boolean;
|
value: string | number | boolean;
|
||||||
|
|||||||
@@ -7,9 +7,11 @@ import { ConfigService } from "src/config/config.service";
|
|||||||
export class EmailService {
|
export class EmailService {
|
||||||
constructor(private config: ConfigService) {}
|
constructor(private config: ConfigService) {}
|
||||||
|
|
||||||
async sendMail(recipientEmail: string, shareId: string, creator: User) {
|
getTransporter() {
|
||||||
// create reusable transporter object using the default SMTP transport
|
if (!this.config.get("SMTP_ENABLED"))
|
||||||
const transporter = nodemailer.createTransport({
|
throw new InternalServerErrorException("SMTP is disabled");
|
||||||
|
|
||||||
|
return nodemailer.createTransport({
|
||||||
host: this.config.get("SMTP_HOST"),
|
host: this.config.get("SMTP_HOST"),
|
||||||
port: parseInt(this.config.get("SMTP_PORT")),
|
port: parseInt(this.config.get("SMTP_PORT")),
|
||||||
secure: parseInt(this.config.get("SMTP_PORT")) == 465,
|
secure: parseInt(this.config.get("SMTP_PORT")) == 465,
|
||||||
@@ -18,21 +20,70 @@ export class EmailService {
|
|||||||
pass: this.config.get("SMTP_PASSWORD"),
|
pass: this.config.get("SMTP_PASSWORD"),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (!this.config.get("ENABLE_EMAIL_RECIPIENTS"))
|
async sendMailToShareRecepients(
|
||||||
|
recipientEmail: string,
|
||||||
|
shareId: string,
|
||||||
|
creator?: User
|
||||||
|
) {
|
||||||
|
if (!this.config.get("ENABLE_SHARE_EMAIL_RECIPIENTS"))
|
||||||
throw new InternalServerErrorException("Email service disabled");
|
throw new InternalServerErrorException("Email service disabled");
|
||||||
|
|
||||||
const shareUrl = `${this.config.get("APP_URL")}/share/${shareId}`;
|
const shareUrl = `${this.config.get("APP_URL")}/share/${shareId}`;
|
||||||
|
|
||||||
await transporter.sendMail({
|
await this.getTransporter().sendMail({
|
||||||
from: `"Pingvin Share" <${this.config.get("SMTP_EMAIL")}>`,
|
from: `"Pingvin Share" <${this.config.get("SMTP_EMAIL")}>`,
|
||||||
to: recipientEmail,
|
to: recipientEmail,
|
||||||
subject: "Files shared with you",
|
subject: this.config.get("SHARE_RECEPIENTS_EMAIL_SUBJECT"),
|
||||||
text: this.config
|
text: this.config
|
||||||
.get("EMAIL_MESSAGE")
|
.get("SHARE_RECEPIENTS_EMAIL_MESSAGE")
|
||||||
.replaceAll("\\n", "\n")
|
.replaceAll("\\n", "\n")
|
||||||
.replaceAll("{creator}", creator.username)
|
.replaceAll("{creator}", creator?.username ?? "Someone")
|
||||||
.replaceAll("{shareUrl}", shareUrl),
|
.replaceAll("{shareUrl}", shareUrl),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async sendMailToReverseShareCreator(recipientEmail: string, shareId: string) {
|
||||||
|
const shareUrl = `${this.config.get("APP_URL")}/share/${shareId}`;
|
||||||
|
|
||||||
|
await this.getTransporter().sendMail({
|
||||||
|
from: `"Pingvin Share" <${this.config.get("SMTP_EMAIL")}>`,
|
||||||
|
to: recipientEmail,
|
||||||
|
subject: this.config.get("REVERSE_SHARE_EMAIL_SUBJECT"),
|
||||||
|
text: this.config
|
||||||
|
.get("REVERSE_SHARE_EMAIL_MESSAGE")
|
||||||
|
.replaceAll("\\n", "\n")
|
||||||
|
.replaceAll("{shareUrl}", shareUrl),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async sendResetPasswordEmail(recipientEmail: string, token: string) {
|
||||||
|
const resetPasswordUrl = `${this.config.get(
|
||||||
|
"APP_URL"
|
||||||
|
)}/auth/resetPassword/${token}`;
|
||||||
|
|
||||||
|
await this.getTransporter().sendMail({
|
||||||
|
from: `"Pingvin Share" <${this.config.get("SMTP_EMAIL")}>`,
|
||||||
|
to: recipientEmail,
|
||||||
|
subject: this.config.get("RESET_PASSWORD_EMAIL_SUBJECT"),
|
||||||
|
text: this.config
|
||||||
|
.get("RESET_PASSWORD_EMAIL_MESSAGE")
|
||||||
|
.replaceAll("{url}", resetPasswordUrl),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async sendTestMail(recipientEmail: string) {
|
||||||
|
try {
|
||||||
|
await this.getTransporter().sendMail({
|
||||||
|
from: `"Pingvin Share" <${this.config.get("SMTP_EMAIL")}>`,
|
||||||
|
to: recipientEmail,
|
||||||
|
subject: "Test email",
|
||||||
|
text: "This is a test email",
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
throw new InternalServerErrorException(e.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,71 +1,49 @@
|
|||||||
import {
|
import {
|
||||||
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
Get,
|
Get,
|
||||||
Param,
|
Param,
|
||||||
Post,
|
Post,
|
||||||
|
Query,
|
||||||
Res,
|
Res,
|
||||||
StreamableFile,
|
StreamableFile,
|
||||||
UploadedFile,
|
|
||||||
UseGuards,
|
UseGuards,
|
||||||
UseInterceptors,
|
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
import { FileInterceptor } from "@nestjs/platform-express";
|
import { SkipThrottle } from "@nestjs/throttler";
|
||||||
import * as contentDisposition from "content-disposition";
|
import * as contentDisposition from "content-disposition";
|
||||||
import { Response } from "express";
|
import { Response } from "express";
|
||||||
import { JwtGuard } from "src/auth/guard/jwt.guard";
|
import { CreateShareGuard } from "src/share/guard/createShare.guard";
|
||||||
import { FileDownloadGuard } from "src/file/guard/fileDownload.guard";
|
|
||||||
import { ShareDTO } from "src/share/dto/share.dto";
|
|
||||||
import { ShareOwnerGuard } from "src/share/guard/shareOwner.guard";
|
import { ShareOwnerGuard } from "src/share/guard/shareOwner.guard";
|
||||||
import { ShareSecurityGuard } from "src/share/guard/shareSecurity.guard";
|
|
||||||
import { FileService } from "./file.service";
|
import { FileService } from "./file.service";
|
||||||
|
import { FileSecurityGuard } from "./guard/fileSecurity.guard";
|
||||||
|
|
||||||
@Controller("shares/:shareId/files")
|
@Controller("shares/:shareId/files")
|
||||||
export class FileController {
|
export class FileController {
|
||||||
constructor(private fileService: FileService) {}
|
constructor(private fileService: FileService) {}
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
@UseGuards(JwtGuard, ShareOwnerGuard)
|
@SkipThrottle()
|
||||||
@UseInterceptors(
|
@UseGuards(CreateShareGuard, ShareOwnerGuard)
|
||||||
FileInterceptor("file", {
|
|
||||||
dest: "./data/uploads/_temp/",
|
|
||||||
})
|
|
||||||
)
|
|
||||||
async create(
|
async create(
|
||||||
@UploadedFile()
|
@Query() query: any,
|
||||||
file: Express.Multer.File,
|
|
||||||
|
@Body() body: string,
|
||||||
@Param("shareId") shareId: string
|
@Param("shareId") shareId: string
|
||||||
) {
|
) {
|
||||||
// Fixes file names with special characters
|
const { id, name, chunkIndex, totalChunks } = query;
|
||||||
file.originalname = Buffer.from(file.originalname, "latin1").toString(
|
|
||||||
"utf8"
|
const data = body.toString().split(",")[1];
|
||||||
|
|
||||||
|
return await this.fileService.create(
|
||||||
|
data,
|
||||||
|
{ index: parseInt(chunkIndex), total: parseInt(totalChunks) },
|
||||||
|
{ id, name },
|
||||||
|
shareId
|
||||||
);
|
);
|
||||||
return new ShareDTO().from(await this.fileService.create(file, shareId));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get(":fileId/download")
|
|
||||||
@UseGuards(ShareSecurityGuard)
|
|
||||||
async getFileDownloadUrl(
|
|
||||||
@Param("shareId") shareId: string,
|
|
||||||
@Param("fileId") fileId: string
|
|
||||||
) {
|
|
||||||
const url = this.fileService.getFileDownloadUrl(shareId, fileId);
|
|
||||||
|
|
||||||
return { url };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get("zip/download")
|
|
||||||
@UseGuards(ShareSecurityGuard)
|
|
||||||
async getZipArchiveDownloadURL(
|
|
||||||
@Param("shareId") shareId: string,
|
|
||||||
@Param("fileId") fileId: string
|
|
||||||
) {
|
|
||||||
const url = this.fileService.getFileDownloadUrl(shareId, fileId);
|
|
||||||
|
|
||||||
return { url };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("zip")
|
@Get("zip")
|
||||||
@UseGuards(FileDownloadGuard)
|
@UseGuards(FileSecurityGuard)
|
||||||
async getZip(
|
async getZip(
|
||||||
@Res({ passthrough: true }) res: Response,
|
@Res({ passthrough: true }) res: Response,
|
||||||
@Param("shareId") shareId: string
|
@Param("shareId") shareId: string
|
||||||
@@ -73,25 +51,32 @@ export class FileController {
|
|||||||
const zip = this.fileService.getZip(shareId);
|
const zip = this.fileService.getZip(shareId);
|
||||||
res.set({
|
res.set({
|
||||||
"Content-Type": "application/zip",
|
"Content-Type": "application/zip",
|
||||||
"Content-Disposition": `attachment ; filename="pingvin-share-${shareId}.zip"`,
|
"Content-Disposition": contentDisposition(`pingvin-share-${shareId}.zip`),
|
||||||
});
|
});
|
||||||
|
|
||||||
return new StreamableFile(zip);
|
return new StreamableFile(zip);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get(":fileId")
|
@Get(":fileId")
|
||||||
@UseGuards(FileDownloadGuard)
|
@UseGuards(FileSecurityGuard)
|
||||||
async getFile(
|
async getFile(
|
||||||
@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"
|
||||||
) {
|
) {
|
||||||
const file = await this.fileService.get(shareId, fileId);
|
const file = await this.fileService.get(shareId, fileId);
|
||||||
res.set({
|
|
||||||
|
const headers = {
|
||||||
"Content-Type": file.metaData.mimeType,
|
"Content-Type": file.metaData.mimeType,
|
||||||
"Content-Length": file.metaData.size,
|
"Content-Length": file.metaData.size,
|
||||||
"Content-Disposition": contentDisposition(file.metaData.name),
|
};
|
||||||
});
|
|
||||||
|
if (download === "true") {
|
||||||
|
headers["Content-Disposition"] = contentDisposition(file.metaData.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
res.set(headers);
|
||||||
|
|
||||||
return new StreamableFile(file.file);
|
return new StreamableFile(file.file);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
import { Module } from "@nestjs/common";
|
import { Module } from "@nestjs/common";
|
||||||
import { JwtModule } from "@nestjs/jwt";
|
import { JwtModule } from "@nestjs/jwt";
|
||||||
|
import { ReverseShareModule } from "src/reverseShare/reverseShare.module";
|
||||||
import { ShareModule } from "src/share/share.module";
|
import { ShareModule } from "src/share/share.module";
|
||||||
import { FileController } from "./file.controller";
|
import { FileController } from "./file.controller";
|
||||||
import { FileService } from "./file.service";
|
import { FileService } from "./file.service";
|
||||||
import { FileValidationPipe } from "./pipe/fileValidation.pipe";
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [JwtModule.register({}), ShareModule],
|
imports: [JwtModule.register({}), ReverseShareModule, ShareModule],
|
||||||
controllers: [FileController],
|
controllers: [FileController],
|
||||||
providers: [FileService, FileValidationPipe],
|
providers: [FileService],
|
||||||
exports: [FileService],
|
exports: [FileService],
|
||||||
})
|
})
|
||||||
export class FileModule {}
|
export class FileModule {}
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import {
|
import {
|
||||||
BadRequestException,
|
BadRequestException,
|
||||||
|
HttpException,
|
||||||
|
HttpStatus,
|
||||||
Injectable,
|
Injectable,
|
||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
import { JwtService } from "@nestjs/jwt";
|
import { JwtService } from "@nestjs/jwt";
|
||||||
import { randomUUID } from "crypto";
|
import * as crypto from "crypto";
|
||||||
import * as fs from "fs";
|
import * as fs from "fs";
|
||||||
import * as mime from "mime-types";
|
import * as mime from "mime-types";
|
||||||
import { ConfigService } from "src/config/config.service";
|
import { ConfigService } from "src/config/config.service";
|
||||||
@@ -18,32 +20,88 @@ export class FileService {
|
|||||||
private config: ConfigService
|
private config: ConfigService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(file: Express.Multer.File, shareId: string) {
|
async create(
|
||||||
|
data: string,
|
||||||
|
chunk: { index: number; total: number },
|
||||||
|
file: { id?: string; name: string },
|
||||||
|
shareId: string
|
||||||
|
) {
|
||||||
|
if (!file.id) file.id = crypto.randomUUID();
|
||||||
|
|
||||||
const share = await this.prisma.share.findUnique({
|
const share = await this.prisma.share.findUnique({
|
||||||
where: { id: shareId },
|
where: { id: shareId },
|
||||||
|
include: { files: true, reverseShare: true },
|
||||||
});
|
});
|
||||||
|
|
||||||
if (share.uploadLocked)
|
if (share.uploadLocked)
|
||||||
throw new BadRequestException("Share is already completed");
|
throw new BadRequestException("Share is already completed");
|
||||||
|
|
||||||
const fileId = randomUUID();
|
let diskFileSize: number;
|
||||||
|
try {
|
||||||
|
diskFileSize = fs.statSync(
|
||||||
|
`./data/uploads/shares/${shareId}/${file.id}.tmp-chunk`
|
||||||
|
).size;
|
||||||
|
} catch {
|
||||||
|
diskFileSize = 0;
|
||||||
|
}
|
||||||
|
|
||||||
await fs.promises.mkdir(`./data/uploads/shares/${shareId}`, {
|
// If the sent chunk index and the expected chunk index doesn't match throw an error
|
||||||
recursive: true,
|
const chunkSize = 10 * 1024 * 1024; // 10MB
|
||||||
});
|
const expectedChunkIndex = Math.ceil(diskFileSize / chunkSize);
|
||||||
fs.promises.rename(
|
|
||||||
`./data/uploads/_temp/${file.filename}`,
|
if (expectedChunkIndex != chunk.index)
|
||||||
`./data/uploads/shares/${shareId}/${fileId}`
|
throw new BadRequestException({
|
||||||
|
message: "Unexpected chunk received",
|
||||||
|
error: "unexpected_chunk_index",
|
||||||
|
expectedChunkIndex,
|
||||||
|
});
|
||||||
|
|
||||||
|
const buffer = Buffer.from(data, "base64");
|
||||||
|
|
||||||
|
// Check if share size limit is exceeded
|
||||||
|
const fileSizeSum = share.files.reduce(
|
||||||
|
(n, { size }) => n + parseInt(size),
|
||||||
|
0
|
||||||
);
|
);
|
||||||
|
|
||||||
return await this.prisma.file.create({
|
const shareSizeSum = fileSizeSum + diskFileSize + buffer.byteLength;
|
||||||
data: {
|
|
||||||
id: fileId,
|
if (
|
||||||
name: file.originalname,
|
shareSizeSum > this.config.get("MAX_SHARE_SIZE") ||
|
||||||
size: file.size.toString(),
|
(share.reverseShare?.maxShareSize &&
|
||||||
share: { connect: { id: shareId } },
|
shareSizeSum > parseInt(share.reverseShare.maxShareSize))
|
||||||
},
|
) {
|
||||||
});
|
throw new HttpException(
|
||||||
|
"Max share size exceeded",
|
||||||
|
HttpStatus.PAYLOAD_TOO_LARGE
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
fs.appendFileSync(
|
||||||
|
`./data/uploads/shares/${shareId}/${file.id}.tmp-chunk`,
|
||||||
|
buffer
|
||||||
|
);
|
||||||
|
|
||||||
|
const isLastChunk = chunk.index == chunk.total - 1;
|
||||||
|
if (isLastChunk) {
|
||||||
|
fs.renameSync(
|
||||||
|
`./data/uploads/shares/${shareId}/${file.id}.tmp-chunk`,
|
||||||
|
`./data/uploads/shares/${shareId}/${file.id}`
|
||||||
|
);
|
||||||
|
const fileSize = fs.statSync(
|
||||||
|
`./data/uploads/shares/${shareId}/${file.id}`
|
||||||
|
).size;
|
||||||
|
await this.prisma.file.create({
|
||||||
|
data: {
|
||||||
|
id: file.id,
|
||||||
|
name: file.name,
|
||||||
|
size: fileSize.toString(),
|
||||||
|
share: { connect: { id: shareId } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return file;
|
||||||
}
|
}
|
||||||
|
|
||||||
async get(shareId: string, fileId: string) {
|
async get(shareId: string, fileId: string) {
|
||||||
@@ -77,38 +135,4 @@ export class FileService {
|
|||||||
getZip(shareId: string) {
|
getZip(shareId: string) {
|
||||||
return fs.createReadStream(`./data/uploads/shares/${shareId}/archive.zip`);
|
return fs.createReadStream(`./data/uploads/shares/${shareId}/archive.zip`);
|
||||||
}
|
}
|
||||||
|
|
||||||
getFileDownloadUrl(shareId: string, fileId: string) {
|
|
||||||
const downloadToken = this.generateFileDownloadToken(shareId, fileId);
|
|
||||||
|
|
||||||
return `${this.config.get(
|
|
||||||
"APP_URL"
|
|
||||||
)}/api/shares/${shareId}/files/${fileId}?token=${downloadToken}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
generateFileDownloadToken(shareId: string, fileId: string) {
|
|
||||||
if (fileId == "zip") fileId = undefined;
|
|
||||||
|
|
||||||
return this.jwtService.sign(
|
|
||||||
{
|
|
||||||
shareId,
|
|
||||||
fileId,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
expiresIn: "10min",
|
|
||||||
secret: this.config.get("JWT_SECRET"),
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
verifyFileDownloadToken(shareId: string, token: string) {
|
|
||||||
try {
|
|
||||||
const claims = this.jwtService.verify(token, {
|
|
||||||
secret: this.config.get("JWT_SECRET"),
|
|
||||||
});
|
|
||||||
return claims.shareId == shareId;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
|
|
||||||
import { Request } from "express";
|
|
||||||
import { FileService } from "src/file/file.service";
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class FileDownloadGuard implements CanActivate {
|
|
||||||
constructor(private fileService: FileService) {}
|
|
||||||
|
|
||||||
async canActivate(context: ExecutionContext) {
|
|
||||||
const request: Request = context.switchToHttp().getRequest();
|
|
||||||
|
|
||||||
const token = request.query.token as string;
|
|
||||||
const { shareId } = request.params;
|
|
||||||
|
|
||||||
return this.fileService.verifyFileDownloadToken(shareId, token);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
65
backend/src/file/guard/fileSecurity.guard.ts
Normal file
65
backend/src/file/guard/fileSecurity.guard.ts
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
import {
|
||||||
|
ExecutionContext,
|
||||||
|
ForbiddenException,
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
} from "@nestjs/common";
|
||||||
|
import { Request } from "express";
|
||||||
|
import * as moment from "moment";
|
||||||
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
import { ShareSecurityGuard } from "src/share/guard/shareSecurity.guard";
|
||||||
|
import { ShareService } from "src/share/share.service";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class FileSecurityGuard extends ShareSecurityGuard {
|
||||||
|
constructor(
|
||||||
|
private _shareService: ShareService,
|
||||||
|
private _prisma: PrismaService
|
||||||
|
) {
|
||||||
|
super(_shareService, _prisma);
|
||||||
|
}
|
||||||
|
|
||||||
|
async canActivate(context: ExecutionContext) {
|
||||||
|
const request: Request = context.switchToHttp().getRequest();
|
||||||
|
|
||||||
|
const shareId = Object.prototype.hasOwnProperty.call(
|
||||||
|
request.params,
|
||||||
|
"shareId"
|
||||||
|
)
|
||||||
|
? request.params.shareId
|
||||||
|
: request.params.id;
|
||||||
|
|
||||||
|
const shareToken = request.cookies[`share_${shareId}_token`];
|
||||||
|
|
||||||
|
const share = await this._prisma.share.findUnique({
|
||||||
|
where: { id: shareId },
|
||||||
|
include: { security: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
// If there is no share token the user requests a file directly
|
||||||
|
if (!shareToken) {
|
||||||
|
if (
|
||||||
|
!share ||
|
||||||
|
(moment().isAfter(share.expiration) &&
|
||||||
|
!moment(share.expiration).isSame(0))
|
||||||
|
) {
|
||||||
|
throw new NotFoundException("File not found");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (share.security?.password)
|
||||||
|
throw new ForbiddenException("This share is password protected");
|
||||||
|
|
||||||
|
if (share.security?.maxViews && share.security.maxViews <= share.views) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
"Maximum views exceeded",
|
||||||
|
"share_max_views_exceeded"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this._shareService.increaseViewCount(share);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return super.canActivate(context);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
import {
|
|
||||||
ArgumentMetadata,
|
|
||||||
BadRequestException,
|
|
||||||
Injectable,
|
|
||||||
PipeTransform,
|
|
||||||
} from "@nestjs/common";
|
|
||||||
import { ConfigService } from "src/config/config.service";
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class FileValidationPipe implements PipeTransform {
|
|
||||||
constructor(private config: ConfigService) {}
|
|
||||||
async transform(value: any, metadata: ArgumentMetadata) {
|
|
||||||
if (value.size > this.config.get("MAX_FILE_SIZE"))
|
|
||||||
throw new BadRequestException("File is ");
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
import { Module } from "@nestjs/common";
|
import { Module } from "@nestjs/common";
|
||||||
import { FileModule } from "src/file/file.module";
|
import { FileModule } from "src/file/file.module";
|
||||||
|
import { ReverseShareModule } from "src/reverseShare/reverseShare.module";
|
||||||
import { JobsService } from "./jobs.service";
|
import { JobsService } from "./jobs.service";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [FileModule],
|
imports: [FileModule, ReverseShareModule],
|
||||||
providers: [JobsService],
|
providers: [JobsService],
|
||||||
})
|
})
|
||||||
export class JobsModule {}
|
export class JobsModule {}
|
||||||
|
|||||||
@@ -4,11 +4,13 @@ import * as fs from "fs";
|
|||||||
import * as moment from "moment";
|
import * as moment from "moment";
|
||||||
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";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class JobsService {
|
export class JobsService {
|
||||||
constructor(
|
constructor(
|
||||||
private prisma: PrismaService,
|
private prisma: PrismaService,
|
||||||
|
private reverseShareService: ReverseShareService,
|
||||||
private fileService: FileService
|
private fileService: FileService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@@ -36,31 +38,76 @@ export class JobsService {
|
|||||||
console.log(`job: deleted ${expiredShares.length} expired shares`);
|
console.log(`job: deleted ${expiredShares.length} expired shares`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Cron("0 0 * * *")
|
@Cron("0 * * * *")
|
||||||
deleteTemporaryFiles() {
|
async deleteExpiredReverseShares() {
|
||||||
const files = fs.readdirSync("./data/uploads/_temp");
|
const expiredReverseShares = await this.prisma.reverseShare.findMany({
|
||||||
|
where: {
|
||||||
|
shareExpiration: { lt: new Date() },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
for (const file of files) {
|
for (const expiredReverseShare of expiredReverseShares) {
|
||||||
const stats = fs.statSync(`./data/uploads/_temp/${file}`);
|
await this.reverseShareService.remove(expiredReverseShare.id);
|
||||||
const isOlderThanOneDay = moment(stats.mtime)
|
|
||||||
.add(1, "day")
|
|
||||||
.isBefore(moment());
|
|
||||||
|
|
||||||
if (isOlderThanOneDay) fs.rmSync(`./data/uploads/_temp/${file}`);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(`job: deleted ${files.length} temporary files`);
|
if (expiredReverseShares.length > 0)
|
||||||
|
console.log(
|
||||||
|
`job: deleted ${expiredReverseShares.length} expired reverse shares`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Cron("0 0 * * *")
|
||||||
|
deleteTemporaryFiles() {
|
||||||
|
let filesDeleted = 0;
|
||||||
|
|
||||||
|
const shareDirectories = fs
|
||||||
|
.readdirSync("./data/uploads/shares", { withFileTypes: true })
|
||||||
|
.filter((dirent) => dirent.isDirectory())
|
||||||
|
.map((dirent) => dirent.name);
|
||||||
|
|
||||||
|
for (const shareDirectory of shareDirectories) {
|
||||||
|
const temporaryFiles = fs
|
||||||
|
.readdirSync(`./data/uploads/shares/${shareDirectory}`)
|
||||||
|
.filter((file) => file.endsWith(".tmp-chunk"));
|
||||||
|
|
||||||
|
for (const file of temporaryFiles) {
|
||||||
|
const stats = fs.statSync(
|
||||||
|
`./data/uploads/shares/${shareDirectory}/${file}`
|
||||||
|
);
|
||||||
|
const isOlderThanOneDay = moment(stats.mtime)
|
||||||
|
.add(1, "day")
|
||||||
|
.isBefore(moment());
|
||||||
|
|
||||||
|
if (isOlderThanOneDay) {
|
||||||
|
fs.rmSync(`./data/uploads/shares/${shareDirectory}/${file}`);
|
||||||
|
filesDeleted++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`job: deleted ${filesDeleted} temporary files`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Cron("0 * * * *")
|
@Cron("0 * * * *")
|
||||||
async deleteExpiredRefreshTokens() {
|
async deleteExpiredTokens() {
|
||||||
const expiredRefreshTokens = await this.prisma.refreshToken.deleteMany({
|
const { count: refreshTokenCount } =
|
||||||
|
await this.prisma.refreshToken.deleteMany({
|
||||||
|
where: { expiresAt: { lt: new Date() } },
|
||||||
|
});
|
||||||
|
|
||||||
|
const { count: loginTokenCount } = await this.prisma.loginToken.deleteMany({
|
||||||
where: { expiresAt: { lt: new Date() } },
|
where: { expiresAt: { lt: new Date() } },
|
||||||
});
|
});
|
||||||
|
|
||||||
if (expiredRefreshTokens.count > 0)
|
const { count: resetPasswordTokenCount } =
|
||||||
console.log(
|
await this.prisma.resetPasswordToken.deleteMany({
|
||||||
`job: deleted ${expiredRefreshTokens.count} expired refresh tokens`
|
where: { expiresAt: { lt: new Date() } },
|
||||||
);
|
});
|
||||||
|
|
||||||
|
const deletedTokensCount =
|
||||||
|
refreshTokenCount + loginTokenCount + resetPasswordTokenCount;
|
||||||
|
|
||||||
|
if (deletedTokensCount > 0)
|
||||||
|
console.log(`job: deleted ${deletedTokensCount} expired refresh tokens`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
import { ClassSerializerInterceptor, ValidationPipe } from "@nestjs/common";
|
import { ClassSerializerInterceptor, 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 * as bodyParser from "body-parser";
|
||||||
|
import * as cookieParser from "cookie-parser";
|
||||||
import * as fs from "fs";
|
import * as fs from "fs";
|
||||||
import { AppModule } from "./app.module";
|
import { AppModule } from "./app.module";
|
||||||
|
|
||||||
@@ -9,11 +12,24 @@ 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" }));
|
||||||
|
app.use(cookieParser());
|
||||||
app.set("trust proxy", true);
|
app.set("trust proxy", true);
|
||||||
|
|
||||||
await fs.promises.mkdir("./data/uploads/_temp", { recursive: true });
|
await fs.promises.mkdir("./data/uploads/_temp", { recursive: true });
|
||||||
|
|
||||||
app.setGlobalPrefix("api");
|
app.setGlobalPrefix("api");
|
||||||
|
|
||||||
|
// Setup Swagger in development mode
|
||||||
|
if (process.env.NODE_ENV == "development") {
|
||||||
|
const config = new DocumentBuilder()
|
||||||
|
.setTitle("Pingvin Share API")
|
||||||
|
.setVersion("1.0")
|
||||||
|
.build();
|
||||||
|
const document = SwaggerModule.createDocument(app, config);
|
||||||
|
SwaggerModule.setup("api/swagger", app, document);
|
||||||
|
}
|
||||||
|
|
||||||
await app.listen(8080);
|
await app.listen(8080);
|
||||||
}
|
}
|
||||||
bootstrap();
|
bootstrap();
|
||||||
|
|||||||
16
backend/src/reverseShare/dto/createReverseShare.dto.ts
Normal file
16
backend/src/reverseShare/dto/createReverseShare.dto.ts
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
import { IsBoolean, IsString, Max, Min } from "class-validator";
|
||||||
|
|
||||||
|
export class CreateReverseShareDTO {
|
||||||
|
@IsBoolean()
|
||||||
|
sendEmailNotification: boolean;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
maxShareSize: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
shareExpiration: string;
|
||||||
|
|
||||||
|
@Min(1)
|
||||||
|
@Max(1000)
|
||||||
|
maxUseCount: number;
|
||||||
|
}
|
||||||
18
backend/src/reverseShare/dto/reverseShare.dto.ts
Normal file
18
backend/src/reverseShare/dto/reverseShare.dto.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { Expose, plainToClass } from "class-transformer";
|
||||||
|
|
||||||
|
export class ReverseShareDTO {
|
||||||
|
@Expose()
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
maxShareSize: string;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
shareExpiration: Date;
|
||||||
|
|
||||||
|
from(partial: Partial<ReverseShareDTO>) {
|
||||||
|
return plainToClass(ReverseShareDTO, partial, {
|
||||||
|
excludeExtraneousValues: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
29
backend/src/reverseShare/dto/reverseShareTokenWithShares.ts
Normal file
29
backend/src/reverseShare/dto/reverseShareTokenWithShares.ts
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { OmitType } from "@nestjs/swagger";
|
||||||
|
import { Expose, plainToClass, Type } from "class-transformer";
|
||||||
|
import { MyShareDTO } from "src/share/dto/myShare.dto";
|
||||||
|
import { ReverseShareDTO } from "./reverseShare.dto";
|
||||||
|
|
||||||
|
export class ReverseShareTokenWithShares extends OmitType(ReverseShareDTO, [
|
||||||
|
"shareExpiration",
|
||||||
|
] as const) {
|
||||||
|
@Expose()
|
||||||
|
shareExpiration: Date;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
@Type(() => OmitType(MyShareDTO, ["recipients", "hasPassword"] as const))
|
||||||
|
shares: Omit<
|
||||||
|
MyShareDTO,
|
||||||
|
"recipients" | "files" | "from" | "fromList" | "hasPassword"
|
||||||
|
>[];
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
remainingUses: number;
|
||||||
|
|
||||||
|
fromList(partial: Partial<ReverseShareTokenWithShares>[]) {
|
||||||
|
return partial.map((part) =>
|
||||||
|
plainToClass(ReverseShareTokenWithShares, part, {
|
||||||
|
excludeExtraneousValues: true,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
backend/src/reverseShare/guards/reverseShareOwner.guard.ts
Normal file
22
backend/src/reverseShare/guards/reverseShareOwner.guard.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
|
||||||
|
import { User } from "@prisma/client";
|
||||||
|
import { Request } from "express";
|
||||||
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ReverseShareOwnerGuard implements CanActivate {
|
||||||
|
constructor(private prisma: PrismaService) {}
|
||||||
|
|
||||||
|
async canActivate(context: ExecutionContext) {
|
||||||
|
const request: Request = context.switchToHttp().getRequest();
|
||||||
|
const { reverseShareId } = request.params;
|
||||||
|
|
||||||
|
const reverseShare = await this.prisma.reverseShare.findUnique({
|
||||||
|
where: { id: reverseShareId },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!reverseShare) return false;
|
||||||
|
|
||||||
|
return reverseShare.creatorId == (request.user as User).id;
|
||||||
|
}
|
||||||
|
}
|
||||||
64
backend/src/reverseShare/reverseShare.controller.ts
Normal file
64
backend/src/reverseShare/reverseShare.controller.ts
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
import {
|
||||||
|
Body,
|
||||||
|
Controller,
|
||||||
|
Delete,
|
||||||
|
Get,
|
||||||
|
NotFoundException,
|
||||||
|
Param,
|
||||||
|
Post,
|
||||||
|
UseGuards,
|
||||||
|
} from "@nestjs/common";
|
||||||
|
import { Throttle } from "@nestjs/throttler";
|
||||||
|
import { User } from "@prisma/client";
|
||||||
|
import { GetUser } from "src/auth/decorator/getUser.decorator";
|
||||||
|
import { JwtGuard } from "src/auth/guard/jwt.guard";
|
||||||
|
import { ConfigService } from "src/config/config.service";
|
||||||
|
import { CreateReverseShareDTO } from "./dto/createReverseShare.dto";
|
||||||
|
import { ReverseShareDTO } from "./dto/reverseShare.dto";
|
||||||
|
import { ReverseShareTokenWithShares } from "./dto/reverseShareTokenWithShares";
|
||||||
|
import { ReverseShareOwnerGuard } from "./guards/reverseShareOwner.guard";
|
||||||
|
import { ReverseShareService } from "./reverseShare.service";
|
||||||
|
|
||||||
|
@Controller("reverseShares")
|
||||||
|
export class ReverseShareController {
|
||||||
|
constructor(
|
||||||
|
private reverseShareService: ReverseShareService,
|
||||||
|
private config: ConfigService
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
|
async create(@Body() body: CreateReverseShareDTO, @GetUser() user: User) {
|
||||||
|
const token = await this.reverseShareService.create(body, user.id);
|
||||||
|
|
||||||
|
const link = `${this.config.get("APP_URL")}/upload/${token}`;
|
||||||
|
|
||||||
|
return { token, link };
|
||||||
|
}
|
||||||
|
|
||||||
|
@Throttle(20, 60)
|
||||||
|
@Get(":reverseShareToken")
|
||||||
|
async getByToken(@Param("reverseShareToken") reverseShareToken: string) {
|
||||||
|
const isValid = await this.reverseShareService.isValid(reverseShareToken);
|
||||||
|
|
||||||
|
if (!isValid) throw new NotFoundException("Reverse share token not found");
|
||||||
|
|
||||||
|
return new ReverseShareDTO().from(
|
||||||
|
await this.reverseShareService.getByToken(reverseShareToken)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
|
async getAllByUser(@GetUser() user: User) {
|
||||||
|
return new ReverseShareTokenWithShares().fromList(
|
||||||
|
await this.reverseShareService.getAllByUser(user.id)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete(":reverseShareId")
|
||||||
|
@UseGuards(JwtGuard, ReverseShareOwnerGuard)
|
||||||
|
async remove(@Param("reverseShareId") id: string) {
|
||||||
|
await this.reverseShareService.remove(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
12
backend/src/reverseShare/reverseShare.module.ts
Normal file
12
backend/src/reverseShare/reverseShare.module.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import { forwardRef, Module } from "@nestjs/common";
|
||||||
|
import { FileModule } from "src/file/file.module";
|
||||||
|
import { ReverseShareController } from "./reverseShare.controller";
|
||||||
|
import { ReverseShareService } from "./reverseShare.service";
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [forwardRef(() => FileModule)],
|
||||||
|
controllers: [ReverseShareController],
|
||||||
|
providers: [ReverseShareService],
|
||||||
|
exports: [ReverseShareService],
|
||||||
|
})
|
||||||
|
export class ReverseShareModule {}
|
||||||
97
backend/src/reverseShare/reverseShare.service.ts
Normal file
97
backend/src/reverseShare/reverseShare.service.ts
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
import { BadRequestException, Injectable } from "@nestjs/common";
|
||||||
|
import * as moment from "moment";
|
||||||
|
import { ConfigService } from "src/config/config.service";
|
||||||
|
import { FileService } from "src/file/file.service";
|
||||||
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
|
import { CreateReverseShareDTO } from "./dto/createReverseShare.dto";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ReverseShareService {
|
||||||
|
constructor(
|
||||||
|
private config: ConfigService,
|
||||||
|
private prisma: PrismaService,
|
||||||
|
private fileService: FileService
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async create(data: CreateReverseShareDTO, creatorId: string) {
|
||||||
|
// Parse date string to date
|
||||||
|
const expirationDate = moment()
|
||||||
|
.add(
|
||||||
|
data.shareExpiration.split("-")[0],
|
||||||
|
data.shareExpiration.split(
|
||||||
|
"-"
|
||||||
|
)[1] as moment.unitOfTime.DurationConstructor
|
||||||
|
)
|
||||||
|
.toDate();
|
||||||
|
|
||||||
|
const globalMaxShareSize = this.config.get("MAX_SHARE_SIZE");
|
||||||
|
|
||||||
|
if (globalMaxShareSize < data.maxShareSize)
|
||||||
|
throw new BadRequestException(
|
||||||
|
`Max share size can't be greater than ${globalMaxShareSize} bytes.`
|
||||||
|
);
|
||||||
|
|
||||||
|
const reverseShare = await this.prisma.reverseShare.create({
|
||||||
|
data: {
|
||||||
|
shareExpiration: expirationDate,
|
||||||
|
remainingUses: data.maxUseCount,
|
||||||
|
maxShareSize: data.maxShareSize,
|
||||||
|
sendEmailNotification: data.sendEmailNotification,
|
||||||
|
creatorId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return reverseShare.token;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getByToken(reverseShareToken?: string) {
|
||||||
|
if (!reverseShareToken) return null;
|
||||||
|
|
||||||
|
const reverseShare = await this.prisma.reverseShare.findUnique({
|
||||||
|
where: { token: reverseShareToken },
|
||||||
|
});
|
||||||
|
|
||||||
|
return reverseShare;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getAllByUser(userId: string) {
|
||||||
|
const reverseShares = await this.prisma.reverseShare.findMany({
|
||||||
|
where: {
|
||||||
|
creatorId: userId,
|
||||||
|
shareExpiration: { gt: new Date() },
|
||||||
|
},
|
||||||
|
orderBy: {
|
||||||
|
shareExpiration: "desc",
|
||||||
|
},
|
||||||
|
include: { shares: { include: { creator: true } } },
|
||||||
|
});
|
||||||
|
|
||||||
|
return reverseShares;
|
||||||
|
}
|
||||||
|
|
||||||
|
async isValid(reverseShareToken: string) {
|
||||||
|
const reverseShare = await this.prisma.reverseShare.findUnique({
|
||||||
|
where: { token: reverseShareToken },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!reverseShare) return false;
|
||||||
|
|
||||||
|
const isExpired = new Date() > reverseShare.shareExpiration;
|
||||||
|
const remainingUsesExceeded = reverseShare.remainingUses <= 0;
|
||||||
|
|
||||||
|
return !(isExpired || remainingUsesExceeded);
|
||||||
|
}
|
||||||
|
|
||||||
|
async remove(id: string) {
|
||||||
|
const shares = await this.prisma.share.findMany({
|
||||||
|
where: { reverseShare: { id } },
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const share of shares) {
|
||||||
|
await this.prisma.share.delete({ where: { id: share.id } });
|
||||||
|
await this.fileService.deleteAllFiles(share.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.prisma.reverseShare.delete({ where: { id } });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,6 +20,9 @@ export class ShareDTO {
|
|||||||
@Expose()
|
@Expose()
|
||||||
description: string;
|
description: string;
|
||||||
|
|
||||||
|
@Expose()
|
||||||
|
hasPassword: boolean;
|
||||||
|
|
||||||
from(partial: Partial<ShareDTO>) {
|
from(partial: Partial<ShareDTO>) {
|
||||||
return plainToClass(ShareDTO, partial, { excludeExtraneousValues: true });
|
return plainToClass(ShareDTO, partial, { excludeExtraneousValues: true });
|
||||||
}
|
}
|
||||||
|
|||||||
29
backend/src/share/guard/createShare.guard.ts
Normal file
29
backend/src/share/guard/createShare.guard.ts
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { ExecutionContext, Injectable } from "@nestjs/common";
|
||||||
|
import { JwtGuard } from "src/auth/guard/jwt.guard";
|
||||||
|
import { ConfigService } from "src/config/config.service";
|
||||||
|
import { ReverseShareService } from "src/reverseShare/reverseShare.service";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class CreateShareGuard extends JwtGuard {
|
||||||
|
constructor(
|
||||||
|
configService: ConfigService,
|
||||||
|
private reverseShareService: ReverseShareService
|
||||||
|
) {
|
||||||
|
super(configService);
|
||||||
|
}
|
||||||
|
|
||||||
|
async canActivate(context: ExecutionContext): Promise<boolean> {
|
||||||
|
if (await super.canActivate(context)) return true;
|
||||||
|
|
||||||
|
const reverseShareTokenId = context.switchToHttp().getRequest()
|
||||||
|
.cookies.reverse_share_token;
|
||||||
|
|
||||||
|
if (!reverseShareTokenId) return false;
|
||||||
|
|
||||||
|
const isReverseShareTokenValid = await this.reverseShareService.isValid(
|
||||||
|
reverseShareTokenId
|
||||||
|
);
|
||||||
|
|
||||||
|
return isReverseShareTokenValid;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,7 +5,6 @@ import {
|
|||||||
Injectable,
|
Injectable,
|
||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
import { Reflector } from "@nestjs/core";
|
|
||||||
import { Request } from "express";
|
import { Request } from "express";
|
||||||
import * as moment from "moment";
|
import * as moment from "moment";
|
||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.service";
|
||||||
@@ -14,14 +13,13 @@ import { ShareService } from "src/share/share.service";
|
|||||||
@Injectable()
|
@Injectable()
|
||||||
export class ShareSecurityGuard implements CanActivate {
|
export class ShareSecurityGuard implements CanActivate {
|
||||||
constructor(
|
constructor(
|
||||||
private reflector: Reflector,
|
|
||||||
private shareService: ShareService,
|
private shareService: ShareService,
|
||||||
private prisma: PrismaService
|
private prisma: PrismaService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async canActivate(context: ExecutionContext) {
|
async canActivate(context: ExecutionContext) {
|
||||||
const request: Request = context.switchToHttp().getRequest();
|
const request: Request = context.switchToHttp().getRequest();
|
||||||
const shareToken = request.get("X-Share-Token");
|
|
||||||
const shareId = Object.prototype.hasOwnProperty.call(
|
const shareId = Object.prototype.hasOwnProperty.call(
|
||||||
request.params,
|
request.params,
|
||||||
"shareId"
|
"shareId"
|
||||||
@@ -29,6 +27,8 @@ export class ShareSecurityGuard implements CanActivate {
|
|||||||
? request.params.shareId
|
? request.params.shareId
|
||||||
: request.params.id;
|
: request.params.id;
|
||||||
|
|
||||||
|
const shareToken = request.cookies[`share_${shareId}_token`];
|
||||||
|
|
||||||
const share = await this.prisma.share.findUnique({
|
const share = await this.prisma.share.findUnique({
|
||||||
where: { id: shareId },
|
where: { id: shareId },
|
||||||
include: { security: true },
|
include: { security: true },
|
||||||
@@ -37,7 +37,7 @@ export class ShareSecurityGuard implements CanActivate {
|
|||||||
if (
|
if (
|
||||||
!share ||
|
!share ||
|
||||||
(moment().isAfter(share.expiration) &&
|
(moment().isAfter(share.expiration) &&
|
||||||
moment(share.expiration).unix() !== 0)
|
!moment(share.expiration).isSame(0))
|
||||||
)
|
)
|
||||||
throw new NotFoundException("Share not found");
|
throw new NotFoundException("Share not found");
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import {
|
import {
|
||||||
CanActivate,
|
CanActivate,
|
||||||
ExecutionContext,
|
ExecutionContext,
|
||||||
ForbiddenException,
|
|
||||||
Injectable,
|
Injectable,
|
||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
@@ -34,12 +33,6 @@ export class ShareTokenSecurity implements CanActivate {
|
|||||||
)
|
)
|
||||||
throw new NotFoundException("Share not found");
|
throw new NotFoundException("Share not found");
|
||||||
|
|
||||||
if (share.security?.maxViews && share.security.maxViews <= share.views)
|
|
||||||
throw new ForbiddenException(
|
|
||||||
"Maximum views exceeded",
|
|
||||||
"share_max_views_exceeded"
|
|
||||||
);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,13 @@ import {
|
|||||||
HttpCode,
|
HttpCode,
|
||||||
Param,
|
Param,
|
||||||
Post,
|
Post,
|
||||||
|
Req,
|
||||||
|
Res,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
import { Throttle } from "@nestjs/throttler";
|
import { Throttle } from "@nestjs/throttler";
|
||||||
import { User } from "@prisma/client";
|
import { User } from "@prisma/client";
|
||||||
|
import { Request, Response } from "express";
|
||||||
import { GetUser } from "src/auth/decorator/getUser.decorator";
|
import { GetUser } from "src/auth/decorator/getUser.decorator";
|
||||||
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";
|
||||||
@@ -17,6 +20,7 @@ import { MyShareDTO } from "./dto/myShare.dto";
|
|||||||
import { ShareDTO } from "./dto/share.dto";
|
import { ShareDTO } from "./dto/share.dto";
|
||||||
import { ShareMetaDataDTO } from "./dto/shareMetaData.dto";
|
import { ShareMetaDataDTO } from "./dto/shareMetaData.dto";
|
||||||
import { SharePasswordDto } from "./dto/sharePassword.dto";
|
import { SharePasswordDto } from "./dto/sharePassword.dto";
|
||||||
|
import { CreateShareGuard } from "./guard/createShare.guard";
|
||||||
import { ShareOwnerGuard } from "./guard/shareOwner.guard";
|
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";
|
||||||
@@ -46,9 +50,16 @@ export class ShareController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
@UseGuards(JwtGuard)
|
@UseGuards(CreateShareGuard)
|
||||||
async create(@Body() body: CreateShareDTO, @GetUser() user: User) {
|
async create(
|
||||||
return new ShareDTO().from(await this.shareService.create(body, user));
|
@Body() body: CreateShareDTO,
|
||||||
|
@Req() request: Request,
|
||||||
|
@GetUser() user: User
|
||||||
|
) {
|
||||||
|
const { reverse_share_token } = request.cookies;
|
||||||
|
return new ShareDTO().from(
|
||||||
|
await this.shareService.create(body, user, reverse_share_token)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete(":id")
|
@Delete(":id")
|
||||||
@@ -59,21 +70,35 @@ export class ShareController {
|
|||||||
|
|
||||||
@Post(":id/complete")
|
@Post(":id/complete")
|
||||||
@HttpCode(202)
|
@HttpCode(202)
|
||||||
@UseGuards(JwtGuard, ShareOwnerGuard)
|
@UseGuards(CreateShareGuard, ShareOwnerGuard)
|
||||||
async complete(@Param("id") id: string) {
|
async complete(@Param("id") id: string, @Req() request: Request) {
|
||||||
return new ShareDTO().from(await this.shareService.complete(id));
|
const { reverse_share_token } = request.cookies;
|
||||||
|
return new ShareDTO().from(
|
||||||
|
await this.shareService.complete(id, reverse_share_token)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Throttle(10, 60)
|
||||||
@Get("isShareIdAvailable/:id")
|
@Get("isShareIdAvailable/:id")
|
||||||
async isShareIdAvailable(@Param("id") id: string) {
|
async isShareIdAvailable(@Param("id") id: string) {
|
||||||
return this.shareService.isShareIdAvailable(id);
|
return this.shareService.isShareIdAvailable(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@HttpCode(200)
|
@HttpCode(200)
|
||||||
@Throttle(10, 5 * 60)
|
@Throttle(20, 5 * 60)
|
||||||
@UseGuards(ShareTokenSecurity)
|
@UseGuards(ShareTokenSecurity)
|
||||||
@Post(":id/token")
|
@Post(":id/token")
|
||||||
async getShareToken(@Param("id") id: string, @Body() body: SharePasswordDto) {
|
async getShareToken(
|
||||||
return this.shareService.getShareToken(id, body.password);
|
@Param("id") id: string,
|
||||||
|
@Res({ passthrough: true }) response: Response,
|
||||||
|
@Body() body: SharePasswordDto
|
||||||
|
) {
|
||||||
|
const token = await this.shareService.getShareToken(id, body.password);
|
||||||
|
response.cookie(`share_${id}_token`, token, {
|
||||||
|
path: "/",
|
||||||
|
httpOnly: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
return { token };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,20 @@
|
|||||||
import { forwardRef, Module } from "@nestjs/common";
|
import { forwardRef, Module } from "@nestjs/common";
|
||||||
import { JwtModule } from "@nestjs/jwt";
|
import { JwtModule } from "@nestjs/jwt";
|
||||||
|
import { ClamScanModule } from "src/clamscan/clamscan.module";
|
||||||
import { EmailModule } from "src/email/email.module";
|
import { EmailModule } from "src/email/email.module";
|
||||||
import { FileModule } from "src/file/file.module";
|
import { FileModule } from "src/file/file.module";
|
||||||
|
import { ReverseShareModule } from "src/reverseShare/reverseShare.module";
|
||||||
import { ShareController } from "./share.controller";
|
import { ShareController } from "./share.controller";
|
||||||
import { ShareService } from "./share.service";
|
import { ShareService } from "./share.service";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [JwtModule.register({}), EmailModule, forwardRef(() => FileModule)],
|
imports: [
|
||||||
|
JwtModule.register({}),
|
||||||
|
EmailModule,
|
||||||
|
ClamScanModule,
|
||||||
|
ReverseShareModule,
|
||||||
|
forwardRef(() => FileModule),
|
||||||
|
],
|
||||||
controllers: [ShareController],
|
controllers: [ShareController],
|
||||||
providers: [ShareService],
|
providers: [ShareService],
|
||||||
exports: [ShareService],
|
exports: [ShareService],
|
||||||
|
|||||||
@@ -10,10 +10,12 @@ import * as archiver from "archiver";
|
|||||||
import * as argon from "argon2";
|
import * as argon from "argon2";
|
||||||
import * as fs from "fs";
|
import * as fs from "fs";
|
||||||
import * as moment from "moment";
|
import * as moment from "moment";
|
||||||
|
import { ClamScanService } from "src/clamscan/clamscan.service";
|
||||||
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";
|
||||||
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 { CreateShareDTO } from "./dto/createShare.dto";
|
import { CreateShareDTO } from "./dto/createShare.dto";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@@ -23,10 +25,12 @@ export class ShareService {
|
|||||||
private fileService: FileService,
|
private fileService: FileService,
|
||||||
private emailService: EmailService,
|
private emailService: EmailService,
|
||||||
private config: ConfigService,
|
private config: ConfigService,
|
||||||
private jwtService: JwtService
|
private jwtService: JwtService,
|
||||||
|
private reverseShareService: ReverseShareService,
|
||||||
|
private clamScanService: ClamScanService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(share: CreateShareDTO, user?: User) {
|
async create(share: CreateShareDTO, user?: User, reverseShareToken?: string) {
|
||||||
if (!(await this.isShareIdAvailable(share.id)).isAvailable)
|
if (!(await this.isShareIdAvailable(share.id)).isAvailable)
|
||||||
throw new BadRequestException("Share id already in use");
|
throw new BadRequestException("Share id already in use");
|
||||||
|
|
||||||
@@ -37,26 +41,35 @@ export class ShareService {
|
|||||||
share.security.password = await argon.hash(share.security.password);
|
share.security.password = await argon.hash(share.security.password);
|
||||||
}
|
}
|
||||||
|
|
||||||
// We have to add an exception for "never" (since moment won't like that)
|
|
||||||
let expirationDate: Date;
|
let expirationDate: Date;
|
||||||
if (share.expiration !== "never") {
|
|
||||||
expirationDate = moment()
|
|
||||||
.add(
|
|
||||||
share.expiration.split("-")[0],
|
|
||||||
share.expiration.split(
|
|
||||||
"-"
|
|
||||||
)[1] as moment.unitOfTime.DurationConstructor
|
|
||||||
)
|
|
||||||
.toDate();
|
|
||||||
|
|
||||||
// Throw error if expiration date is now
|
// If share is created by a reverse share token override the expiration date
|
||||||
if (expirationDate.setMilliseconds(0) == new Date().setMilliseconds(0))
|
const reverseShare = await this.reverseShareService.getByToken(
|
||||||
throw new BadRequestException("Invalid expiration date");
|
reverseShareToken
|
||||||
|
);
|
||||||
|
if (reverseShare) {
|
||||||
|
expirationDate = reverseShare.shareExpiration;
|
||||||
} else {
|
} else {
|
||||||
expirationDate = moment(0).toDate();
|
// We have to add an exception for "never" (since moment won't like that)
|
||||||
|
if (share.expiration !== "never") {
|
||||||
|
expirationDate = moment()
|
||||||
|
.add(
|
||||||
|
share.expiration.split("-")[0],
|
||||||
|
share.expiration.split(
|
||||||
|
"-"
|
||||||
|
)[1] as moment.unitOfTime.DurationConstructor
|
||||||
|
)
|
||||||
|
.toDate();
|
||||||
|
} else {
|
||||||
|
expirationDate = moment(0).toDate();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return await this.prisma.share.create({
|
fs.mkdirSync(`./data/uploads/shares/${share.id}`, {
|
||||||
|
recursive: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
const shareTuple = await this.prisma.share.create({
|
||||||
data: {
|
data: {
|
||||||
...share,
|
...share,
|
||||||
expiration: expirationDate,
|
expiration: expirationDate,
|
||||||
@@ -69,6 +82,20 @@ export class ShareService {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (reverseShare) {
|
||||||
|
// Assign share to reverse share token
|
||||||
|
await this.prisma.reverseShare.update({
|
||||||
|
where: { token: reverseShareToken },
|
||||||
|
data: {
|
||||||
|
shares: {
|
||||||
|
connect: { id: shareTuple.id },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return shareTuple;
|
||||||
}
|
}
|
||||||
|
|
||||||
async createZip(shareId: string) {
|
async createZip(shareId: string) {
|
||||||
@@ -90,10 +117,15 @@ export class ShareService {
|
|||||||
await archive.finalize();
|
await archive.finalize();
|
||||||
}
|
}
|
||||||
|
|
||||||
async complete(id: string) {
|
async complete(id: string, reverseShareToken?: string) {
|
||||||
const share = await this.prisma.share.findUnique({
|
const share = await this.prisma.share.findUnique({
|
||||||
where: { id },
|
where: { id },
|
||||||
include: { files: true, recipients: true, creator: true },
|
include: {
|
||||||
|
files: true,
|
||||||
|
recipients: true,
|
||||||
|
creator: true,
|
||||||
|
reverseShare: { include: { creator: true } },
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (await this.isShareCompleted(id))
|
if (await this.isShareCompleted(id))
|
||||||
@@ -112,13 +144,34 @@ export class ShareService {
|
|||||||
|
|
||||||
// Send email for each recepient
|
// Send email for each recepient
|
||||||
for (const recepient of share.recipients) {
|
for (const recepient of share.recipients) {
|
||||||
await this.emailService.sendMail(
|
await this.emailService.sendMailToShareRecepients(
|
||||||
recepient.email,
|
recepient.email,
|
||||||
share.id,
|
share.id,
|
||||||
share.creator
|
share.creator
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
share.reverseShare &&
|
||||||
|
this.config.get("SMTP_ENABLED") &&
|
||||||
|
share.reverseShare.sendEmailNotification
|
||||||
|
) {
|
||||||
|
await this.emailService.sendMailToReverseShareCreator(
|
||||||
|
share.reverseShare.creator.email,
|
||||||
|
share.id
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if any file is malicious with ClamAV
|
||||||
|
this.clamScanService.checkAndRemove(share.id);
|
||||||
|
|
||||||
|
if (share.reverseShare) {
|
||||||
|
await this.prisma.reverseShare.update({
|
||||||
|
where: { token: reverseShareToken },
|
||||||
|
data: { remainingUses: { decrement: 1 } },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return await this.prisma.share.update({
|
return await this.prisma.share.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: { uploadLocked: true },
|
data: { uploadLocked: true },
|
||||||
@@ -152,19 +205,25 @@ export class ShareService {
|
|||||||
return sharesWithEmailRecipients;
|
return sharesWithEmailRecipients;
|
||||||
}
|
}
|
||||||
|
|
||||||
async get(id: string) {
|
async get(id: string): Promise<any> {
|
||||||
const share: any = await this.prisma.share.findUnique({
|
const share = await this.prisma.share.findUnique({
|
||||||
where: { id },
|
where: { id },
|
||||||
include: {
|
include: {
|
||||||
files: true,
|
files: true,
|
||||||
creator: true,
|
creator: true,
|
||||||
|
security: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (share.removedReason)
|
||||||
|
throw new NotFoundException(share.removedReason, "share_removed");
|
||||||
|
|
||||||
if (!share || !share.uploadLocked)
|
if (!share || !share.uploadLocked)
|
||||||
throw new NotFoundException("Share not found");
|
throw new NotFoundException("Share not found");
|
||||||
|
return {
|
||||||
return share;
|
...share,
|
||||||
|
hasPassword: share.security?.password ? true : false,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async getMetaData(id: string) {
|
async getMetaData(id: string) {
|
||||||
@@ -218,12 +277,20 @@ export class ShareService {
|
|||||||
if (
|
if (
|
||||||
share?.security?.password &&
|
share?.security?.password &&
|
||||||
!(await argon.verify(share.security.password, password))
|
!(await argon.verify(share.security.password, password))
|
||||||
)
|
) {
|
||||||
throw new ForbiddenException("Wrong password");
|
throw new ForbiddenException("Wrong password");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (share.security?.maxViews && share.security.maxViews <= share.views) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
"Maximum views exceeded",
|
||||||
|
"share_max_views_exceeded"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const token = await this.generateShareToken(shareId);
|
const token = await this.generateShareToken(shareId);
|
||||||
await this.increaseViewCount(share);
|
await this.increaseViewCount(share);
|
||||||
return { token };
|
return token;
|
||||||
}
|
}
|
||||||
|
|
||||||
async generateShareToken(shareId: string) {
|
async generateShareToken(shareId: string) {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { PickType } from "@nestjs/mapped-types";
|
import { PickType } from "@nestjs/swagger";
|
||||||
import { UserDTO } from "./user.dto";
|
import { UserDTO } from "./user.dto";
|
||||||
|
|
||||||
export class PublicUserDTO extends PickType(UserDTO, ["username"] as const) {}
|
export class PublicUserDTO extends PickType(UserDTO, ["username"] as const) {}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { OmitType, PartialType } from "@nestjs/mapped-types";
|
import { OmitType, PartialType } from "@nestjs/swagger";
|
||||||
import { UserDTO } from "./user.dto";
|
import { UserDTO } from "./user.dto";
|
||||||
|
|
||||||
export class UpdateOwnUserDTO extends PartialType(
|
export class UpdateOwnUserDTO extends PartialType(
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { PartialType } from "@nestjs/mapped-types";
|
import { PartialType } from "@nestjs/swagger";
|
||||||
import { CreateUserDTO } from "./createUser.dto";
|
import { CreateUserDTO } from "./createUser.dto";
|
||||||
|
|
||||||
export class UpdateUserDto extends PartialType(CreateUserDTO) {}
|
export class UpdateUserDto extends PartialType(CreateUserDTO) {}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import * as argon from "argon2";
|
|||||||
import { PrismaService } from "src/prisma/prisma.service";
|
import { PrismaService } from "src/prisma/prisma.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";
|
||||||
import { UserDTO } from "./dto/user.dto";
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class UserSevice {
|
export class UserSevice {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"info": {
|
"info": {
|
||||||
"_postman_id": "84a95987-2997-429a-aba6-d38289b0b76a",
|
"_postman_id": "cd31bdf9-d558-42da-9231-154721476cd2",
|
||||||
"name": "Pingvin Share Testing",
|
"name": "Pingvin Share Testing",
|
||||||
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
|
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
|
||||||
"_exporter_id": "17822132"
|
"_exporter_id": "17822132"
|
||||||
@@ -18,12 +18,12 @@
|
|||||||
"exec": [
|
"exec": [
|
||||||
"if(pm.response.to.have.status(201)){",
|
"if(pm.response.to.have.status(201)){",
|
||||||
" const token = pm.response.json()[\"accessToken\"]",
|
" const token = pm.response.json()[\"accessToken\"]",
|
||||||
" pm.collectionVariables.set(\"USER_AUTH_TOKEN\", token)",
|
|
||||||
"",
|
|
||||||
" // Get user id",
|
" // Get user id",
|
||||||
" const jwtPayload = JSON.parse(atob(token.split('.')[1]));",
|
" const jwtPayload = JSON.parse(atob(token.split('.')[1]));",
|
||||||
" const userId = jwtPayload[\"sub\"]",
|
" const userId = jwtPayload[\"sub\"]",
|
||||||
" pm.collectionVariables.set(\"USER_ID\", userId)",
|
" pm.collectionVariables.set(\"USER_ID\", userId)",
|
||||||
|
"",
|
||||||
|
" pm.collectionVariables.set(\"COOKIES\", pm.response.headers.get(\"Set-Cookie\"))",
|
||||||
"}",
|
"}",
|
||||||
""
|
""
|
||||||
],
|
],
|
||||||
@@ -80,6 +80,7 @@
|
|||||||
" pm.expect(responseBody).to.have.property(\"accessToken\")",
|
" pm.expect(responseBody).to.have.property(\"accessToken\")",
|
||||||
" pm.expect(responseBody).to.have.property(\"refreshToken\")",
|
" pm.expect(responseBody).to.have.property(\"refreshToken\")",
|
||||||
"});",
|
"});",
|
||||||
|
"",
|
||||||
""
|
""
|
||||||
],
|
],
|
||||||
"type": "text/javascript"
|
"type": "text/javascript"
|
||||||
@@ -97,7 +98,7 @@
|
|||||||
],
|
],
|
||||||
"body": {
|
"body": {
|
||||||
"mode": "raw",
|
"mode": "raw",
|
||||||
"raw": "{\n \"email\": \"system2@test.org\",\n \"username\": \"system.test2\",\n \"password\": \"N44HcHgeuAvfCT\"\n}",
|
"raw": "{\n \"email\": \"system2@test.org\",\n \"username\": \"system2.test\",\n \"password\": \"N44HcHgeuAvfCT\"\n}",
|
||||||
"options": {
|
"options": {
|
||||||
"raw": {
|
"raw": {
|
||||||
"language": "json"
|
"language": "json"
|
||||||
@@ -477,28 +478,34 @@
|
|||||||
"pm.test(\"Response body correct\", () => {",
|
"pm.test(\"Response body correct\", () => {",
|
||||||
" 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(Object.keys(responseBody).length).be.equal(1)",
|
" pm.expect(responseBody.name).to.be.equal(\"test-file.txt\")",
|
||||||
|
" pm.expect(Object.keys(responseBody).length).be.equal(2)",
|
||||||
"});"
|
"});"
|
||||||
],
|
],
|
||||||
"type": "text/javascript"
|
"type": "text/javascript"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"protocolProfileBehavior": {
|
||||||
|
"disabledSystemHeaders": {
|
||||||
|
"content-type": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"request": {
|
"request": {
|
||||||
"method": "POST",
|
"method": "POST",
|
||||||
"header": [],
|
"header": [
|
||||||
|
{
|
||||||
|
"key": "Content-Type",
|
||||||
|
"value": "application/octet-stream",
|
||||||
|
"type": "text"
|
||||||
|
}
|
||||||
|
],
|
||||||
"body": {
|
"body": {
|
||||||
"mode": "formdata",
|
"mode": "raw",
|
||||||
"formdata": [
|
"raw": "data:application/octet-stream;base64,VGhpcyBpcyBhIHRlc3QgZmlsZWQgdXNlZCBmb3IgdXBsb2FkaW5nIGluIHRoZSBzeXN0ZW0gdGVzdC4="
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"url": {
|
"url": {
|
||||||
"raw": "{{API_URL}}/shares/:shareId/files",
|
"raw": "{{API_URL}}/shares/:shareId/files?name=test-file.txt&chunkIndex=0&totalChunks=1",
|
||||||
"host": [
|
"host": [
|
||||||
"{{API_URL}}"
|
"{{API_URL}}"
|
||||||
],
|
],
|
||||||
@@ -507,6 +514,20 @@
|
|||||||
":shareId",
|
":shareId",
|
||||||
"files"
|
"files"
|
||||||
],
|
],
|
||||||
|
"query": [
|
||||||
|
{
|
||||||
|
"key": "name",
|
||||||
|
"value": "test-file.txt"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "chunkIndex",
|
||||||
|
"value": "0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "totalChunks",
|
||||||
|
"value": "1"
|
||||||
|
}
|
||||||
|
],
|
||||||
"variable": [
|
"variable": [
|
||||||
{
|
{
|
||||||
"key": "shareId",
|
"key": "shareId",
|
||||||
@@ -530,29 +551,34 @@
|
|||||||
"",
|
"",
|
||||||
"pm.test(\"Response body correct\", () => {",
|
"pm.test(\"Response body correct\", () => {",
|
||||||
" const responseBody = pm.response.json();",
|
" const responseBody = pm.response.json();",
|
||||||
" pm.expect(responseBody).to.have.property(\"id\")",
|
" pm.expect(responseBody.name).to.be.equal(\"test-file2.txt\")",
|
||||||
" pm.expect(Object.keys(responseBody).length).be.equal(1)",
|
" pm.expect(Object.keys(responseBody).length).be.equal(2)",
|
||||||
"});"
|
"});"
|
||||||
],
|
],
|
||||||
"type": "text/javascript"
|
"type": "text/javascript"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"protocolProfileBehavior": {
|
||||||
|
"disabledSystemHeaders": {
|
||||||
|
"content-type": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"request": {
|
"request": {
|
||||||
"method": "POST",
|
"method": "POST",
|
||||||
"header": [],
|
"header": [
|
||||||
|
{
|
||||||
|
"key": "Content-Type",
|
||||||
|
"value": "application/octet-stream",
|
||||||
|
"type": "text"
|
||||||
|
}
|
||||||
|
],
|
||||||
"body": {
|
"body": {
|
||||||
"mode": "formdata",
|
"mode": "raw",
|
||||||
"formdata": [
|
"raw": "data:application/octet-stream;base64,VGhpcyBpcyBhIHRlc3QgZmlsZWQgdXNlZCBmb3IgdXBsb2FkaW5nIGluIHRoZSBzeXN0ZW0gdGVzdC4="
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"url": {
|
"url": {
|
||||||
"raw": "{{API_URL}}/shares/:shareId/files",
|
"raw": "{{API_URL}}/shares/:shareId/files?name=test-file2.txt&chunkIndex=0&totalChunks=1",
|
||||||
"host": [
|
"host": [
|
||||||
"{{API_URL}}"
|
"{{API_URL}}"
|
||||||
],
|
],
|
||||||
@@ -561,6 +587,20 @@
|
|||||||
":shareId",
|
":shareId",
|
||||||
"files"
|
"files"
|
||||||
],
|
],
|
||||||
|
"query": [
|
||||||
|
{
|
||||||
|
"key": "name",
|
||||||
|
"value": "test-file2.txt"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "chunkIndex",
|
||||||
|
"value": "0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "totalChunks",
|
||||||
|
"value": "1"
|
||||||
|
}
|
||||||
|
],
|
||||||
"variable": [
|
"variable": [
|
||||||
{
|
{
|
||||||
"key": "shareId",
|
"key": "shareId",
|
||||||
@@ -764,16 +804,6 @@
|
|||||||
"request": {
|
"request": {
|
||||||
"method": "POST",
|
"method": "POST",
|
||||||
"header": [],
|
"header": [],
|
||||||
"body": {
|
|
||||||
"mode": "formdata",
|
|
||||||
"formdata": [
|
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"url": {
|
"url": {
|
||||||
"raw": "{{API_URL}}/shares/:shareId/files",
|
"raw": "{{API_URL}}/shares/:shareId/files",
|
||||||
"host": [
|
"host": [
|
||||||
@@ -813,16 +843,6 @@
|
|||||||
"request": {
|
"request": {
|
||||||
"method": "POST",
|
"method": "POST",
|
||||||
"header": [],
|
"header": [],
|
||||||
"body": {
|
|
||||||
"mode": "formdata",
|
|
||||||
"formdata": [
|
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"url": {
|
"url": {
|
||||||
"raw": "{{API_URL}}/shares/:shareId/files",
|
"raw": "{{API_URL}}/shares/:shareId/files",
|
||||||
"host": [
|
"host": [
|
||||||
@@ -947,7 +967,8 @@
|
|||||||
" pm.expect(Object.keys(responseBody).length).be.equal(1)",
|
" pm.expect(Object.keys(responseBody).length).be.equal(1)",
|
||||||
"});",
|
"});",
|
||||||
"",
|
"",
|
||||||
"pm.collectionVariables.set(\"shareToken\", pm.response.json().token)"
|
"pm.collectionVariables.set(\"COOKIES\", `${pm.collectionVariables.get(\"COOKIES\")};${pm.response.headers.get(\"Set-Cookie\")}`)",
|
||||||
|
""
|
||||||
],
|
],
|
||||||
"type": "text/javascript"
|
"type": "text/javascript"
|
||||||
}
|
}
|
||||||
@@ -1001,8 +1022,6 @@
|
|||||||
" pm.expect(responseBody.files.length).be.equal(2)",
|
" pm.expect(responseBody.files.length).be.equal(2)",
|
||||||
"});",
|
"});",
|
||||||
"",
|
"",
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"pm.collectionVariables.set(\"fileId\", pm.response.json().files[0].id)"
|
"pm.collectionVariables.set(\"fileId\", pm.response.json().files[0].id)"
|
||||||
],
|
],
|
||||||
"type": "text/javascript"
|
"type": "text/javascript"
|
||||||
@@ -1011,13 +1030,7 @@
|
|||||||
],
|
],
|
||||||
"request": {
|
"request": {
|
||||||
"method": "GET",
|
"method": "GET",
|
||||||
"header": [
|
"header": [],
|
||||||
{
|
|
||||||
"key": "X-Share-Token",
|
|
||||||
"value": "{{shareToken}}",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"url": {
|
"url": {
|
||||||
"raw": "{{API_URL}}/shares/:shareId",
|
"raw": "{{API_URL}}/shares/:shareId",
|
||||||
"host": [
|
"host": [
|
||||||
@@ -1037,88 +1050,6 @@
|
|||||||
},
|
},
|
||||||
"response": []
|
"response": []
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "Get file download url",
|
|
||||||
"event": [
|
|
||||||
{
|
|
||||||
"listen": "test",
|
|
||||||
"script": {
|
|
||||||
"exec": [
|
|
||||||
"let URL = require('url');",
|
|
||||||
"",
|
|
||||||
"pm.test(\"Status code is 200\", () => {",
|
|
||||||
" pm.response.to.have.status(200);",
|
|
||||||
"});",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"pm.test(\"Response body correct\", () => {",
|
|
||||||
" const responseBody = pm.response.json();",
|
|
||||||
" pm.expect(responseBody).to.have.property(\"url\")",
|
|
||||||
" pm.expect(Object.keys(responseBody).length).be.equal(1)",
|
|
||||||
"});",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"const path = URL.parse(pm.response.json().url).path.replace(\"/api/\", \"\")",
|
|
||||||
"",
|
|
||||||
"pm.collectionVariables.set(\"fileDownloadPath\",path )"
|
|
||||||
],
|
|
||||||
"type": "text/javascript"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"protocolProfileBehavior": {
|
|
||||||
"disableBodyPruning": true
|
|
||||||
},
|
|
||||||
"request": {
|
|
||||||
"method": "GET",
|
|
||||||
"header": [
|
|
||||||
{
|
|
||||||
"key": "X-Share-Token",
|
|
||||||
"value": "{{shareToken}}",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"body": {
|
|
||||||
"mode": "formdata",
|
|
||||||
"formdata": [
|
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "shareId",
|
|
||||||
"value": "868c6a44-fb8c-4768-ad0d-ef22feebc8ea",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"url": {
|
|
||||||
"raw": "{{API_URL}}/shares/:shareId/files/:fileId/download",
|
|
||||||
"host": [
|
|
||||||
"{{API_URL}}"
|
|
||||||
],
|
|
||||||
"path": [
|
|
||||||
"shares",
|
|
||||||
":shareId",
|
|
||||||
"files",
|
|
||||||
":fileId",
|
|
||||||
"download"
|
|
||||||
],
|
|
||||||
"variable": [
|
|
||||||
{
|
|
||||||
"key": "shareId",
|
|
||||||
"value": "test-share"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "fileId",
|
|
||||||
"value": "{{fileId}}"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"response": []
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Get File",
|
"name": "Get File",
|
||||||
"event": [
|
"event": [
|
||||||
@@ -1134,97 +1065,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"protocolProfileBehavior": {
|
|
||||||
"disableBodyPruning": true
|
|
||||||
},
|
|
||||||
"request": {
|
"request": {
|
||||||
"method": "GET",
|
"method": "GET",
|
||||||
"header": [],
|
"header": [],
|
||||||
"body": {
|
|
||||||
"mode": "formdata",
|
|
||||||
"formdata": [
|
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "shareId",
|
|
||||||
"value": "868c6a44-fb8c-4768-ad0d-ef22feebc8ea",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"url": {
|
"url": {
|
||||||
"raw": "{{API_URL}}/{{fileDownloadPath}}",
|
"raw": "{{API_URL}}/shares/:shareId/files/{{fileId}}",
|
||||||
"host": [
|
|
||||||
"{{API_URL}}"
|
|
||||||
],
|
|
||||||
"path": [
|
|
||||||
"{{fileDownloadPath}}"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"response": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Get zip download url",
|
|
||||||
"event": [
|
|
||||||
{
|
|
||||||
"listen": "test",
|
|
||||||
"script": {
|
|
||||||
"exec": [
|
|
||||||
"let URL = require('url');",
|
|
||||||
"",
|
|
||||||
"pm.test(\"Status code is 200\", () => {",
|
|
||||||
" pm.response.to.have.status(200);",
|
|
||||||
"});",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"pm.test(\"Response body correct\", () => {",
|
|
||||||
" const responseBody = pm.response.json();",
|
|
||||||
" pm.expect(responseBody).to.have.property(\"url\")",
|
|
||||||
" pm.expect(Object.keys(responseBody).length).be.equal(1)",
|
|
||||||
"});",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"const path = URL.parse(pm.response.json().url).path.replace(\"/api/\", \"\")",
|
|
||||||
"",
|
|
||||||
"pm.collectionVariables.set(\"zipDownloadPath\",path )"
|
|
||||||
],
|
|
||||||
"type": "text/javascript"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"protocolProfileBehavior": {
|
|
||||||
"disableBodyPruning": true
|
|
||||||
},
|
|
||||||
"request": {
|
|
||||||
"method": "GET",
|
|
||||||
"header": [
|
|
||||||
{
|
|
||||||
"key": "X-Share-Token",
|
|
||||||
"value": "{{shareToken}}",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"body": {
|
|
||||||
"mode": "formdata",
|
|
||||||
"formdata": [
|
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "shareId",
|
|
||||||
"value": "868c6a44-fb8c-4768-ad0d-ef22feebc8ea",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"url": {
|
|
||||||
"raw": "{{API_URL}}/shares/:shareId/files/zip/download",
|
|
||||||
"host": [
|
"host": [
|
||||||
"{{API_URL}}"
|
"{{API_URL}}"
|
||||||
],
|
],
|
||||||
@@ -1232,8 +1077,7 @@
|
|||||||
"shares",
|
"shares",
|
||||||
":shareId",
|
":shareId",
|
||||||
"files",
|
"files",
|
||||||
"zip",
|
"{{fileId}}"
|
||||||
"download"
|
|
||||||
],
|
],
|
||||||
"variable": [
|
"variable": [
|
||||||
{
|
{
|
||||||
@@ -1266,64 +1110,16 @@
|
|||||||
"request": {
|
"request": {
|
||||||
"method": "GET",
|
"method": "GET",
|
||||||
"header": [],
|
"header": [],
|
||||||
"body": {
|
|
||||||
"mode": "formdata",
|
|
||||||
"formdata": [
|
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "shareId",
|
|
||||||
"value": "868c6a44-fb8c-4768-ad0d-ef22feebc8ea",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"url": {
|
"url": {
|
||||||
"raw": "{{API_URL}}/{{zipDownloadPath}}",
|
"raw": "{{API_URL}}/shares/:shareId/files/zip",
|
||||||
"host": [
|
|
||||||
"{{API_URL}}"
|
|
||||||
],
|
|
||||||
"path": [
|
|
||||||
"{{zipDownloadPath}}"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"response": []
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Negative",
|
|
||||||
"item": [
|
|
||||||
{
|
|
||||||
"name": "Get share - No token",
|
|
||||||
"event": [
|
|
||||||
{
|
|
||||||
"listen": "test",
|
|
||||||
"script": {
|
|
||||||
"exec": [
|
|
||||||
"pm.test(\"Status code is 403\", () => {",
|
|
||||||
" pm.response.to.have.status(403);",
|
|
||||||
"});"
|
|
||||||
],
|
|
||||||
"type": "text/javascript"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"request": {
|
|
||||||
"method": "GET",
|
|
||||||
"header": [],
|
|
||||||
"url": {
|
|
||||||
"raw": "{{API_URL}}/shares/:shareId",
|
|
||||||
"host": [
|
"host": [
|
||||||
"{{API_URL}}"
|
"{{API_URL}}"
|
||||||
],
|
],
|
||||||
"path": [
|
"path": [
|
||||||
"shares",
|
"shares",
|
||||||
":shareId"
|
":shareId",
|
||||||
|
"files",
|
||||||
|
"zip"
|
||||||
],
|
],
|
||||||
"variable": [
|
"variable": [
|
||||||
{
|
{
|
||||||
@@ -1334,7 +1130,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"response": []
|
"response": []
|
||||||
},
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Negative",
|
||||||
|
"item": [
|
||||||
{
|
{
|
||||||
"name": "Get share token - Wrong password",
|
"name": "Get share token - Wrong password",
|
||||||
"event": [
|
"event": [
|
||||||
@@ -1428,151 +1229,19 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"response": []
|
"response": []
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Get file download url - No token",
|
|
||||||
"event": [
|
|
||||||
{
|
|
||||||
"listen": "test",
|
|
||||||
"script": {
|
|
||||||
"exec": [
|
|
||||||
"pm.test(\"Status code is 403\", () => {",
|
|
||||||
" pm.response.to.have.status(403);",
|
|
||||||
"});",
|
|
||||||
""
|
|
||||||
],
|
|
||||||
"type": "text/javascript"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"protocolProfileBehavior": {
|
|
||||||
"disableBodyPruning": true
|
|
||||||
},
|
|
||||||
"request": {
|
|
||||||
"method": "GET",
|
|
||||||
"header": [],
|
|
||||||
"body": {
|
|
||||||
"mode": "formdata",
|
|
||||||
"formdata": [
|
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "shareId",
|
|
||||||
"value": "868c6a44-fb8c-4768-ad0d-ef22feebc8ea",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"url": {
|
|
||||||
"raw": "{{API_URL}}/shares/:shareId/files/:fileId/download",
|
|
||||||
"host": [
|
|
||||||
"{{API_URL}}"
|
|
||||||
],
|
|
||||||
"path": [
|
|
||||||
"shares",
|
|
||||||
":shareId",
|
|
||||||
"files",
|
|
||||||
":fileId",
|
|
||||||
"download"
|
|
||||||
],
|
|
||||||
"variable": [
|
|
||||||
{
|
|
||||||
"key": "shareId",
|
|
||||||
"value": "test-share"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "fileId",
|
|
||||||
"value": "{{fileId}}"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"response": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Get zip download url - No token",
|
|
||||||
"event": [
|
|
||||||
{
|
|
||||||
"listen": "test",
|
|
||||||
"script": {
|
|
||||||
"exec": [
|
|
||||||
"pm.test(\"Status code is 403\", () => {",
|
|
||||||
" pm.response.to.have.status(403);",
|
|
||||||
"});",
|
|
||||||
""
|
|
||||||
],
|
|
||||||
"type": "text/javascript"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"protocolProfileBehavior": {
|
|
||||||
"disableBodyPruning": true
|
|
||||||
},
|
|
||||||
"request": {
|
|
||||||
"method": "GET",
|
|
||||||
"header": [],
|
|
||||||
"body": {
|
|
||||||
"mode": "formdata",
|
|
||||||
"formdata": [
|
|
||||||
{
|
|
||||||
"key": "file",
|
|
||||||
"type": "file",
|
|
||||||
"src": "./test/system/test-file.txt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "shareId",
|
|
||||||
"value": "868c6a44-fb8c-4768-ad0d-ef22feebc8ea",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"url": {
|
|
||||||
"raw": "{{API_URL}}/shares/:shareId/files/zip/download",
|
|
||||||
"host": [
|
|
||||||
"{{API_URL}}"
|
|
||||||
],
|
|
||||||
"path": [
|
|
||||||
"shares",
|
|
||||||
":shareId",
|
|
||||||
"files",
|
|
||||||
"zip",
|
|
||||||
"download"
|
|
||||||
],
|
|
||||||
"variable": [
|
|
||||||
{
|
|
||||||
"key": "shareId",
|
|
||||||
"value": "test-share"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"response": []
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"auth": {
|
|
||||||
"type": "bearer",
|
|
||||||
"bearer": [
|
|
||||||
{
|
|
||||||
"key": "token",
|
|
||||||
"value": "{{USER_AUTH_TOKEN}}",
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"event": [
|
"event": [
|
||||||
{
|
{
|
||||||
"listen": "prerequest",
|
"listen": "prerequest",
|
||||||
"script": {
|
"script": {
|
||||||
"type": "text/javascript",
|
"type": "text/javascript",
|
||||||
"exec": [
|
"exec": [
|
||||||
""
|
"pm.request.addHeader(\"Cookie\", pm.collectionVariables.get(\"COOKIES\"))"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1 +0,0 @@
|
|||||||
This is a test filed used for uploading in the system test.
|
|
||||||
7
docker-compose-dev.yml
Normal file
7
docker-compose-dev.yml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
version: '3.8'
|
||||||
|
services:
|
||||||
|
clamav:
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- 3310:3310
|
||||||
|
image: clamav/clamav
|
||||||
@@ -6,4 +6,13 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- 3000:3000
|
- 3000:3000
|
||||||
volumes:
|
volumes:
|
||||||
- "${PWD}/data:/opt/app/backend/data"
|
- "./data:/opt/app/backend/data"
|
||||||
|
# Optional: If you add ClamAV, uncomment the following to have ClamAV start first.
|
||||||
|
# depends_on:
|
||||||
|
# clamav:
|
||||||
|
# condition: service_healthy
|
||||||
|
# Optional: Add ClamAV (see README.md)
|
||||||
|
# ClamAV is currently only available for AMD64 see https://github.com/Cisco-Talos/clamav/issues/482
|
||||||
|
# clamav:
|
||||||
|
# restart: unless-stopped
|
||||||
|
# image: clamav/clamav
|
||||||
|
|||||||
@@ -1,8 +1,14 @@
|
|||||||
/** @type {import('next').NextConfig} */
|
/** @type {import('next').NextConfig} */
|
||||||
|
|
||||||
|
const { version } = require('./package.json');
|
||||||
|
|
||||||
const withPWA = require("next-pwa")({
|
const withPWA = require("next-pwa")({
|
||||||
dest: "public",
|
dest: "public",
|
||||||
disable: process.env.NODE_ENV == "development",
|
disable: process.env.NODE_ENV == "development",
|
||||||
});
|
});
|
||||||
|
|
||||||
module.exports = withPWA({ output: "standalone" });
|
module.exports = withPWA({
|
||||||
|
output: "standalone", env: {
|
||||||
|
VERSION: version,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|||||||
752
frontend/package-lock.json
generated
752
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pingvin-share",
|
"name": "pingvin-share-frontend",
|
||||||
"version": "0.0.1",
|
"version": "0.10.2",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
@@ -11,19 +11,21 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.10.5",
|
"@emotion/react": "^11.10.5",
|
||||||
"@emotion/server": "^11.10.0",
|
"@emotion/server": "^11.10.0",
|
||||||
"@mantine/core": "^5.9.2",
|
"@mantine/core": "^5.10.0",
|
||||||
"@mantine/dropzone": "^5.9.2",
|
"@mantine/dropzone": "^5.10.0",
|
||||||
"@mantine/form": "^5.9.2",
|
"@mantine/form": "^5.10.0",
|
||||||
"@mantine/hooks": "^5.9.2",
|
"@mantine/hooks": "^5.10.0",
|
||||||
"@mantine/modals": "^5.9.2",
|
"@mantine/modals": "^5.10.0",
|
||||||
"@mantine/next": "^5.9.2",
|
"@mantine/next": "^5.10.0",
|
||||||
"@mantine/notifications": "^5.9.2",
|
"@mantine/notifications": "^5.10.0",
|
||||||
"axios": "^1.2.0",
|
"axios": "^1.2.2",
|
||||||
"cookies-next": "^2.1.1",
|
"cookies-next": "^2.1.1",
|
||||||
"file-saver": "^2.0.5",
|
"file-saver": "^2.0.5",
|
||||||
"jose": "^4.11.1",
|
"jose": "^4.11.2",
|
||||||
|
"jwt-decode": "^3.1.2",
|
||||||
|
"mime-types": "^2.1.35",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
"next": "^13.0.6",
|
"next": "^13.1.2",
|
||||||
"next-cookies": "^2.0.3",
|
"next-cookies": "^2.0.3",
|
||||||
"next-http-proxy-middleware": "^1.2.5",
|
"next-http-proxy-middleware": "^1.2.5",
|
||||||
"next-pwa": "^5.6.0",
|
"next-pwa": "^5.6.0",
|
||||||
@@ -34,15 +36,16 @@
|
|||||||
"yup": "^0.32.11"
|
"yup": "^0.32.11"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "18.11.10",
|
"@types/mime-types": "^2.1.1",
|
||||||
|
"@types/node": "18.11.18",
|
||||||
"@types/react": "18.0.26",
|
"@types/react": "18.0.26",
|
||||||
"@types/react-dom": "18.0.9",
|
"@types/react-dom": "18.0.10",
|
||||||
"axios": "^1.2.0",
|
"axios": "^1.2.2",
|
||||||
"eslint": "8.29.0",
|
"eslint": "8.31.0",
|
||||||
"eslint-config-next": "^13.0.6",
|
"eslint-config-next": "^13.1.2",
|
||||||
"eslint-config-prettier": "^8.5.0",
|
"eslint-config-prettier": "^8.6.0",
|
||||||
"prettier": "^2.8.0",
|
"prettier": "^2.8.2",
|
||||||
"tar": "^6.1.12",
|
"tar": "^6.1.13",
|
||||||
"typescript": "^4.9.3"
|
"typescript": "^4.9.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,18 +7,20 @@ const Meta = ({
|
|||||||
title: string;
|
title: string;
|
||||||
description?: string;
|
description?: string;
|
||||||
}) => {
|
}) => {
|
||||||
|
const metaTitle = `${title} - Pingvin Share`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Head>
|
<Head>
|
||||||
{/* TODO: Doesn't work because script get only executed on client side */}
|
<title>{metaTitle}</title>
|
||||||
<title>{title} - Pingvin Share</title>
|
<meta name="og:title" content={metaTitle} />
|
||||||
<meta name="og:title" content={`${title} - Pingvin Share`} />
|
|
||||||
<meta
|
<meta
|
||||||
name="og:description"
|
name="og:description"
|
||||||
content={
|
content={
|
||||||
description ?? "An open-source and self-hosted sharing platform."
|
description ?? "An open-source and self-hosted sharing platform."
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<meta name="twitter:title" content={`${title} - Pingvin Share`} />
|
<meta property="og:image" content="/img/opengraph-default.png" />
|
||||||
|
<meta name="twitter:title" content={metaTitle} />
|
||||||
<meta name="twitter:description" content={description} />
|
<meta name="twitter:description" content={description} />
|
||||||
</Head>
|
</Head>
|
||||||
);
|
);
|
||||||
|
|||||||
66
frontend/src/components/account/ThemeSwitcher.tsx
Normal file
66
frontend/src/components/account/ThemeSwitcher.tsx
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
import {
|
||||||
|
Box,
|
||||||
|
Center,
|
||||||
|
ColorScheme,
|
||||||
|
SegmentedControl,
|
||||||
|
Stack,
|
||||||
|
useMantineColorScheme,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { useColorScheme } from "@mantine/hooks";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { TbDeviceLaptop, TbMoon, TbSun } from "react-icons/tb";
|
||||||
|
import usePreferences from "../../hooks/usePreferences";
|
||||||
|
|
||||||
|
const ThemeSwitcher = () => {
|
||||||
|
const preferences = usePreferences();
|
||||||
|
const [colorScheme, setColorScheme] = useState(
|
||||||
|
preferences.get("colorScheme")
|
||||||
|
);
|
||||||
|
const { toggleColorScheme } = useMantineColorScheme();
|
||||||
|
const systemColorScheme = useColorScheme();
|
||||||
|
return (
|
||||||
|
<Stack>
|
||||||
|
<SegmentedControl
|
||||||
|
value={colorScheme}
|
||||||
|
onChange={(value) => {
|
||||||
|
preferences.set("colorScheme", value);
|
||||||
|
setColorScheme(value);
|
||||||
|
toggleColorScheme(
|
||||||
|
value == "system" ? systemColorScheme : (value as ColorScheme)
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
data={[
|
||||||
|
{
|
||||||
|
label: (
|
||||||
|
<Center>
|
||||||
|
<TbMoon size={16} />
|
||||||
|
<Box ml={10}>Dark</Box>
|
||||||
|
</Center>
|
||||||
|
),
|
||||||
|
value: "dark",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: (
|
||||||
|
<Center>
|
||||||
|
<TbSun size={16} />
|
||||||
|
<Box ml={10}>Light</Box>
|
||||||
|
</Center>
|
||||||
|
),
|
||||||
|
value: "light",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: (
|
||||||
|
<Center>
|
||||||
|
<TbDeviceLaptop size={16} />
|
||||||
|
<Box ml={10}>System</Box>
|
||||||
|
</Center>
|
||||||
|
),
|
||||||
|
value: "system",
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ThemeSwitcher;
|
||||||
@@ -14,7 +14,6 @@ import { useForm, yupResolver } from "@mantine/form";
|
|||||||
import { useModals } from "@mantine/modals";
|
import { useModals } from "@mantine/modals";
|
||||||
import { ModalsContextProps } from "@mantine/modals/lib/context";
|
import { ModalsContextProps } from "@mantine/modals/lib/context";
|
||||||
import * as yup from "yup";
|
import * as yup from "yup";
|
||||||
import useUser from "../../hooks/user.hook";
|
|
||||||
import authService from "../../services/auth.service";
|
import authService from "../../services/auth.service";
|
||||||
import toast from "../../utils/toast.util";
|
import toast from "../../utils/toast.util";
|
||||||
|
|
||||||
@@ -47,9 +46,6 @@ const CreateEnableTotpModal = ({
|
|||||||
refreshUser: () => {};
|
refreshUser: () => {};
|
||||||
}) => {
|
}) => {
|
||||||
const modals = useModals();
|
const modals = useModals();
|
||||||
const user = useUser();
|
|
||||||
|
|
||||||
console.log(user.user);
|
|
||||||
|
|
||||||
const validationSchema = yup.object().shape({
|
const validationSchema = yup.object().shape({
|
||||||
code: yup
|
code: yup
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
import { Stack, TextInput } from "@mantine/core";
|
import { Stack, TextInput } from "@mantine/core";
|
||||||
import { ModalsContextProps } from "@mantine/modals/lib/context";
|
import { ModalsContextProps } from "@mantine/modals/lib/context";
|
||||||
|
|
||||||
const showShareLinkModal = (modals: ModalsContextProps, shareId: string) => {
|
const showShareLinkModal = (
|
||||||
const link = `${window.location.origin}/share/${shareId}`;
|
modals: ModalsContextProps,
|
||||||
|
shareId: string,
|
||||||
|
appUrl: string
|
||||||
|
) => {
|
||||||
|
const link = `${appUrl}/share/${shareId}`;
|
||||||
return modals.openModal({
|
return modals.openModal({
|
||||||
title: "Share link",
|
title: "Share link",
|
||||||
children: (
|
children: (
|
||||||
|
|||||||
@@ -1,115 +0,0 @@
|
|||||||
import {
|
|
||||||
ActionIcon,
|
|
||||||
Box,
|
|
||||||
Code,
|
|
||||||
Group,
|
|
||||||
Skeleton,
|
|
||||||
Table,
|
|
||||||
Text,
|
|
||||||
} from "@mantine/core";
|
|
||||||
import { useModals } from "@mantine/modals";
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import { TbEdit, TbLock } from "react-icons/tb";
|
|
||||||
import configService from "../../services/config.service";
|
|
||||||
import { AdminConfig as AdminConfigType } from "../../types/config.type";
|
|
||||||
import showUpdateConfigVariableModal from "./showUpdateConfigVariableModal";
|
|
||||||
|
|
||||||
const AdminConfigTable = () => {
|
|
||||||
const modals = useModals();
|
|
||||||
|
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
|
||||||
|
|
||||||
const [configVariables, setConfigVariables] = useState<AdminConfigType[]>([]);
|
|
||||||
|
|
||||||
const getConfigVariables = async () => {
|
|
||||||
await configService.listForAdmin().then((configVariables) => {
|
|
||||||
setConfigVariables(configVariables);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setIsLoading(true);
|
|
||||||
getConfigVariables().then(() => setIsLoading(false));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const skeletonRows = [...Array(9)].map((c, i) => (
|
|
||||||
<tr key={i}>
|
|
||||||
<td>
|
|
||||||
<Skeleton height={18} width={80} mb="sm" />
|
|
||||||
<Skeleton height={30} />
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<Skeleton height={18} />
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<Group position="right">
|
|
||||||
<Skeleton height={25} width={25} />
|
|
||||||
</Group>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
));
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Box sx={{ display: "block", overflowX: "auto" }}>
|
|
||||||
<Table verticalSpacing="sm" horizontalSpacing="xl" withBorder>
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Key</th>
|
|
||||||
<th>Value</th>
|
|
||||||
<th></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{isLoading
|
|
||||||
? skeletonRows
|
|
||||||
: configVariables.map((configVariable) => (
|
|
||||||
<tr key={configVariable.key}>
|
|
||||||
<td style={{ maxWidth: "200px" }}>
|
|
||||||
<Code>{configVariable.key}</Code>{" "}
|
|
||||||
{configVariable.secret && <TbLock />} <br />
|
|
||||||
<Text size="xs" color="dimmed">
|
|
||||||
{configVariable.description}
|
|
||||||
</Text>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<Text
|
|
||||||
style={{
|
|
||||||
whiteSpace: "nowrap",
|
|
||||||
overflow: "hidden",
|
|
||||||
textOverflow: "ellipsis",
|
|
||||||
maxWidth: "40ch",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{configVariable.obscured
|
|
||||||
? "•".repeat(configVariable.value.length)
|
|
||||||
: configVariable.value}
|
|
||||||
</Text>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<Group position="right">
|
|
||||||
<ActionIcon
|
|
||||||
color="primary"
|
|
||||||
variant="light"
|
|
||||||
size={25}
|
|
||||||
onClick={() =>
|
|
||||||
showUpdateConfigVariableModal(
|
|
||||||
modals,
|
|
||||||
configVariable,
|
|
||||||
getConfigVariables
|
|
||||||
)
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<TbEdit />
|
|
||||||
</ActionIcon>
|
|
||||||
</Group>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
</tbody>
|
|
||||||
</Table>
|
|
||||||
</Box>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default AdminConfigTable;
|
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import {
|
||||||
|
NumberInput,
|
||||||
|
PasswordInput,
|
||||||
|
Stack,
|
||||||
|
Switch,
|
||||||
|
Textarea,
|
||||||
|
TextInput,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { useForm } from "@mantine/form";
|
||||||
|
import { AdminConfig, UpdateConfig } from "../../../types/config.type";
|
||||||
|
|
||||||
|
const AdminConfigInput = ({
|
||||||
|
configVariable,
|
||||||
|
updateConfigVariable,
|
||||||
|
}: {
|
||||||
|
configVariable: AdminConfig;
|
||||||
|
updateConfigVariable: (variable: UpdateConfig) => void;
|
||||||
|
}) => {
|
||||||
|
const form = useForm({
|
||||||
|
initialValues: {
|
||||||
|
stringValue: configVariable.value,
|
||||||
|
textValue: configVariable.value,
|
||||||
|
numberValue: parseInt(configVariable.value),
|
||||||
|
booleanValue: configVariable.value == "true",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const onValueChange = (configVariable: AdminConfig, value: any) => {
|
||||||
|
form.setFieldValue(`${configVariable.type}Value`, value);
|
||||||
|
updateConfigVariable({ key: configVariable.key, value: value });
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Stack align="end">
|
||||||
|
{configVariable.type == "string" &&
|
||||||
|
(configVariable.obscured ? (
|
||||||
|
<PasswordInput
|
||||||
|
style={{ width: "100%" }}
|
||||||
|
{...form.getInputProps("stringValue")}
|
||||||
|
onChange={(e) => onValueChange(configVariable, e.target.value)}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<TextInput
|
||||||
|
style={{ width: "100%" }}
|
||||||
|
{...form.getInputProps("stringValue")}
|
||||||
|
onChange={(e) => onValueChange(configVariable, e.target.value)}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
|
||||||
|
{configVariable.type == "text" && (
|
||||||
|
<Textarea
|
||||||
|
style={{ width: "100%" }}
|
||||||
|
autosize
|
||||||
|
{...form.getInputProps("textValue")}
|
||||||
|
onChange={(e) => onValueChange(configVariable, e.target.value)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{configVariable.type == "number" && (
|
||||||
|
<NumberInput
|
||||||
|
{...form.getInputProps("numberValue")}
|
||||||
|
onChange={(number) => onValueChange(configVariable, number)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{configVariable.type == "boolean" && (
|
||||||
|
<>
|
||||||
|
<Switch
|
||||||
|
{...form.getInputProps("booleanValue", { type: "checkbox" })}
|
||||||
|
onChange={(e) => onValueChange(configVariable, e.target.checked)}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default AdminConfigInput;
|
||||||
153
frontend/src/components/admin/configuration/AdminConfigTable.tsx
Normal file
153
frontend/src/components/admin/configuration/AdminConfigTable.tsx
Normal file
@@ -0,0 +1,153 @@
|
|||||||
|
import {
|
||||||
|
Box,
|
||||||
|
Button,
|
||||||
|
Group,
|
||||||
|
Paper,
|
||||||
|
Space,
|
||||||
|
Stack,
|
||||||
|
Text,
|
||||||
|
Title,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { useMediaQuery } from "@mantine/hooks";
|
||||||
|
import { useRouter } from "next/router";
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import useConfig from "../../../hooks/config.hook";
|
||||||
|
import configService from "../../../services/config.service";
|
||||||
|
import {
|
||||||
|
AdminConfigGroupedByCategory,
|
||||||
|
UpdateConfig,
|
||||||
|
} from "../../../types/config.type";
|
||||||
|
import {
|
||||||
|
capitalizeFirstLetter,
|
||||||
|
configVariableToFriendlyName,
|
||||||
|
} from "../../../utils/string.util";
|
||||||
|
import toast from "../../../utils/toast.util";
|
||||||
|
|
||||||
|
import AdminConfigInput from "./AdminConfigInput";
|
||||||
|
import TestEmailButton from "./TestEmailButton";
|
||||||
|
|
||||||
|
const AdminConfigTable = () => {
|
||||||
|
const config = useConfig();
|
||||||
|
const router = useRouter();
|
||||||
|
const isMobile = useMediaQuery("(max-width: 560px)");
|
||||||
|
|
||||||
|
const [updatedConfigVariables, setUpdatedConfigVariables] = useState<
|
||||||
|
UpdateConfig[]
|
||||||
|
>([]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (config.get("SETUP_STATUS") != "FINISHED") {
|
||||||
|
config.refresh();
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const updateConfigVariable = (configVariable: UpdateConfig) => {
|
||||||
|
const index = updatedConfigVariables.findIndex(
|
||||||
|
(item) => item.key === configVariable.key
|
||||||
|
);
|
||||||
|
if (index > -1) {
|
||||||
|
updatedConfigVariables[index] = configVariable;
|
||||||
|
} else {
|
||||||
|
setUpdatedConfigVariables([...updatedConfigVariables, configVariable]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const [configVariablesByCategory, setCofigVariablesByCategory] =
|
||||||
|
useState<AdminConfigGroupedByCategory>({});
|
||||||
|
|
||||||
|
const getConfigVariables = async () => {
|
||||||
|
await configService.listForAdmin().then((configVariables) => {
|
||||||
|
const configVariablesByCategory = configVariables.reduce(
|
||||||
|
(categories: any, item) => {
|
||||||
|
const category = categories[item.category] || [];
|
||||||
|
category.push(item);
|
||||||
|
categories[item.category] = category;
|
||||||
|
return categories;
|
||||||
|
},
|
||||||
|
{}
|
||||||
|
);
|
||||||
|
setCofigVariablesByCategory(configVariablesByCategory);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const saveConfigVariables = async () => {
|
||||||
|
if (config.get("SETUP_STATUS") == "REGISTERED") {
|
||||||
|
await configService
|
||||||
|
.updateMany(updatedConfigVariables)
|
||||||
|
.then(async () => {
|
||||||
|
await configService.finishSetup();
|
||||||
|
router.reload();
|
||||||
|
})
|
||||||
|
.catch(toast.axiosError);
|
||||||
|
} else {
|
||||||
|
await configService
|
||||||
|
.updateMany(updatedConfigVariables)
|
||||||
|
.then(() => {
|
||||||
|
setUpdatedConfigVariables([]);
|
||||||
|
toast.success("Configurations updated successfully");
|
||||||
|
})
|
||||||
|
.catch(toast.axiosError);
|
||||||
|
}
|
||||||
|
config.refresh();
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
getConfigVariables();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box mb="lg">
|
||||||
|
{Object.entries(configVariablesByCategory).map(
|
||||||
|
([category, configVariables]) => {
|
||||||
|
return (
|
||||||
|
<Paper key={category} withBorder p="lg" mb="xl">
|
||||||
|
<Title mb="xs" order={3}>
|
||||||
|
{capitalizeFirstLetter(category)}
|
||||||
|
</Title>
|
||||||
|
{configVariables.map((configVariable) => (
|
||||||
|
<>
|
||||||
|
<Group position="apart">
|
||||||
|
<Stack
|
||||||
|
style={{ maxWidth: isMobile ? "100%" : "40%" }}
|
||||||
|
spacing={0}
|
||||||
|
>
|
||||||
|
<Title order={6}>
|
||||||
|
{configVariableToFriendlyName(configVariable.key)}
|
||||||
|
</Title>
|
||||||
|
<Text color="dimmed" size="sm" mb="xs">
|
||||||
|
{configVariable.description}
|
||||||
|
</Text>
|
||||||
|
</Stack>
|
||||||
|
<Stack></Stack>
|
||||||
|
<Box style={{ width: isMobile ? "100%" : "50%" }}>
|
||||||
|
<AdminConfigInput
|
||||||
|
key={configVariable.key}
|
||||||
|
updateConfigVariable={updateConfigVariable}
|
||||||
|
configVariable={configVariable}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
</Group>
|
||||||
|
|
||||||
|
<Space h="lg" />
|
||||||
|
</>
|
||||||
|
))}
|
||||||
|
{category == "smtp" && (
|
||||||
|
<Group position="right">
|
||||||
|
<TestEmailButton
|
||||||
|
configVariablesChanged={updatedConfigVariables.length != 0}
|
||||||
|
saveConfigVariables={saveConfigVariables}
|
||||||
|
/>
|
||||||
|
</Group>
|
||||||
|
)}
|
||||||
|
</Paper>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
)}
|
||||||
|
<Group position="right">
|
||||||
|
<Button onClick={saveConfigVariables}>Save</Button>
|
||||||
|
</Group>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default AdminConfigTable;
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { Button, Stack, Text, Textarea } from "@mantine/core";
|
||||||
|
import { useModals } from "@mantine/modals";
|
||||||
|
import { useState } from "react";
|
||||||
|
import useUser from "../../../hooks/user.hook";
|
||||||
|
import configService from "../../../services/config.service";
|
||||||
|
import toast from "../../../utils/toast.util";
|
||||||
|
|
||||||
|
const TestEmailButton = ({
|
||||||
|
configVariablesChanged,
|
||||||
|
saveConfigVariables,
|
||||||
|
}: {
|
||||||
|
configVariablesChanged: boolean;
|
||||||
|
saveConfigVariables: () => Promise<void>;
|
||||||
|
}) => {
|
||||||
|
const { user } = useUser();
|
||||||
|
const modals = useModals();
|
||||||
|
|
||||||
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
|
||||||
|
const sendTestEmail = async () => {
|
||||||
|
await configService
|
||||||
|
.sendTestEmail(user!.email)
|
||||||
|
.then(() => toast.success("Email sent successfully"))
|
||||||
|
.catch((e) =>
|
||||||
|
modals.openModal({
|
||||||
|
title: "Failed to send email",
|
||||||
|
children: (
|
||||||
|
<Stack spacing="xs">
|
||||||
|
<Text size="sm">
|
||||||
|
While sending the test email, the following error occurred:
|
||||||
|
</Text>
|
||||||
|
<Textarea minRows={4} readOnly value={e.response.data.message} />
|
||||||
|
</Stack>
|
||||||
|
),
|
||||||
|
})
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Button
|
||||||
|
loading={isLoading}
|
||||||
|
variant="light"
|
||||||
|
onClick={async () => {
|
||||||
|
if (!configVariablesChanged) {
|
||||||
|
setIsLoading(true);
|
||||||
|
await sendTestEmail();
|
||||||
|
setIsLoading(false);
|
||||||
|
} else {
|
||||||
|
modals.openConfirmModal({
|
||||||
|
title: "Save configuration",
|
||||||
|
children: (
|
||||||
|
<Text size="sm">
|
||||||
|
To continue you need to save the configuration first. Do you
|
||||||
|
want to save the configuration and send the test email?
|
||||||
|
</Text>
|
||||||
|
),
|
||||||
|
labels: { confirm: "Save and send", cancel: "Cancel" },
|
||||||
|
onConfirm: async () => {
|
||||||
|
setIsLoading(true);
|
||||||
|
await saveConfigVariables();
|
||||||
|
await sendTestEmail();
|
||||||
|
setIsLoading(false);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Send test email
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
export default TestEmailButton;
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
import {
|
|
||||||
Button,
|
|
||||||
Code,
|
|
||||||
NumberInput,
|
|
||||||
PasswordInput,
|
|
||||||
Select,
|
|
||||||
Space,
|
|
||||||
Stack,
|
|
||||||
Text,
|
|
||||||
Textarea,
|
|
||||||
TextInput,
|
|
||||||
Title,
|
|
||||||
} from "@mantine/core";
|
|
||||||
import { useForm } from "@mantine/form";
|
|
||||||
import { useModals } from "@mantine/modals";
|
|
||||||
import { ModalsContextProps } from "@mantine/modals/lib/context";
|
|
||||||
import configService from "../../services/config.service";
|
|
||||||
import { AdminConfig } from "../../types/config.type";
|
|
||||||
import toast from "../../utils/toast.util";
|
|
||||||
|
|
||||||
const showUpdateConfigVariableModal = (
|
|
||||||
modals: ModalsContextProps,
|
|
||||||
configVariable: AdminConfig,
|
|
||||||
getConfigVariables: () => void
|
|
||||||
) => {
|
|
||||||
return modals.openModal({
|
|
||||||
title: <Title order={5}>Update configuration variable</Title>,
|
|
||||||
children: (
|
|
||||||
<Body
|
|
||||||
configVariable={configVariable}
|
|
||||||
getConfigVariables={getConfigVariables}
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const Body = ({
|
|
||||||
configVariable,
|
|
||||||
getConfigVariables,
|
|
||||||
}: {
|
|
||||||
configVariable: AdminConfig;
|
|
||||||
getConfigVariables: () => void;
|
|
||||||
}) => {
|
|
||||||
const modals = useModals();
|
|
||||||
|
|
||||||
const form = useForm({
|
|
||||||
initialValues: {
|
|
||||||
stringValue: configVariable.value,
|
|
||||||
textValue: configVariable.value,
|
|
||||||
numberValue: parseInt(configVariable.value),
|
|
||||||
booleanValue: configVariable.value,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return (
|
|
||||||
<Stack align="stretch">
|
|
||||||
<Text>
|
|
||||||
Set <Code>{configVariable.key}</Code> to
|
|
||||||
</Text>
|
|
||||||
{configVariable.type == "string" &&
|
|
||||||
(configVariable.obscured ? (
|
|
||||||
<PasswordInput {...form.getInputProps("stringValue")} />
|
|
||||||
) : (
|
|
||||||
<TextInput {...form.getInputProps("stringValue")} />
|
|
||||||
))}
|
|
||||||
|
|
||||||
{configVariable.type == "text" && (
|
|
||||||
<Textarea autosize {...form.getInputProps("textValue")} />
|
|
||||||
)}
|
|
||||||
{configVariable.type == "number" && (
|
|
||||||
<NumberInput {...form.getInputProps("numberValue")} />
|
|
||||||
)}
|
|
||||||
{configVariable.type == "boolean" && (
|
|
||||||
<Select
|
|
||||||
data={[
|
|
||||||
{ value: "true", label: "True" },
|
|
||||||
{ value: "false", label: "False" },
|
|
||||||
]}
|
|
||||||
{...form.getInputProps("booleanValue")}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<Space />
|
|
||||||
<Button
|
|
||||||
onClick={async () => {
|
|
||||||
const value =
|
|
||||||
configVariable.type == "string"
|
|
||||||
? form.values.stringValue
|
|
||||||
: configVariable.type == "text"
|
|
||||||
? form.values.textValue
|
|
||||||
: configVariable.type == "number"
|
|
||||||
? form.values.numberValue
|
|
||||||
: form.values.booleanValue == "true";
|
|
||||||
|
|
||||||
await configService
|
|
||||||
.update(configVariable.key, value)
|
|
||||||
.then(() => {
|
|
||||||
getConfigVariables();
|
|
||||||
modals.closeAll();
|
|
||||||
})
|
|
||||||
.catch(toast.axiosError);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Save
|
|
||||||
</Button>
|
|
||||||
</Stack>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default showUpdateConfigVariableModal;
|
|
||||||
@@ -2,6 +2,7 @@ import {
|
|||||||
Anchor,
|
Anchor,
|
||||||
Button,
|
Button,
|
||||||
Container,
|
Container,
|
||||||
|
Group,
|
||||||
Paper,
|
Paper,
|
||||||
PasswordInput,
|
PasswordInput,
|
||||||
Text,
|
Text,
|
||||||
@@ -10,17 +11,21 @@ import {
|
|||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { useForm, yupResolver } from "@mantine/form";
|
import { useForm, yupResolver } from "@mantine/form";
|
||||||
import { showNotification } from "@mantine/notifications";
|
import { showNotification } from "@mantine/notifications";
|
||||||
import { setCookie } from "cookies-next";
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
import { useRouter } from "next/router";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { TbInfoCircle } from "react-icons/tb";
|
import { TbInfoCircle } from "react-icons/tb";
|
||||||
import * as yup from "yup";
|
import * as yup from "yup";
|
||||||
import useConfig from "../../hooks/config.hook";
|
import useConfig from "../../hooks/config.hook";
|
||||||
|
import useUser from "../../hooks/user.hook";
|
||||||
import authService from "../../services/auth.service";
|
import authService from "../../services/auth.service";
|
||||||
import toast from "../../utils/toast.util";
|
import toast from "../../utils/toast.util";
|
||||||
|
|
||||||
const SignInForm = () => {
|
const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
|
||||||
const config = useConfig();
|
const config = useConfig();
|
||||||
|
const router = useRouter();
|
||||||
|
const { refreshUser } = useUser();
|
||||||
|
|
||||||
const [showTotp, setShowTotp] = React.useState(false);
|
const [showTotp, setShowTotp] = React.useState(false);
|
||||||
const [loginToken, setLoginToken] = React.useState("");
|
const [loginToken, setLoginToken] = React.useState("");
|
||||||
|
|
||||||
@@ -43,10 +48,10 @@ const SignInForm = () => {
|
|||||||
validate: yupResolver(validationSchema),
|
validate: yupResolver(validationSchema),
|
||||||
});
|
});
|
||||||
|
|
||||||
const signIn = (email: string, password: string) => {
|
const signIn = async (email: string, password: string) => {
|
||||||
authService
|
await authService
|
||||||
.signIn(email, password)
|
.signIn(email, password)
|
||||||
.then((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);
|
setShowTotp(true);
|
||||||
@@ -59,9 +64,8 @@ const SignInForm = () => {
|
|||||||
});
|
});
|
||||||
setLoginToken(response.data["loginToken"]);
|
setLoginToken(response.data["loginToken"]);
|
||||||
} else {
|
} else {
|
||||||
setCookie("access_token", response.data.accessToken);
|
await refreshUser();
|
||||||
setCookie("refresh_token", response.data.refreshToken);
|
router.replace(redirectPath);
|
||||||
window.location.replace("/");
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(toast.axiosError);
|
.catch(toast.axiosError);
|
||||||
@@ -70,10 +74,9 @@ const SignInForm = () => {
|
|||||||
const signInTotp = (email: string, password: string, totp: string) => {
|
const signInTotp = (email: string, password: string, totp: string) => {
|
||||||
authService
|
authService
|
||||||
.signInTotp(email, password, totp, loginToken)
|
.signInTotp(email, password, totp, loginToken)
|
||||||
.then((response) => {
|
.then(async () => {
|
||||||
setCookie("access_token", response.data.accessToken);
|
await refreshUser();
|
||||||
setCookie("refresh_token", response.data.refreshToken);
|
router.replace(redirectPath);
|
||||||
window.location.replace("/");
|
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
if (error?.response?.data?.message == "Login token expired") {
|
if (error?.response?.data?.message == "Login token expired") {
|
||||||
@@ -89,13 +92,7 @@ const SignInForm = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Container size={420} my={40}>
|
<Container size={420} my={40}>
|
||||||
<Title
|
<Title order={2} align="center" weight={900}>
|
||||||
align="center"
|
|
||||||
sx={(theme) => ({
|
|
||||||
fontFamily: `Greycliff CF, ${theme.fontFamily}`,
|
|
||||||
fontWeight: 900,
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
Welcome back
|
Welcome back
|
||||||
</Title>
|
</Title>
|
||||||
{config.get("ALLOW_REGISTRATION") && (
|
{config.get("ALLOW_REGISTRATION") && (
|
||||||
@@ -116,7 +113,7 @@ const SignInForm = () => {
|
|||||||
>
|
>
|
||||||
<TextInput
|
<TextInput
|
||||||
label="Email or username"
|
label="Email or username"
|
||||||
placeholder="you@email.com"
|
placeholder="Your email or username"
|
||||||
{...form.getInputProps("emailOrUsername")}
|
{...form.getInputProps("emailOrUsername")}
|
||||||
/>
|
/>
|
||||||
<PasswordInput
|
<PasswordInput
|
||||||
@@ -134,6 +131,13 @@ const SignInForm = () => {
|
|||||||
{...form.getInputProps("totp")}
|
{...form.getInputProps("totp")}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{config.get("SMTP_ENABLED") && (
|
||||||
|
<Group position="right" mt="xs">
|
||||||
|
<Anchor component={Link} href="/auth/resetPassword" size="xs">
|
||||||
|
Forgot password?
|
||||||
|
</Anchor>
|
||||||
|
</Group>
|
||||||
|
)}
|
||||||
<Button fullWidth mt="xl" type="submit">
|
<Button fullWidth mt="xl" type="submit">
|
||||||
Sign in
|
Sign in
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -9,15 +9,18 @@ import {
|
|||||||
Title,
|
Title,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { useForm, yupResolver } from "@mantine/form";
|
import { useForm, yupResolver } from "@mantine/form";
|
||||||
import { setCookie } from "cookies-next";
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
import { useRouter } from "next/router";
|
||||||
import * as yup from "yup";
|
import * as yup from "yup";
|
||||||
import useConfig from "../../hooks/config.hook";
|
import useConfig from "../../hooks/config.hook";
|
||||||
|
import useUser from "../../hooks/user.hook";
|
||||||
import authService from "../../services/auth.service";
|
import authService from "../../services/auth.service";
|
||||||
import toast from "../../utils/toast.util";
|
import toast from "../../utils/toast.util";
|
||||||
|
|
||||||
const SignUpForm = () => {
|
const SignUpForm = () => {
|
||||||
const config = useConfig();
|
const config = useConfig();
|
||||||
|
const router = useRouter();
|
||||||
|
const { refreshUser } = useUser();
|
||||||
|
|
||||||
const validationSchema = yup.object().shape({
|
const validationSchema = yup.object().shape({
|
||||||
email: yup.string().email().required(),
|
email: yup.string().email().required(),
|
||||||
@@ -34,26 +37,19 @@ const SignUpForm = () => {
|
|||||||
validate: yupResolver(validationSchema),
|
validate: yupResolver(validationSchema),
|
||||||
});
|
});
|
||||||
|
|
||||||
const signUp = (email: string, username: string, password: string) => {
|
const signUp = async (email: string, username: string, password: string) => {
|
||||||
authService
|
await authService
|
||||||
.signUp(email, username, password)
|
.signUp(email, username, password)
|
||||||
.then((response) => {
|
.then(async () => {
|
||||||
setCookie("access_token", response.data.accessToken);
|
await refreshUser();
|
||||||
setCookie("refresh_token", response.data.refreshToken);
|
router.replace("/upload");
|
||||||
window.location.replace("/");
|
|
||||||
})
|
})
|
||||||
.catch(toast.axiosError);
|
.catch(toast.axiosError);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container size={420} my={40}>
|
<Container size={420} my={40}>
|
||||||
<Title
|
<Title order={2} align="center" weight={900}>
|
||||||
align="center"
|
|
||||||
sx={(theme) => ({
|
|
||||||
fontFamily: `Greycliff CF, ${theme.fontFamily}`,
|
|
||||||
fontWeight: 900,
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
Sign up
|
Sign up
|
||||||
</Title>
|
</Title>
|
||||||
{config.get("ALLOW_REGISTRATION") && (
|
{config.get("ALLOW_REGISTRATION") && (
|
||||||
@@ -72,12 +68,12 @@ const SignUpForm = () => {
|
|||||||
>
|
>
|
||||||
<TextInput
|
<TextInput
|
||||||
label="Username"
|
label="Username"
|
||||||
placeholder="john.doe"
|
placeholder="Your username"
|
||||||
{...form.getInputProps("username")}
|
{...form.getInputProps("username")}
|
||||||
/>
|
/>
|
||||||
<TextInput
|
<TextInput
|
||||||
label="Email"
|
label="Email"
|
||||||
placeholder="you@email.com"
|
placeholder="Your email"
|
||||||
mt="md"
|
mt="md"
|
||||||
{...form.getInputProps("email")}
|
{...form.getInputProps("email")}
|
||||||
/>
|
/>
|
||||||
|
|||||||
13
frontend/src/components/core/CenterLoader.tsx
Normal file
13
frontend/src/components/core/CenterLoader.tsx
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import { Center, Loader, Stack } from "@mantine/core";
|
||||||
|
|
||||||
|
const CenterLoader = () => {
|
||||||
|
return (
|
||||||
|
<Center style={{ height: "70vh" }}>
|
||||||
|
<Stack align="center" spacing={10}>
|
||||||
|
<Loader />
|
||||||
|
</Stack>
|
||||||
|
</Center>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default CenterLoader;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import { ActionIcon, Avatar, Menu } from "@mantine/core";
|
import { ActionIcon, Avatar, Menu } from "@mantine/core";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { TbDoorExit, TbLink, TbSettings, TbUser } from "react-icons/tb";
|
import { TbDoorExit, TbSettings, TbUser } from "react-icons/tb";
|
||||||
import useUser from "../../hooks/user.hook";
|
import useUser from "../../hooks/user.hook";
|
||||||
import authService from "../../services/auth.service";
|
import authService from "../../services/auth.service";
|
||||||
|
|
||||||
@@ -11,17 +11,10 @@ const ActionAvatar = () => {
|
|||||||
<Menu position="bottom-start" withinPortal>
|
<Menu position="bottom-start" withinPortal>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon>
|
<ActionIcon>
|
||||||
<Avatar size={28} radius="xl" />
|
<Avatar size={28} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
<Menu.Dropdown>
|
<Menu.Dropdown>
|
||||||
<Menu.Item
|
|
||||||
component={Link}
|
|
||||||
href="/account/shares"
|
|
||||||
icon={<TbLink size={14} />}
|
|
||||||
>
|
|
||||||
My shares
|
|
||||||
</Menu.Item>
|
|
||||||
<Menu.Item component={Link} href="/account" icon={<TbUser size={14} />}>
|
<Menu.Item component={Link} href="/account" icon={<TbUser size={14} />}>
|
||||||
My account
|
My account
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
@@ -37,7 +30,7 @@ const ActionAvatar = () => {
|
|||||||
|
|
||||||
<Menu.Item
|
<Menu.Item
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
authService.signOut();
|
await authService.signOut();
|
||||||
}}
|
}}
|
||||||
icon={<TbDoorExit size={14} />}
|
icon={<TbDoorExit size={14} />}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -12,11 +12,13 @@ import {
|
|||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { useDisclosure } from "@mantine/hooks";
|
import { useDisclosure } from "@mantine/hooks";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
import { useRouter } from "next/router";
|
||||||
import { ReactNode, useEffect, useState } from "react";
|
import { ReactNode, useEffect, useState } from "react";
|
||||||
import useConfig from "../../hooks/config.hook";
|
import useConfig from "../../hooks/config.hook";
|
||||||
import useUser from "../../hooks/user.hook";
|
import useUser from "../../hooks/user.hook";
|
||||||
import Logo from "../Logo";
|
import Logo from "../Logo";
|
||||||
import ActionAvatar from "./ActionAvatar";
|
import ActionAvatar from "./ActionAvatar";
|
||||||
|
import NavbarShareMenu from "./NavbarShareMenu";
|
||||||
|
|
||||||
const HEADER_HEIGHT = 60;
|
const HEADER_HEIGHT = 60;
|
||||||
|
|
||||||
@@ -108,46 +110,55 @@ const useStyles = createStyles((theme) => ({
|
|||||||
|
|
||||||
const NavBar = () => {
|
const NavBar = () => {
|
||||||
const { user } = useUser();
|
const { user } = useUser();
|
||||||
|
const router = useRouter();
|
||||||
const config = useConfig();
|
const config = useConfig();
|
||||||
|
|
||||||
const [opened, toggleOpened] = useDisclosure(false);
|
const [opened, toggleOpened] = useDisclosure(false);
|
||||||
|
|
||||||
const authenticatedLinks = [
|
const [currentRoute, setCurrentRoute] = useState("");
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setCurrentRoute(router.pathname);
|
||||||
|
}, [router.pathname]);
|
||||||
|
|
||||||
|
const authenticatedLinks: NavLink[] = [
|
||||||
{
|
{
|
||||||
link: "/upload",
|
link: "/upload",
|
||||||
label: "Upload",
|
label: "Upload",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
component: <NavbarShareMenu />,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
component: <ActionAvatar />,
|
component: <ActionAvatar />,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const [unauthenticatedLinks, setUnauthenticatedLinks] = useState<NavLink[]>([
|
let unauthenticatedLinks: NavLink[] = [
|
||||||
{
|
{
|
||||||
link: "/auth/signIn",
|
link: "/auth/signIn",
|
||||||
label: "Sign in",
|
label: "Sign in",
|
||||||
},
|
},
|
||||||
]);
|
];
|
||||||
|
|
||||||
useEffect(() => {
|
if (config.get("ALLOW_UNAUTHENTICATED_SHARES")) {
|
||||||
if (config.get("SHOW_HOME_PAGE"))
|
unauthenticatedLinks.unshift({
|
||||||
setUnauthenticatedLinks((array) => [
|
link: "/upload",
|
||||||
{
|
label: "Upload",
|
||||||
link: "/",
|
});
|
||||||
label: "Home",
|
}
|
||||||
},
|
|
||||||
...array,
|
|
||||||
]);
|
|
||||||
|
|
||||||
if (config.get("ALLOW_REGISTRATION"))
|
if (config.get("SHOW_HOME_PAGE"))
|
||||||
setUnauthenticatedLinks((array) => [
|
unauthenticatedLinks.unshift({
|
||||||
...array,
|
link: "/",
|
||||||
{
|
label: "Home",
|
||||||
link: "/auth/signUp",
|
});
|
||||||
label: "Sign up",
|
|
||||||
},
|
if (config.get("ALLOW_REGISTRATION"))
|
||||||
]);
|
unauthenticatedLinks.push({
|
||||||
}, []);
|
link: "/auth/signUp",
|
||||||
|
label: "Sign up",
|
||||||
|
});
|
||||||
|
|
||||||
const { classes, cx } = useStyles();
|
const { classes, cx } = useStyles();
|
||||||
const items = (
|
const items = (
|
||||||
@@ -166,7 +177,7 @@ const NavBar = () => {
|
|||||||
href={link.link ?? ""}
|
href={link.link ?? ""}
|
||||||
onClick={() => toggleOpened.toggle()}
|
onClick={() => toggleOpened.toggle()}
|
||||||
className={cx(classes.link, {
|
className={cx(classes.link, {
|
||||||
[classes.linkActive]: window.location.pathname == link.link,
|
[classes.linkActive]: currentRoute == link.link,
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
{link.label}
|
{link.label}
|
||||||
|
|||||||
29
frontend/src/components/navBar/NavbarShareMenu.tsx
Normal file
29
frontend/src/components/navBar/NavbarShareMenu.tsx
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { ActionIcon, Menu } from "@mantine/core";
|
||||||
|
import Link from "next/link";
|
||||||
|
import { TbArrowLoopLeft, TbLink } from "react-icons/tb";
|
||||||
|
|
||||||
|
const NavbarShareMneu = () => {
|
||||||
|
return (
|
||||||
|
<Menu position="bottom-start" withinPortal>
|
||||||
|
<Menu.Target>
|
||||||
|
<ActionIcon>
|
||||||
|
<TbLink />
|
||||||
|
</ActionIcon>
|
||||||
|
</Menu.Target>
|
||||||
|
<Menu.Dropdown>
|
||||||
|
<Menu.Item component={Link} href="/account/shares" icon={<TbLink />}>
|
||||||
|
My shares
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
component={Link}
|
||||||
|
href="/account/reverseShares"
|
||||||
|
icon={<TbArrowLoopLeft />}
|
||||||
|
>
|
||||||
|
Reverse shares
|
||||||
|
</Menu.Item>
|
||||||
|
</Menu.Dropdown>
|
||||||
|
</Menu>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default NavbarShareMneu;
|
||||||
@@ -1,18 +1,57 @@
|
|||||||
import { ActionIcon, Loader, Skeleton, Table } from "@mantine/core";
|
import {
|
||||||
import { TbCircleCheck, TbDownload } from "react-icons/tb";
|
ActionIcon,
|
||||||
import shareService from "../../services/share.service";
|
Group,
|
||||||
|
Skeleton,
|
||||||
|
Stack,
|
||||||
|
Table,
|
||||||
|
TextInput,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { useClipboard } from "@mantine/hooks";
|
||||||
|
import { useModals } from "@mantine/modals";
|
||||||
|
import mime from "mime-types";
|
||||||
|
|
||||||
import { byteStringToHumanSizeString } from "../../utils/math/byteStringToHumanSizeString.util";
|
import Link from "next/link";
|
||||||
|
import { TbDownload, TbEye, TbLink } from "react-icons/tb";
|
||||||
|
import useConfig from "../../hooks/config.hook";
|
||||||
|
import shareService from "../../services/share.service";
|
||||||
|
import { FileMetaData } from "../../types/File.type";
|
||||||
|
import { Share } from "../../types/share.type";
|
||||||
|
import { byteToHumanSizeString } from "../../utils/fileSize.util";
|
||||||
|
import toast from "../../utils/toast.util";
|
||||||
|
|
||||||
const FileList = ({
|
const FileList = ({
|
||||||
files,
|
files,
|
||||||
shareId,
|
share,
|
||||||
isLoading,
|
isLoading,
|
||||||
}: {
|
}: {
|
||||||
files?: any[];
|
files?: FileMetaData[];
|
||||||
shareId: string;
|
share: Share;
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
}) => {
|
}) => {
|
||||||
|
const clipboard = useClipboard();
|
||||||
|
const config = useConfig();
|
||||||
|
const modals = useModals();
|
||||||
|
|
||||||
|
const copyFileLink = (file: FileMetaData) => {
|
||||||
|
const link = `${config.get("APP_URL")}/api/shares/${share.id}/files/${
|
||||||
|
file.id
|
||||||
|
}`;
|
||||||
|
|
||||||
|
if (window.isSecureContext) {
|
||||||
|
clipboard.copy(link);
|
||||||
|
toast.success("Your file link was copied to the keyboard.");
|
||||||
|
} else {
|
||||||
|
modals.openModal({
|
||||||
|
title: "File link",
|
||||||
|
children: (
|
||||||
|
<Stack align="stretch">
|
||||||
|
<TextInput variant="filled" value={link} />
|
||||||
|
</Stack>
|
||||||
|
),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Table>
|
<Table>
|
||||||
<thead>
|
<thead>
|
||||||
@@ -28,24 +67,35 @@ const FileList = ({
|
|||||||
: files!.map((file) => (
|
: files!.map((file) => (
|
||||||
<tr key={file.name}>
|
<tr key={file.name}>
|
||||||
<td>{file.name}</td>
|
<td>{file.name}</td>
|
||||||
<td>{byteStringToHumanSizeString(file.size)}</td>
|
<td>{byteToHumanSizeString(parseInt(file.size))}</td>
|
||||||
<td>
|
<td>
|
||||||
{file.uploadingState ? (
|
<Group position="right">
|
||||||
file.uploadingState != "finished" ? (
|
{shareService.doesFileSupportPreview(file.name) && (
|
||||||
<Loader size={22} />
|
<ActionIcon
|
||||||
) : (
|
component={Link}
|
||||||
<TbCircleCheck color="green" size={22} />
|
href={`/share/${share.id}/preview/${
|
||||||
)
|
file.id
|
||||||
) : (
|
}?type=${mime.contentType(file.name)}`}
|
||||||
|
target="_blank"
|
||||||
|
size={25}
|
||||||
|
>
|
||||||
|
<TbEye />
|
||||||
|
</ActionIcon>
|
||||||
|
)}
|
||||||
|
{!share.hasPassword && (
|
||||||
|
<ActionIcon size={25} onClick={() => copyFileLink(file)}>
|
||||||
|
<TbLink />
|
||||||
|
</ActionIcon>
|
||||||
|
)}
|
||||||
<ActionIcon
|
<ActionIcon
|
||||||
size={25}
|
size={25}
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
await shareService.downloadFile(shareId, file.id);
|
await shareService.downloadFile(share.id, file.id);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<TbDownload />
|
<TbDownload />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
)}
|
</Group>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
|
|||||||
62
frontend/src/components/share/FileSizeInput.tsx
Normal file
62
frontend/src/components/share/FileSizeInput.tsx
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
import { Col, Grid, NumberInput, Select } from "@mantine/core";
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import {
|
||||||
|
byteToUnitAndSize,
|
||||||
|
unitAndSizeToByte,
|
||||||
|
} from "../../utils/fileSize.util";
|
||||||
|
|
||||||
|
const FileSizeInput = ({
|
||||||
|
label,
|
||||||
|
value,
|
||||||
|
onChange,
|
||||||
|
}: {
|
||||||
|
label: string;
|
||||||
|
value: number;
|
||||||
|
onChange: (number: number) => void;
|
||||||
|
}) => {
|
||||||
|
const [unit, setUnit] = useState("MB");
|
||||||
|
const [size, setSize] = useState(100);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const { unit, size } = byteToUnitAndSize(value);
|
||||||
|
setUnit(unit);
|
||||||
|
setSize(size);
|
||||||
|
}, [value]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Grid align="flex-end">
|
||||||
|
<Col xs={6}>
|
||||||
|
<NumberInput
|
||||||
|
min={1}
|
||||||
|
max={99999}
|
||||||
|
precision={0}
|
||||||
|
variant="filled"
|
||||||
|
label={label}
|
||||||
|
value={size}
|
||||||
|
onChange={(value) => {
|
||||||
|
setSize(value!);
|
||||||
|
onChange(unitAndSizeToByte(unit, value!));
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
<Col xs={6}>
|
||||||
|
<Select
|
||||||
|
data={[
|
||||||
|
{ label: "B", value: "B" },
|
||||||
|
{ label: "KB", value: "KB" },
|
||||||
|
{ label: "MB", value: "MB" },
|
||||||
|
{ label: "GB", value: "GB" },
|
||||||
|
{ label: "TB", value: "TB" },
|
||||||
|
]}
|
||||||
|
value={unit}
|
||||||
|
onChange={(value) => {
|
||||||
|
setUnit(value!);
|
||||||
|
onChange(unitAndSizeToByte(value!, size));
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
</Grid>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default FileSizeInput;
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
import { ActionIcon, Button, Stack, TextInput, Title } from "@mantine/core";
|
||||||
|
import { useClipboard } from "@mantine/hooks";
|
||||||
|
import { useModals } from "@mantine/modals";
|
||||||
|
import { ModalsContextProps } from "@mantine/modals/lib/context";
|
||||||
|
import { TbCopy } from "react-icons/tb";
|
||||||
|
import toast from "../../../utils/toast.util";
|
||||||
|
|
||||||
|
const showCompletedReverseShareModal = (
|
||||||
|
modals: ModalsContextProps,
|
||||||
|
link: string,
|
||||||
|
getReverseShares: () => void
|
||||||
|
) => {
|
||||||
|
return modals.openModal({
|
||||||
|
closeOnClickOutside: false,
|
||||||
|
withCloseButton: false,
|
||||||
|
closeOnEscape: false,
|
||||||
|
title: (
|
||||||
|
<Stack align="stretch" spacing={0}>
|
||||||
|
<Title order={4}>Reverse share link</Title>
|
||||||
|
</Stack>
|
||||||
|
),
|
||||||
|
children: <Body link={link} getReverseShares={getReverseShares} />,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const Body = ({
|
||||||
|
link,
|
||||||
|
getReverseShares,
|
||||||
|
}: {
|
||||||
|
link: string;
|
||||||
|
getReverseShares: () => void;
|
||||||
|
}) => {
|
||||||
|
const clipboard = useClipboard({ timeout: 500 });
|
||||||
|
const modals = useModals();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Stack align="stretch">
|
||||||
|
<TextInput
|
||||||
|
readOnly
|
||||||
|
variant="filled"
|
||||||
|
value={link}
|
||||||
|
rightSection={
|
||||||
|
window.isSecureContext && (
|
||||||
|
<ActionIcon
|
||||||
|
onClick={() => {
|
||||||
|
clipboard.copy(link);
|
||||||
|
toast.success("Your link was copied to the keyboard.");
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<TbCopy />
|
||||||
|
</ActionIcon>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
modals.closeAll();
|
||||||
|
getReverseShares();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Done
|
||||||
|
</Button>
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default showCompletedReverseShareModal;
|
||||||
@@ -0,0 +1,167 @@
|
|||||||
|
import {
|
||||||
|
Button,
|
||||||
|
Col,
|
||||||
|
Grid,
|
||||||
|
Group,
|
||||||
|
NumberInput,
|
||||||
|
Select,
|
||||||
|
Stack,
|
||||||
|
Switch,
|
||||||
|
Text,
|
||||||
|
Title,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { useForm } from "@mantine/form";
|
||||||
|
import { useModals } from "@mantine/modals";
|
||||||
|
import { ModalsContextProps } from "@mantine/modals/lib/context";
|
||||||
|
import shareService from "../../../services/share.service";
|
||||||
|
import { getExpirationPreview } from "../../../utils/date.util";
|
||||||
|
import toast from "../../../utils/toast.util";
|
||||||
|
import FileSizeInput from "../FileSizeInput";
|
||||||
|
import showCompletedReverseShareModal from "./showCompletedReverseShareModal";
|
||||||
|
|
||||||
|
const showCreateReverseShareModal = (
|
||||||
|
modals: ModalsContextProps,
|
||||||
|
showSendEmailNotificationOption: boolean,
|
||||||
|
getReverseShares: () => void
|
||||||
|
) => {
|
||||||
|
return modals.openModal({
|
||||||
|
title: <Title order={4}>Create reverse share</Title>,
|
||||||
|
children: (
|
||||||
|
<Body
|
||||||
|
showSendEmailNotificationOption={showSendEmailNotificationOption}
|
||||||
|
getReverseShares={getReverseShares}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const Body = ({
|
||||||
|
getReverseShares,
|
||||||
|
showSendEmailNotificationOption,
|
||||||
|
}: {
|
||||||
|
getReverseShares: () => void;
|
||||||
|
showSendEmailNotificationOption: boolean;
|
||||||
|
}) => {
|
||||||
|
const modals = useModals();
|
||||||
|
|
||||||
|
const form = useForm({
|
||||||
|
initialValues: {
|
||||||
|
maxShareSize: 104857600,
|
||||||
|
maxUseCount: 1,
|
||||||
|
sendEmailNotification: false,
|
||||||
|
expiration_num: 1,
|
||||||
|
expiration_unit: "-days",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return (
|
||||||
|
<Group>
|
||||||
|
<form
|
||||||
|
onSubmit={form.onSubmit(async (values) => {
|
||||||
|
shareService
|
||||||
|
.createReverseShare(
|
||||||
|
values.expiration_num + values.expiration_unit,
|
||||||
|
values.maxShareSize,
|
||||||
|
values.maxUseCount,
|
||||||
|
values.sendEmailNotification
|
||||||
|
)
|
||||||
|
.then(({ link }) => {
|
||||||
|
modals.closeAll();
|
||||||
|
showCompletedReverseShareModal(modals, link, getReverseShares);
|
||||||
|
})
|
||||||
|
.catch(toast.axiosError);
|
||||||
|
})}
|
||||||
|
>
|
||||||
|
<Stack align="stretch">
|
||||||
|
<div>
|
||||||
|
<Grid align={form.errors.link ? "center" : "flex-end"}>
|
||||||
|
<Col xs={6}>
|
||||||
|
<NumberInput
|
||||||
|
min={1}
|
||||||
|
max={99999}
|
||||||
|
precision={0}
|
||||||
|
variant="filled"
|
||||||
|
label="Share expiration"
|
||||||
|
{...form.getInputProps("expiration_num")}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
<Col xs={6}>
|
||||||
|
<Select
|
||||||
|
{...form.getInputProps("expiration_unit")}
|
||||||
|
data={[
|
||||||
|
// Set the label to singular if the number is 1, else plural
|
||||||
|
{
|
||||||
|
value: "-minutes",
|
||||||
|
label:
|
||||||
|
"Minute" + (form.values.expiration_num == 1 ? "" : "s"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: "-hours",
|
||||||
|
label:
|
||||||
|
"Hour" + (form.values.expiration_num == 1 ? "" : "s"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: "-days",
|
||||||
|
label:
|
||||||
|
"Day" + (form.values.expiration_num == 1 ? "" : "s"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: "-weeks",
|
||||||
|
label:
|
||||||
|
"Week" + (form.values.expiration_num == 1 ? "" : "s"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: "-months",
|
||||||
|
label:
|
||||||
|
"Month" + (form.values.expiration_num == 1 ? "" : "s"),
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
</Grid>
|
||||||
|
<Text
|
||||||
|
mt="sm"
|
||||||
|
italic
|
||||||
|
size="xs"
|
||||||
|
sx={(theme) => ({
|
||||||
|
color: theme.colors.gray[6],
|
||||||
|
})}
|
||||||
|
>
|
||||||
|
{getExpirationPreview("reverse share", form)}
|
||||||
|
</Text>
|
||||||
|
</div>
|
||||||
|
<FileSizeInput
|
||||||
|
label="Max share size"
|
||||||
|
value={form.values.maxShareSize}
|
||||||
|
onChange={(number) => form.setFieldValue("maxShareSize", number)}
|
||||||
|
/>
|
||||||
|
<NumberInput
|
||||||
|
min={1}
|
||||||
|
max={1000}
|
||||||
|
precision={0}
|
||||||
|
variant="filled"
|
||||||
|
label="Max use count"
|
||||||
|
description="The maximum number of times this reverse share link can be used"
|
||||||
|
{...form.getInputProps("maxUseCount")}
|
||||||
|
/>
|
||||||
|
{showSendEmailNotificationOption && (
|
||||||
|
<Switch
|
||||||
|
mt="xs"
|
||||||
|
labelPosition="left"
|
||||||
|
label="Send email notification"
|
||||||
|
description="Send an email notification when a share is created with this reverse share link"
|
||||||
|
{...form.getInputProps("sendEmailNotification", {
|
||||||
|
type: "checkbox",
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<Button mt="md" type="submit">
|
||||||
|
Create
|
||||||
|
</Button>
|
||||||
|
</Stack>
|
||||||
|
</form>
|
||||||
|
</Group>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default showCreateReverseShareModal;
|
||||||
@@ -4,7 +4,7 @@ import { Dispatch, ForwardedRef, SetStateAction, useRef } from "react";
|
|||||||
import { TbCloudUpload, TbUpload } from "react-icons/tb";
|
import { TbCloudUpload, TbUpload } from "react-icons/tb";
|
||||||
import useConfig from "../../hooks/config.hook";
|
import useConfig from "../../hooks/config.hook";
|
||||||
import { FileUpload } from "../../types/File.type";
|
import { FileUpload } from "../../types/File.type";
|
||||||
import { byteStringToHumanSizeString } from "../../utils/math/byteStringToHumanSizeString.util";
|
import { byteToHumanSizeString } from "../../utils/fileSize.util";
|
||||||
import toast from "../../utils/toast.util";
|
import toast from "../../utils/toast.util";
|
||||||
|
|
||||||
const useStyles = createStyles((theme) => ({
|
const useStyles = createStyles((theme) => ({
|
||||||
@@ -33,9 +33,13 @@ const useStyles = createStyles((theme) => ({
|
|||||||
|
|
||||||
const Dropzone = ({
|
const Dropzone = ({
|
||||||
isUploading,
|
isUploading,
|
||||||
|
maxShareSize,
|
||||||
|
files,
|
||||||
setFiles,
|
setFiles,
|
||||||
}: {
|
}: {
|
||||||
isUploading: boolean;
|
isUploading: boolean;
|
||||||
|
maxShareSize: number;
|
||||||
|
files: FileUpload[];
|
||||||
setFiles: Dispatch<SetStateAction<FileUpload[]>>;
|
setFiles: Dispatch<SetStateAction<FileUpload[]>>;
|
||||||
}) => {
|
}) => {
|
||||||
const config = useConfig();
|
const config = useConfig();
|
||||||
@@ -45,18 +49,30 @@ const Dropzone = ({
|
|||||||
return (
|
return (
|
||||||
<div className={classes.wrapper}>
|
<div className={classes.wrapper}>
|
||||||
<MantineDropzone
|
<MantineDropzone
|
||||||
maxSize={parseInt(config.get("MAX_FILE_SIZE"))}
|
|
||||||
onReject={(e) => {
|
onReject={(e) => {
|
||||||
toast.error(e[0].errors[0].message);
|
toast.error(e[0].errors[0].message);
|
||||||
}}
|
}}
|
||||||
disabled={isUploading}
|
disabled={isUploading}
|
||||||
openRef={openRef as ForwardedRef<() => void>}
|
openRef={openRef as ForwardedRef<() => void>}
|
||||||
onDrop={(files) => {
|
onDrop={(newFiles: FileUpload[]) => {
|
||||||
const newFiles = files.map((file) => {
|
const fileSizeSum = [...newFiles, ...files].reduce(
|
||||||
(file as FileUpload).uploadingProgress = 0;
|
(n, { size }) => n + size,
|
||||||
return file as FileUpload;
|
0
|
||||||
});
|
);
|
||||||
setFiles(newFiles);
|
|
||||||
|
if (fileSizeSum > maxShareSize) {
|
||||||
|
toast.error(
|
||||||
|
`Your files exceed the maximum share size of ${byteToHumanSizeString(
|
||||||
|
maxShareSize
|
||||||
|
)}.`
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
newFiles = newFiles.map((newFile) => {
|
||||||
|
newFile.uploadingProgress = 0;
|
||||||
|
return newFile;
|
||||||
|
});
|
||||||
|
setFiles([...newFiles, ...files]);
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
className={classes.dropzone}
|
className={classes.dropzone}
|
||||||
radius="md"
|
radius="md"
|
||||||
@@ -70,8 +86,8 @@ const Dropzone = ({
|
|||||||
</Text>
|
</Text>
|
||||||
<Text align="center" size="sm" mt="xs" color="dimmed">
|
<Text align="center" size="sm" mt="xs" color="dimmed">
|
||||||
Drag'n'drop files here to start your share. We can accept
|
Drag'n'drop files here to start your share. We can accept
|
||||||
only files that are less than{" "}
|
only files that are less than {byteToHumanSizeString(maxShareSize)}{" "}
|
||||||
{byteStringToHumanSizeString(config.get("MAX_FILE_SIZE"))} in size.
|
in total.
|
||||||
</Text>
|
</Text>
|
||||||
</div>
|
</div>
|
||||||
</MantineDropzone>
|
</MantineDropzone>
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
import moment from "moment";
|
|
||||||
|
|
||||||
const ExpirationPreview = ({ form }: { form: any }) => {
|
|
||||||
const value = form.values.never_expires
|
|
||||||
? "never"
|
|
||||||
: form.values.expiration_num + form.values.expiration_unit;
|
|
||||||
if (value === "never") return "This share will never expire.";
|
|
||||||
|
|
||||||
const expirationDate = moment()
|
|
||||||
.add(
|
|
||||||
value.split("-")[0],
|
|
||||||
value.split("-")[1] as moment.unitOfTime.DurationConstructor
|
|
||||||
)
|
|
||||||
.toDate();
|
|
||||||
|
|
||||||
return `This share will expire on ${moment(expirationDate).format("LLL")}`;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ExpirationPreview;
|
|
||||||
@@ -2,7 +2,7 @@ import { ActionIcon, Table } from "@mantine/core";
|
|||||||
import { Dispatch, SetStateAction } from "react";
|
import { Dispatch, SetStateAction } from "react";
|
||||||
import { TbTrash } from "react-icons/tb";
|
import { TbTrash } from "react-icons/tb";
|
||||||
import { FileUpload } from "../../types/File.type";
|
import { FileUpload } from "../../types/File.type";
|
||||||
import { byteStringToHumanSizeString } from "../../utils/math/byteStringToHumanSizeString.util";
|
import { byteToHumanSizeString } from "../../utils/fileSize.util";
|
||||||
import UploadProgressIndicator from "./UploadProgressIndicator";
|
import UploadProgressIndicator from "./UploadProgressIndicator";
|
||||||
|
|
||||||
const FileList = ({
|
const FileList = ({
|
||||||
@@ -19,7 +19,7 @@ const FileList = ({
|
|||||||
const rows = files.map((file, i) => (
|
const rows = files.map((file, i) => (
|
||||||
<tr key={i}>
|
<tr key={i}>
|
||||||
<td>{file.name}</td>
|
<td>{file.name}</td>
|
||||||
<td>{byteStringToHumanSizeString(file.size.toString())}</td>
|
<td>{byteToHumanSizeString(file.size)}</td>
|
||||||
<td>
|
<td>
|
||||||
{file.uploadingProgress == 0 ? (
|
{file.uploadingProgress == 0 ? (
|
||||||
<ActionIcon
|
<ActionIcon
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { RingProgress } from "@mantine/core";
|
import { Loader, RingProgress } from "@mantine/core";
|
||||||
import { TbCircleCheck, TbCircleX } from "react-icons/tb";
|
import { TbCircleCheck } from "react-icons/tb";
|
||||||
const UploadProgressIndicator = ({ progress }: { progress: number }) => {
|
const UploadProgressIndicator = ({ progress }: { progress: number }) => {
|
||||||
if (progress > 0 && progress < 100) {
|
if (progress > 0 && progress < 100) {
|
||||||
return (
|
return (
|
||||||
@@ -12,7 +12,7 @@ const UploadProgressIndicator = ({ progress }: { progress: number }) => {
|
|||||||
} else if (progress >= 100) {
|
} else if (progress >= 100) {
|
||||||
return <TbCircleCheck color="green" size={22} />;
|
return <TbCircleCheck color="green" size={22} />;
|
||||||
} else {
|
} else {
|
||||||
return <TbCircleX color="red" size={22} />;
|
return <Loader color="red" size={19} />;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,11 @@ import { TbCopy } from "react-icons/tb";
|
|||||||
import { Share } from "../../../types/share.type";
|
import { Share } from "../../../types/share.type";
|
||||||
import toast from "../../../utils/toast.util";
|
import toast from "../../../utils/toast.util";
|
||||||
|
|
||||||
const showCompletedUploadModal = (modals: ModalsContextProps, share: Share) => {
|
const showCompletedUploadModal = (
|
||||||
|
modals: ModalsContextProps,
|
||||||
|
share: Share,
|
||||||
|
appUrl: string
|
||||||
|
) => {
|
||||||
return modals.openModal({
|
return modals.openModal({
|
||||||
closeOnClickOutside: false,
|
closeOnClickOutside: false,
|
||||||
withCloseButton: false,
|
withCloseButton: false,
|
||||||
@@ -25,18 +29,20 @@ const showCompletedUploadModal = (modals: ModalsContextProps, share: Share) => {
|
|||||||
<Title order={4}>Share ready</Title>
|
<Title order={4}>Share ready</Title>
|
||||||
</Stack>
|
</Stack>
|
||||||
),
|
),
|
||||||
children: <Body share={share} />,
|
children: <Body share={share} appUrl={appUrl} />,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const Body = ({ share }: { share: Share }) => {
|
const Body = ({ share, appUrl }: { share: Share; appUrl: string }) => {
|
||||||
const clipboard = useClipboard({ timeout: 500 });
|
const clipboard = useClipboard({ timeout: 500 });
|
||||||
const modals = useModals();
|
const modals = useModals();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const link = `${window.location.origin}/share/${share.id}`;
|
|
||||||
|
const link = `${appUrl}/share/${share.id}`;
|
||||||
return (
|
return (
|
||||||
<Stack align="stretch">
|
<Stack align="stretch">
|
||||||
<TextInput
|
<TextInput
|
||||||
|
readOnly
|
||||||
variant="filled"
|
variant="filled"
|
||||||
value={link}
|
value={link}
|
||||||
rightSection={
|
rightSection={
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user