Add clickable link to reverse share's shares

Co-authored-by: Elias Schneider <login@eliasschneider.com>

.github/ISSUE_TEMPLATE/language-request.yml

@@ -1,19 +0,0 @@
-name: "🌐 Language request"
-description: "You want to contribute to a language that isn't on Crowdin yet?"
-title: "🌐 Language request: <language name in english>"
-labels: [language-request]
-body:
-  - type: input
-    id: language-name-native
-    attributes:
-      label: "🌐 Language name (native)"
-      placeholder: "Schweizerdeutsch"
-    validations:
-      required: true
-  - type: input
-    id: language-code
-    attributes:
-      label: "🌐 Language code"
-      placeholder: "de-CH"
-    validations:
-      required: true

.github/workflows/build-docker-image.yml

@@ -1,4 +1,4 @@
-name: Build and Push Docker Image
+name: Create Docker Image
 
 on:
   release:
@@ -10,25 +10,15 @@ jobs:
     steps:
       - name: checkout code
         uses: actions/checkout@v3
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
         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
-        uses: docker/login-action@v2
+      - name: Build the image
-        with:
+        run: |
-          username: ${{ secrets.DOCKER_USERNAME }}
+          docker buildx build --push \
-          password: ${{ secrets.DOCKER_PASSWORD }}
+             --tag stonith404/pingvin-share:latest \
-
+             --tag stonith404/pingvin-share:${{  github.ref_name }} \
-      - name: Build and push
+             --platform linux/amd64,linux/arm64 .
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: stonith404/pingvin-share:latest,stonith404/pingvin-share:${{  github.ref_name }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/close_inactive_issues.yml

@@ -0,0 +1,23 @@
+name: Close inactive issues
+on:
+  schedule:
+    - cron: "00 00 * * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v4
+        with:
+          days-before-issue-stale: 30
+          days-before-issue-close: 14
+          exempt-issue-labels: "feature"
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
+          close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.prettierignore

@@ -0,0 +1 @@
+/backend/src/constants.ts

CHANGELOG.md

@@ -1,217 +1,3 @@
-## [0.21.5](https://github.com/stonith404/pingvin-share/compare/v0.21.4...v0.21.5) (2024-01-14)
-
-
-### Bug Fixes
-
-* password can be changed with wrong password ([0ccb836](https://github.com/stonith404/pingvin-share/commit/0ccb8364448d27ea07c8b11972ff454d610893c6))
-
-## [0.21.4](https://github.com/stonith404/pingvin-share/compare/v0.21.3...v0.21.4) (2024-01-09)
-
-
-### Features
-
-* **frontend:** add navigateToLink button for CopyTextField. close [#372](https://github.com/stonith404/pingvin-share/issues/372). ([#376](https://github.com/stonith404/pingvin-share/issues/376)) ([d775008](https://github.com/stonith404/pingvin-share/commit/d7750086b5b796cfc70d8dc0c7d0ab4bd1996ca0))
-
-## [0.21.3](https://github.com/stonith404/pingvin-share/compare/v0.21.2...v0.21.3) (2024-01-02)
-
-
-### Bug Fixes
-
-* don't show validation error on upload modal if password or max views are empty ([fe09d0e](https://github.com/stonith404/pingvin-share/commit/fe09d0e25f6fbfc4e1c9302054d3387fe8b1f0ea))
-
-## [0.21.2](https://github.com/stonith404/pingvin-share/compare/v0.21.1...v0.21.2) (2023-12-29)
-
-
-### Bug Fixes
-
-* missing logo images on fresh installation ([6fb31ab](https://github.com/stonith404/pingvin-share/commit/6fb31abd84b22cd464b6b45bf7ca6f83853e8720))
-* missing translations on reset password page ([7a301b4](https://github.com/stonith404/pingvin-share/commit/7a301b455cdea4b1dbc04cc6223e094fee9aca7b))
-
-## [0.21.1](https://github.com/stonith404/pingvin-share/compare/v0.21.0...v0.21.1) (2023-12-20)
-
-
-### Features
-
-* **oauth:** add oidc username claim ([#357](https://github.com/stonith404/pingvin-share/issues/357)) ([3ea52a2](https://github.com/stonith404/pingvin-share/commit/3ea52a24ef7c3b6845bc13382616ea0c8d784585))
-
-## [0.21.0](https://github.com/stonith404/pingvin-share/compare/v0.20.3...v0.21.0) (2023-12-01)
-
-
-### Features
-
-* **oauth:** limited discord server sign-in ([#346](https://github.com/stonith404/pingvin-share/issues/346)) ([5f94c72](https://github.com/stonith404/pingvin-share/commit/5f94c7295ab8594ed2ed615628214e869a02da2d))
-
-## [0.20.3](https://github.com/stonith404/pingvin-share/compare/v0.20.2...v0.20.3) (2023-11-17)
-
-
-### Bug Fixes
-
-* max expiration gets ignored if expiration is set to "never" ([330eef5](https://github.com/stonith404/pingvin-share/commit/330eef51e4f3f3fb29833bc9337e705553340aaa))
-
-## [0.20.2](https://github.com/stonith404/pingvin-share/compare/v0.20.1...v0.20.2) (2023-11-11)
-
-
-### Bug Fixes
-
-* **oauth:** github and discord login error ([#323](https://github.com/stonith404/pingvin-share/issues/323)) ([fd44f42](https://github.com/stonith404/pingvin-share/commit/fd44f42f28c0fa2091876b138f170202d9fde04e)), closes [#322](https://github.com/stonith404/pingvin-share/issues/322) [#302](https://github.com/stonith404/pingvin-share/issues/302)
-* reverse shares couldn't be created unauthenticated ([966ce26](https://github.com/stonith404/pingvin-share/commit/966ce261cb4ad99efaadef5c36564fdfaed0d5c4))
-
-## [0.20.1](https://github.com/stonith404/pingvin-share/compare/v0.20.0...v0.20.1) (2023-11-05)
-
-
-### Bug Fixes
-
-* share information text color in light mode ([1138cd0](https://github.com/stonith404/pingvin-share/commit/1138cd02b0b6ac1d71c4dbc2808110c672237190))
-
-## [0.20.0](https://github.com/stonith404/pingvin-share/compare/v0.19.2...v0.20.0) (2023-11-04)
-
-
-### Features
-
-* ability to add and delete files of existing share ([#306](https://github.com/stonith404/pingvin-share/issues/306)) ([98380e2](https://github.com/stonith404/pingvin-share/commit/98380e2d48cc8ffa831d9b69cf5c0e8a40e28862))
-
-## [0.19.2](https://github.com/stonith404/pingvin-share/compare/v0.19.1...v0.19.2) (2023-11-03)
-
-
-### Features
-
-* ability to limit the max expiration of a share ([bbfc9d6](https://github.com/stonith404/pingvin-share/commit/bbfc9d6f147eea404f011c3af9d7dc7655c3d21d))
-* change totp issuer to display logo in 2FAS app ([e0fbbec](https://github.com/stonith404/pingvin-share/commit/e0fbbeca3c1a858838b20aeead52694772b7d871))
-
-
-### Bug Fixes
-
-* jwt secret changes on application restart ([33742a0](https://github.com/stonith404/pingvin-share/commit/33742a043d6549783984ae7e8a3c30f0fe3917de))
-* wrong validation of setting max share expiration to `0` ([acc35f4](https://github.com/stonith404/pingvin-share/commit/acc35f47178e230f50ce54d6f1ad5370caa3382d))
-
-## [0.19.1](https://github.com/stonith404/pingvin-share/compare/v0.19.0...v0.19.1) (2023-10-22)
-
-
-### Bug Fixes
-
-* **oauth:** fix wrong redirectUri in oidc after change appUrl ([#296](https://github.com/stonith404/pingvin-share/issues/296)) ([119b1ec](https://github.com/stonith404/pingvin-share/commit/119b1ec840ad7f4e1c7c4bb476bf1eeed91d9a1a))
-
-## [0.19.0](https://github.com/stonith404/pingvin-share/compare/v0.18.2...v0.19.0) (2023-10-22)
-
-
-### Features
-
-* **auth:** add OAuth2 login ([#276](https://github.com/stonith404/pingvin-share/issues/276)) ([02cd98f](https://github.com/stonith404/pingvin-share/commit/02cd98fa9cf9865d91494848aabaf42b19e4957b)), closes [#278](https://github.com/stonith404/pingvin-share/issues/278) [#279](https://github.com/stonith404/pingvin-share/issues/279) [#281](https://github.com/stonith404/pingvin-share/issues/281)
-
-
-### Bug Fixes
-
-* delete unfinished shares after a day ([d327bc3](https://github.com/stonith404/pingvin-share/commit/d327bc355c8583231e058731934cf51ab25d9ce5))
-
-## [0.18.2](https://github.com/stonith404/pingvin-share/compare/v0.18.1...v0.18.2) (2023-10-09)
-
-
-### Bug Fixes
-
-* disable image optimizations for logo to prevent caching issues with custom logos ([3891900](https://github.com/stonith404/pingvin-share/commit/38919003e9091203b507d0f0b061f4a1835ff4f4))
-* memory leak while downloading large files ([97e7d71](https://github.com/stonith404/pingvin-share/commit/97e7d7190dfe219caf441dffcd7830c304c3c939))
-
-## [0.18.1](https://github.com/stonith404/pingvin-share/compare/v0.18.0...v0.18.1) (2023-09-22)
-
-
-### Bug Fixes
-
-* permission changes of docker container brakes existing installations ([6a4108e](https://github.com/stonith404/pingvin-share/commit/6a4108ed6138e7297e66fd1e38450f23afe99aae))
-
-## [0.18.0](https://github.com/stonith404/pingvin-share/compare/v0.17.5...v0.18.0) (2023-09-21)
-
-
-### Features
-
-* show upload modal on file drop ([13e7a30](https://github.com/stonith404/pingvin-share/commit/13e7a30bb96faeb25936ff08a107834fd7af5766))
-
-
-### Bug Fixes
-
-* **docker:** Updated to newest version of alpine linux and fixed missing dependencies ([#255](https://github.com/stonith404/pingvin-share/issues/255)) ([6fa7af7](https://github.com/stonith404/pingvin-share/commit/6fa7af79051c964060bd291c9faad90fc01a1b72))
-* nextjs proxy warning ([e9efbc1](https://github.com/stonith404/pingvin-share/commit/e9efbc17bcf4827e935e2018dcdf3b70a9a49991))
-
-## [0.17.5](https://github.com/stonith404/pingvin-share/compare/v0.17.4...v0.17.5) (2023-09-03)
-
-
-### Features
-
-* **localization:** Added thai language ([#231](https://github.com/stonith404/pingvin-share/issues/231)) ([bddb87b](https://github.com/stonith404/pingvin-share/commit/bddb87b9b3ec5426a3c7a14a96caf2eb45b93ff7))
-
-
-### Bug Fixes
-
-* autocomplete on create share modal ([d4e8d4f](https://github.com/stonith404/pingvin-share/commit/d4e8d4f58b9b7d10b865eff49aa784547891c4e8))
-* missing translation ([7647a9f](https://github.com/stonith404/pingvin-share/commit/7647a9f620cbc5d38e019225a680a53bd3027698))
-
-## [0.17.4](https://github.com/stonith404/pingvin-share/compare/v0.17.3...v0.17.4) (2023-08-01)
-
-
-### Bug Fixes
-
-* redirection to `localhost:3000` ([ea0d521](https://github.com/stonith404/pingvin-share/commit/ea0d5216e89346b8d3ef0277b76fdc6302e9de15))
-
-## [0.17.3](https://github.com/stonith404/pingvin-share/compare/v0.17.2...v0.17.3) (2023-07-31)
-
-
-### Bug Fixes
-
-* logo doesn't get loaded correctly ([9ba2b4c](https://github.com/stonith404/pingvin-share/commit/9ba2b4c82cdad9097b33f0451771818c7b972a6b))
-* share expiration never doesn't work if using another language than English ([a47d080](https://github.com/stonith404/pingvin-share/commit/a47d080657e1d08ef06ec7425d8bdafd5a26c24a))
-
-## [0.17.2](https://github.com/stonith404/pingvin-share/compare/v0.17.1...v0.17.2) (2023-07-31)
-
-
-### Bug Fixes
-
-* `ECONNREFUSED` with Docker ipv6 enabled ([c9a2a46](https://github.com/stonith404/pingvin-share/commit/c9a2a469c67d3c3cd08179b44e2bf82208f05177))
-
-## [0.17.1](https://github.com/stonith404/pingvin-share/compare/v0.17.0...v0.17.1) (2023-07-30)
-
-
-### Bug Fixes
-
-* rename pt-PT.ts to pt-BR.ts ([2584bb0](https://github.com/stonith404/pingvin-share/commit/2584bb0d48c761940eafc03d5cd98d47e7a5b0ae))
-
-## [0.17.0](https://github.com/stonith404/pingvin-share/compare/v0.16.1...v0.17.0) (2023-07-23)
-
-
-### Features
-
-* ability to define zip compression level ([7827b68](https://github.com/stonith404/pingvin-share/commit/7827b687fa022e86a2643e7a1951af8c7e80608c))
-* add note to language picker ([7f0c31c](https://github.com/stonith404/pingvin-share/commit/7f0c31c2e09b3ee9aae6c3dfb54fac2f2b1dfe23))
-* add share url alias `/s` ([231a2e9](https://github.com/stonith404/pingvin-share/commit/231a2e95b9734cf4704454e1945698753dbb378b))
-* localization ([#196](https://github.com/stonith404/pingvin-share/issues/196)) ([b9f6e3b](https://github.com/stonith404/pingvin-share/commit/b9f6e3bd08dcfc050048fba582b35958bc7b6184))
-* update default value of `maxSize` from `1073741824` to `1000000000` ([389dc87](https://github.com/stonith404/pingvin-share/commit/389dc87cac775d916d0cff9b71d3c5ff90bfe916))
-
-
-### Bug Fixes
-
-* confusion between GB and GiB ([5816b39](https://github.com/stonith404/pingvin-share/commit/5816b39fc6ef6fe6b7cf8e7925aa297561f5b796))
-* mistakes in English translations ([70b425b](https://github.com/stonith404/pingvin-share/commit/70b425b3807be79a3b518cc478996c71dffcf986))
-* wrong layout if button text is too long in modals ([f4c88ae](https://github.com/stonith404/pingvin-share/commit/f4c88aeb0823c2c18535c25fcf8e16afa8b53a56))
-
-### [0.16.1](https://github.com/stonith404/pingvin-share/compare/v0.16.0...v0.16.1) (2023-07-10)
-
-
-### Features
-
-* Adding reverse share ability to copy the link ([#191](https://github.com/stonith404/pingvin-share/issues/191)) ([7574eb3](https://github.com/stonith404/pingvin-share/commit/7574eb3191f21aadd64f436e9e7c78d3e3973a07)), closes [#178](https://github.com/stonith404/pingvin-share/issues/178) [#181](https://github.com/stonith404/pingvin-share/issues/181)
-* Adding reverse shares' shares a clickable link ([#190](https://github.com/stonith404/pingvin-share/issues/190)) ([0276294](https://github.com/stonith404/pingvin-share/commit/0276294f5219a7edcc762bc52391b6720cfd741d))
-
-
-### Bug Fixes
-
-* set link default value to random ([#192](https://github.com/stonith404/pingvin-share/issues/192)) ([a1ea7c0](https://github.com/stonith404/pingvin-share/commit/a1ea7c026594a54eafd52f764eecbf06e1bb4d4e)), closes [#178](https://github.com/stonith404/pingvin-share/issues/178) [#181](https://github.com/stonith404/pingvin-share/issues/181)
-
-## [0.16.0](https://github.com/stonith404/pingvin-share/compare/v0.15.0...v0.16.0) (2023-07-09)
-
-
-### Features
-
-* Adding more informations on My Shares page (table and modal) ([#174](https://github.com/stonith404/pingvin-share/issues/174)) ([1466240](https://github.com/stonith404/pingvin-share/commit/14662404614f15bc25384d924d8cb0458ab06cd8))
-* Adding the possibility of copying the link by clicking text and icons ([#171](https://github.com/stonith404/pingvin-share/issues/171)) ([348852c](https://github.com/stonith404/pingvin-share/commit/348852cfa4275f5c642669b43697f83c35333044))
-
 ## [0.15.0](https://github.com/stonith404/pingvin-share/compare/v0.14.1...v0.15.0) (2023-05-09)
 
 

Dockerfile

@@ -1,25 +1,27 @@
-# Stage 1: Frontend dependencies
+# Using node slim because prisma ORM needs libc for ARM builds
-FROM node:20-alpine AS frontend-dependencies
+
+# Stage 1: on frontend dependency change
+FROM node:19-slim AS frontend-dependencies
 WORKDIR /opt/app
 COPY frontend/package.json frontend/package-lock.json ./
 RUN npm ci
 
-# Stage 2: Build frontend
+# Stage 2: on frontend change
-FROM node:20-alpine AS frontend-builder
+FROM node:19-slim AS frontend-builder
 WORKDIR /opt/app
 COPY ./frontend .
 COPY --from=frontend-dependencies /opt/app/node_modules ./node_modules
 RUN npm run build
 
-# Stage 3: Backend dependencies
+# Stage 3: on backend dependency change
-FROM node:20-alpine AS backend-dependencies
+FROM node:19-slim AS backend-dependencies
-RUN apk add --no-cache python3
 WORKDIR /opt/app
 COPY backend/package.json backend/package-lock.json ./
 RUN npm ci
 
-# Stage 4: Build backend
+# Stage 4:on backend change
-FROM node:20-alpine AS backend-builder
+FROM node:19-slim AS backend-builder
+RUN apt-get update && apt-get install -y openssl
 WORKDIR /opt/app
 COPY ./backend .
 COPY --from=backend-dependencies /opt/app/node_modules ./node_modules
@@ -27,15 +29,9 @@ RUN npx prisma generate
 RUN npm run build  && npm prune --production
 
 # Stage 5: Final image
-FROM node:20-alpine AS runner
+FROM node:19-slim AS runner
 ENV NODE_ENV=docker
-
+RUN apt-get update && apt-get install -y curl openssl
-# Alpine specific dependencies
-RUN apk update --no-cache
-RUN apk upgrade --no-cache
-RUN apk add --no-cache curl nginx
-
-COPY ./nginx/nginx.conf /etc/nginx/nginx.conf
 
 WORKDIR /opt/app/frontend
 COPY --from=frontend-builder /opt/app/public ./public
@@ -50,12 +46,7 @@ COPY --from=backend-builder /opt/app/prisma ./prisma
 COPY --from=backend-builder /opt/app/package.json ./
 
 WORKDIR /opt/app
-
 EXPOSE 3000
-
-# Add a health check to ensure the container is healthy
 HEALTHCHECK --interval=10s --timeout=3s CMD curl -f http://localhost:3000/api/health || exit 1
 
-# Application startup
+CMD cp -rn /tmp/img /opt/app/frontend/public && node frontend/server.js & cd backend && npm run prod
-# HOSTNAME=0.0.0.0 fixes https://github.com/vercel/next.js/issues/51684. It can be removed as soon as the issue is fixed
-CMD cp -rn /tmp/img/* /opt/app/frontend/public/img && nginx && PORT=3333 HOSTNAME=0.0.0.0 node frontend/server.js & cd backend && npm run prod

README.md

@@ -2,7 +2,7 @@
 
 ---
 
-_Read this in another language: [Spanish](/docs/README.es.md), [English](/README.md), [Simplified Chinese](/docs/README.zh-cn.md), [日本語](/docs/README.ja-jp.md)_
+_Read this in another language: [Spanish](/docs/README.es.md), [English](/README.md), [Simplified Chinese](/docs/README.zh-cn.md)_
 
 ---
 
@@ -63,8 +63,6 @@ npm run build
 pm2 start --name="pingvin-share-frontend" npm -- run start
 ```
 
-**Uploading Large Files**: By default, Pingvin Share uses a built-in reverse proxy to reduce the installation steps. However, this reverse proxy is not optimized for uploading large files. If you wish to upload larger files, you can either use the Docker installation or set up your own reverse proxy. An example configuration for Nginx can be found in `/nginx/nginx.conf`.
-
 The website is now listening on `http://localhost:3000`, have fun with Pingvin Share 🐧!
 
 ### Integrations
@@ -79,10 +77,6 @@ ClamAV is used to scan shares for malicious files and remove them if found.
 
 Please note that ClamAV needs a lot of [ressources](https://docs.clamav.net/manual/Installing/Docker.html#memory-ram-requirements).
 
-#### OAuth 2 Login
-
-View the [OAuth 2 guide](/docs/oauth2-guide.md) for more information.
-
 ### Additional resources
 
 - [Synology NAS installation](https://mariushosting.com/how-to-install-pingvin-share-on-your-synology-nas/)
@@ -150,15 +144,4 @@ For installation specific configuration, you can use environment variables. The
 
 ## 🖤 Contribute
 
-### Translations
+You're very welcome to contribute to Pingvin Share! Follow the [contribution guide](/CONTRIBUTING.md) to get started.
-
-You can help to translate Pingvin Share into your language.
-On [Crowdin](https://crowdin.com/project/pingvin-share) you can easily translate Pingvin Share online.
-
-Is your language not on Crowdin? Feel free to [Request it](https://github.com/stonith404/pingvin-share/issues/new?assignees=&labels=language-request&projects=&template=language-request.yml&title=%F0%9F%8C%90+Language+request%3A+%3Clanguage+name+in+english%3E).
-
-Any issues while translating? Feel free to participate in the [Localization discussion](https://github.com/stonith404/pingvin-share/discussions/198).
-
-### Project
-
-You're very welcome to contribute to Pingvin Share! Please follow the [contribution guide](/CONTRIBUTING.md) to get started.

backend/.prettierignore

@@ -1 +0,0 @@
-/src/constants.ts

backend/package.json

@@ -1,33 +1,31 @@
 {
   "name": "pingvin-share-backend",
-  "version": "0.21.5",
+  "version": "0.15.0",
   "scripts": {
     "build": "nest build",
     "dev": "cross-env NODE_ENV=development nest start --watch",
     "prod": "prisma migrate deploy && prisma db seed && node dist/src/main",
     "lint": "eslint 'src/**/*.ts'",
-    "format": "prettier --end-of-line=auto --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/newman-system-tests.json"
   },
   "prisma": {
     "seed": "ts-node prisma/seed/config.seed.ts"
   },
   "dependencies": {
-    "@nestjs/cache-manager": "^2.1.0",
+    "@nestjs/common": "^9.3.9",
-    "@nestjs/common": "^10.1.2",
+    "@nestjs/config": "^2.3.1",
-    "@nestjs/config": "^3.0.0",
+    "@nestjs/core": "^9.3.9",
-    "@nestjs/core": "^10.1.2",
+    "@nestjs/jwt": "^10.0.2",
-    "@nestjs/jwt": "^10.1.0",
+    "@nestjs/passport": "^9.0.3",
-    "@nestjs/passport": "^10.0.0",
+    "@nestjs/platform-express": "^9.3.9",
-    "@nestjs/platform-express": "^10.1.2",
+    "@nestjs/schedule": "^2.2.0",
-    "@nestjs/schedule": "^3.0.1",
+    "@nestjs/swagger": "^6.2.1",
-    "@nestjs/swagger": "^7.1.4",
+    "@nestjs/throttler": "^4.0.0",
-    "@nestjs/throttler": "^4.2.1",
+    "@prisma/client": "^4.11.0",
-    "@prisma/client": "^5.0.0",
     "archiver": "^5.3.1",
     "argon2": "^0.30.3",
     "body-parser": "^1.20.2",
-    "cache-manager": "^5.2.4",
     "clamscan": "^2.1.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
@@ -35,51 +33,48 @@
     "cookie-parser": "^1.4.6",
     "mime-types": "^2.1.35",
     "moment": "^2.29.4",
-    "nanoid": "^3.3.6",
+    "nodemailer": "^6.9.1",
-    "node-fetch": "^2.7.0",
-    "nodemailer": "^6.9.4",
     "otplib": "^12.0.1",
     "passport": "^0.6.0",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
     "qrcode-svg": "^1.1.0",
     "reflect-metadata": "^0.1.13",
-    "rimraf": "^5.0.1",
+    "rimraf": "^4.4.0",
-    "rxjs": "^7.8.1",
+    "rxjs": "^7.8.0",
-    "sharp": "^0.32.4",
+    "sharp": "^0.31.3",
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
-    "@nestjs/cli": "^10.1.10",
+    "@nestjs/cli": "^9.2.0",
-    "@nestjs/schematics": "^10.0.1",
+    "@nestjs/schematics": "^9.0.4",
-    "@nestjs/testing": "^10.1.2",
+    "@nestjs/testing": "^9.3.9",
-    "@types/archiver": "^5.3.2",
+    "@types/archiver": "^5.3.1",
     "@types/clamscan": "^2.0.4",
     "@types/cookie-parser": "^1.4.3",
-    "@types/cron": "^2.0.1",
+    "@types/cron": "^2.0.0",
     "@types/express": "^4.17.17",
     "@types/mime-types": "^2.1.1",
     "@types/multer": "^1.4.7",
-    "@types/node": "^20.4.5",
+    "@types/node": "^18.15.0",
-    "@types/node-fetch": "^2.6.6",
+    "@types/nodemailer": "^6.4.7",
-    "@types/nodemailer": "^6.4.9",
+    "@types/passport-jwt": "^3.0.8",
-    "@types/passport-jwt": "^3.0.9",
     "@types/qrcode-svg": "^1.1.1",
     "@types/sharp": "^0.31.1",
     "@types/supertest": "^2.0.12",
-    "@typescript-eslint/eslint-plugin": "^6.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
-    "@typescript-eslint/parser": "^6.2.0",
+    "@typescript-eslint/parser": "^5.54.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.46.0",
+    "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.9.0",
+    "eslint-config-prettier": "^8.7.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "newman": "^5.3.2",
-    "prettier": "^3.0.0",
+    "prettier": "^2.8.4",
-    "prisma": "^5.0.0",
+    "prisma": "^4.11.0",
     "source-map-support": "^0.5.21",
-    "ts-loader": "^9.4.4",
+    "ts-loader": "^9.4.2",
-    "tsconfig-paths": "4.2.0",
+    "tsconfig-paths": "4.1.2",
-    "typescript": "^5.1.6",
+    "typescript": "^4.9.5",
     "wait-on": "^7.0.1"
   }
 }

backend/prisma/migrations/20230718155819_remove_config_veriable_description/migration.sql

@@ -1,27 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `description` on the `Config` table. All the data in the column will be lost.
-
-*/
--- RedefineTables
-PRAGMA foreign_keys=OFF;
-CREATE TABLE "new_Config" (
-    "updatedAt" DATETIME NOT NULL,
-    "name" TEXT NOT NULL,
-    "category" TEXT NOT NULL,
-    "type" TEXT NOT NULL,
-    "defaultValue" TEXT NOT NULL DEFAULT '',
-    "value" TEXT,
-    "obscured" BOOLEAN NOT NULL DEFAULT false,
-    "secret" BOOLEAN NOT NULL DEFAULT true,
-    "locked" BOOLEAN NOT NULL DEFAULT false,
-    "order" INTEGER NOT NULL,
-
-    PRIMARY KEY ("name", "category")
-);
-INSERT INTO "new_Config" ("category", "defaultValue", "locked", "name", "obscured", "order", "secret", "type", "updatedAt", "value") SELECT "category", "defaultValue", "locked", "name", "obscured", "order", "secret", "type", "updatedAt", "value" FROM "Config";
-DROP TABLE "Config";
-ALTER TABLE "new_Config" RENAME TO "Config";
-PRAGMA foreign_key_check;
-PRAGMA foreign_keys=ON;

backend/prisma/migrations/20231021165436_oauth/migration.sql

@@ -1,31 +0,0 @@
--- CreateTable
-CREATE TABLE "OAuthUser" (
-    "id" TEXT NOT NULL PRIMARY KEY,
-    "provider" TEXT NOT NULL,
-    "providerUserId" TEXT NOT NULL,
-    "providerUsername" TEXT NOT NULL,
-    "userId" TEXT NOT NULL,
-    CONSTRAINT "OAuthUser_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
--- RedefineTables
-PRAGMA foreign_keys=OFF;
-CREATE TABLE "new_User" (
-    "id" TEXT NOT NULL PRIMARY KEY,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" DATETIME NOT NULL,
-    "username" TEXT NOT NULL,
-    "email" TEXT NOT NULL,
-    "password" TEXT,
-    "isAdmin" BOOLEAN NOT NULL DEFAULT false,
-    "totpEnabled" BOOLEAN NOT NULL DEFAULT false,
-    "totpVerified" BOOLEAN NOT NULL DEFAULT false,
-    "totpSecret" TEXT
-);
-INSERT INTO "new_User" ("createdAt", "email", "id", "isAdmin", "password", "totpEnabled", "totpSecret", "totpVerified", "updatedAt", "username") SELECT "createdAt", "email", "id", "isAdmin", "password", "totpEnabled", "totpSecret", "totpVerified", "updatedAt", "username" FROM "User";
-DROP TABLE "User";
-ALTER TABLE "new_User" RENAME TO "User";
-CREATE UNIQUE INDEX "User_username_key" ON "User"("username");
-CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
-PRAGMA foreign_key_check;
-PRAGMA foreign_keys=ON;

backend/prisma/schema.prisma

@@ -14,7 +14,7 @@ model User {
 
   username String  @unique
   email    String  @unique
-  password String?
+  password String
   isAdmin  Boolean @default(false)
 
   shares        Share[]
@@ -26,8 +26,6 @@ model User {
   totpVerified       Boolean             @default(false)
   totpSecret         String?
   resetPasswordToken ResetPasswordToken?
-
-  oAuthUsers OAuthUser[]
 }
 
 model RefreshToken {
@@ -62,15 +60,6 @@ model ResetPasswordToken {
   user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
-model OAuthUser {
-  id               String @id @default(uuid())
-  provider         String
-  providerUserId   String
-  providerUsername String
-  userId           String
-  user             User   @relation(fields: [userId], references: [id], onDelete: Cascade)
-}
-
 model Share {
   id        String   @id @default(uuid())
   createdAt DateTime @default(now())
@@ -147,6 +136,7 @@ model Config {
   type         String
   defaultValue String @default("")
   value        String?
+  description  String
   obscured     Boolean @default(false)
   secret       Boolean @default(true)
   locked       Boolean @default(false)

backend/prisma/seed/config.seed.ts

@@ -1,26 +1,30 @@
 import { Prisma, PrismaClient } from "@prisma/client";
 import * as crypto from "crypto";
-
 const configVariables: ConfigVariables = {
   internal: {
     jwtSecret: {
+      description: "Long random string used to sign JWT tokens",
       type: "string",
-      value: crypto.randomBytes(256).toString("base64"),
+      defaultValue: crypto.randomBytes(256).toString("base64"),
       locked: true,
     },
   },
   general: {
     appName: {
+      description: "Name of the application",
       type: "string",
       defaultValue: "Pingvin Share",
       secret: false,
     },
     appUrl: {
+      description: "On which URL Pingvin Share is available",
       type: "string",
       defaultValue: "http://localhost:3000",
+
       secret: false,
     },
     showHomePage: {
+      description: "Whether to show the home page",
       type: "boolean",
       defaultValue: "true",
       secret: false,
@@ -28,69 +32,84 @@ const configVariables: ConfigVariables = {
   },
   share: {
     allowRegistration: {
+      description: "Whether registration is allowed",
       type: "boolean",
       defaultValue: "true",
+
       secret: false,
     },
     allowUnauthenticatedShares: {
+      description: "Whether unauthorized users can create shares",
       type: "boolean",
       defaultValue: "false",
-      secret: false,
+
-    },
-    maxExpiration: {
-      type: "number",
-      defaultValue: "0",
       secret: false,
     },
     maxSize: {
+      description: "Maximum share size in bytes",
       type: "number",
-      defaultValue: "1000000000",
+      defaultValue: "1073741824",
+
       secret: false,
     },
-    zipCompressionLevel: {
-      type: "number",
-      defaultValue: "9",
-    },
   },
   email: {
     enableShareEmailRecipients: {
+      description:
+        "Whether to allow emails to share recipients. Only enable this if you have enabled SMTP.",
       type: "boolean",
       defaultValue: "false",
 
       secret: false,
     },
     shareRecipientsSubject: {
+      description:
+        "Subject of the email which gets sent to the share recipients.",
       type: "string",
       defaultValue: "Files shared with you",
     },
     shareRecipientsMessage: {
+      description:
+        "Message which gets sent to the share recipients.\n\nAvailable variables:\n{creator} - The username of the creator of the share\n{shareUrl} - The URL of the share\n{desc} - The description of the share\n{expires} - The expiration date of the share\n\nVariables will be replaced with the actual values.",
       type: "text",
       defaultValue:
         "Hey!\n\n{creator} shared some files with you, view or download the files with this link: {shareUrl}\n\nThe share will expire {expires}.\n\nNote: {desc}\n\nShared securely with Pingvin Share 🐧",
     },
     reverseShareSubject: {
+      description:
+        "Subject of the email which gets sent when someone created a share with your reverse share link.",
       type: "string",
       defaultValue: "Reverse share link used",
     },
     reverseShareMessage: {
+      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",
       defaultValue:
         "Hey!\n\nA share was just created with your reverse share link: {shareUrl}\n\nShared securely with Pingvin Share 🐧",
     },
     resetPasswordSubject: {
+      description:
+        "Subject of the email which gets sent when a user requests a password reset.",
       type: "string",
       defaultValue: "Pingvin Share password reset",
     },
     resetPasswordMessage: {
+      description:
+        "Message which gets sent when a user requests a password reset. {url} will be replaced with the reset password URL.",
       type: "text",
       defaultValue:
         "Hey!\n\nYou requested a password reset. Click this link to reset your password: {url}\nThe link expires in a hour.\n\nPingvin Share 🐧",
     },
     inviteSubject: {
+      description:
+        "Subject of the email which gets sent when an admin invites an user.",
       type: "string",
       defaultValue: "Pingvin Share invite",
     },
     inviteMessage: {
+      description:
+        "Message which gets sent when an admin invites an user. {url} will be replaced with the invite URL and {password} with the password.",
       type: "text",
       defaultValue:
         "Hey!\n\nYou were invited to Pingvin Share. Click this link to accept the invite: {url}\n\nYour password is: {password}\n\nPingvin Share 🐧",
@@ -98,123 +117,39 @@ const configVariables: ConfigVariables = {
   },
   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",
       defaultValue: "false",
       secret: false,
     },
     host: {
+      description: "Host of the SMTP server",
       type: "string",
       defaultValue: "",
     },
     port: {
+      description: "Port of the SMTP server",
       type: "number",
       defaultValue: "0",
     },
     email: {
+      description: "Email address which the emails get sent from",
       type: "string",
       defaultValue: "",
     },
     username: {
+      description: "Username of the SMTP server",
       type: "string",
       defaultValue: "",
     },
     password: {
+      description: "Password of the SMTP server",
       type: "string",
       defaultValue: "",
       obscured: true,
     },
   },
-  oauth: {
-    "allowRegistration": {
-      type: "boolean",
-      defaultValue: "true",
-    },
-    "ignoreTotp": {
-      type: "boolean",
-      defaultValue: "true",
-    },
-    "github-enabled": {
-      type: "boolean",
-      defaultValue: "false",
-    },
-    "github-clientId": {
-      type: "string",
-      defaultValue: "",
-    },
-    "github-clientSecret": {
-      type: "string",
-      defaultValue: "",
-      obscured: true,
-    },
-    "google-enabled": {
-      type: "boolean",
-      defaultValue: "false",
-    },
-    "google-clientId": {
-      type: "string",
-      defaultValue: "",
-    },
-    "google-clientSecret": {
-      type: "string",
-      defaultValue: "",
-      obscured: true,
-    },
-    "microsoft-enabled": {
-      type: "boolean",
-      defaultValue: "false",
-    },
-    "microsoft-tenant": {
-      type: "string",
-      defaultValue: "common",
-    },
-    "microsoft-clientId": {
-      type: "string",
-      defaultValue: "",
-    },
-    "microsoft-clientSecret": {
-      type: "string",
-      defaultValue: "",
-      obscured: true,
-    },
-    "discord-enabled": {
-      type: "boolean",
-      defaultValue: "false",
-    },
-    "discord-limitedGuild": {
-      type: "string",
-      defaultValue: "",
-    },
-    "discord-clientId": {
-      type: "string",
-      defaultValue: "",
-    },
-    "discord-clientSecret": {
-      type: "string",
-      defaultValue: "",
-      obscured: true,
-    },
-    "oidc-enabled": {
-      type: "boolean",
-      defaultValue: "false",
-    },
-    "oidc-discoveryUri": {
-      type: "string",
-      defaultValue: "",
-    },
-    "oidc-usernameClaim": {
-      type: "string",
-      defaultValue: "",
-    },
-    "oidc-clientId": {
-      type: "string",
-      defaultValue: "",
-    },
-    "oidc-clientSecret": {
-      type: "string",
-      defaultValue: "",
-      obscured: true,
-    },
-  }
 };
 
 type ConfigVariables = {

backend/src/app.controller.ts

@@ -1,19 +0,0 @@
-import { Controller, Get, Res } from "@nestjs/common";
-import { Response } from "express";
-import { PrismaService } from "./prisma/prisma.service";
-
-@Controller("/")
-export class AppController {
-  constructor(private prismaService: PrismaService) {}
-
-  @Get("health")
-  async health(@Res({ passthrough: true }) res: Response) {
-    try {
-      await this.prismaService.config.findMany();
-      return "OK";
-    } catch {
-      res.statusCode = 500;
-      return "ERROR";
-    }
-  }
-}

backend/src/app.module.ts

@@ -14,9 +14,6 @@ import { ShareModule } from "./share/share.module";
 import { UserModule } from "./user/user.module";
 import { ClamScanModule } from "./clamscan/clamscan.module";
 import { ReverseShareModule } from "./reverseShare/reverseShare.module";
-import { AppController } from "./app.controller";
-import { OAuthModule } from "./oauth/oauth.module";
-import { CacheModule } from "@nestjs/cache-manager";
 
 @Module({
   imports: [
@@ -35,12 +32,7 @@ import { CacheModule } from "@nestjs/cache-manager";
     ScheduleModule.forRoot(),
     ClamScanModule,
     ReverseShareModule,
-    OAuthModule,
-    CacheModule.register({
-      isGlobal: true,
-    }),
   ],
-  controllers: [AppController],
   providers: [
     {
       provide: APP_GUARD,

backend/src/auth/auth.controller.ts

@@ -33,24 +33,24 @@ export class AuthController {
   constructor(
     private authService: AuthService,
     private authTotpService: AuthTotpService,
-    private config: ConfigService,
+    private config: ConfigService
   ) {}
 
   @Post("signUp")
   @Throttle(10, 5 * 60)
   async signUp(
     @Body() dto: AuthRegisterDTO,
-    @Res({ passthrough: true }) response: Response,
+    @Res({ passthrough: true }) response: Response
   ) {
     if (!this.config.get("share.allowRegistration"))
       throw new ForbiddenException("Registration is not allowed");
 
     const result = await this.authService.signUp(dto);
 
-    this.authService.addTokensToResponse(
+    response = this.addTokensToResponse(
       response,
       result.refreshToken,
-      result.accessToken,
+      result.accessToken
     );
 
     return result;
@@ -61,15 +61,15 @@ export class AuthController {
   @HttpCode(200)
   async signIn(
     @Body() dto: AuthSignInDTO,
-    @Res({ passthrough: true }) response: Response,
+    @Res({ passthrough: true }) response: Response
   ) {
     const result = await this.authService.signIn(dto);
 
     if (result.accessToken && result.refreshToken) {
-      this.authService.addTokensToResponse(
+      response = this.addTokensToResponse(
         response,
         result.refreshToken,
-        result.accessToken,
+        result.accessToken
       );
     }
 
@@ -81,14 +81,14 @@ export class AuthController {
   @HttpCode(200)
   async signInTotp(
     @Body() dto: AuthSignInTotpDTO,
-    @Res({ passthrough: true }) response: Response,
+    @Res({ passthrough: true }) response: Response
   ) {
     const result = await this.authTotpService.signInTotp(dto);
 
-    this.authService.addTokensToResponse(
+    response = this.addTokensToResponse(
       response,
       result.refreshToken,
-      result.accessToken,
+      result.accessToken
     );
 
     return new TokenDTO().from(result);
@@ -113,15 +113,15 @@ export class AuthController {
   async updatePassword(
     @GetUser() user: User,
     @Res({ passthrough: true }) response: Response,
-    @Body() dto: UpdatePasswordDTO,
+    @Body() dto: UpdatePasswordDTO
   ) {
     const result = await this.authService.updatePassword(
       user,
-      dto.password,
       dto.oldPassword,
+      dto.password
     );
 
-    this.authService.addTokensToResponse(response, result.refreshToken);
+    response = this.addTokensToResponse(response, result.refreshToken);
     return new TokenDTO().from(result);
   }
 
@@ -129,21 +129,21 @@ export class AuthController {
   @HttpCode(200)
   async refreshAccessToken(
     @Req() request: Request,
-    @Res({ passthrough: true }) response: Response,
+    @Res({ passthrough: true }) response: Response
   ) {
     if (!request.cookies.refresh_token) throw new UnauthorizedException();
 
     const accessToken = await this.authService.refreshAccessToken(
-      request.cookies.refresh_token,
+      request.cookies.refresh_token
     );
-    this.authService.addTokensToResponse(response, undefined, accessToken);
+    response = this.addTokensToResponse(response, undefined, accessToken);
     return new TokenDTO().from({ accessToken });
   }
 
   @Post("signOut")
   async signOut(
     @Req() request: Request,
-    @Res({ passthrough: true }) response: Response,
+    @Res({ passthrough: true }) response: Response
   ) {
     await this.authService.signOut(request.cookies.access_token);
     response.cookie("access_token", "accessToken", { maxAge: -1 });
@@ -172,4 +172,22 @@ export class AuthController {
     // Note: We use VerifyTotpDTO here because it has both fields we need: password and totp code
     return this.authTotpService.disableTotp(user, body.password, body.code);
   }
+
+  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;
+  }
 }

backend/src/auth/auth.module.ts

@@ -7,12 +7,7 @@ import { AuthTotpService } from "./authTotp.service";
 import { JwtStrategy } from "./strategy/jwt.strategy";
 
 @Module({
-  imports: [
+  imports: [JwtModule.register({}), EmailModule],
-    JwtModule.register({
-      global: true,
-    }),
-    EmailModule,
-  ],
   controllers: [AuthController],
   providers: [AuthService, AuthTotpService, JwtStrategy],
   exports: [AuthService],

backend/src/auth/auth.service.ts

@@ -8,7 +8,6 @@ import { JwtService } from "@nestjs/jwt";
 import { User } from "@prisma/client";
 import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
 import * as argon from "argon2";
-import { Request, Response } from "express";
 import * as moment from "moment";
 import { ConfigService } from "src/config/config.service";
 import { EmailService } from "src/email/email.service";
@@ -22,13 +21,13 @@ export class AuthService {
     private prisma: PrismaService,
     private jwtService: JwtService,
     private config: ConfigService,
-    private emailService: EmailService,
+    private emailService: EmailService
   ) {}
 
   async signUp(dto: AuthRegisterDTO) {
     const isFirstUser = (await this.prisma.user.count()) == 0;
 
-    const hash = dto.password ? await argon.hash(dto.password) : null;
+    const hash = await argon.hash(dto.password);
     try {
       const user = await this.prisma.user.create({
         data: {
@@ -40,17 +39,17 @@ export class AuthService {
       });
 
       const { refreshToken, refreshTokenId } = await this.createRefreshToken(
-        user.id,
+        user.id
       );
       const accessToken = await this.createAccessToken(user, refreshTokenId);
 
-      return { accessToken, refreshToken, user };
+      return { accessToken, refreshToken };
     } catch (e) {
       if (e instanceof PrismaClientKnownRequestError) {
         if (e.code == "P2002") {
           const duplicatedField: string = e.meta.target[0];
           throw new BadRequestException(
-            `A user with this ${duplicatedField} already exists`,
+            `A user with this ${duplicatedField} already exists`
           );
         }
       }
@@ -70,23 +69,16 @@ export class AuthService {
     if (!user || !(await argon.verify(user.password, dto.password)))
       throw new UnauthorizedException("Wrong email or password");
 
-    return this.generateToken(user);
-  }
-
-  async generateToken(user: User, isOAuth = false) {
     // TODO: Make all old loginTokens invalid when a new one is created
     // Check if the user has TOTP enabled
-    if (
+    if (user.totpVerified) {
-      user.totpVerified &&
-      !(isOAuth && this.config.get("oauth.ignoreTotp"))
-    ) {
       const loginToken = await this.createLoginToken(user.id);
 
       return { loginToken };
     }
 
     const { refreshToken, refreshTokenId } = await this.createRefreshToken(
-      user.id,
+      user.id
     );
     const accessToken = await this.createAccessToken(user, refreshTokenId);
 
@@ -137,11 +129,9 @@ export class AuthService {
     });
   }
 
-  async updatePassword(user: User, newPassword: string, oldPassword?: string) {
+  async updatePassword(user: User, oldPassword: string, newPassword: string) {
-    const isPasswordValid =
+    if (!(await argon.verify(user.password, oldPassword)))
-      !user.password || await argon.verify(user.password, oldPassword);
+      throw new ForbiddenException("Invalid password");
-
-    if (!isPasswordValid) throw new ForbiddenException("Invalid password");
 
     const hash = await argon.hash(newPassword);
 
@@ -168,7 +158,7 @@ export class AuthService {
       {
         expiresIn: "15min",
         secret: this.config.get("internal.jwtSecret"),
-      },
+      }
     );
   }
 
@@ -199,7 +189,7 @@ export class AuthService {
 
     return this.createAccessToken(
       refreshTokenMetaData.user,
-      refreshTokenMetaData.id,
+      refreshTokenMetaData.id
     );
   }
 
@@ -220,38 +210,4 @@ export class AuthService {
 
     return loginToken;
   }
-
-  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,
-      });
-  }
-
-  /**
-   * Returns the user id if the user is logged in, null otherwise
-   */
-  async getIdOfCurrentUser(request: Request): Promise<string | null> {
-    if (!request.cookies.access_token) return null;
-    try {
-      const payload = await this.jwtService.verifyAsync(
-        request.cookies.access_token,
-        {
-          secret: this.config.get("internal.jwtSecret"),
-        },
-      );
-      return payload.sub;
-    } catch {
-      return null;
-    }
-  }
 }

backend/src/auth/authTotp.service.ts

@@ -8,6 +8,7 @@ import { User } from "@prisma/client";
 import * as argon from "argon2";
 import { authenticator, totp } from "otplib";
 import * as qrcode from "qrcode-svg";
+import { ConfigService } from "src/config/config.service";
 import { PrismaService } from "src/prisma/prisma.service";
 import { AuthService } from "./auth.service";
 import { AuthSignInTotpDTO } from "./dto/authSignInTotp.dto";
@@ -17,32 +18,47 @@ export class AuthTotpService {
   constructor(
     private prisma: PrismaService,
     private authService: AuthService,
+    private config: ConfigService
   ) {}
 
   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,
       },
-      include: {
-        user: true,
-      },
     });
 
-    if (!token || token.used)
+    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", "token_expired");
 
     // Check the TOTP code
-    const { totpSecret } = token.user;
+    const { totpSecret } = await this.prisma.user.findUnique({
+      where: { id: user.id },
+      select: { totpSecret: true },
+    });
 
     if (!totpSecret) {
       throw new BadRequestException("TOTP is not enabled");
     }
 
-    if (!authenticator.check(dto.totp, totpSecret)) {
+    const expected = authenticator.generate(totpSecret);
+
+    if (dto.totp !== expected) {
       throw new BadRequestException("Invalid code");
     }
 
@@ -53,10 +69,10 @@ export class AuthTotpService {
     });
 
     const { refreshToken, refreshTokenId } =
-      await this.authService.createRefreshToken(token.user.id);
+      await this.authService.createRefreshToken(user.id);
     const accessToken = await this.authService.createAccessToken(
-      token.user,
+      user,
-      refreshTokenId,
+      refreshTokenId
     );
 
     return { accessToken, refreshToken };
@@ -76,12 +92,13 @@ export class AuthTotpService {
       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",
+      this.config.get("general.appName"),
-      secret,
+      secret
     );
 
     await this.prisma.user.update({

backend/src/auth/decorator/getUser.decorator.ts

@@ -5,5 +5,5 @@ export const GetUser = createParamDecorator(
     const request = ctx.switchToHttp().getRequest();
     const user = request.user;
     return data ? user?.[data] : user;
-  },
+  }
 );

backend/src/auth/dto/authSignInTotp.dto.ts

@@ -1,7 +1,7 @@
 import { IsString } from "class-validator";
 import { AuthSignInDTO } from "./authSignIn.dto";
 
-export class AuthSignInTotpDTO {
+export class AuthSignInTotpDTO extends AuthSignInDTO {
   @IsString()
   totp: string;
 

backend/src/auth/dto/updatePassword.dto.ts

@@ -1,9 +1,8 @@
 import { PickType } from "@nestjs/swagger";
-import { IsOptional, IsString } from "class-validator";
+import { IsString } from "class-validator";
 import { UserDTO } from "src/user/dto/user.dto";
 
 export class UpdatePasswordDTO extends PickType(UserDTO, ["password"]) {
   @IsString()
-  @IsOptional()
+  oldPassword: string;
-  oldPassword?: string;
 }

backend/src/auth/strategy/jwt.strategy.ts

@@ -8,10 +8,7 @@ import { PrismaService } from "src/prisma/prisma.service";
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy) {
-  constructor(
+  constructor(config: ConfigService, private prisma: PrismaService) {
-    config: ConfigService,
-    private prisma: PrismaService,
-  ) {
     config.get("internal.jwtSecret");
     super({
       jwtFromRequest: JwtStrategy.extractJWT,

backend/src/clamscan/clamscan.service.ts

@@ -19,7 +19,7 @@ export class ClamScanService {
 
   constructor(
     private fileService: FileService,
-    private prisma: PrismaService,
+    private prisma: PrismaService
   ) {}
 
   private ClamScan: Promise<NodeClam | null> = new NodeClam()
@@ -81,7 +81,7 @@ export class ClamScanService {
       });
 
       this.logger.warn(
-        `Share ${shareId} deleted because it contained ${infectedFiles.length} malicious file(s)`,
+        `Share ${shareId} deleted because it contained ${infectedFiles.length} malicious file(s)`
       );
     }
   }

backend/src/config/config.controller.ts

@@ -28,7 +28,7 @@ export class ConfigController {
   constructor(
     private configService: ConfigService,
     private logoService: LogoService,
-    private emailService: EmailService,
+    private emailService: EmailService
   ) {}
 
   @Get()
@@ -41,7 +41,7 @@ export class ConfigController {
   @UseGuards(JwtGuard, AdministratorGuard)
   async getByCategory(@Param("category") category: string) {
     return new AdminConfigDTO().fromList(
-      await this.configService.getByCategory(category),
+      await this.configService.getByCategory(category)
     );
   }
 
@@ -49,7 +49,7 @@ export class ConfigController {
   @UseGuards(JwtGuard, AdministratorGuard)
   async updateMany(@Body() data: UpdateConfigDTO[]) {
     return new AdminConfigDTO().fromList(
-      await this.configService.updateMany(data),
+      await this.configService.updateMany(data)
     );
   }
 
@@ -66,9 +66,9 @@ export class ConfigController {
     @UploadedFile(
       new ParseFilePipe({
         validators: [new FileTypeValidator({ fileType: "image/png" })],
-      }),
+      })
     )
-    file: Express.Multer.File,
+    file: Express.Multer.File
   ) {
     return await this.logoService.create(file.buffer);
   }

backend/src/config/config.service.ts

@@ -6,24 +6,17 @@ import {
 } from "@nestjs/common";
 import { Config } from "@prisma/client";
 import { PrismaService } from "src/prisma/prisma.service";
-import { EventEmitter } from "events";
 
-/**
- * ConfigService extends EventEmitter to allow listening for config updates,
- * now only `update` event will be emitted.
- */
 @Injectable()
-export class ConfigService extends EventEmitter {
+export class ConfigService {
   constructor(
     @Inject("CONFIG_VARIABLES") private configVariables: Config[],
-    private prisma: PrismaService,
+    private prisma: PrismaService
-  ) {
+  ) {}
-    super();
-  }
 
   get(key: `${string}.${string}`): any {
     const configVariable = this.configVariables.filter(
-      (variable) => `${variable.category}.${variable.name}` == key,
+      (variable) => `${variable.category}.${variable.name}` == key
     )[0];
 
     if (!configVariable) throw new Error(`Config variable ${key} not found`);
@@ -96,7 +89,7 @@ export class ConfigService extends EventEmitter {
       configVariable.type != "text"
     ) {
       throw new BadRequestException(
-        `Config variable must be of type ${configVariable.type}`,
+        `Config variable must be of type ${configVariable.type}`
       );
     }
 
@@ -112,8 +105,6 @@ export class ConfigService extends EventEmitter {
 
     this.configVariables = await this.prisma.config.findMany();
 
-    this.emit("update", key, value);
-
     return updatedVariable;
   }
 }

backend/src/config/dto/adminConfig.dto.ts

@@ -14,6 +14,9 @@ export class AdminConfigDTO extends ConfigDTO {
   @Expose()
   updatedAt: Date;
 
+  @Expose()
+  description: string;
+
   @Expose()
   obscured: boolean;
 
@@ -25,7 +28,7 @@ export class AdminConfigDTO extends ConfigDTO {
 
   fromList(partial: Partial<AdminConfigDTO>[]) {
     return partial.map((part) =>
-      plainToClass(AdminConfigDTO, part, { excludeExtraneousValues: true }),
+      plainToClass(AdminConfigDTO, part, { excludeExtraneousValues: true })
     );
   }
 }

backend/src/config/dto/config.dto.ts

@@ -12,7 +12,7 @@ export class ConfigDTO {
 
   fromList(partial: Partial<ConfigDTO>[]) {
     return partial.map((part) =>
-      plainToClass(ConfigDTO, part, { excludeExtraneousValues: true }),
+      plainToClass(ConfigDTO, part, { excludeExtraneousValues: true })
     );
   }
 }

backend/src/config/logo.service.ts

@@ -7,8 +7,7 @@ const IMAGES_PATH = "../frontend/public/img";
 @Injectable()
 export class LogoService {
   async create(file: Buffer) {
-    const resized = await sharp(file).resize(900).toBuffer();
+    fs.writeFileSync(`${IMAGES_PATH}/logo.png`, file, "binary");
-    fs.writeFileSync(`${IMAGES_PATH}/logo.png`, resized, "binary");
     this.createFavicon(file);
     this.createPWAIcons(file);
   }
@@ -26,7 +25,7 @@ export class LogoService {
       fs.promises.writeFile(
         `${IMAGES_PATH}/icons/icon-${size}x${size}.png`,
         resized,
-        "binary",
+        "binary"
       );
     }
   }

backend/src/constants.ts

@@ -1,9 +1,5 @@
 export const DATA_DIRECTORY = process.env.DATA_DIRECTORY || "./data";
-export const SHARE_DIRECTORY = `${DATA_DIRECTORY}/uploads/shares`;
+export const SHARE_DIRECTORY =  `${DATA_DIRECTORY}/uploads/shares` 
-export const DATABASE_URL =
+export const DATABASE_URL = process.env.DATABASE_URL || "file:../data/pingvin-share.db?connection_limit=1";
-  process.env.DATABASE_URL ||
+export const CLAMAV_HOST = process.env.CLAMAV_HOST || (process.env.NODE_ENV == "docker" ? "clamav" : "127.0.0.1");
-  "file:../data/pingvin-share.db?connection_limit=1";
-export const CLAMAV_HOST =
-  process.env.CLAMAV_HOST ||
-  (process.env.NODE_ENV == "docker" ? "clamav" : "127.0.0.1");
 export const CLAMAV_PORT = parseInt(process.env.CLAMAV_PORT) || 3310;

backend/src/email/email.service.ts

@@ -32,7 +32,7 @@ export class EmailService {
     await this.getTransporter()
       .sendMail({
         from: `"${this.config.get("general.appName")}" <${this.config.get(
-          "smtp.email",
+          "smtp.email"
         )}>`,
         to: email,
         subject,
@@ -49,12 +49,12 @@ export class EmailService {
     shareId: string,
     creator?: User,
     description?: string,
-    expiration?: Date,
+    expiration?: Date
   ) {
     if (!this.config.get("email.enableShareEmailRecipients"))
       throw new InternalServerErrorException("Email service disabled");
 
-    const shareUrl = `${this.config.get("general.appUrl")}/s/${shareId}`;
+    const shareUrl = `${this.config.get("general.appUrl")}/share/${shareId}`;
 
     await this.sendMail(
       recipientEmail,
@@ -69,13 +69,13 @@ export class EmailService {
           "{expires}",
           moment(expiration).unix() != 0
             ? moment(expiration).fromNow()
-            : "in: never",
+            : "in: never"
-        ),
+        )
     );
   }
 
   async sendMailToReverseShareCreator(recipientEmail: string, shareId: string) {
-    const shareUrl = `${this.config.get("general.appUrl")}/s/${shareId}`;
+    const shareUrl = `${this.config.get("general.appUrl")}/share/${shareId}`;
 
     await this.sendMail(
       recipientEmail,
@@ -83,13 +83,13 @@ export class EmailService {
       this.config
         .get("email.reverseShareMessage")
         .replaceAll("\\n", "\n")
-        .replaceAll("{shareUrl}", shareUrl),
+        .replaceAll("{shareUrl}", shareUrl)
     );
   }
 
   async sendResetPasswordEmail(recipientEmail: string, token: string) {
     const resetPasswordUrl = `${this.config.get(
-      "general.appUrl",
+      "general.appUrl"
     )}/auth/resetPassword/${token}`;
 
     await this.sendMail(
@@ -98,7 +98,7 @@ export class EmailService {
       this.config
         .get("email.resetPasswordMessage")
         .replaceAll("\\n", "\n")
-        .replaceAll("{url}", resetPasswordUrl),
+        .replaceAll("{url}", resetPasswordUrl)
     );
   }
 
@@ -111,7 +111,7 @@ export class EmailService {
       this.config
         .get("email.inviteMessage")
         .replaceAll("{url}", loginUrl)
-        .replaceAll("{password}", password),
+        .replaceAll("{password}", password)
     );
   }
 
@@ -119,7 +119,7 @@ export class EmailService {
     await this.getTransporter()
       .sendMail({
         from: `"${this.config.get("general.appName")}" <${this.config.get(
-          "smtp.email",
+          "smtp.email"
         )}>`,
         to: recipientEmail,
         subject: "Test email",

backend/src/file/file.controller.ts

@@ -1,7 +1,6 @@
 import {
   Body,
   Controller,
-  Delete,
   Get,
   Param,
   Post,
@@ -29,7 +28,7 @@ export class FileController {
     @Query() query: any,
 
     @Body() body: string,
-    @Param("shareId") shareId: string,
+    @Param("shareId") shareId: string
   ) {
     const { id, name, chunkIndex, totalChunks } = query;
 
@@ -40,7 +39,7 @@ export class FileController {
       data,
       { index: parseInt(chunkIndex), total: parseInt(totalChunks) },
       { id, name },
-      shareId,
+      shareId
     );
   }
 
@@ -48,7 +47,7 @@ export class FileController {
   @UseGuards(FileSecurityGuard)
   async getZip(
     @Res({ passthrough: true }) res: Response,
-    @Param("shareId") shareId: string,
+    @Param("shareId") shareId: string
   ) {
     const zip = this.fileService.getZip(shareId);
     res.set({
@@ -65,7 +64,7 @@ export class FileController {
     @Res({ passthrough: true }) res: Response,
     @Param("shareId") shareId: string,
     @Param("fileId") fileId: string,
-    @Query("download") download = "true",
+    @Query("download") download = "true"
   ) {
     const file = await this.fileService.get(shareId, fileId);
 
@@ -82,14 +81,4 @@ export class FileController {
 
     return new StreamableFile(file.file);
   }
-
-  @Delete(":fileId")
-  @SkipThrottle()
-  @UseGuards(ShareOwnerGuard)
-  async remove(
-    @Param("fileId") fileId: string,
-    @Param("shareId") shareId: string,
-  ) {
-    await this.fileService.remove(shareId, fileId);
-  }
 }

backend/src/file/file.service.ts

@@ -18,14 +18,14 @@ export class FileService {
   constructor(
     private prisma: PrismaService,
     private jwtService: JwtService,
-    private config: ConfigService,
+    private config: ConfigService
   ) {}
 
   async create(
     data: string,
     chunk: { index: number; total: number },
     file: { id?: string; name: string },
-    shareId: string,
+    shareId: string
   ) {
     if (!file.id) file.id = crypto.randomUUID();
 
@@ -40,7 +40,7 @@ export class FileService {
     let diskFileSize: number;
     try {
       diskFileSize = fs.statSync(
-        `${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`,
+        `${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`
       ).size;
     } catch {
       diskFileSize = 0;
@@ -62,7 +62,7 @@ export class FileService {
     // Check if share size limit is exceeded
     const fileSizeSum = share.files.reduce(
       (n, { size }) => n + parseInt(size),
-      0,
+      0
     );
 
     const shareSizeSum = fileSizeSum + diskFileSize + buffer.byteLength;
@@ -74,23 +74,23 @@ export class FileService {
     ) {
       throw new HttpException(
         "Max share size exceeded",
-        HttpStatus.PAYLOAD_TOO_LARGE,
+        HttpStatus.PAYLOAD_TOO_LARGE
       );
     }
 
     fs.appendFileSync(
       `${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`,
-      buffer,
+      buffer
     );
 
     const isLastChunk = chunk.index == chunk.total - 1;
     if (isLastChunk) {
       fs.renameSync(
         `${SHARE_DIRECTORY}/${shareId}/${file.id}.tmp-chunk`,
-        `${SHARE_DIRECTORY}/${shareId}/${file.id}`,
+        `${SHARE_DIRECTORY}/${shareId}/${file.id}`
       );
       const fileSize = fs.statSync(
-        `${SHARE_DIRECTORY}/${shareId}/${file.id}`,
+        `${SHARE_DIRECTORY}/${shareId}/${file.id}`
       ).size;
       await this.prisma.file.create({
         data: {
@@ -124,18 +124,6 @@ export class FileService {
     };
   }
 
-  async remove(shareId: string, fileId: string) {
-    const fileMetaData = await this.prisma.file.findUnique({
-      where: { id: fileId },
-    });
-
-    if (!fileMetaData) throw new NotFoundException("File not found");
-
-    fs.unlinkSync(`${SHARE_DIRECTORY}/${shareId}/${fileId}`);
-
-    await this.prisma.file.delete({ where: { id: fileId } });
-  }
-
   async deleteAllFiles(shareId: string) {
     await fs.promises.rm(`${SHARE_DIRECTORY}/${shareId}`, {
       recursive: true,

backend/src/file/guard/fileSecurity.guard.ts

@@ -14,7 +14,7 @@ import { ShareService } from "src/share/share.service";
 export class FileSecurityGuard extends ShareSecurityGuard {
   constructor(
     private _shareService: ShareService,
-    private _prisma: PrismaService,
+    private _prisma: PrismaService
   ) {
     super(_shareService, _prisma);
   }
@@ -24,7 +24,7 @@ export class FileSecurityGuard extends ShareSecurityGuard {
 
     const shareId = Object.prototype.hasOwnProperty.call(
       request.params,
-      "shareId",
+      "shareId"
     )
       ? request.params.shareId
       : request.params.id;
@@ -52,7 +52,7 @@ export class FileSecurityGuard extends ShareSecurityGuard {
       if (share.security?.maxViews && share.security.maxViews <= share.views) {
         throw new ForbiddenException(
           "Maximum views exceeded",
-          "share_max_views_exceeded",
+          "share_max_views_exceeded"
         );
       }
 

backend/src/jobs/jobs.service.ts

@@ -14,7 +14,7 @@ export class JobsService {
   constructor(
     private prisma: PrismaService,
     private reverseShareService: ReverseShareService,
-    private fileService: FileService,
+    private fileService: FileService
   ) {}
 
   @Cron("0 * * * *")
@@ -56,33 +56,11 @@ export class JobsService {
 
     if (expiredReverseShares.length > 0) {
       this.logger.log(
-        `Deleted ${expiredReverseShares.length} expired reverse shares`,
+        `Deleted ${expiredReverseShares.length} expired reverse shares`
       );
     }
   }
 
-  @Cron("0 */6 * * *")
-  async deleteUnfinishedShares() {
-    const unfinishedShares = await this.prisma.share.findMany({
-      where: {
-        createdAt: { lt: moment().subtract(1, "day").toDate() },
-        uploadLocked: false,
-      },
-    });
-
-    for (const unfinishedShare of unfinishedShares) {
-      await this.prisma.share.delete({
-        where: { id: unfinishedShare.id },
-      });
-
-      await this.fileService.deleteAllFiles(unfinishedShare.id);
-    }
-
-    if (unfinishedShares.length > 0) {
-      this.logger.log(`Deleted ${unfinishedShares.length} unfinished shares`);
-    }
-  }
-
   @Cron("0 0 * * *")
   deleteTemporaryFiles() {
     let filesDeleted = 0;
@@ -99,7 +77,7 @@ export class JobsService {
 
       for (const file of temporaryFiles) {
         const stats = fs.statSync(
-          `${SHARE_DIRECTORY}/${shareDirectory}/${file}`,
+          `${SHARE_DIRECTORY}/${shareDirectory}/${file}`
         );
         const isOlderThanOneDay = moment(stats.mtime)
           .add(1, "day")
@@ -115,7 +93,7 @@ export class JobsService {
     this.logger.log(`Deleted ${filesDeleted} temporary files`);
   }
 
-  @Cron("1 * * * *")
+  @Cron("0 * * * *")
   async deleteExpiredTokens() {
     const { count: refreshTokenCount } =
       await this.prisma.refreshToken.deleteMany({

backend/src/oauth/dto/oauthCallback.dto.ts

@@ -1,9 +0,0 @@
-import { IsString } from "class-validator";
-
-export class OAuthCallbackDto {
-  @IsString()
-  code: string;
-
-  @IsString()
-  state: string;
-}

backend/src/oauth/dto/oauthSignIn.dto.ts

@@ -1,6 +0,0 @@
-export interface OAuthSignInDto {
-  provider: "github" | "google" | "microsoft" | "discord" | "oidc";
-  providerId: string;
-  providerUsername: string;
-  email: string;
-}

backend/src/oauth/exceptions/errorPage.exception.ts

@@ -1,15 +0,0 @@
-export class ErrorPageException extends Error {
-  /**
-   * Exception for redirecting to error page (all i18n key should omit `error.msg` and `error.param` prefix)
-   * @param key i18n key of message
-   * @param redirect redirect url
-   * @param params message params (key)
-   */
-  constructor(
-    public readonly key: string = "default",
-    public readonly redirect?: string,
-    public readonly params?: string[],
-  ) {
-    super("error");
-  }
-}

backend/src/oauth/filter/errorPageException.filter.ts

@@ -1,39 +0,0 @@
-import { ArgumentsHost, Catch, ExceptionFilter, Logger } from "@nestjs/common";
-import { ConfigService } from "../../config/config.service";
-import { ErrorPageException } from "../exceptions/errorPage.exception";
-
-@Catch(ErrorPageException)
-export class ErrorPageExceptionFilter implements ExceptionFilter {
-  private readonly logger = new Logger(ErrorPageExceptionFilter.name);
-
-  constructor(private config: ConfigService) {}
-
-  catch(exception: ErrorPageException, host: ArgumentsHost) {
-    this.logger.error(
-      JSON.stringify({
-        error: exception.key,
-        params: exception.params,
-        redirect: exception.redirect,
-      }),
-    );
-
-    const ctx = host.switchToHttp();
-    const response = ctx.getResponse();
-
-    const url = new URL(`${this.config.get("general.appUrl")}/error`);
-    url.searchParams.set("error", exception.key);
-    if (exception.redirect) {
-      url.searchParams.set("redirect", exception.redirect);
-    } else {
-      const redirect = ctx.getRequest().cookies.access_token
-        ? "/account"
-        : "/auth/signIn";
-      url.searchParams.set("redirect", redirect);
-    }
-    if (exception.params) {
-      url.searchParams.set("params", exception.params.join(","));
-    }
-
-    response.redirect(url.toString());
-  }
-}

backend/src/oauth/filter/oauthException.filter.ts

@@ -1,38 +0,0 @@
-import {
-  ArgumentsHost,
-  Catch,
-  ExceptionFilter,
-  HttpException,
-  Logger,
-} from "@nestjs/common";
-import { ConfigService } from "../../config/config.service";
-
-@Catch(HttpException)
-export class OAuthExceptionFilter implements ExceptionFilter {
-  private errorKeys: Record<string, string> = {
-    access_denied: "access_denied",
-    expired_token: "expired_token",
-  };
-  private readonly logger = new Logger(OAuthExceptionFilter.name);
-
-  constructor(private config: ConfigService) {}
-
-  catch(exception: HttpException, host: ArgumentsHost) {
-    const ctx = host.switchToHttp();
-    const response = ctx.getResponse();
-    const request = ctx.getRequest();
-
-    this.logger.error(exception.message);
-    this.logger.error(
-      "Request query: " + JSON.stringify(request.query, null, 2),
-    );
-
-    const key = this.errorKeys[request.query.error] || "default";
-
-    const url = new URL(`${this.config.get("general.appUrl")}/error`);
-    url.searchParams.set("redirect", "/account");
-    url.searchParams.set("error", key);
-
-    response.redirect(url.toString());
-  }
-}

backend/src/oauth/guard/oauth.guard.ts

@@ -1,12 +0,0 @@
-import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
-
-@Injectable()
-export class OAuthGuard implements CanActivate {
-  constructor() {}
-
-  canActivate(context: ExecutionContext): boolean {
-    const request = context.switchToHttp().getRequest();
-    const provider = request.params.provider;
-    return request.query.state === request.cookies[`oauth_${provider}_state`];
-  }
-}

backend/src/oauth/guard/provider.guard.ts

@@ -1,24 +0,0 @@
-import {
-  CanActivate,
-  ExecutionContext,
-  Inject,
-  Injectable,
-} from "@nestjs/common";
-import { ConfigService } from "../../config/config.service";
-
-@Injectable()
-export class ProviderGuard implements CanActivate {
-  constructor(
-    private config: ConfigService,
-    @Inject("OAUTH_PLATFORMS") private platforms: string[],
-  ) {}
-
-  canActivate(context: ExecutionContext): boolean {
-    const request = context.switchToHttp().getRequest();
-    const provider = request.params.provider;
-    return (
-      this.platforms.includes(provider) &&
-      this.config.get(`oauth.${provider}-enabled`)
-    );
-  }
-}

backend/src/oauth/oauth.controller.ts

@@ -1,110 +0,0 @@
-import {
-  Controller,
-  Get,
-  Inject,
-  Param,
-  Post,
-  Query,
-  Req,
-  Res,
-  UseFilters,
-  UseGuards,
-} from "@nestjs/common";
-import { User } from "@prisma/client";
-import { Request, Response } from "express";
-import { nanoid } from "nanoid";
-import { AuthService } from "../auth/auth.service";
-import { GetUser } from "../auth/decorator/getUser.decorator";
-import { JwtGuard } from "../auth/guard/jwt.guard";
-import { ConfigService } from "../config/config.service";
-import { OAuthCallbackDto } from "./dto/oauthCallback.dto";
-import { ErrorPageExceptionFilter } from "./filter/errorPageException.filter";
-import { OAuthGuard } from "./guard/oauth.guard";
-import { ProviderGuard } from "./guard/provider.guard";
-import { OAuthService } from "./oauth.service";
-import { OAuthProvider } from "./provider/oauthProvider.interface";
-import { OAuthExceptionFilter } from "./filter/oauthException.filter";
-
-@Controller("oauth")
-export class OAuthController {
-  constructor(
-    private authService: AuthService,
-    private oauthService: OAuthService,
-    private config: ConfigService,
-    @Inject("OAUTH_PROVIDERS")
-    private providers: Record<string, OAuthProvider<unknown>>,
-  ) {}
-
-  @Get("available")
-  available() {
-    return this.oauthService.available();
-  }
-
-  @Get("status")
-  @UseGuards(JwtGuard)
-  async status(@GetUser() user: User) {
-    return this.oauthService.status(user);
-  }
-
-  @Get("auth/:provider")
-  @UseGuards(ProviderGuard)
-  @UseFilters(ErrorPageExceptionFilter)
-  async auth(
-    @Param("provider") provider: string,
-    @Res({ passthrough: true }) response: Response,
-  ) {
-    const state = nanoid(16);
-    const url = await this.providers[provider].getAuthEndpoint(state);
-    response.cookie(`oauth_${provider}_state`, state, { sameSite: "lax" });
-    response.redirect(url);
-  }
-
-  @Get("callback/:provider")
-  @UseGuards(ProviderGuard, OAuthGuard)
-  @UseFilters(ErrorPageExceptionFilter, OAuthExceptionFilter)
-  async callback(
-    @Param("provider") provider: string,
-    @Query() query: OAuthCallbackDto,
-    @Req() request: Request,
-    @Res({ passthrough: true }) response: Response,
-  ) {
-    const oauthToken = await this.providers[provider].getToken(query);
-    const user = await this.providers[provider].getUserInfo(oauthToken, query);
-    const id = await this.authService.getIdOfCurrentUser(request);
-
-    if (id) {
-      await this.oauthService.link(
-        id,
-        provider,
-        user.providerId,
-        user.providerUsername,
-      );
-      response.redirect(this.config.get("general.appUrl") + "/account");
-    } else {
-      const token: {
-        accessToken?: string;
-        refreshToken?: string;
-        loginToken?: string;
-      } = await this.oauthService.signIn(user);
-      if (token.accessToken) {
-        this.authService.addTokensToResponse(
-          response,
-          token.refreshToken,
-          token.accessToken,
-        );
-        response.redirect(this.config.get("general.appUrl"));
-      } else {
-        response.redirect(
-          this.config.get("general.appUrl") + `/auth/totp/${token.loginToken}`,
-        );
-      }
-    }
-  }
-
-  @Post("unlink/:provider")
-  @UseGuards(JwtGuard, ProviderGuard)
-  @UseFilters(ErrorPageExceptionFilter)
-  unlink(@GetUser() user: User, @Param("provider") provider: string) {
-    return this.oauthService.unlink(user, provider);
-  }
-}

backend/src/oauth/oauth.module.ts

@@ -1,56 +0,0 @@
-import { Module } from "@nestjs/common";
-import { OAuthController } from "./oauth.controller";
-import { OAuthService } from "./oauth.service";
-import { AuthModule } from "../auth/auth.module";
-import { GitHubProvider } from "./provider/github.provider";
-import { GoogleProvider } from "./provider/google.provider";
-import { OAuthProvider } from "./provider/oauthProvider.interface";
-import { OidcProvider } from "./provider/oidc.provider";
-import { DiscordProvider } from "./provider/discord.provider";
-import { MicrosoftProvider } from "./provider/microsoft.provider";
-
-@Module({
-  controllers: [OAuthController],
-  providers: [
-    OAuthService,
-    GitHubProvider,
-    GoogleProvider,
-    MicrosoftProvider,
-    DiscordProvider,
-    OidcProvider,
-    {
-      provide: "OAUTH_PROVIDERS",
-      useFactory(
-        github: GitHubProvider,
-        google: GoogleProvider,
-        microsoft: MicrosoftProvider,
-        discord: DiscordProvider,
-        oidc: OidcProvider,
-      ): Record<string, OAuthProvider<unknown>> {
-        return {
-          github,
-          google,
-          microsoft,
-          discord,
-          oidc,
-        };
-      },
-      inject: [
-        GitHubProvider,
-        GoogleProvider,
-        MicrosoftProvider,
-        DiscordProvider,
-        OidcProvider,
-      ],
-    },
-    {
-      provide: "OAUTH_PLATFORMS",
-      useFactory(providers: Record<string, OAuthProvider<unknown>>): string[] {
-        return Object.keys(providers);
-      },
-      inject: ["OAUTH_PROVIDERS"],
-    },
-  ],
-  imports: [AuthModule],
-})
-export class OAuthModule {}

backend/src/oauth/oauth.service.ts

@@ -1,171 +0,0 @@
-import { Inject, Injectable } from "@nestjs/common";
-import { User } from "@prisma/client";
-import { nanoid } from "nanoid";
-import { AuthService } from "../auth/auth.service";
-import { ConfigService } from "../config/config.service";
-import { PrismaService } from "../prisma/prisma.service";
-import { OAuthSignInDto } from "./dto/oauthSignIn.dto";
-import { ErrorPageException } from "./exceptions/errorPage.exception";
-
-@Injectable()
-export class OAuthService {
-  constructor(
-    private prisma: PrismaService,
-    private config: ConfigService,
-    private auth: AuthService,
-    @Inject("OAUTH_PLATFORMS") private platforms: string[],
-  ) {}
-
-  available(): string[] {
-    return this.platforms
-      .map((platform) => [
-        platform,
-        this.config.get(`oauth.${platform}-enabled`),
-      ])
-      .filter(([_, enabled]) => enabled)
-      .map(([platform, _]) => platform);
-  }
-
-  async status(user: User) {
-    const oauthUsers = await this.prisma.oAuthUser.findMany({
-      select: {
-        provider: true,
-        providerUsername: true,
-      },
-      where: {
-        userId: user.id,
-      },
-    });
-    return Object.fromEntries(oauthUsers.map((u) => [u.provider, u]));
-  }
-
-  async signIn(user: OAuthSignInDto) {
-    const oauthUser = await this.prisma.oAuthUser.findFirst({
-      where: {
-        provider: user.provider,
-        providerUserId: user.providerId,
-      },
-      include: {
-        user: true,
-      },
-    });
-    if (oauthUser) {
-      return this.auth.generateToken(oauthUser.user, true);
-    }
-
-    return this.signUp(user);
-  }
-
-  async link(
-    userId: string,
-    provider: string,
-    providerUserId: string,
-    providerUsername: string,
-  ) {
-    const oauthUser = await this.prisma.oAuthUser.findFirst({
-      where: {
-        provider,
-        providerUserId,
-      },
-    });
-    if (oauthUser) {
-      throw new ErrorPageException("already_linked", "/account", [
-        `provider_${provider}`,
-      ]);
-    }
-
-    await this.prisma.oAuthUser.create({
-      data: {
-        userId,
-        provider,
-        providerUsername,
-        providerUserId,
-      },
-    });
-  }
-
-  async unlink(user: User, provider: string) {
-    const oauthUser = await this.prisma.oAuthUser.findFirst({
-      where: {
-        userId: user.id,
-        provider,
-      },
-    });
-    if (oauthUser) {
-      await this.prisma.oAuthUser.delete({
-        where: {
-          id: oauthUser.id,
-        },
-      });
-    } else {
-      throw new ErrorPageException("not_linked", "/account", [provider]);
-    }
-  }
-
-  private async getAvailableUsername(email: string) {
-    // only remove + and - from email for now (maybe not enough)
-    let username = email.split("@")[0].replace(/[+-]/g, "").substring(0, 20);
-    while (true) {
-      const user = await this.prisma.user.findFirst({
-        where: {
-          username: username,
-        },
-      });
-      if (user) {
-        username = username + "_" + nanoid(10).replaceAll("-", "");
-      } else {
-        return username;
-      }
-    }
-  }
-
-  private async signUp(user: OAuthSignInDto) {
-    // register
-    if (!this.config.get("oauth.allowRegistration")) {
-      throw new ErrorPageException("no_user", "/auth/signIn", [
-        `provider_${user.provider}`,
-      ]);
-    }
-
-    if (!user.email) {
-      throw new ErrorPageException("no_email", "/auth/signIn", [
-        `provider_${user.provider}`,
-      ]);
-    }
-
-    const existingUser: User = await this.prisma.user.findFirst({
-      where: {
-        email: user.email,
-      },
-    });
-
-    if (existingUser) {
-      await this.prisma.oAuthUser.create({
-        data: {
-          provider: user.provider,
-          providerUserId: user.providerId.toString(),
-          providerUsername: user.providerUsername,
-          userId: existingUser.id,
-        },
-      });
-      return this.auth.generateToken(existingUser, true);
-    }
-
-    const result = await this.auth.signUp({
-      email: user.email,
-      username: await this.getAvailableUsername(user.email),
-      password: null,
-    });
-
-    await this.prisma.oAuthUser.create({
-      data: {
-        provider: user.provider,
-        providerUserId: user.providerId.toString(),
-        providerUsername: user.providerUsername,
-        userId: result.user.id,
-      },
-    });
-
-    return result;
-  }
-}

backend/src/oauth/provider/discord.provider.ts

@@ -1,136 +0,0 @@
-import { Injectable } from "@nestjs/common";
-import fetch from "node-fetch";
-import { ConfigService } from "../../config/config.service";
-import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
-import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
-import { ErrorPageException } from "../exceptions/errorPage.exception";
-import { OAuthProvider, OAuthToken } from "./oauthProvider.interface";
-@Injectable()
-export class DiscordProvider implements OAuthProvider<DiscordToken> {
-  constructor(private config: ConfigService) {}
-
-  getAuthEndpoint(state: string): Promise<string> {
-    let scope = "identify email";
-    if (this.config.get("oauth.discord-limitedGuild")) {
-      scope += " guilds";
-    }
-    return Promise.resolve(
-      "https://discord.com/api/oauth2/authorize?" +
-        new URLSearchParams({
-          client_id: this.config.get("oauth.discord-clientId"),
-          redirect_uri:
-            this.config.get("general.appUrl") + "/api/oauth/callback/discord",
-          response_type: "code",
-          state,
-          scope,
-        }).toString(),
-    );
-  }
-
-  private getAuthorizationHeader() {
-    return (
-      "Basic " +
-      Buffer.from(
-        this.config.get("oauth.discord-clientId") +
-          ":" +
-          this.config.get("oauth.discord-clientSecret"),
-      ).toString("base64")
-    );
-  }
-
-  async getToken(query: OAuthCallbackDto): Promise<OAuthToken<DiscordToken>> {
-    const res = await fetch("https://discord.com/api/v10/oauth2/token", {
-      method: "post",
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded",
-        Authorization: this.getAuthorizationHeader(),
-      },
-      body: new URLSearchParams({
-        code: query.code,
-        grant_type: "authorization_code",
-        redirect_uri:
-          this.config.get("general.appUrl") + "/api/oauth/callback/discord",
-      }),
-    });
-    const token: DiscordToken = await res.json();
-    return {
-      accessToken: token.access_token,
-      refreshToken: token.refresh_token,
-      expiresIn: token.expires_in,
-      scope: token.scope,
-      tokenType: token.token_type,
-      rawToken: token,
-    };
-  }
-
-  async getUserInfo(token: OAuthToken<DiscordToken>): Promise<OAuthSignInDto> {
-    const res = await fetch("https://discord.com/api/v10/users/@me", {
-      method: "get",
-      headers: {
-        Accept: "application/json",
-        Authorization: `${token.tokenType || "Bearer"} ${token.accessToken}`,
-      },
-    });
-    const user = (await res.json()) as DiscordUser;
-    if (user.verified === false) {
-      throw new ErrorPageException("unverified_account", undefined, [
-        "provider_discord",
-      ]);
-    }
-
-    const guild = this.config.get("oauth.discord-limitedGuild");
-    if (guild) {
-      await this.checkLimitedGuild(token, guild);
-    }
-
-    return {
-      provider: "discord",
-      providerId: user.id,
-      providerUsername: user.global_name ?? user.username,
-      email: user.email,
-    };
-  }
-
-  async checkLimitedGuild(token: OAuthToken<DiscordToken>, guildId: string) {
-    try {
-      const res = await fetch("https://discord.com/api/v10/users/@me/guilds", {
-        method: "get",
-        headers: {
-          Accept: "application/json",
-          Authorization: `${token.tokenType || "Bearer"} ${token.accessToken}`,
-        },
-      });
-      const guilds = (await res.json()) as DiscordPartialGuild[];
-      if (!guilds.some((guild) => guild.id === guildId)) {
-        throw new ErrorPageException("discord_guild_permission_denied");
-      }
-    } catch {
-      throw new ErrorPageException("discord_guild_permission_denied");
-    }
-  }
-}
-
-export interface DiscordToken {
-  access_token: string;
-  token_type: string;
-  expires_in: number;
-  refresh_token: string;
-  scope: string;
-}
-
-export interface DiscordUser {
-  id: string;
-  username: string;
-  global_name: string;
-  email: string;
-  verified: boolean;
-}
-
-export interface DiscordPartialGuild {
-  id: string;
-  name: string;
-  icon: string;
-  owner: boolean;
-  permissions: string;
-  features: string[];
-}

backend/src/oauth/provider/genericOidc.provider.ts

@@ -1,237 +0,0 @@
-import { Logger } from "@nestjs/common";
-import fetch from "node-fetch";
-import { ConfigService } from "../../config/config.service";
-import { JwtService } from "@nestjs/jwt";
-import { Cache } from "cache-manager";
-import { nanoid } from "nanoid";
-import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
-import { OAuthProvider, OAuthToken } from "./oauthProvider.interface";
-import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
-import { ErrorPageException } from "../exceptions/errorPage.exception";
-
-export abstract class GenericOidcProvider implements OAuthProvider<OidcToken> {
-  protected discoveryUri: string;
-  private configuration: OidcConfigurationCache;
-  private jwk: OidcJwkCache;
-  private logger: Logger = new Logger(
-    Object.getPrototypeOf(this).constructor.name,
-  );
-
-  protected constructor(
-    protected name: string,
-    protected keyOfConfigUpdateEvents: string[],
-    protected config: ConfigService,
-    protected jwtService: JwtService,
-    protected cache: Cache,
-  ) {
-    this.discoveryUri = this.getDiscoveryUri();
-    this.config.addListener("update", (key: string, _: unknown) => {
-      if (this.keyOfConfigUpdateEvents.includes(key)) {
-        this.deinit();
-        this.discoveryUri = this.getDiscoveryUri();
-      }
-    });
-  }
-
-  protected getRedirectUri(): string {
-    return `${this.config.get("general.appUrl")}/api/oauth/callback/${
-      this.name
-    }`;
-  }
-
-  async getConfiguration(): Promise<OidcConfiguration> {
-    if (!this.configuration || this.configuration.expires < Date.now()) {
-      await this.fetchConfiguration();
-    }
-    return this.configuration.data;
-  }
-
-  async getJwk(): Promise<OidcJwk[]> {
-    if (!this.jwk || this.jwk.expires < Date.now()) {
-      await this.fetchJwk();
-    }
-    return this.jwk.data;
-  }
-
-  async getAuthEndpoint(state: string) {
-    const configuration = await this.getConfiguration();
-    const endpoint = configuration.authorization_endpoint;
-
-    const nonce = nanoid();
-    await this.cache.set(
-      `oauth-${this.name}-nonce-${state}`,
-      nonce,
-      1000 * 60 * 5,
-    );
-
-    return (
-      endpoint +
-      "?" +
-      new URLSearchParams({
-        client_id: this.config.get(`oauth.${this.name}-clientId`),
-        response_type: "code",
-        scope: "openid profile email",
-        redirect_uri: this.getRedirectUri(),
-        state,
-        nonce,
-      }).toString()
-    );
-  }
-
-  async getToken(query: OAuthCallbackDto): Promise<OAuthToken<OidcToken>> {
-    const configuration = await this.getConfiguration();
-    const endpoint = configuration.token_endpoint;
-    const res = await fetch(endpoint, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded",
-      },
-      body: new URLSearchParams({
-        client_id: this.config.get(`oauth.${this.name}-clientId`),
-        client_secret: this.config.get(`oauth.${this.name}-clientSecret`),
-        grant_type: "authorization_code",
-        code: query.code,
-        redirect_uri: this.getRedirectUri(),
-      }).toString(),
-    });
-    const token: OidcToken = await res.json();
-    return {
-      accessToken: token.access_token,
-      expiresIn: token.expires_in,
-      idToken: token.id_token,
-      refreshToken: token.refresh_token,
-      tokenType: token.token_type,
-      rawToken: token,
-    };
-  }
-
-  async getUserInfo(
-    token: OAuthToken<OidcToken>,
-    query: OAuthCallbackDto,
-    claim?: string,
-  ): Promise<OAuthSignInDto> {
-    const idTokenData = this.decodeIdToken(token.idToken);
-    // maybe it's not necessary to verify the id token since it's directly obtained from the provider
-
-    const key = `oauth-${this.name}-nonce-${query.state}`;
-    const nonce = await this.cache.get(key);
-    await this.cache.del(key);
-    if (nonce !== idTokenData.nonce) {
-      this.logger.error(
-        `Invalid nonce. Expected ${nonce}, but got ${idTokenData.nonce}`,
-      );
-      throw new ErrorPageException("invalid_token");
-    }
-
-    const username = claim
-      ? idTokenData[claim]
-      : idTokenData.name ||
-        idTokenData.nickname ||
-        idTokenData.preferred_username;
-
-    if (!username) {
-      this.logger.error(
-        `Can not get username from ID Token ${JSON.stringify(
-          idTokenData,
-          undefined,
-          2,
-        )}`,
-      );
-      throw new ErrorPageException("cannot_get_user_info", undefined, [
-        `provider_${this.name}`,
-      ]);
-    }
-
-    return {
-      provider: this.name as any,
-      email: idTokenData.email,
-      providerId: idTokenData.sub,
-      providerUsername: username,
-    };
-  }
-
-  protected abstract getDiscoveryUri(): string;
-
-  private async fetchConfiguration(): Promise<void> {
-    const res = await fetch(this.discoveryUri);
-    const expires = res.headers.has("expires")
-      ? new Date(res.headers.get("expires")).getTime()
-      : Date.now() + 1000 * 60 * 60 * 24;
-    this.configuration = {
-      expires,
-      data: await res.json(),
-    };
-  }
-
-  private async fetchJwk(): Promise<void> {
-    const configuration = await this.getConfiguration();
-    const res = await fetch(configuration.jwks_uri);
-    const expires = res.headers.has("expires")
-      ? new Date(res.headers.get("expires")).getTime()
-      : Date.now() + 1000 * 60 * 60 * 24;
-    this.jwk = {
-      expires,
-      data: (await res.json())["keys"],
-    };
-  }
-
-  private deinit() {
-    this.discoveryUri = undefined;
-    this.configuration = undefined;
-    this.jwk = undefined;
-  }
-
-  private decodeIdToken(idToken: string): OidcIdToken {
-    return this.jwtService.decode(idToken) as OidcIdToken;
-  }
-}
-
-export interface OidcCache<T> {
-  expires: number;
-  data: T;
-}
-
-export interface OidcConfiguration {
-  issuer: string;
-  authorization_endpoint: string;
-  token_endpoint: string;
-  userinfo_endpoint?: string;
-  jwks_uri: string;
-  response_types_supported: string[];
-  id_token_signing_alg_values_supported: string[];
-  scopes_supported?: string[];
-  claims_supported?: string[];
-}
-
-export interface OidcJwk {
-  e: string;
-  alg: string;
-  kid: string;
-  use: string;
-  kty: string;
-  n: string;
-}
-
-export type OidcConfigurationCache = OidcCache<OidcConfiguration>;
-
-export type OidcJwkCache = OidcCache<OidcJwk[]>;
-
-export interface OidcToken {
-  access_token: string;
-  refresh_token: string;
-  token_type: string;
-  expires_in: number;
-  id_token: string;
-}
-
-export interface OidcIdToken {
-  iss: string;
-  sub: string;
-  exp: number;
-  iat: number;
-  email: string;
-  name: string;
-  nickname: string;
-  preferred_username: string;
-  nonce: string;
-}

backend/src/oauth/provider/github.provider.ts

@@ -1,112 +0,0 @@
-import { Injectable } from "@nestjs/common";
-import fetch from "node-fetch";
-import { ConfigService } from "../../config/config.service";
-import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
-import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
-import { ErrorPageException } from "../exceptions/errorPage.exception";
-import { OAuthProvider, OAuthToken } from "./oauthProvider.interface";
-
-@Injectable()
-export class GitHubProvider implements OAuthProvider<GitHubToken> {
-  constructor(private config: ConfigService) {}
-
-  getAuthEndpoint(state: string): Promise<string> {
-    return Promise.resolve(
-      "https://github.com/login/oauth/authorize?" +
-        new URLSearchParams({
-          client_id: this.config.get("oauth.github-clientId"),
-          redirect_uri:
-            this.config.get("general.appUrl") + "/api/oauth/callback/github",
-          state: state,
-          scope: "user:email",
-        }).toString(),
-    );
-  }
-
-  async getToken(query: OAuthCallbackDto): Promise<OAuthToken<GitHubToken>> {
-    const res = await fetch(
-      "https://github.com/login/oauth/access_token?" +
-        new URLSearchParams({
-          client_id: this.config.get("oauth.github-clientId"),
-          client_secret: this.config.get("oauth.github-clientSecret"),
-          code: query.code,
-        }).toString(),
-      {
-        method: "post",
-        headers: {
-          Accept: "application/json",
-        },
-      },
-    );
-    const token: GitHubToken = await res.json();
-    return {
-      accessToken: token.access_token,
-      tokenType: token.token_type,
-      scope: token.scope,
-      rawToken: token,
-    };
-  }
-
-  async getUserInfo(token: OAuthToken<GitHubToken>): Promise<OAuthSignInDto> {
-    if (!token.scope.includes("user:email")) {
-      throw new ErrorPageException("no_email", undefined, ["provider_github"]);
-    }
-    const user = await this.getGitHubUser(token);
-    const email = await this.getGitHubEmail(token);
-    if (!email) {
-      throw new ErrorPageException("no_email", undefined, ["provider_github"]);
-    }
-
-    return {
-      provider: "github",
-      providerId: user.id.toString(),
-      providerUsername: user.name ?? user.login,
-      email,
-    };
-  }
-
-  private async getGitHubUser(
-    token: OAuthToken<GitHubToken>,
-  ): Promise<GitHubUser> {
-    const res = await fetch("https://api.github.com/user", {
-      headers: {
-        Accept: "application/vnd.github+json",
-        Authorization: `${token.tokenType ?? "Bearer"} ${token.accessToken}`,
-      },
-    });
-    return (await res.json()) as GitHubUser;
-  }
-
-  private async getGitHubEmail(
-    token: OAuthToken<GitHubToken>,
-  ): Promise<string | undefined> {
-    const res = await fetch("https://api.github.com/user/public_emails", {
-      headers: {
-        Accept: "application/vnd.github+json",
-        Authorization: `${token.tokenType ?? "Bearer"} ${token.accessToken}`,
-      },
-    });
-    const emails = (await res.json()) as GitHubEmail[];
-    return emails.find((e) => e.primary && e.verified)?.email;
-  }
-}
-
-export interface GitHubToken {
-  access_token: string;
-  token_type: string;
-  scope: string;
-}
-
-export interface GitHubUser {
-  login: string;
-  id: number;
-  name?: string;
-  email?: string; // this filed seems only return null
-}
-
-export interface GitHubEmail {
-  email: string;
-  primary: boolean;
-  verified: boolean;
-  visibility: string | null;
-}

backend/src/oauth/provider/google.provider.ts

@@ -1,21 +0,0 @@
-import { GenericOidcProvider } from "./genericOidc.provider";
-import { ConfigService } from "../../config/config.service";
-import { JwtService } from "@nestjs/jwt";
-import { Inject, Injectable } from "@nestjs/common";
-import { CACHE_MANAGER } from "@nestjs/cache-manager";
-import { Cache } from "cache-manager";
-
-@Injectable()
-export class GoogleProvider extends GenericOidcProvider {
-  constructor(
-    config: ConfigService,
-    jwtService: JwtService,
-    @Inject(CACHE_MANAGER) cache: Cache,
-  ) {
-    super("google", ["oauth.google-enabled"], config, jwtService, cache);
-  }
-
-  protected getDiscoveryUri(): string {
-    return "https://accounts.google.com/.well-known/openid-configuration";
-  }
-}

backend/src/oauth/provider/microsoft.provider.ts

@@ -1,29 +0,0 @@
-import { GenericOidcProvider } from "./genericOidc.provider";
-import { ConfigService } from "../../config/config.service";
-import { JwtService } from "@nestjs/jwt";
-import { Inject, Injectable } from "@nestjs/common";
-import { CACHE_MANAGER } from "@nestjs/cache-manager";
-import { Cache } from "cache-manager";
-
-@Injectable()
-export class MicrosoftProvider extends GenericOidcProvider {
-  constructor(
-    config: ConfigService,
-    jwtService: JwtService,
-    @Inject(CACHE_MANAGER) cache: Cache,
-  ) {
-    super(
-      "microsoft",
-      ["oauth.microsoft-enabled", "oauth.microsoft-tenant"],
-      config,
-      jwtService,
-      cache,
-    );
-  }
-
-  protected getDiscoveryUri(): string {
-    return `https://login.microsoftonline.com/${this.config.get(
-      "oauth.microsoft-tenant",
-    )}/v2.0/.well-known/openid-configuration`;
-  }
-}

backend/src/oauth/provider/oauthProvider.interface.ts

@@ -1,24 +0,0 @@
-import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
-import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
-
-/**
- * @typeParam T - type of token
- * @typeParam C - type of callback query
- */
-export interface OAuthProvider<T, C = OAuthCallbackDto> {
-  getAuthEndpoint(state: string): Promise<string>;
-
-  getToken(query: C): Promise<OAuthToken<T>>;
-
-  getUserInfo(token: OAuthToken<T>, query: C): Promise<OAuthSignInDto>;
-}
-
-export interface OAuthToken<T> {
-  accessToken: string;
-  expiresIn?: number;
-  refreshToken?: string;
-  tokenType?: string;
-  scope?: string;
-  idToken?: string;
-  rawToken: T;
-}

backend/src/oauth/provider/oidc.provider.ts

@@ -1,39 +0,0 @@
-import { GenericOidcProvider, OidcToken } from "./genericOidc.provider";
-import { Inject, Injectable } from "@nestjs/common";
-import { ConfigService } from "../../config/config.service";
-import { JwtService } from "@nestjs/jwt";
-import { CACHE_MANAGER } from "@nestjs/cache-manager";
-import { Cache } from "cache-manager";
-import { OAuthCallbackDto } from "../dto/oauthCallback.dto";
-import { OAuthSignInDto } from "../dto/oauthSignIn.dto";
-import { OAuthToken } from "./oauthProvider.interface";
-
-@Injectable()
-export class OidcProvider extends GenericOidcProvider {
-  constructor(
-    config: ConfigService,
-    jwtService: JwtService,
-    @Inject(CACHE_MANAGER) protected cache: Cache,
-  ) {
-    super(
-      "oidc",
-      ["oauth.oidc-enabled", "oauth.oidc-discoveryUri"],
-      config,
-      jwtService,
-      cache,
-    );
-  }
-
-  protected getDiscoveryUri(): string {
-    return this.config.get("oauth.oidc-discoveryUri");
-  }
-
-  getUserInfo(
-    token: OAuthToken<OidcToken>,
-    query: OAuthCallbackDto,
-    _?: string,
-  ): Promise<OAuthSignInDto> {
-    const claim = this.config.get("oauth.oidc-usernameClaim") || undefined;
-    return super.getUserInfo(token, query, claim);
-  }
-}

backend/src/reverseShare/dto/reverseShare.dto.ts

@@ -10,9 +10,6 @@ export class ReverseShareDTO {
   @Expose()
   shareExpiration: Date;
 
-  @Expose()
-  token: string;
-
   from(partial: Partial<ReverseShareDTO>) {
     return plainToClass(ReverseShareDTO, partial, {
       excludeExtraneousValues: true,

backend/src/reverseShare/dto/reverseShareTokenWithShares.ts

@@ -23,7 +23,7 @@ export class ReverseShareTokenWithShares extends OmitType(ReverseShareDTO, [
     return partial.map((part) =>
       plainToClass(ReverseShareTokenWithShares, part, {
         excludeExtraneousValues: true,
-      }),
+      })
     );
   }
 }

backend/src/reverseShare/reverseShare.controller.ts

@@ -23,7 +23,7 @@ import { ReverseShareService } from "./reverseShare.service";
 export class ReverseShareController {
   constructor(
     private reverseShareService: ReverseShareService,
-    private config: ConfigService,
+    private config: ConfigService
   ) {}
 
   @Post()
@@ -44,7 +44,7 @@ export class ReverseShareController {
     if (!isValid) throw new NotFoundException("Reverse share token not found");
 
     return new ReverseShareDTO().from(
-      await this.reverseShareService.getByToken(reverseShareToken),
+      await this.reverseShareService.getByToken(reverseShareToken)
     );
   }
 
@@ -52,7 +52,7 @@ export class ReverseShareController {
   @UseGuards(JwtGuard)
   async getAllByUser(@GetUser() user: User) {
     return new ReverseShareTokenWithShares().fromList(
-      await this.reverseShareService.getAllByUser(user.id),
+      await this.reverseShareService.getAllByUser(user.id)
     );
   }
 

backend/src/reverseShare/reverseShare.service.ts

@@ -3,7 +3,6 @@ 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 { parseRelativeDateToAbsolute } from "src/utils/date.util";
 import { CreateReverseShareDTO } from "./dto/createReverseShare.dto";
 
 @Injectable()
@@ -11,7 +10,7 @@ export class ReverseShareService {
   constructor(
     private config: ConfigService,
     private prisma: PrismaService,
-    private fileService: FileService,
+    private fileService: FileService
   ) {}
 
   async create(data: CreateReverseShareDTO, creatorId: string) {
@@ -20,27 +19,16 @@ export class ReverseShareService {
       .add(
         data.shareExpiration.split("-")[0],
         data.shareExpiration.split(
-          "-",
+          "-"
-        )[1] as moment.unitOfTime.DurationConstructor,
+        )[1] as moment.unitOfTime.DurationConstructor
       )
       .toDate();
 
-    const parsedExpiration = parseRelativeDateToAbsolute(data.shareExpiration);
-    if (
-      this.config.get("share.maxExpiration") !== 0 &&
-      parsedExpiration >
-        moment().add(this.config.get("share.maxExpiration"), "hours").toDate()
-    ) {
-      throw new BadRequestException(
-        "Expiration date exceeds maximum expiration date",
-      );
-    }
-
     const globalMaxShareSize = this.config.get("share.maxSize");
 
     if (globalMaxShareSize < data.maxShareSize)
       throw new BadRequestException(
-        `Max share size can't be greater than ${globalMaxShareSize} bytes.`,
+        `Max share size can't be greater than ${globalMaxShareSize} bytes.`
       );
 
     const reverseShare = await this.prisma.reverseShare.create({

backend/src/share/dto/myShare.dto.ts

@@ -1,7 +1,7 @@
 import { Expose, plainToClass, Type } from "class-transformer";
 import { ShareDTO } from "./share.dto";
-import { FileDTO } from "../../file/dto/file.dto";
+import {FileDTO} from "../../file/dto/file.dto";
-import { OmitType } from "@nestjs/swagger";
+import {OmitType} from "@nestjs/swagger";
 
 export class MyShareDTO extends OmitType(ShareDTO, [
   "files",
@@ -27,7 +27,7 @@ export class MyShareDTO extends OmitType(ShareDTO, [
 
   fromList(partial: Partial<MyShareDTO>[]) {
     return partial.map((part) =>
-      plainToClass(MyShareDTO, part, { excludeExtraneousValues: true }),
+      plainToClass(MyShareDTO, part, { excludeExtraneousValues: true })
     );
   }
 }

backend/src/share/dto/share.dto.ts

@@ -29,7 +29,7 @@ export class ShareDTO {
 
   fromList(partial: Partial<ShareDTO>[]) {
     return partial.map((part) =>
-      plainToClass(ShareDTO, part, { excludeExtraneousValues: true }),
+      plainToClass(ShareDTO, part, { excludeExtraneousValues: true })
     );
   }
 }

backend/src/share/guard/createShare.guard.ts

@@ -7,7 +7,7 @@ import { ReverseShareService } from "src/reverseShare/reverseShare.service";
 export class CreateShareGuard extends JwtGuard {
   constructor(
     configService: ConfigService,
-    private reverseShareService: ReverseShareService,
+    private reverseShareService: ReverseShareService
   ) {
     super(configService);
   }
@@ -21,7 +21,7 @@ export class CreateShareGuard extends JwtGuard {
     if (!reverseShareTokenId) return false;
 
     const isReverseShareTokenValid = await this.reverseShareService.isValid(
-      reverseShareTokenId,
+      reverseShareTokenId
     );
 
     return isReverseShareTokenValid;

backend/src/share/guard/shareOwner.guard.ts

@@ -1,4 +1,5 @@
 import {
+  CanActivate,
   ExecutionContext,
   Injectable,
   NotFoundException,
@@ -6,23 +7,16 @@ import {
 import { User } from "@prisma/client";
 import { Request } from "express";
 import { PrismaService } from "src/prisma/prisma.service";
-import { JwtGuard } from "../../auth/guard/jwt.guard";
-import { ConfigService } from "src/config/config.service";
 
 @Injectable()
-export class ShareOwnerGuard extends JwtGuard {
+export class ShareOwnerGuard implements CanActivate {
-  constructor(
+  constructor(private prisma: PrismaService) {}
-    configService: ConfigService,
-    private prisma: PrismaService,
-  ) {
-    super(configService);
-  }
 
   async canActivate(context: ExecutionContext) {
     const request: Request = context.switchToHttp().getRequest();
     const shareId = Object.prototype.hasOwnProperty.call(
       request.params,
-      "shareId",
+      "shareId"
     )
       ? request.params.shareId
       : request.params.id;
@@ -36,8 +30,6 @@ export class ShareOwnerGuard extends JwtGuard {
 
     if (!share.creatorId) return true;
 
-    if (!(await super.canActivate(context))) return false;
-
     return share.creatorId == (request.user as User).id;
   }
 }

backend/src/share/guard/shareSecurity.guard.ts

@@ -14,7 +14,7 @@ import { ShareService } from "src/share/share.service";
 export class ShareSecurityGuard implements CanActivate {
   constructor(
     private shareService: ShareService,
-    private prisma: PrismaService,
+    private prisma: PrismaService
   ) {}
 
   async canActivate(context: ExecutionContext) {
@@ -22,7 +22,7 @@ export class ShareSecurityGuard implements CanActivate {
 
     const shareId = Object.prototype.hasOwnProperty.call(
       request.params,
-      "shareId",
+      "shareId"
     )
       ? request.params.shareId
       : request.params.id;
@@ -44,13 +44,13 @@ export class ShareSecurityGuard implements CanActivate {
     if (share.security?.password && !shareToken)
       throw new ForbiddenException(
         "This share is password protected",
-        "share_password_required",
+        "share_password_required"
       );
 
     if (!(await this.shareService.verifyShareToken(shareId, shareToken)))
       throw new ForbiddenException(
         "Share token required",
-        "share_token_required",
+        "share_token_required"
       );
 
     return true;

backend/src/share/guard/shareTokenSecurity.guard.ts

@@ -16,7 +16,7 @@ export class ShareTokenSecurity implements CanActivate {
     const request: Request = context.switchToHttp().getRequest();
     const shareId = Object.prototype.hasOwnProperty.call(
       request.params,
-      "shareId",
+      "shareId"
     )
       ? request.params.shareId
       : request.params.id;

backend/src/share/share.controller.ts

@@ -33,7 +33,7 @@ export class ShareController {
   @UseGuards(JwtGuard)
   async getMyShares(@GetUser() user: User) {
     return new MyShareDTO().fromList(
-      await this.shareService.getSharesByUser(user.id),
+      await this.shareService.getSharesByUser(user.id)
     );
   }
 
@@ -43,12 +43,6 @@ export class ShareController {
     return new ShareDTO().from(await this.shareService.get(id));
   }
 
-  @Get(":id/from-owner")
-  @UseGuards(ShareOwnerGuard)
-  async getFromOwner(@Param("id") id: string) {
-    return new ShareDTO().from(await this.shareService.get(id));
-  }
-
   @Get(":id/metaData")
   @UseGuards(ShareSecurityGuard)
   async getMetaData(@Param("id") id: string) {
@@ -60,36 +54,30 @@ export class ShareController {
   async create(
     @Body() body: CreateShareDTO,
     @Req() request: Request,
-    @GetUser() user: User,
+    @GetUser() user: User
   ) {
     const { reverse_share_token } = request.cookies;
     return new ShareDTO().from(
-      await this.shareService.create(body, user, reverse_share_token),
+      await this.shareService.create(body, user, reverse_share_token)
     );
   }
 
+  @Delete(":id")
+  @UseGuards(JwtGuard, ShareOwnerGuard)
+  async remove(@Param("id") id: string) {
+    await this.shareService.remove(id);
+  }
+
   @Post(":id/complete")
   @HttpCode(202)
   @UseGuards(CreateShareGuard, ShareOwnerGuard)
   async complete(@Param("id") id: string, @Req() request: Request) {
     const { reverse_share_token } = request.cookies;
     return new ShareDTO().from(
-      await this.shareService.complete(id, reverse_share_token),
+      await this.shareService.complete(id, reverse_share_token)
     );
   }
 
-  @Delete(":id/complete")
-  @UseGuards(ShareOwnerGuard)
-  async revertComplete(@Param("id") id: string) {
-    return new ShareDTO().from(await this.shareService.revertComplete(id));
-  }
-
-  @Delete(":id")
-  @UseGuards(ShareOwnerGuard)
-  async remove(@Param("id") id: string) {
-    await this.shareService.remove(id);
-  }
-
   @Throttle(10, 60)
   @Get("isShareIdAvailable/:id")
   async isShareIdAvailable(@Param("id") id: string) {
@@ -103,7 +91,7 @@ export class ShareController {
   async getShareToken(
     @Param("id") id: string,
     @Res({ passthrough: true }) response: Response,
-    @Body() body: SharePasswordDto,
+    @Body() body: SharePasswordDto
   ) {
     const token = await this.shareService.getShareToken(id, body.password);
     response.cookie(`share_${id}_token`, token, {

backend/src/share/share.service.ts

@@ -16,7 +16,6 @@ import { EmailService } from "src/email/email.service";
 import { FileService } from "src/file/file.service";
 import { PrismaService } from "src/prisma/prisma.service";
 import { ReverseShareService } from "src/reverseShare/reverseShare.service";
-import { parseRelativeDateToAbsolute } from "src/utils/date.util";
 import { SHARE_DIRECTORY } from "../constants";
 import { CreateShareDTO } from "./dto/createShare.dto";
 
@@ -29,7 +28,7 @@ export class ShareService {
     private config: ConfigService,
     private jwtService: JwtService,
     private reverseShareService: ReverseShareService,
-    private clamScanService: ClamScanService,
+    private clamScanService: ClamScanService
   ) {}
 
   async create(share: CreateShareDTO, user?: User, reverseShareToken?: string) {
@@ -47,29 +46,24 @@ export class ShareService {
 
     // If share is created by a reverse share token override the expiration date
     const reverseShare = await this.reverseShareService.getByToken(
-      reverseShareToken,
+      reverseShareToken
     );
     if (reverseShare) {
       expirationDate = reverseShare.shareExpiration;
     } else {
-      const parsedExpiration = parseRelativeDateToAbsolute(share.expiration);
+      // We have to add an exception for "never" (since moment won't like that)
-
+      if (share.expiration !== "never") {
-      const expiresNever = moment(0).toDate() == parsedExpiration;
+        expirationDate = moment()
-
+          .add(
-      if (
+            share.expiration.split("-")[0],
-        this.config.get("share.maxExpiration") !== 0 &&
+            share.expiration.split(
-        (expiresNever ||
+              "-"
-          parsedExpiration >
+            )[1] as moment.unitOfTime.DurationConstructor
-            moment()
+          )
-              .add(this.config.get("share.maxExpiration"), "hours")
+          .toDate();
-              .toDate())
+      } else {
-      ) {
+        expirationDate = moment(0).toDate();
-        throw new BadRequestException(
-          "Expiration date exceeds maximum expiration date",
-        );
       }
-
-      expirationDate = parsedExpiration;
     }
 
     fs.mkdirSync(`${SHARE_DIRECTORY}/${share.id}`, {
@@ -110,7 +104,7 @@ export class ShareService {
 
     const files = await this.prisma.file.findMany({ where: { shareId } });
     const archive = archiver("zip", {
-      zlib: { level: this.config.get("share.zipCompressionLevel") },
+      zlib: { level: 9 },
     });
     const writeStream = fs.createWriteStream(`${path}/archive.zip`);
 
@@ -140,13 +134,13 @@ export class ShareService {
 
     if (share.files.length == 0)
       throw new BadRequestException(
-        "You need at least on file in your share to complete it.",
+        "You need at least on file in your share to complete it."
       );
 
     // Asynchronously create a zip of all files
     if (share.files.length > 1)
       this.createZip(id).then(() =>
-        this.prisma.share.update({ where: { id }, data: { isZipReady: true } }),
+        this.prisma.share.update({ where: { id }, data: { isZipReady: true } })
       );
 
     // Send email for each recipient
@@ -156,7 +150,7 @@ export class ShareService {
         share.id,
         share.creator,
         share.description,
-        share.expiration,
+        share.expiration
       );
     }
 
@@ -167,7 +161,7 @@ export class ShareService {
     ) {
       await this.emailService.sendMailToReverseShareCreator(
         share.reverseShare.creator.email,
-        share.id,
+        share.id
       );
     }
 
@@ -187,13 +181,6 @@ export class ShareService {
     });
   }
 
-  async revertComplete(id: string) {
-    return this.prisma.share.update({
-      where: { id },
-      data: { uploadLocked: false, isZipReady: false },
-    });
-  }
-
   async getSharesByUser(userId: string) {
     const shares = await this.prisma.share.findMany({
       where: {
@@ -298,7 +285,7 @@ export class ShareService {
     if (share.security?.maxViews && share.security.maxViews <= share.views) {
       throw new ForbiddenException(
         "Maximum views exceeded",
-        "share_max_views_exceeded",
+        "share_max_views_exceeded"
       );
     }
 
@@ -318,7 +305,7 @@ export class ShareService {
       {
         expiresIn: moment(expiration).diff(new Date(), "seconds") + "s",
         secret: this.config.get("internal.jwtSecret"),
-      },
+      }
     );
   }
 

backend/src/user/dto/updateOwnUser.dto.ts

@@ -2,5 +2,5 @@ import { OmitType, PartialType } from "@nestjs/swagger";
 import { UserDTO } from "./user.dto";
 
 export class UpdateOwnUserDTO extends PartialType(
-  OmitType(UserDTO, ["isAdmin", "password"] as const),
+  OmitType(UserDTO, ["isAdmin", "password"] as const)
 ) {}

backend/src/user/dto/user.dto.ts

@@ -16,9 +16,6 @@ export class UserDTO {
   @IsEmail()
   email: string;
 
-  @Expose()
-  hasPassword: boolean;
-
   @MinLength(8)
   password: string;
 
@@ -34,7 +31,7 @@ export class UserDTO {
 
   fromList(partial: Partial<UserDTO>[]) {
     return partial.map((part) =>
-      plainToClass(UserDTO, part, { excludeExtraneousValues: true }),
+      plainToClass(UserDTO, part, { excludeExtraneousValues: true })
     );
   }
 }

backend/src/user/user.controller.ts

@@ -28,16 +28,14 @@ export class UserController {
   @Get("me")
   @UseGuards(JwtGuard)
   async getCurrentUser(@GetUser() user: User) {
-    const userDTO = new UserDTO().from(user);
+    return new UserDTO().from(user);
-    userDTO.hasPassword = !!user.password;
-    return userDTO;
   }
 
   @Patch("me")
   @UseGuards(JwtGuard)
   async updateCurrentUser(
     @GetUser() user: User,
-    @Body() data: UpdateOwnUserDTO,
+    @Body() data: UpdateOwnUserDTO
   ) {
     return new UserDTO().from(await this.userService.update(user.id, data));
   }
@@ -46,7 +44,7 @@ export class UserController {
   @UseGuards(JwtGuard)
   async deleteCurrentUser(
     @GetUser() user: User,
-    @Res({ passthrough: true }) response: Response,
+    @Res({ passthrough: true }) response: Response
   ) {
     response.cookie("access_token", "accessToken", { maxAge: -1 });
     response.cookie("refresh_token", "", {

backend/src/user/user.service.ts

@@ -11,7 +11,7 @@ import { UpdateUserDto } from "./dto/updateUser.dto";
 export class UserSevice {
   constructor(
     private prisma: PrismaService,
-    private emailService: EmailService,
+    private emailService: EmailService
   ) {}
 
   async list() {
@@ -46,7 +46,7 @@ export class UserSevice {
         if (e.code == "P2002") {
           const duplicatedField: string = e.meta.target[0];
           throw new BadRequestException(
-            `A user with this ${duplicatedField} already exists`,
+            `A user with this ${duplicatedField} already exists`
           );
         }
       }
@@ -66,7 +66,7 @@ export class UserSevice {
         if (e.code == "P2002") {
           const duplicatedField: string = e.meta.target[0];
           throw new BadRequestException(
-            `A user with this ${duplicatedField} already exists`,
+            `A user with this ${duplicatedField} already exists`
           );
         }
       }

backend/src/utils/date.util.ts

@@ -1,12 +0,0 @@
-import * as moment from "moment";
-
-export function parseRelativeDateToAbsolute(relativeDate: string) {
-  if (relativeDate == "never") return moment(0).toDate();
-
-  return moment()
-    .add(
-      relativeDate.split("-")[0],
-      relativeDate.split("-")[1] as moment.unitOfTime.DurationConstructor,
-    )
-    .toDate();
-}

backend/tsconfig.json

@@ -6,10 +6,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
-    "target": "es2021",
+    "target": "es2017",
-    "lib": [
-      "ES2021"
-    ],
     "sourceMap": true,
     "outDir": "./dist",
     "baseUrl": "./",

crowdin.yml

@@ -1,4 +0,0 @@
-files:
-  - source: /frontend/src/i18n/translations/en-US.ts
-    translation: /%original_path%/%locale%.ts
-pull_request_title: "chore(translations): update translations via Crowdin"

docs/README.es.md

@@ -2,7 +2,7 @@
 
 ---
 
-_Leer esto en otro idioma: [Inglés](/README.md), [Español](/docs/README.es.md), [Chino Simplificado](/docs/README.zh-cn.md), [日本語](/docs/README.ja-jp.md)_
+_Leer esto en otro idioma: [Inglés](/README.md), [Español](/docs/README.es.md), [Chino Simplificado](/docs/README.zh-cn.md)_
 
 ---
 
@@ -20,8 +20,7 @@ Pingvin Share es una plataforma de intercambio de archivos autoalojada y una alt
 ## 🐧 Conoce Pingvin Share
 
 - [Demo](https://pingvin-share.dev.eliasschneider.com)
-- [Reseña realizada por No Solo Hacking (español)](https://www.youtube.com/watch?v=ocd4EpLTYkU)
+- [Reseña por DB Tech](https://www.youtube.com/watch?v=rWwNeZCOPJA)
-- [Reseña por DB Tech (inglés)](https://www.youtube.com/watch?v=rWwNeZCOPJA)
 
 <img src="https://user-images.githubusercontent.com/58886915/225038319-b2ef742c-3a74-4eb6-9689-4207a36842a4.png" width="700"/>
 

docs/README.ja-jp.md

@@ -1,158 +0,0 @@
-# <div align="center"><img  src="https://user-images.githubusercontent.com/58886915/166198400-c2134044-1198-4647-a8b6-da9c4a204c68.svg" width="40"/> </br>Pingvin Share</div>
-
----
-
-_READMEを別の言語で読む: [Spanish](/docs/README.es.md), [English](/README.md), [Simplified Chinese](/docs/README.zh-cn.md), [日本語](/docs/README.ja-jp.md)_
-
----
-
-Pingvin Share は、セルフホスト型のファイル共有プラットフォームであり、WeTransfer、ギガファイル便などの代替プラットフォームです。
-
-## ✨ 特徴的な機能
-
-- リンクを用いたファイル共有
-- ファイルサイズ無制限 (ストレージスペースの範囲内で)
-- 共有への有効期限の設定
-- 訪問回数の制限とパスワードの設定により共有を安全に保つ
-- メールでリンクを共有
-- ClamAVと連携して、ウイルスチェックが可能
-
-## 🐧 Pingvin Shareについて知る
-
-- [デモ](https://pingvin-share.dev.eliasschneider.com)
-- [DB Techによるレビュー](https://www.youtube.com/watch?v=rWwNeZCOPJA)
-
-<img src="https://user-images.githubusercontent.com/58886915/225038319-b2ef742c-3a74-4eb6-9689-4207a36842a4.png" width="700"/>
-
-## ⌨️ セットアップ
-
-> 注意: Pingvin Shareは、早期段階であり、バグが含まれている場合があります。
-
-### Dockerでインストール (おすすめ)
-
-1. `docker-compose.yml`ファイルをダウンロード
-2. `docker-compose up -d`を実行
-
-Webサイトは、`http://localhost:3000`でリッスンされます。これでPingvin Shareをお使い頂けます🐧!
-
-### スタンドアローンインストール
-
-必要なツール:
-
-- [Node.js](https://nodejs.org/en/download/) >= 16
-- [Git](https://git-scm.com/downloads)
-- [pm2](https://pm2.keymetrics.io/) Pingvin Shareをバックグラウンドで動作させるために必要
-
-```bash
-git clone https://github.com/stonith404/pingvin-share
-cd pingvin-share
-
-# 最新バージョンをチェックアウト
-git fetch --tags && git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
-
-# バックエンドを開始
-cd backend
-npm install
-npm run build
-pm2 start --name="pingvin-share-backend" npm -- run prod
-
-#フロントエンドを開始
-cd ../frontend
-npm install
-npm run build
-pm2 start --name="pingvin-share-frontend" npm -- run start
-```
-
-Webサイトは、`http://localhost:3000`でリッスンされます。これでPingvin Shareをお使い頂けます🐧!
-
-### 連携機能
-
-#### ClamAV (Dockerのみ)
-
-ClamAVは、共有されたファイルをスキャンし、感染したファイルを見つけた場合に削除するために使用されます。
-
-1. ClamAVコンテナをDocker Composeの定義ファイル(`docker-compose.yml`を確認)に追加し、コンテナを開始してください。
-2. Dockerは、Pingvin Shareを開始する前に、ClamAVの準備が整うまで待機します。これには、1分から2分ほどかかります。
-3. Pingvin Shareのログに"ClamAV is active"というログが記録されます。
-
-ClamAVは、非常に多くのリソースを必要とします、詳しくは[リソース](https://docs.clamav.net/manual/Installing/Docker.html#memory-ram-requirements)をご確認ください。
-
-### 追加情報
-
-- [Synology NASへのインストール方法](https://mariushosting.com/how-to-install-pingvin-share-on-your-synology-nas/)
-
-### 新しいバージョンへのアップグレード
-
-Pingvin Shareは早期段階のため、アップグレード前に必ずリリースノートを確認して、アップグレードしても問題ないかどうかご確認ください。
-
-#### Docker
-
-```bash
-docker compose pull
-docker compose up -d
-```
-
-#### スタンドアローン
-
-1. アプリを停止する
-   ```bash
-   pm2 stop pingvin-share-backend pingvin-share-frontend
-   ```
-2. `git clone`のステップを除いて、[インストールガイド](#stand-alone-installation)をくり返してください。
-
-   ```bash
-   cd pingvin-share
-
-   # 最新バージョンをチェックアウト
-   git fetch --tags && git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
-
-   # バックエンドを開始
-   cd backend
-   npm run build
-   pm2 restart pingvin-share-backend
-
-   #フロントエンドを開始
-   cd ../frontend
-   npm run build
-   pm2 restart pingvin-share-frontend
-   ```
-
-### 設定
-
-管理者のダッシュボード内の「設定」ページから、Pingvin Shareをカスタマイズできます。
-
-#### 環境変数
-
-インストール時の特定の設定で、環境変数を使用できます。次の環境変数が使用可能です:
-
-##### バックエンド
-
-| 変数名            | デフォルト値                                        | 説明                                   |
-| ---------------- | -------------------------------------------------- | -------------------------------------- |
-| `PORT`           | `8080`                                             | バックエンドがリッスンするポート番号       |
-| `DATABASE_URL`   | `file:../data/pingvin-share.db?connection_limit=1` | SQLiteのURL                             |
-| `DATA_DIRECTORY` | `./data`                                           | データを保管するディレクトリ               |
-| `CLAMAV_HOST`    | `127.0.0.1`                                        | ClamAVサーバーのIPアドレス               |
-| `CLAMAV_PORT`    | `3310`                                             | ClamAVサーバーのポート番号                |
-
-##### フロントエンド
-
-| 変数名     | デフォルト値             | 説明                                          |
-| --------- | ----------------------- | ----------------------------------------      |
-| `PORT`    | `3000`                  | フロントエンドがリッスンするポート番号            |
-| `API_URL` | `http://localhost:8080` | フロントエンドからアクセスするバックエンドへのURL |
-
-## 🖤 コントリビュート
-
-### 翻訳
-
-Pingvin Shareをあなたが使用している言語に翻訳するお手伝いを募集しています。
-[Crowdin](https://crowdin.com/project/pingvin-share)上で、簡単にPingvin Shareの翻訳作業への参加が可能です。
-
-あなたの言語がありませんか？ 気軽に[リクエスト](https://github.com/stonith404/pingvin-share/issues/new?assignees=&labels=language-request&projects=&template=language-request.yml&title=%F0%9F%8C%90+Language+request%3A+%3Clanguage+name+in+english%3E)してください。
-
-翻訳中に問題がありましたか？ [ローカライズに関するディスカッション](https://github.com/stonith404/pingvin-share/discussions/198)に是非参加してください。
-
-### プロジェクト
-
-Pingvin Shareへのコントリビュートをいつでもお待ちしています！ [コントリビューションガイド](/CONTRIBUTING.md)を確認して、是非参加してください。

docs/README.zh-cn.md

@@ -2,7 +2,7 @@
 
 ---
 
-_选择合适的语言阅读: [西班牙语](/docs/README.es.md), [英语](/README.md), [简体中文](/docs/README.zh-cn.md), [日本语](/docs/README.ja-jp.md)_
+_选择合适的语言阅读: [西班牙语](/docs/README.es.md), [英语](/README.md), [简体中文](/docs/README.zh-cn.md)_
 
 ---
 

docs/oauth2-guide.md

@@ -1,157 +0,0 @@
-# OAuth 2 Login Guide
-
-## Config Built-in OAuth 2 Providers
-
-- [GitHub](#github)
-- [Google](#google)
-- [Microsoft](#microsoft)
-- [Discord](#discord)
-- [OpenID Connect](#openid-connect)
-
-### GitHub
-
-Please follow the [official guide](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app) to create an OAuth app.
-
-Redirect URL: `https://<your-domain>/api/oauth/callback/github`
-
-### Google
-
-Please follow the [official guide](https://developers.google.com/identity/protocols/oauth2/web-server#prerequisites) to create an OAuth 2.0 App.
-
-Redirect URL: `https://<your-domain>/api/oauth/callback/google`
-
-### Microsoft
-
-Please follow the [official guide](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app) to register an application.
-
-> [!IMPORTANT]
-> **Microsoft Tenant** you set in the admin panel must match the **supported account types** you set in the Microsoft Entra admin center, otherwise the OAuth login will not work. Refer to the [official documentation](https://learn.microsoft.com/en-us/entra/identity-platform/v2-protocols-oidc#find-your-apps-openid-configuration-document-uri) for more details.
-
-Redirect URL: `https://<your-domain>/api/oauth/callback/microsoft`
-
-### Discord
-
-Create an application on [Discord Developer Portal](https://discord.com/developers/applications).
-
-Redirect URL: `https://<your-domain>/api/oauth/callback/discord`
-
-### OpenID Connect
-
-Generic OpenID Connect provider is also supported, we have tested it on Keycloak, Authentik and Casdoor.
-
-Redirect URL: `https://<your-domain>/api/oauth/callback/oidc`
-
-## Custom your OAuth 2 Provider
-
-If our built-in providers don't meet your needs, you can create your own OAuth 2 provider.
-
-### 1. Create config
-
-Add your config (client id, client secret, etc.) in [`config.seed.ts`](../backend/prisma/seed/config.seed.ts):
-
-```ts
-const configVariables: ConfigVariables = {
-  // ...
-  oauth: {
-    // ...
-    "YOUR_PROVIDER_NAME-enabled": {
-      type: "boolean",
-      defaultValue: "false",
-    },
-    "YOUR_PROVIDER_NAME-clientId": {
-      type: "string",
-      defaultValue: "",
-    },
-    "YOUR_PROVIDER_NAME-clientSecret": {
-      type: "string",
-      defaultValue: "",
-      obscured: true,
-    },
-  }
-}
-```
-
-### 2. Create provider class
-
-#### Generic OpenID Connect
-
-If your provider supports OpenID connect, it's extremely easy to extend [`GenericOidcProvider`](../backend/src/oauth/provider/genericOidc.provider.ts) to add a new OpenID Connect provider.
-
-The [Google provider](../backend/src/oauth/provider/google.provider.ts) and [Microsoft provider](../backend/src/oauth/provider/microsoft.provider.ts) are good examples.
-
-Here are some discovery URIs for popular providers:
-
-- Microsoft: `https://login.microsoftonline.com/{tenant}/v2.0/.well-known/openid-configuration`
-- Google: `https://accounts.google.com/.well-known/openid-configuration`
-- Apple: `https://appleid.apple.com/.well-known/openid-configuration`
-- Gitlab: `https://gitlab.com/.well-known/openid-configuration`
-- Huawei: `https://oauth-login.cloud.huawei.com/.well-known/openid-configuration`
-- Paypal: `https://www.paypal.com/.well-known/openid-configuration`
-- Yahoo: `https://api.login.yahoo.com/.well-known/openid-configuration`
-
-#### OAuth 2
-
-If your provider only supports OAuth 2, you can implement [`OAuthProvider`](../backend/src/oauth/provider/oauthProvider.interface.ts) interface to add a new OAuth 2 provider.
-
-The [GitHub provider](../backend/src/oauth/provider/github.provider.ts) and [Discord provider](../backend/src/oauth/provider/discord.provider.ts) are good examples.
-
-### 3. Register provider
-
-Register your provider in [`OAuthModule`](../backend/src/oauth/oauth.module.ts) and [`OAuthSignInDto`](../backend/src/oauth/dto/oauthSignIn.dto.ts):
-
-```ts
-@Module({
-  providers: [
-    GitHubProvider,
-    // your provider
-    {
-      provide: "OAUTH_PROVIDERS",
-      useFactory(github: GitHubProvider, /* your provider */): Record<string, OAuthProvider<unknown>> {
-        return {
-          github,
-          /* your provider */
-        };
-      },
-      inject: [GitHubProvider, /* your provider */],
-    },
-  ],
-})
-export class OAuthModule {
-}
-```
-
-```ts
-export interface OAuthSignInDto {
-  provider: 'github' | 'google' | 'microsoft' | 'discord' | 'oidc' /* your provider*/;
-  providerId: string;
-  providerUsername: string;
-  email: string;
-}
-```
-
-### 4. Add frontend icon
-
-Add an icon in [`oauth.util.tsx`](../frontend/src/utils/oauth.util.tsx).
-
-```tsx
-const getOAuthIcon = (provider: string) => {
-  return {
-    'github': <SiGithub />,
-    /* your provider */
-  }[provider];
-}
-```
-
-### 5. Add i18n text
-
-Add keys below to your i18n text in [locale file](../frontend/src/i18n/translations/en-US.ts).
-
-- `signIn.oauth.YOUR_PROVIDER_NAME`
-- `account.card.oauth.YOUR_PROVIDER_NAME`
-- `admin.config.oauth.YOUR_PROVIDER_NAME-enabled`
-- `admin.config.oauth.YOUR_PROVIDER_NAME-client-id`
-- `admin.config.oauth.YOUR_PROVIDER_NAME-client-secret`
-- `error.param.provider_YOUR_PROVIDER_NAME`
-- Other config keys you defined in step 1
-
-Congratulations! 🎉 You have successfully added a new OAuth 2 provider! Pull requests are welcome if you want to share your provider with others.

frontend/.eslintrc.json

@@ -1,17 +1,11 @@
 {
-  "extends": [
+  "extends": ["eslint-config-next", "eslint:recommended", "prettier"],
-    "next",
-    "eslint-config-next",
-    "eslint:recommended",
-    "prettier"
-  ],
   "plugins": ["react"],
   "rules": {
     "quotes": ["warn", "double", { "allowTemplateLiterals": true }],
     "react-hooks/exhaustive-deps": ["off"],
     "import/no-anonymous-default-export": ["off"],
     "no-unused-vars": ["warn"],
-    "react/no-unescaped-entities": ["off"],
+    "react/no-unescaped-entities": ["off"]
-    "@next/next/no-img-element": ["off"]
   }
 }

frontend/.prettierignore

@@ -1 +0,0 @@
-/src/i18n/translations/*

frontend/next.config.js

@@ -1,4 +1,5 @@
 /** @type {import('next').NextConfig} */
+
 const { version } = require('./package.json');
 
 const withPWA = require("next-pwa")({

frontend/package.json

@@ -1,53 +1,52 @@
 {
   "name": "pingvin-share-frontend",
-  "version": "0.21.5",
+  "version": "0.15.0",
   "scripts": {
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "format": "prettier --end-of-line=auto --write \"src/**/*.ts*\""
+    "format": "prettier --write \"src/**/*.ts*\""
   },
   "dependencies": {
-    "@emotion/react": "^11.11.1",
+    "@emotion/react": "^11.10.6",
-    "@emotion/server": "^11.11.0",
+    "@emotion/server": "^11.10.0",
-    "@mantine/core": "^6.0.17",
+    "@mantine/core": "^6.0.1",
-    "@mantine/dropzone": "^6.0.17",
+    "@mantine/dropzone": "^6.0.1",
-    "@mantine/form": "^6.0.17",
+    "@mantine/form": "^6.0.1",
-    "@mantine/hooks": "^6.0.17",
+    "@mantine/hooks": "^6.0.1",
-    "@mantine/modals": "^6.0.17",
+    "@mantine/modals": "^6.0.1",
-    "@mantine/next": "^6.0.17",
+    "@mantine/next": "^6.0.1",
-    "@mantine/notifications": "^6.0.17",
+    "@mantine/notifications": "^6.0.1",
-    "axios": "^1.4.0",
+    "axios": "^1.3.4",
-    "cookies-next": "^2.1.2",
+    "cookies-next": "^2.1.1",
     "file-saver": "^2.0.5",
-    "jose": "^4.14.4",
+    "jose": "^4.13.1",
     "jwt-decode": "^3.1.2",
     "mime-types": "^2.1.35",
     "moment": "^2.29.4",
-    "next": "^13.4.12",
+    "next": "^13.2.4",
     "next-cookies": "^2.0.3",
     "next-http-proxy-middleware": "^1.2.5",
     "next-pwa": "^5.6.0",
     "p-limit": "^4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-icons": "^4.10.1",
+    "react-icons": "^4.8.0",
-    "react-intl": "^6.4.4",
+    "sharp": "^0.31.3",
-    "sharp": "^0.32.4",
+    "yup": "^1.0.2"
-    "yup": "^1.2.0"
   },
   "devDependencies": {
     "@types/mime-types": "^2.1.1",
-    "@types/node": "20.4.5",
+    "@types/node": "18.15.0",
-    "@types/react": "18.2.17",
+    "@types/react": "18.0.28",
-    "@types/react-dom": "18.2.7",
+    "@types/react-dom": "18.0.11",
-    "axios": "^1.4.0",
+    "axios": "^1.3.4",
-    "eslint": "8.46.0",
+    "eslint": "8.35.0",
-    "eslint-config-next": "^13.4.12",
+    "eslint-config-next": "^13.2.4",
-    "eslint-config-prettier": "^8.9.0",
+    "eslint-config-prettier": "^8.7.0",
-    "prettier": "^3.0.0",
+    "prettier": "^2.8.4",
-    "tar": "^6.1.15",
+    "tar": "^6.1.13",
-    "typescript": "^5.1.6"
+    "typescript": "^4.9.5"
   }
 }

frontend/src/components/Logo.tsx

@@ -1,4 +1,6 @@
+import Image from "next/image";
+
 const Logo = ({ height, width }: { height: number; width: number }) => {
-  return <img src="/img/logo.png" alt="logo" height={height} width={width} />;
+  return <Image src="/img/logo.png" alt="logo" height={height} width={width} />;
 };
 export default Logo;

frontend/src/components/account/LanguagePicker.tsx

@@ -1,36 +0,0 @@
-import { Select } from "@mantine/core";
-import { getCookie, setCookie } from "cookies-next";
-import { useState } from "react";
-import useTranslate from "../../hooks/useTranslate.hook";
-import { LOCALES } from "../../i18n/locales";
-
-const LanguagePicker = () => {
-  const t = useTranslate();
-  const [selectedLanguage, setSelectedLanguage] = useState(
-    getCookie("language")?.toString(),
-  );
-
-  const languages = Object.values(LOCALES).map((locale) => ({
-    value: locale.code,
-    label: locale.name,
-  }));
-  return (
-    <Select
-      value={selectedLanguage}
-      description={t("account.card.language.description")}
-      onChange={(value) => {
-        setSelectedLanguage(value ?? "en");
-        setCookie("language", value, {
-          sameSite: "lax",
-          expires: new Date(
-            new Date().setFullYear(new Date().getFullYear() + 1),
-          ),
-        });
-        location.reload();
-      }}
-      data={languages}
-    />
-  );
-};
-
-export default LanguagePicker;

frontend/src/components/account/ThemeSwitcher.tsx

@@ -9,12 +9,12 @@ import {
 import { useColorScheme } from "@mantine/hooks";
 import { useState } from "react";
 import { TbDeviceLaptop, TbMoon, TbSun } from "react-icons/tb";
-import { FormattedMessage } from "react-intl";
+import usePreferences from "../../hooks/usePreferences";
-import userPreferences from "../../utils/userPreferences.util";
 
 const ThemeSwitcher = () => {
+  const preferences = usePreferences();
   const [colorScheme, setColorScheme] = useState(
-    userPreferences.get("colorScheme"),
+    preferences.get("colorScheme")
   );
   const { toggleColorScheme } = useMantineColorScheme();
   const systemColorScheme = useColorScheme();
@@ -23,10 +23,10 @@ const ThemeSwitcher = () => {
       <SegmentedControl
         value={colorScheme}
         onChange={(value) => {
-          userPreferences.set("colorScheme", value);
+          preferences.set("colorScheme", value);
           setColorScheme(value);
           toggleColorScheme(
-            value == "system" ? systemColorScheme : (value as ColorScheme),
+            value == "system" ? systemColorScheme : (value as ColorScheme)
           );
         }}
         data={[
@@ -34,9 +34,7 @@ const ThemeSwitcher = () => {
             label: (
               <Center>
                 <TbMoon size={16} />
-                <Box ml={10}>
+                <Box ml={10}>Dark</Box>
-                  <FormattedMessage id="account.theme.dark" />
-                </Box>
               </Center>
             ),
             value: "dark",
@@ -45,9 +43,7 @@ const ThemeSwitcher = () => {
             label: (
               <Center>
                 <TbSun size={16} />
-                <Box ml={10}>
+                <Box ml={10}>Light</Box>
-                  <FormattedMessage id="account.theme.light" />
-                </Box>
               </Center>
             ),
             value: "light",
@@ -56,9 +52,7 @@ const ThemeSwitcher = () => {
             label: (
               <Center>
                 <TbDeviceLaptop size={16} />
-                <Box ml={10}>
+                <Box ml={10}>System</Box>
-                  <FormattedMessage id="account.theme.system" />
-                </Box>
               </Center>
             ),
             value: "system",

frontend/src/components/account/showEnableTotpModal.tsx

@@ -1,7 +1,8 @@
 import {
   Button,
   Center,
-  Group,
+  Col,
+  Grid,
   Image,
   Stack,
   Text,
@@ -11,11 +12,7 @@ import {
 import { useForm, yupResolver } from "@mantine/form";
 import { useModals } from "@mantine/modals";
 import { ModalsContextProps } from "@mantine/modals/lib/context";
-import { FormattedMessage } from "react-intl";
 import * as yup from "yup";
-import useTranslate, {
-  translateOutsideContext,
-} from "../../hooks/useTranslate.hook";
 import authService from "../../services/auth.service";
 import toast from "../../utils/toast.util";
 
@@ -26,11 +23,10 @@ const showEnableTotpModal = (
     qrCode: string;
     secret: string;
     password: string;
-  },
+  }
 ) => {
-  const t = translateOutsideContext();
   return modals.openModal({
-    title: t("account.modal.totp.title"),
+    title: "Enable TOTP",
     children: (
       <CreateEnableTotpModal options={options} refreshUser={refreshUser} />
     ),
@@ -49,7 +45,6 @@ const CreateEnableTotpModal = ({
   refreshUser: () => {};
 }) => {
   const modals = useModals();
-  const t = useTranslate();
 
   const validationSchema = yup.object().shape({
     code: yup
@@ -71,19 +66,14 @@ const CreateEnableTotpModal = ({
     <div>
       <Center>
         <Stack>
-          <Text>
+          <Text>Step 1: Add your authenticator</Text>
-            <FormattedMessage id="account.modal.totp.step1" />
-          </Text>
           <Image src={options.qrCode} alt="QR Code" />
 
           <Center>
-            <span>
+            <span>OR</span>
-              {" "}
-              <FormattedMessage id="common.text.or" />
-            </span>
           </Center>
 
-          <Tooltip label={t("account.modal.totp.clickToCopy")}>
+          <Tooltip label="Click to copy">
             <Button
               onClick={() => {
                 navigator.clipboard.writeText(options.secret);
@@ -94,42 +84,38 @@ const CreateEnableTotpModal = ({
             </Button>
           </Tooltip>
           <Center>
-            <Text fz="xs"></Text>
+            <Text fz="xs">Enter manually</Text>
           </Center>
 
-          <Text>
+          <Text>Step 2: Validate your code</Text>
-            <FormattedMessage id="account.modal.totp.step2" />
-          </Text>
 
           <form
             onSubmit={form.onSubmit((values) => {
               authService
                 .verifyTOTP(values.code, options.password)
                 .then(() => {
-                  toast.success(t("account.notify.totp.enable"));
+                  toast.success("Successfully enabled TOTP");
                   modals.closeAll();
                   refreshUser();
                 })
                 .catch(toast.axiosError);
             })}
           >
-            <Group align="end">
+            <Grid align="flex-end">
+              <Col xs={9}>
                 <TextInput
-                style={{ flex: "1" }}
                   variant="filled"
-                label={t("account.modal.totp.code")}
+                  label="Code"
                   placeholder="******"
                   {...form.getInputProps("code")}
                 />
-
+              </Col>
-              <Button
+              <Col xs={3}>
-                style={{ flex: "0 0 auto" }}
+                <Button variant="outline" type="submit">
-                variant="outline"
+                  Verify
-                type="submit"
-              >
-                <FormattedMessage id="account.modal.totp.verify" />
                 </Button>
-            </Group>
+              </Col>
+            </Grid>
           </form>
         </Stack>
       </Center>

frontend/src/components/account/showReverseShareLinkModal.tsx

@@ -1,22 +0,0 @@
-import { Stack, TextInput } from "@mantine/core";
-import { ModalsContextProps } from "@mantine/modals/lib/context";
-import { translateOutsideContext } from "../../hooks/useTranslate.hook";
-
-const showReverseShareLinkModal = (
-  modals: ModalsContextProps,
-  reverseShareToken: string,
-  appUrl: string,
-) => {
-  const t = translateOutsideContext();
-  const link = `${appUrl}/upload/${reverseShareToken}`;
-  return modals.openModal({
-    title: t("account.reverseShares.modal.reverse-share-link"),
-    children: (
-      <Stack align="stretch">
-        <TextInput variant="filled" value={link} />
-      </Stack>
-    ),
-  });
-};
-
-export default showReverseShareLinkModal;

frontend/src/components/account/showShareInformationsModal.tsx

@@ -1,21 +1,18 @@
-import { Divider, Flex, Progress, Stack, Text } from "@mantine/core";
+import { Text, Divider, Progress, Stack, Group, Flex } from "@mantine/core";
 import { ModalsContextProps } from "@mantine/modals/lib/context";
-import moment from "moment";
-import { FormattedMessage } from "react-intl";
-import { translateOutsideContext } from "../../hooks/useTranslate.hook";
-import { FileMetaData } from "../../types/File.type";
 import { MyShare } from "../../types/share.type";
+import moment from "moment";
 import { byteToHumanSizeString } from "../../utils/fileSize.util";
 import CopyTextField from "../upload/CopyTextField";
+import { FileMetaData } from "../../types/File.type";
 
 const showShareInformationsModal = (
   modals: ModalsContextProps,
   share: MyShare,
   appUrl: string,
-  maxShareSize: number,
+  maxShareSize: number
 ) => {
-  const t = translateOutsideContext();
+  const link = `${appUrl}/share/${share.id}`;
-  const link = `${appUrl}/s/${share.id}`;
 
   let shareSize: number = 0;
   for (let file of share.files as FileMetaData[])
@@ -32,51 +29,40 @@ const showShareInformationsModal = (
       : moment(share.expiration).format("LLL");
 
   return modals.openModal({
-    title: t("account.shares.modal.share-informations"),
+    title: "Share informations",
 
     children: (
       <Stack align="stretch" spacing="md">
-        <Text size="sm">
+        <Text size="sm" color="lightgray">
-          <b>
+          <b>ID:</b> {share.id}
-            <FormattedMessage id="account.shares.table.id" />:{" "}
-          </b>
-          {share.id}
         </Text>
 
-        <Text size="sm">
+        <Text size="sm" color="lightgray">
-          <b>
+          <b>Description:</b> {share.description || "No description"}
-            <FormattedMessage id="account.shares.table.description" />:{" "}
-          </b>
-          {share.description || "No description"}
         </Text>
 
-        <Text size="sm">
+        <Text size="sm" color="lightgray">
-          <b>
+          <b>Created at:</b> {formattedCreatedAt}
-            <FormattedMessage id="account.shares.table.createdAt" />:{" "}
-          </b>
-          {formattedCreatedAt}
         </Text>
 
-        <Text size="sm">
+        <Text size="sm" color="lightgray">
-          <b>
+          <b>Expires at:</b> {formattedExpiration}
-            <FormattedMessage id="account.shares.table.expiresAt" />:{" "}
-          </b>
-          {formattedExpiration}
         </Text>
+
         <Divider />
+
         <CopyTextField link={link} />
+
         <Divider />
-        <Text size="sm">
+
-          <b>
+        <Text size="sm" color="lightgray">
-            <FormattedMessage id="account.shares.table.size" />:{" "}
+          <b>Size:</b> {formattedShareSize} / {formattedMaxShareSize} (
-          </b>
-          {formattedShareSize} / {formattedMaxShareSize} (
           {shareSizeProgress.toFixed(1)}%)
         </Text>
 
         <Flex align="center" justify="center">
           {shareSize / maxShareSize < 0.1 && (
-            <Text size="xs" style={{ marginRight: "4px" }}>
+            <Text size="xs" color="lightgray" style={{ marginRight: "4px" }}>
               {formattedShareSize}
             </Text>
           )}
@@ -87,7 +73,7 @@ const showShareInformationsModal = (
             size="xl"
             radius="xl"
           />
-          <Text size="xs" style={{ marginLeft: "4px" }}>
+          <Text size="xs" color="lightgray" style={{ marginLeft: "4px" }}>
             {formattedMaxShareSize}
           </Text>
         </Flex>

frontend/src/components/account/showShareLinkModal.tsx

@@ -1,16 +1,14 @@
 import { Stack, TextInput } from "@mantine/core";
 import { ModalsContextProps } from "@mantine/modals/lib/context";
-import { translateOutsideContext } from "../../hooks/useTranslate.hook";
 
 const showShareLinkModal = (
   modals: ModalsContextProps,
   shareId: string,
-  appUrl: string,
+  appUrl: string
 ) => {
-  const t = translateOutsideContext();
+  const link = `${appUrl}/share/${shareId}`;
-  const link = `${appUrl}/s/${shareId}`;
   return modals.openModal({
-    title: t("account.shares.modal.share-link"),
+    title: "Share link",
     children: (
       <Stack align="stretch">
         <TextInput variant="filled" value={link} />

frontend/src/components/admin/configuration/AdminConfigInput.tsx

@@ -21,7 +21,7 @@ const AdminConfigInput = ({
       stringValue: configVariable.value ?? configVariable.defaultValue,
       textValue: configVariable.value ?? configVariable.defaultValue,
       numberValue: parseInt(
-        configVariable.value ?? configVariable.defaultValue,
+        configVariable.value ?? configVariable.defaultValue
       ),
       booleanValue:
         (configVariable.value ?? configVariable.defaultValue) == "true",

frontend/src/components/admin/configuration/ConfigurationHeader.tsx

@@ -9,7 +9,6 @@ import {
 } from "@mantine/core";
 import Link from "next/link";
 import { Dispatch, SetStateAction } from "react";
-import { FormattedMessage } from "react-intl";
 import useConfig from "../../../hooks/config.hook";
 import Logo from "../../Logo";
 
@@ -43,7 +42,7 @@ const ConfigurationHeader = ({
           </Link>
           <MediaQuery smallerThan="sm" styles={{ display: "none" }}>
             <Button variant="light" component={Link} href="/admin">
-              <FormattedMessage id="common.button.go-back" />
+              Go back
             </Button>
           </MediaQuery>
         </Group>

frontend/src/components/admin/configuration/ConfigurationNavBar.tsx

@@ -11,15 +11,13 @@ import {
 } from "@mantine/core";
 import Link from "next/link";
 import { Dispatch, SetStateAction } from "react";
-import { TbAt, TbMail, TbShare, TbSocial, TbSquare } from "react-icons/tb";
+import { TbAt, TbMail, TbShare, TbSquare } from "react-icons/tb";
-import { FormattedMessage } from "react-intl";
 
 const categories = [
   { name: "General", icon: <TbSquare /> },
   { name: "Email", icon: <TbMail /> },
   { name: "Share", icon: <TbShare /> },
   { name: "SMTP", icon: <TbAt /> },
-  { name: "OAuth", icon: <TbSocial /> },
 ];
 
 const useStyles = createStyles((theme) => ({
@@ -55,7 +53,7 @@ const ConfigurationNavBar = ({
     >
       <Navbar.Section>
         <Text size="xs" color="dimmed" mb="sm">
-          <FormattedMessage id="admin.config.title" />
+          Configuration
         </Text>
         <Stack spacing="xs">
           {categories.map((category) => (
@@ -81,11 +79,7 @@ const ConfigurationNavBar = ({
                 >
                   {category.icon}
                 </ThemeIcon>
-                <Text size="sm">
+                <Text size="sm">{category.name}</Text>
-                  <FormattedMessage
-                    id={`admin.config.category.${category.name.toLowerCase()}`}
-                  />
-                </Text>
               </Group>
             </Box>
           ))}
@@ -93,7 +87,7 @@ const ConfigurationNavBar = ({
       </Navbar.Section>
       <MediaQuery largerThan="sm" styles={{ display: "none" }}>
         <Button mt="xl" variant="light" component={Link} href="/admin">
-          <FormattedMessage id="common.button.go-back" />
+          Go back
         </Button>
       </MediaQuery>
     </Navbar>

frontend/src/components/admin/configuration/LogoConfigInput.tsx

@@ -2,8 +2,6 @@ import { Box, FileInput, Group, Stack, Text, Title } from "@mantine/core";
 import { useMediaQuery } from "@mantine/hooks";
 import { Dispatch, SetStateAction } from "react";
 import { TbUpload } from "react-icons/tb";
-import { FormattedMessage } from "react-intl";
-import useTranslate from "../../../hooks/useTranslate.hook";
 
 const LogoConfigInput = ({
   logo,
@@ -13,16 +11,14 @@ const LogoConfigInput = ({
   setLogo: Dispatch<SetStateAction<File | null>>;
 }) => {
   const isMobile = useMediaQuery("(max-width: 560px)");
-  const t = useTranslate();
 
   return (
     <Group position="apart">
       <Stack style={{ maxWidth: isMobile ? "100%" : "40%" }} spacing={0}>
-        <Title order={6}>
+        <Title order={6}>Logo</Title>
-          <FormattedMessage id="admin.config.general.logo" />
-        </Title>
         <Text color="dimmed" size="sm" mb="xs">
-          <FormattedMessage id="admin.config.general.logo.description" />
+          Change your logo by uploading a new image. The image must be a PNG and
+          should have the format 1:1.
         </Text>
       </Stack>
       <Stack></Stack>
@@ -33,7 +29,7 @@ const LogoConfigInput = ({
           value={logo}
           onChange={(v) => setLogo(v)}
           accept=".png"
-          placeholder={t("admin.config.general.logo.placeholder")}
+          placeholder="Pick image"
         />
       </Box>
     </Group>

frontend/src/components/admin/configuration/TestEmailButton.tsx

@@ -1,7 +1,6 @@
 import { Button, Stack, Text, Textarea } from "@mantine/core";
 import { useModals } from "@mantine/modals";
 import { useState } from "react";
-import { FormattedMessage } from "react-intl";
 import useUser from "../../../hooks/user.hook";
 import configService from "../../../services/config.service";
 import toast from "../../../utils/toast.util";
@@ -33,7 +32,7 @@ const TestEmailButton = ({
               <Textarea minRows={4} readOnly value={e.response.data.message} />
             </Stack>
           ),
-        }),
+        })
       );
   };
 
@@ -66,7 +65,7 @@ const TestEmailButton = ({
         }
       }}
     >
-      <FormattedMessage id="admin.config.smtp.button.test" />
+      Send test email
     </Button>
   );
 };

frontend/src/components/admin/users/ManageUserTable.tsx

@@ -3,7 +3,6 @@ import { useModals } from "@mantine/modals";
 import { TbCheck, TbEdit, TbTrash } from "react-icons/tb";
 import User from "../../../types/user.type";
 import showUpdateUserModal from "./showUpdateUserModal";
-import { FormattedMessage, useIntl } from "react-intl";
 
 const ManageUserTable = ({
   users,
@@ -23,15 +22,9 @@ const ManageUserTable = ({
       <Table verticalSpacing="sm">
         <thead>
           <tr>
-            <th>
+            <th>Username</th>
-              <FormattedMessage id="admin.users.table.username" />
+            <th>Email</th>
-            </th>
+            <th>Admin</th>
-            <th>
-              <FormattedMessage id="admin.users.table.email" />
-            </th>
-            <th>
-              <FormattedMessage id="admin.users.table.admin" />
-            </th>
             <th></th>
           </tr>
         </thead>

frontend/src/components/admin/users/showCreateUserModal.tsx

@@ -8,16 +8,14 @@ import {
 } from "@mantine/core";
 import { useForm, yupResolver } from "@mantine/form";
 import { ModalsContextProps } from "@mantine/modals/lib/context";
-import { FormattedMessage } from "react-intl";
 import * as yup from "yup";
-import useTranslate from "../../../hooks/useTranslate.hook";
 import userService from "../../../services/user.service";
 import toast from "../../../utils/toast.util";
 
 const showCreateUserModal = (
   modals: ModalsContextProps,
   smtpEnabled: boolean,
-  getUsers: () => void,
+  getUsers: () => void
 ) => {
   return modals.openModal({
     title: "Create user",
@@ -36,7 +34,6 @@ const Body = ({
   smtpEnabled: boolean;
   getUsers: () => void;
 }) => {
-  const t = useTranslate();
   const form = useForm({
     initialValues: {
       username: "",
@@ -47,15 +44,10 @@ const Body = ({
     },
     validate: yupResolver(
       yup.object().shape({
-        email: yup.string().email(t("common.error.invalid-email")),
+        email: yup.string().email(),
-        username: yup
+        username: yup.string().min(3),
-          .string()
+        password: yup.string().min(8).optional(),
-          .min(3, t("common.error.too-short", { length: 3 })),
+      })
-        password: yup
-          .string()
-          .min(8, t("common.error.too-short", { length: 8 }))
-          .optional(),
-      }),
     ),
   });
 
@@ -73,22 +65,14 @@ const Body = ({
         })}
       >
         <Stack>
-          <TextInput
+          <TextInput label="Username" {...form.getInputProps("username")} />
-            label={t("admin.users.modal.create.username")}
+          <TextInput label="Email" {...form.getInputProps("email")} />
-            {...form.getInputProps("username")}
-          />
-          <TextInput
-            label={t("admin.users.modal.create.email")}
-            {...form.getInputProps("email")}
-          />
           {smtpEnabled && (
             <Switch
               mt="xs"
               labelPosition="left"
-              label={t("admin.users.modal.create.manual-password")}
+              label="Set password manually"
-              description={t(
+              description="If not checked, the user will receive an email with a link to set their password."
-                "admin.users.modal.create.manual-password.description",
-              )}
               {...form.getInputProps("setPasswordManually", {
                 type: "checkbox",
               })}
@@ -96,7 +80,7 @@ const Body = ({
           )}
           {(form.values.setPasswordManually || !smtpEnabled) && (
             <PasswordInput
-              label={t("admin.users.modal.create.password")}
+              label="Password"
               {...form.getInputProps("password")}
             />
           )}
@@ -109,14 +93,12 @@ const Body = ({
             }}
             mt="xs"
             labelPosition="left"
-            label={t("admin.users.modal.create.admin")}
+            label="Admin privileges"
-            description={t("admin.users.modal.create.admin.description")}
+            description="If checked, the user will be able to access the admin panel."
             {...form.getInputProps("isAdmin", { type: "checkbox" })}
           />
           <Group position="right">
-            <Button type="submit">
+            <Button type="submit">Create</Button>
-              <FormattedMessage id="common.button.create" />
-            </Button>
           </Group>
         </Stack>
       </form>

frontend/src/components/admin/users/showUpdateUserModal.tsx

@@ -9,11 +9,7 @@ import {
 } from "@mantine/core";
 import { useForm, yupResolver } from "@mantine/form";
 import { ModalsContextProps } from "@mantine/modals/lib/context";
-import { FormattedMessage } from "react-intl";
 import * as yup from "yup";
-import useTranslate, {
-  translateOutsideContext,
-} from "../../../hooks/useTranslate.hook";
 import userService from "../../../services/user.service";
 import User from "../../../types/user.type";
 import toast from "../../../utils/toast.util";
@@ -21,11 +17,10 @@ import toast from "../../../utils/toast.util";
 const showUpdateUserModal = (
   modals: ModalsContextProps,
   user: User,
-  getUsers: () => void,
+  getUsers: () => void
 ) => {
-  const t = translateOutsideContext();
   return modals.openModal({
-    title: t("admin.users.edit.update.title", { username: user.username }),
+    title: `Update ${user.username}`,
     children: <Body user={user} modals={modals} getUsers={getUsers} />,
   });
 };
@@ -39,8 +34,6 @@ const Body = ({
   user: User;
   getUsers: () => void;
 }) => {
-  const t = useTranslate();
-
   const accountForm = useForm({
     initialValues: {
       username: user.username,
@@ -49,11 +42,9 @@ const Body = ({
     },
     validate: yupResolver(
       yup.object().shape({
-        email: yup.string().email(t("common.error.invalid-email")),
+        email: yup.string().email(),
-        username: yup
+        username: yup.string().min(3),
-          .string()
+      })
-          .min(3, t("common.error.too-short", { length: 3 })),
-      }),
     ),
   });
 
@@ -63,10 +54,8 @@ const Body = ({
     },
     validate: yupResolver(
       yup.object().shape({
-        password: yup
+        password: yup.string().min(8),
-          .string()
+      })
-          .min(8, t("common.error.too-short", { length: 8 })),
-      }),
     ),
   });
 
@@ -86,26 +75,21 @@ const Body = ({
       >
         <Stack>
           <TextInput
-            label={t("admin.users.table.username")}
+            label="Username"
             {...accountForm.getInputProps("username")}
           />
-          <TextInput
+          <TextInput label="Email" {...accountForm.getInputProps("email")} />
-            label={t("admin.users.table.email")}
-            {...accountForm.getInputProps("email")}
-          />
           <Switch
             mt="xs"
             labelPosition="left"
-            label={t("admin.users.edit.update.admin-privileges")}
+            label="Admin privileges"
             {...accountForm.getInputProps("isAdmin", { type: "checkbox" })}
           />
         </Stack>
       </form>
       <Accordion>
         <Accordion.Item sx={{ borderBottom: "none" }} value="changePassword">
-          <Accordion.Control px={0}>
+          <Accordion.Control px={0}>Change password</Accordion.Control>
-            <FormattedMessage id="admin.users.edit.update.change-password.title" />
-          </Accordion.Control>
           <Accordion.Panel>
             <form
               onSubmit={passwordForm.onSubmit(async (values) => {
@@ -113,21 +97,17 @@ const Body = ({
                   .update(user.id, {
                     password: values.password,
                   })
-                  .then(() =>
+                  .then(() => toast.success("Password changed successfully"))
-                    toast.success(
-                      t("admin.users.edit.update.notify.password.success"),
-                    ),
-                  )
                   .catch(toast.axiosError);
               })}
             >
               <Stack>
                 <PasswordInput
-                  label={t("admin.users.edit.update.change-password.field")}
+                  label="New password"
                   {...passwordForm.getInputProps("password")}
                 />
                 <Button variant="light" type="submit">
-                  <FormattedMessage id="admin.users.edit.update.change-password.button" />
+                  Save new password
                 </Button>
               </Stack>
             </form>
@@ -136,7 +116,7 @@ const Body = ({
       </Accordion>
       <Group position="right">
         <Button type="submit" form="accountForm">
-          <FormattedMessage id="common.button.save" />
+          Save
         </Button>
       </Group>
     </Stack>

frontend/src/components/auth/SignInForm.tsx

@@ -2,11 +2,9 @@ import {
   Anchor,
   Button,
   Container,
-  createStyles,
   Group,
   Paper,
   PasswordInput,
-  Stack,
   Text,
   TextInput,
   Title,
@@ -17,63 +15,30 @@ import Link from "next/link";
 import { useRouter } from "next/router";
 import React from "react";
 import { TbInfoCircle } from "react-icons/tb";
-import { FormattedMessage } from "react-intl";
 import * as yup from "yup";
 import useConfig from "../../hooks/config.hook";
 import useUser from "../../hooks/user.hook";
-import useTranslate from "../../hooks/useTranslate.hook";
 import authService from "../../services/auth.service";
-import { getOAuthIcon, getOAuthUrl } from "../../utils/oauth.util";
 import toast from "../../utils/toast.util";
 
-const useStyles = createStyles((theme) => ({
-  or: {
-    "&:before": {
-      content: "''",
-      flex: 1,
-      display: "block",
-      borderTopWidth: 1,
-      borderTopStyle: "solid",
-      borderColor:
-        theme.colorScheme === "dark"
-          ? theme.colors.dark[3]
-          : theme.colors.gray[4],
-    },
-    "&:after": {
-      content: "''",
-      flex: 1,
-      display: "block",
-      borderTopWidth: 1,
-      borderTopStyle: "solid",
-      borderColor:
-        theme.colorScheme === "dark"
-          ? theme.colors.dark[3]
-          : theme.colors.gray[4],
-    },
-  },
-}));
-
 const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
   const config = useConfig();
   const router = useRouter();
-  const t = useTranslate();
   const { refreshUser } = useUser();
-  const { classes } = useStyles();
 
-  const [oauth, setOAuth] = React.useState<string[]>([]);
+  const [showTotp, setShowTotp] = React.useState(false);
+  const [loginToken, setLoginToken] = React.useState("");
 
   const validationSchema = yup.object().shape({
-    emailOrUsername: yup.string().required(t("common.error.field-required")),
+    emailOrUsername: yup.string().required(),
-    password: yup
+    password: yup.string().min(8).required(),
-      .string()
-      .min(8, t("common.error.too-short", { length: 8 }))
-      .required(t("common.error.field-required")),
   });
 
   const form = useForm({
     initialValues: {
       emailOrUsername: "",
       password: "",
+      totp: "",
     },
     validate: yupResolver(validationSchema),
   });
@@ -84,18 +49,15 @@ const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
       .then(async (response) => {
         if (response.data["loginToken"]) {
           // Prompt the user to enter their totp code
+          setShowTotp(true);
           showNotification({
             icon: <TbInfoCircle />,
             color: "blue",
             radius: "md",
-            title: t("signIn.notify.totp-required.title"),
+            title: "Two-factor authentication required",
-            message: t("signIn.notify.totp-required.description"),
+            message: "Please enter your two-factor authentication code",
           });
-          router.push(
+          setLoginToken(response.data["loginToken"]);
-            `/auth/totp/${
-              response.data["loginToken"]
-            }?redirect=${encodeURIComponent(redirectPath)}`,
-          );
         } else {
           await refreshUser();
           router.replace(redirectPath);
@@ -104,77 +66,77 @@ const SignInForm = ({ redirectPath }: { redirectPath: string }) => {
       .catch(toast.axiosError);
   };
 
-  const getAvailableOAuth = async () => {
+  const signInTotp = (email: string, password: string, totp: string) => {
-    const oauth = await authService.getAvailableOAuth();
+    authService
-    setOAuth(oauth.data);
+      .signInTotp(email, password, totp, loginToken)
-  };
+      .then(async () => {
+        await refreshUser();
+        router.replace(redirectPath);
+      })
+      .catch((error) => {
+        if (error?.response?.data?.error == "share_password_required") {
+          toast.axiosError(error);
+          // Refresh the page to start over
+          window.location.reload();
+        }
 
-  React.useEffect(() => {
+        toast.axiosError(error);
-    getAvailableOAuth().catch(toast.axiosError);
+        form.setValues({ totp: "" });
-  }, []);
+      });
+  };
 
   return (
     <Container size={420} my={40}>
       <Title order={2} align="center" weight={900}>
-        <FormattedMessage id="signin.title" />
+        Welcome back
       </Title>
       {config.get("share.allowRegistration") && (
         <Text color="dimmed" size="sm" align="center" mt={5}>
-          <FormattedMessage id="signin.description" />{" "}
+          You don't have an account yet?{" "}
           <Anchor component={Link} href={"signUp"} size="sm">
-            <FormattedMessage id="signin.button.signup" />
+            {"Sign up"}
           </Anchor>
         </Text>
       )}
       <Paper withBorder shadow="md" p={30} mt={30} radius="md">
         <form
           onSubmit={form.onSubmit((values) => {
-            signIn(values.emailOrUsername, values.password);
+            if (showTotp)
+              signInTotp(values.emailOrUsername, values.password, values.totp);
+            else signIn(values.emailOrUsername, values.password);
           })}
         >
           <TextInput
-            label={t("signin.input.email-or-username")}
+            label="Email or username"
-            placeholder={t("signin.input.email-or-username.placeholder")}
+            placeholder="Your email or username"
             {...form.getInputProps("emailOrUsername")}
           />
           <PasswordInput
-            label={t("signin.input.password")}
+            label="Password"
-            placeholder={t("signin.input.password.placeholder")}
+            placeholder="Your password"
             mt="md"
             {...form.getInputProps("password")}
           />
+          {showTotp && (
+            <TextInput
+              variant="filled"
+              label="Code"
+              placeholder="******"
+              mt="md"
+              {...form.getInputProps("totp")}
+            />
+          )}
           {config.get("smtp.enabled") && (
             <Group position="right" mt="xs">
               <Anchor component={Link} href="/auth/resetPassword" size="xs">
-                <FormattedMessage id="resetPassword.title" />
+                Forgot password?
               </Anchor>
             </Group>
           )}
           <Button fullWidth mt="xl" type="submit">
-            <FormattedMessage id="signin.button.submit" />
+            Sign in
           </Button>
         </form>
-        {oauth.length > 0 && (
-          <Stack mt="xl">
-            <Group align="center" className={classes.or}>
-              <Text>{t("signIn.oauth.or")}</Text>
-            </Group>
-            <Group position="center">
-              {oauth.map((provider) => (
-                <Button
-                  key={provider}
-                  component="a"
-                  target="_blank"
-                  title={t(`signIn.oauth.${provider}`)}
-                  href={getOAuthUrl(config.get("general.appUrl"), provider)}
-                  variant="light"
-                >
-                  {getOAuthIcon(provider)}
-                </Button>
-              ))}
-            </Group>
-          </Stack>
-        )}
       </Paper>
     </Container>
   );

frontend/src/components/auth/SignUpForm.tsx

@@ -11,10 +11,8 @@ import {
 import { useForm, yupResolver } from "@mantine/form";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { FormattedMessage } from "react-intl";
 import * as yup from "yup";
 import useConfig from "../../hooks/config.hook";
-import useTranslate from "../../hooks/useTranslate.hook";
 import useUser from "../../hooks/user.hook";
 import authService from "../../services/auth.service";
 import toast from "../../utils/toast.util";
@@ -22,19 +20,12 @@ import toast from "../../utils/toast.util";
 const SignUpForm = () => {
   const config = useConfig();
   const router = useRouter();
-  const t = useTranslate();
   const { refreshUser } = useUser();
 
   const validationSchema = yup.object().shape({
-    email: yup.string().email(t("common.error.invalid-email")).required(),
+    email: yup.string().email().required(),
-    username: yup
+    username: yup.string().min(3).required(),
-      .string()
+    password: yup.string().min(8).required(),
-      .min(3, t("common.error.too-short", { length: 3 }))
-      .required(t("common.error.field-required")),
-    password: yup
-      .string()
-      .min(8, t("common.error.too-short", { length: 8 }))
-      .required(t("common.error.field-required")),
   });
 
   const form = useForm({
@@ -63,41 +54,41 @@ const SignUpForm = () => {
   return (
     <Container size={420} my={40}>
       <Title order={2} align="center" weight={900}>
-        <FormattedMessage id="signup.title" />
+        Sign up
       </Title>
       {config.get("share.allowRegistration") && (
         <Text color="dimmed" size="sm" align="center" mt={5}>
-          <FormattedMessage id="signup.description" />{" "}
+          You have an account already?{" "}
           <Anchor component={Link} href={"signIn"} size="sm">
-            <FormattedMessage id="signup.button.signin" />
+            Sign in
           </Anchor>
         </Text>
       )}
       <Paper withBorder shadow="md" p={30} mt={30} radius="md">
         <form
           onSubmit={form.onSubmit((values) =>
-            signUp(values.email, values.username, values.password),
+            signUp(values.email, values.username, values.password)
           )}
         >
           <TextInput
-            label={t("signup.input.username")}
+            label="Username"
-            placeholder={t("signup.input.username.placeholder")}
+            placeholder="Your username"
             {...form.getInputProps("username")}
           />
           <TextInput
-            label={t("signup.input.email")}
+            label="Email"
-            placeholder={t("signup.input.email.placeholder")}
+            placeholder="Your email"
             mt="md"
             {...form.getInputProps("email")}
           />
           <PasswordInput
-            label={t("signin.input.password")}
+            label="Password"
-            placeholder={t("signin.input.password.placeholder")}
+            placeholder="Your password"
             mt="md"
             {...form.getInputProps("password")}
           />
           <Button fullWidth mt="xl" type="submit">
-            <FormattedMessage id="signup.button.submit" />
+            Let's get started
           </Button>
         </form>
       </Paper>

frontend/src/components/auth/TotpForm.tsx

@@ -1,84 +0,0 @@
-import {
-  Button,
-  Container,
-  Group,
-  Paper,
-  PinInput,
-  Title,
-} from "@mantine/core";
-import { FormattedMessage } from "react-intl";
-import * as yup from "yup";
-import useTranslate from "../../hooks/useTranslate.hook";
-import { useForm, yupResolver } from "@mantine/form";
-import { useState } from "react";
-import authService from "../../services/auth.service";
-import toast from "../../utils/toast.util";
-import { useRouter } from "next/router";
-import useUser from "../../hooks/user.hook";
-
-function TotpForm({ redirectPath }: { redirectPath: string }) {
-  const t = useTranslate();
-  const router = useRouter();
-  const { refreshUser } = useUser();
-
-  const [loading, setLoading] = useState(false);
-
-  const validationSchema = yup.object().shape({
-    code: yup
-      .string()
-      .min(6, t("common.error.too-short", { length: 6 }))
-      .required(t("common.error.field-required")),
-  });
-
-  const form = useForm({
-    initialValues: {
-      code: "",
-    },
-    validate: yupResolver(validationSchema),
-  });
-
-  const onSubmit = async () => {
-    if (loading) return;
-    setLoading(true);
-    try {
-      await authService.signInTotp(
-        form.values.code,
-        router.query.loginToken as string,
-      );
-      await refreshUser();
-      await router.replace(redirectPath);
-    } catch (e) {
-      toast.axiosError(e);
-      form.setFieldError("code", "error");
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  return (
-    <Container size={420} my={40}>
-      <Title order={2} align="center" weight={900}>
-        <FormattedMessage id="totp.title" />
-      </Title>
-      <Paper withBorder shadow="md" p={30} mt={30} radius="md">
-        <form onSubmit={form.onSubmit(onSubmit)}>
-          <Group position="center">
-            <PinInput
-              length={6}
-              oneTimeCode
-              aria-label="One time code"
-              autoFocus={true}
-              onComplete={onSubmit}
-              {...form.getInputProps("code")}
-            />
-            <Button mt="md" type="submit" loading={loading}>
-              {t("totp.button.signIn")}
-            </Button>
-          </Group>
-        </form>
-      </Paper>
-    </Container>
-  );
-}
-
-export default TotpForm;