15 Commits

104 changed files with 7352 additions and 15037 deletions

View File

@ -1,7 +1,3 @@
{ {
"extends": ["@commitlint/config-conventional"], "extends": ["@commitlint/config-conventional"]
"rules": {
"body-max-length": [0, "always"],
"body-max-line-length": [0, "always"]
}
} }

View File

@ -1,2 +1 @@
ARG VARIANT="16" FROM mcr.microsoft.com/devcontainers/javascript-node:18
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}

View File

@ -3,6 +3,8 @@
"dockerComposeFile": "./docker-compose.yml", "dockerComposeFile": "./docker-compose.yml",
"service": "workspace", "service": "workspace",
"workspaceFolder": "/workspace", "workspaceFolder": "/workspace",
"customizations": {
"vscode": {
"settings": { "settings": {
"remote.autoForwardPorts": false "remote.autoForwardPorts": false
}, },
@ -14,7 +16,9 @@
"prisma.prisma", "prisma.prisma",
"mikestead.dotenv", "mikestead.dotenv",
"ms-azuretools.vscode-docker" "ms-azuretools.vscode-docker"
], ]
}
},
"forwardPorts": [8080, 5555, 5432, 1080], "forwardPorts": [8080, 5555, 5432, 1080],
"postAttachCommand": ["npm", "install"], "postAttachCommand": ["npm", "install"],
"remoteUser": "node" "remoteUser": "node"

View File

@ -12,7 +12,7 @@ services:
- 'host.docker.internal:host-gateway' - 'host.docker.internal:host-gateway'
thream-database: thream-database:
image: 'postgres:14.5' image: 'postgres:15.3'
environment: environment:
POSTGRES_USER: 'user' POSTGRES_USER: 'user'
POSTGRES_PASSWORD: 'password' POSTGRES_PASSWORD: 'password'
@ -21,10 +21,5 @@ services:
- 'postgres-data:/var/lib/postgresql/data' - 'postgres-data:/var/lib/postgresql/data'
restart: 'unless-stopped' restart: 'unless-stopped'
thream-maildev:
image: 'maildev/maildev:1.1.0'
ports:
- '1080:80'
volumes: volumes:
postgres-data: postgres-data:

View File

@ -1,9 +1,6 @@
.vscode .*
.git !.npmrc
.env !.swcrc
build build
coverage coverage
.nyc_output
node_modules node_modules
tmp
temp

View File

@ -1,21 +1,22 @@
COMPOSE_PROJECT_NAME=thream-api
NODE_ENV=development
API_URL=http://localhost:8080 API_URL=http://localhost:8080
HOST=0.0.0.0 COMPOSE_PROJECT_NAME=thream-api
PORT=8080
DATABASE_URL=postgresql://user:password@thream-database:5432/thream DATABASE_URL=postgresql://user:password@thream-database:5432/thream
DISCORD_CLIENT_ID=
DISCORD_CLIENT_SECRET=
EMAIL_HOST=thream-maildev EMAIL_HOST=thream-maildev
EMAIL_PASSWORD=password EMAIL_PASSWORD=password
EMAIL_PORT=25 EMAIL_PORT=25
EMAIL_USER=no-reply@thream.fr EMAIL_USER=no-reply@thream.fr
FILE_UPLOADS_API_KEY=apiKeySecret FILE_UPLOADS_API_KEY=apiKeySecret
FILE_UPLOADS_API_URL=http://host.docker.internal:8000 FILE_UPLOADS_API_URL=http://host.docker.internal:8000
DISCORD_CLIENT_ID=
DISCORD_CLIENT_SECRET=
GITHUB_CLIENT_ID= GITHUB_CLIENT_ID=
GITHUB_CLIENT_SECRET= GITHUB_CLIENT_SECRET=
GOOGLE_CLIENT_ID= GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET= GOOGLE_CLIENT_SECRET=
HOST=0.0.0.0
JWT_ACCESS_EXPIRES_IN=15 minutes JWT_ACCESS_EXPIRES_IN=15 minutes
# You can generate JWT secrets with the `npm run generate:jwt-secret` command.
JWT_ACCESS_SECRET=accessTokenSecret JWT_ACCESS_SECRET=accessTokenSecret
JWT_REFRESH_SECRET=refreshTokenSecret JWT_REFRESH_SECRET=refreshTokenSecret
NODE_ENV=development
PORT=8080

View File

@ -4,13 +4,9 @@
"parserOptions": { "parserOptions": {
"project": "./tsconfig.json" "project": "./tsconfig.json"
}, },
"env": {
"node": true
},
"rules": { "rules": {
"prettier/prettier": "error", "prettier/prettier": "error",
"import/extensions": ["error", "always"], "import/extensions": ["error", "always"],
"unicorn/prevent-abbreviations": "error", "unicorn/prevent-abbreviations": "error"
"unicorn/prefer-node-protocol": "error"
} }
} }

View File

@ -1,6 +1,6 @@
<!-- Please first discuss the change you wish to make via issue before making a change. It might avoid a waste of your time. --> <!-- Please first discuss the change you wish to make via issue before making a change. It might avoid a waste of your time. -->
## What changes this PR introduce? # What changes this PR introduce?
## List any relevant issue numbers ## List any relevant issue numbers

View File

@ -16,10 +16,10 @@ jobs:
language: ['javascript'] language: ['javascript']
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.5.2'
- name: 'Initialize CodeQL' - name: 'Initialize CodeQL'
uses: 'github/codeql-action/init@v1' uses: 'github/codeql-action/init@v2'
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}

View File

@ -10,16 +10,18 @@ jobs:
build: build:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.5.2'
- name: 'Use Node.js' - name: 'Setup Node.js'
uses: 'actions/setup-node@v3.0.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install dependencies'
run: 'npm install' run: 'npm clean-install'
- name: 'Build' - name: 'Build'
run: 'npm run build' run: 'npm run build'
- run: 'npm run build:typescript'

View File

@ -10,16 +10,16 @@ jobs:
lint: lint:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.5.2'
- name: 'Use Node.js' - name: 'Setup Node.js'
uses: 'actions/setup-node@v3.0.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install dependencies'
run: 'npm install' run: 'npm clean-install'
- name: 'lint:commit' - name: 'lint:commit'
run: 'npm run lint:commit -- --to "${{ github.sha }}"' run: 'npm run lint:commit -- --to "${{ github.sha }}"'
@ -30,8 +30,8 @@ jobs:
- name: 'lint:markdown' - name: 'lint:markdown'
run: 'npm run lint:markdown' run: 'npm run lint:markdown'
- name: 'lint:typescript' - name: 'lint:eslint'
run: 'npm run lint:typescript' run: 'npm run lint:eslint'
- name: 'lint:prettier' - name: 'lint:prettier'
run: 'npm run lint:prettier' run: 'npm run lint:prettier'
@ -41,10 +41,5 @@ jobs:
with: with:
github_token: ${{ secrets.github_token }} github_token: ${{ secrets.github_token }}
- name: 'lint:docker'
uses: 'hadolint/hadolint-action@v1.6.0'
with:
dockerfile: './Dockerfile'
- name: 'prisma:validate' - name: 'prisma:validate'
run: 'cp .env.example .env && npm run prisma:validate' run: 'cp .env.example .env && npm run prisma:validate'

View File

@ -8,30 +8,32 @@ jobs:
release: release:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.5.2'
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false persist-credentials: false
- name: 'Import GPG key' - name: 'Import GPG key'
uses: 'crazy-max/ghaction-import-gpg@v3.2.0' uses: 'crazy-max/ghaction-import-gpg@v5.3.0'
with: with:
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
git-user-signingkey: true git_user_signingkey: true
git-commit-gpgsign: true git_commit_gpgsign: true
- name: 'Use Node.js' - name: 'Setup Node.js'
uses: 'actions/setup-node@v3.0.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install dependencies'
run: 'npm install' run: 'npm clean-install'
- name: 'Build' - name: 'Build'
run: 'npm run build' run: 'npm run build'
- run: 'npm run build:typescript'
- name: 'Release' - name: 'Release'
run: 'npm run release' run: 'npm run release'
env: env:

View File

@ -10,16 +10,16 @@ jobs:
test: test:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.5.2'
- name: 'Use Node.js' - name: 'Setup Node.js'
uses: 'actions/setup-node@v3.0.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install dependencies'
run: 'npm install' run: 'npm clean-install'
- name: 'Build' - name: 'Build'
run: 'npm run build' run: 'npm run build'

View File

@ -3,3 +3,4 @@
npm run lint:staged npm run lint:staged
npm run build npm run build
npm run build:typescript

View File

@ -1,10 +1,11 @@
{ {
"config": { "config": {
"extends": "markdownlint/style/prettier",
"relative-links": true,
"default": true, "default": true,
"MD013": false, "MD033": false
"MD033": false,
"MD041": false
}, },
"globs": ["**/*.{md,mdx}"], "globs": ["**/*.{md,mdx}"],
"ignores": ["**/node_modules"] "ignores": ["**/node_modules"],
"customRules": ["markdownlint-rule-relative-links"]
} }

View File

@ -60,7 +60,7 @@ representative at an online or offline event.
Instances of abusive, harassing, or otherwise unacceptable behavior may be Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at reported to the community leaders responsible for enforcement at
contact@divlo.fr. <contact@divlo.fr>.
All complaints will be reviewed and investigated promptly and fairly. All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the All community leaders are obligated to respect the privacy and security of the

View File

@ -29,38 +29,14 @@ If you're adding new features to **Thream/api**, please include tests.
## Commits ## Commits
The commit message guidelines respect The commit message guidelines adheres to [Conventional Commits](https://www.conventionalcommits.org/) and [Semantic Versioning](https://semver.org/) for releases.
[@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional)
and [Semantic Versioning](https://semver.org/) for releases.
### Types
Types define which kind of changes you made to the project.
| Types | Description |
| -------- | ------------------------------------------------------------------------------------------------------------ |
| feat | A new feature. |
| fix | A bug fix. |
| docs | Documentation only changes. |
| style | Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc). |
| refactor | A code change that neither fixes a bug nor adds a feature. |
| perf | A code change that improves performance. |
| test | Adding missing tests or correcting existing tests. |
| build | Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm). |
| ci | Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs). |
| chore | Other changes that don't modify src or test files. |
| revert | Reverts a previous commit. |
### Scopes
Scopes define what part of the code changed.
### Examples ### Examples
```sh ```sh
git commit -m "feat(services): add POST /users/signup" git commit -m "feat: add POST /users/signup"
git commit -m "docs(readme): update installation process" git commit -m "docs(readme): update installation process"
git commit -m "fix(services): should emit events to connected users" git commit -m "fix: should emit events to connected users"
``` ```
## Directory Structure ## Directory Structure
@ -120,3 +96,5 @@ The folders after `src/services` : is the real path of the routes in the API exc
folders starting and ending with `__` like `__test__` or `__utils__`. folders starting and ending with `__` like `__test__` or `__utils__`.
The filenames correspond to the HTTP methods used (`get`, `post`, `put`, `delete`). The filenames correspond to the HTTP methods used (`get`, `post`, `put`, `delete`).
You can generate the boilerplate code for a new service with the `npm run generate` command.

View File

@ -1,23 +1,21 @@
FROM node:16.17.0 AS dependencies FROM node:18.16.0 AS dependencies
WORKDIR /usr/src/app WORKDIR /usr/src/app
COPY ./package*.json ./ COPY ./package*.json ./
RUN npm install RUN npm install
FROM node:16.17.0 AS builder FROM node:18.16.0 AS builder
WORKDIR /usr/src/app WORKDIR /usr/src/app
COPY --from=dependencies /usr/src/app/node_modules ./node_modules COPY --from=dependencies /usr/src/app/node_modules ./node_modules
COPY ./ ./ COPY ./ ./
RUN npm run prisma:generate && npm run build RUN npm run prisma:generate && npm run build
FROM node:16.17.0 AS runner FROM node:18.16.0 AS runner
WORKDIR /usr/src/app WORKDIR /usr/src/app
ENV NODE_ENV=production ENV NODE_ENV=production
COPY --from=builder /usr/src/app/node_modules ./node_modules COPY --from=builder /usr/src/app/node_modules ./node_modules
COPY --from=builder /usr/src/app/start.sh ./docker-start.sh
COPY --from=builder /usr/src/app/package.json ./package.json COPY --from=builder /usr/src/app/package.json ./package.json
COPY --from=builder /usr/src/app/email ./email COPY --from=builder /usr/src/app/email ./email
COPY --from=builder /usr/src/app/build ./build COPY --from=builder /usr/src/app/build ./build
COPY --from=builder /usr/src/app/prisma ./prisma COPY --from=builder /usr/src/app/prisma ./prisma
COPY --from=builder /usr/src/app/uploads ./uploads
USER node USER node
CMD ["./docker-start.sh"] CMD ["node", "build/index.js"]

View File

@ -18,7 +18,7 @@
Thream's Application Programming Interface (API) to stay close with your friends and communities. Thream's Application Programming Interface (API) to stay close with your friends and communities.
It uses [Thream/file-uploads-api](https://github.com/Thream/file-uploads-api) [v1.1.0](https://github.com/Thream/file-uploads-api/releases/tag/v1.1.0). It uses [Thream/file-uploads-api](https://github.com/Thream/file-uploads-api) [v1.1.4](https://github.com/Thream/file-uploads-api/releases/tag/v1.1.4).
## ⚙️ Getting Started ## ⚙️ Getting Started
@ -42,6 +42,7 @@ cp .env.example .env
# Install # Install
npm install npm install
npm run prisma:generate
``` ```
You will need to configure the environment variables by creating an `.env` file at You will need to configure the environment variables by creating an `.env` file at
@ -49,6 +50,8 @@ the root of the project (see `.env.example`).
### Local Development environment ### Local Development environment
Recommended to use [VSCode: Remote development in Containers](https://code.visualstudio.com/docs/remote/containers-tutorial).
#### Setup the database #### Setup the database
```sh ```sh
@ -76,18 +79,6 @@ npm run dev
npm run prisma:studio npm run prisma:studio
``` ```
### Production environment with [Docker](https://www.docker.com/)
```sh
# Setup and run all the services for you
docker-compose up --build
```
#### Services started
- API : `http://localhost:8080`
- [PostgreSQL database](https://www.postgresql.org/)
## 💡 Contributing ## 💡 Contributing
Anyone can help to improve the project, submit a Feature Request, a bug report or Anyone can help to improve the project, submit a Feature Request, a bug report or

View File

@ -1,29 +0,0 @@
version: '3.0'
services:
thream-api:
container_name: ${COMPOSE_PROJECT_NAME}
build:
context: './'
env_file:
- '.env'
ports:
- '${PORT}:${PORT}'
depends_on:
- 'thream-database'
volumes:
- './uploads:/usr/src/app/uploads'
restart: 'unless-stopped'
thream-database:
container_name: 'thream-database'
image: 'postgres:14.2'
environment:
POSTGRES_USER: 'user'
POSTGRES_PASSWORD: 'password'
POSTGRES_DB: 'thream'
volumes:
- 'database-volume:/var/lib/postgresql/data'
restart: 'unless-stopped'
volumes:
database-volume:

View File

@ -1,4 +0,0 @@
#!/bin/bash
npm run prisma:migrate:deploy
node build/index.js

21446
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,103 +1,113 @@
{ {
"name": "@thream/api", "name": "@thream/api",
"version": "1.2.0", "version": "1.2.6",
"description": "Thream's application programming interface to stay close with your friends and communities.", "description": "Thream's application programming interface to stay close with your friends and communities.",
"private": true, "private": true,
"type": "module", "type": "module",
"repository": { "imports": {
"type": "git", "#src/*": "./build/*"
"url": "https://github.com/Thream/api"
}, },
"engines": { "engines": {
"node": ">=16.0.0", "node": ">=16.0.0",
"npm": ">=8.0.0" "npm": ">=8.0.0"
}, },
"repository": {
"type": "git",
"url": "https://github.com/Thream/api"
},
"scripts": { "scripts": {
"build": "rimraf ./build && swc ./src --out-dir ./build && tsc", "build": "rimraf ./build && swc ./src --out-dir ./build",
"build:dev": "swc ./src --out-dir ./build --watch", "build:typescript": "tsc",
"start": "node build/index.js", "start": "node build/index.js",
"dev": "concurrently -k -n \"TypeScript,Node\" -p \"[{name}]\" -c \"blue,green\" \"npm run build:dev\" \"cross-env NODE_ENV=development nodemon build/index.js\"", "dev:build": "swc ./src --out-dir ./build --watch",
"dev": "concurrently --kill-others --names \"TypeScript,Node,Maildev,Prisma Studio\" \"npm run dev:build\" \"cross-env NODE_ENV=development nodemon build/index.js\" \"npm run maildev\" \"npm run prisma:studio\"",
"maildev": "maildev",
"generate": "plop", "generate": "plop",
"generate:jwt-secret": "node ./build/scripts/generate-jwt-secret.js",
"lint:commit": "commitlint", "lint:commit": "commitlint",
"lint:editorconfig": "editorconfig-checker", "lint:editorconfig": "editorconfig-checker",
"lint:markdown": "markdownlint-cli2", "lint:markdown": "markdownlint-cli2",
"lint:typescript": "eslint \"**/*.{js,jsx,ts,tsx}\" --ignore-path \".gitignore\"", "lint:eslint": "eslint \".\" --ignore-path \".gitignore\"",
"lint:prettier": "prettier \".\" --check --ignore-path \".gitignore\"", "lint:prettier": "prettier \".\" --check --ignore-path \".gitignore\"",
"lint:staged": "lint-staged", "lint:staged": "lint-staged",
"test": "cross-env NODE_ENV=test c8 tap", "test": "cross-env NODE_ENV=test c8 tap",
"prisma:validate": "prisma validate", "prisma:validate": "prisma validate",
"prisma:generate": "prisma generate", "prisma:generate": "prisma generate",
"prisma:studio": "prisma studio", "prisma:studio": "prisma studio --browser=none",
"prisma:migrate:dev": "prisma migrate dev", "prisma:migrate:dev": "prisma migrate dev",
"prisma:migrate:deploy": "prisma migrate deploy", "prisma:migrate:deploy": "prisma migrate deploy",
"release": "semantic-release", "release": "semantic-release",
"postinstall": "husky install" "postinstall": "husky install"
}, },
"dependencies": { "dependencies": {
"@fastify/cors": "8.1.0", "@fastify/cors": "8.2.1",
"@fastify/helmet": "9.1.0", "@fastify/helmet": "10.1.1",
"@fastify/multipart": "7.1.1", "@fastify/multipart": "7.6.0",
"@fastify/rate-limit": "7.3.0", "@fastify/rate-limit": "8.0.0",
"@fastify/sensible": "5.1.1", "@fastify/sensible": "5.2.0",
"@fastify/swagger": "7.4.1", "@fastify/swagger": "8.3.1",
"@prisma/client": "4.2.1", "@fastify/swagger-ui": "1.8.1",
"@sinclair/typebox": "0.24.28", "@prisma/client": "4.14.0",
"@thream/socketio-jwt": "3.0.0", "@sinclair/typebox": "0.28.10",
"axios": "0.26.1", "@thream/socketio-jwt": "3.1.0",
"axios": "1.4.0",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
"dotenv": "16.0.1", "dotenv": "16.0.3",
"ejs": "3.1.8", "ejs": "3.1.9",
"fastify": "4.5.3", "fastify": "4.17.0",
"fastify-plugin": "4.2.1", "fastify-plugin": "4.5.0",
"form-data": "4.0.0", "form-data": "4.0.0",
"http-errors": "2.0.0", "http-errors": "2.0.0",
"jsonwebtoken": "8.5.1", "jsonwebtoken": "9.0.0",
"ms": "2.1.3", "ms": "2.1.3",
"nodemailer": "6.7.8", "nodemailer": "6.9.2",
"read-pkg": "7.1.0", "read-pkg": "8.0.0",
"socket.io": "4.5.1" "socket.io": "4.6.1"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "17.1.2", "@commitlint/cli": "17.6.3",
"@commitlint/config-conventional": "17.1.0", "@commitlint/config-conventional": "17.6.3",
"@saithodev/semantic-release-backmerge": "2.1.2", "@saithodev/semantic-release-backmerge": "3.2.0",
"@semantic-release/git": "10.0.1", "@semantic-release/git": "10.0.1",
"@swc/cli": "0.1.57", "@swc/cli": "0.1.62",
"@swc/core": "1.2.244", "@swc/core": "1.3.57",
"@tsconfig/strictest": "2.0.1",
"@types/bcryptjs": "2.4.2", "@types/bcryptjs": "2.4.2",
"@types/busboy": "1.5.0", "@types/busboy": "1.5.0",
"@types/ejs": "3.1.1", "@types/ejs": "3.1.2",
"@types/http-errors": "1.8.2", "@types/http-errors": "2.0.1",
"@types/jsonwebtoken": "8.5.9", "@types/jsonwebtoken": "9.0.2",
"@types/ms": "0.7.31", "@types/ms": "0.7.31",
"@types/node": "18.7.13", "@types/node": "20.1.4",
"@types/nodemailer": "6.4.5", "@types/nodemailer": "6.4.7",
"@types/sinon": "10.0.13", "@types/sinon": "10.0.14",
"@types/tap": "15.0.7", "@types/tap": "15.0.8",
"@typescript-eslint/eslint-plugin": "5.35.1", "@typescript-eslint/eslint-plugin": "5.59.5",
"@typescript-eslint/parser": "5.35.1", "@typescript-eslint/parser": "5.59.5",
"c8": "7.12.0", "c8": "7.13.0",
"concurrently": "7.3.0", "concurrently": "8.0.1",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"editorconfig-checker": "4.0.2", "editorconfig-checker": "5.0.1",
"eslint": "8.23.0", "eslint": "8.40.0",
"eslint-config-conventions": "3.0.0", "eslint-config-conventions": "9.0.0",
"eslint-config-prettier": "8.5.0", "eslint-config-prettier": "8.8.0",
"eslint-plugin-import": "2.26.0", "eslint-plugin-import": "2.27.5",
"eslint-plugin-prettier": "4.2.1", "eslint-plugin-prettier": "4.2.1",
"eslint-plugin-promise": "6.0.1", "eslint-plugin-promise": "6.1.1",
"eslint-plugin-unicorn": "43.0.2", "eslint-plugin-unicorn": "47.0.0",
"husky": "8.0.1", "husky": "8.0.3",
"lint-staged": "13.0.3", "lint-staged": "13.2.2",
"markdownlint-cli2": "0.5.1", "maildev": "2.0.5",
"nodemon": "2.0.19", "markdownlint-cli2": "0.7.1",
"plop": "3.1.1", "markdownlint-rule-relative-links": "1.2.0",
"prettier": "2.7.1", "nodemon": "2.0.22",
"prisma": "4.2.1", "plop": "3.1.2",
"rimraf": "3.0.2", "prettier": "2.8.8",
"semantic-release": "19.0.5", "prisma": "4.14.0",
"sinon": "14.0.0", "rimraf": "5.0.0",
"tap": "16.3.0", "semantic-release": "21.0.2",
"typescript": "4.8.2" "sinon": "15.0.4",
"tap": "16.3.4",
"typescript": "5.0.4"
} }
} }

View File

@ -1,8 +1,9 @@
import { User } from '@prisma/client' import type { User } from '@prisma/client'
import sinon from 'sinon' import sinon from 'sinon'
import { refreshTokenExample } from '../../models/RefreshToken.js' import { refreshTokenExample } from '../../models/RefreshToken.js'
import { userExample, UserJWT } from '../../models/User.js' import type { UserJWT } from '../../models/User.js'
import { userExample } from '../../models/User.js'
import { userSettingsExample } from '../../models/UserSettings.js' import { userSettingsExample } from '../../models/UserSettings.js'
import { import {
generateAccessToken, generateAccessToken,

View File

@ -2,17 +2,19 @@ import dotenv from 'dotenv'
import fastify from 'fastify' import fastify from 'fastify'
import fastifyCors from '@fastify/cors' import fastifyCors from '@fastify/cors'
import fastifySwagger from '@fastify/swagger' import fastifySwagger from '@fastify/swagger'
import fastifySwaggerUI from '@fastify/swagger-ui'
import fastifyHelmet from '@fastify/helmet' import fastifyHelmet from '@fastify/helmet'
import fastifyRateLimit from '@fastify/rate-limit' import fastifyRateLimit from '@fastify/rate-limit'
import fastifySensible from '@fastify/sensible' import fastifySensible from '@fastify/sensible'
import { readPackage } from 'read-pkg'
import { services } from './services/index.js' import { services } from './services/index.js'
import { swaggerOptions } from './tools/configurations/swaggerOptions.js'
import fastifySocketIo from './tools/plugins/socket-io.js' import fastifySocketIo from './tools/plugins/socket-io.js'
dotenv.config() dotenv.config()
const packageJSON = await readPackage()
export const application = fastify({ export const application = fastify({
logger: process.env.NODE_ENV === 'development', logger: process.env['NODE_ENV'] === 'development',
ajv: { ajv: {
customOptions: { customOptions: {
strict: 'log', strict: 'log',
@ -39,5 +41,35 @@ await application.register(fastifyRateLimit, {
max: 200, max: 200,
timeWindow: '1 minute' timeWindow: '1 minute'
}) })
await application.register(fastifySwagger, swaggerOptions) await application.register(fastifySwagger, {
openapi: {
info: {
title: packageJSON.name,
description: packageJSON.description,
version: packageJSON.version
},
tags: [
{ name: 'users' },
{ name: 'oauth2' },
{ name: 'guilds' },
{ name: 'channels' },
{ name: 'messages' },
{ name: 'members' }
],
components: {
securitySchemes: {
bearerAuth: {
type: 'http',
scheme: 'bearer',
bearerFormat: 'JWT'
}
}
}
},
hideUntagged: true
})
await application.register(fastifySwaggerUI, {
routePrefix: '/documentation',
staticCSP: true
})
await application.register(services) await application.register(services)

View File

@ -1,5 +1,5 @@
import { application } from './application.js' import { application } from './application.js'
import { HOST, PORT } from './tools/configurations/index.js' import { HOST, PORT } from '#src/tools/configurations.js'
const address = await application.listen({ const address = await application.listen({
port: PORT, port: PORT,

View File

@ -1,5 +1,5 @@
import { Type } from '@sinclair/typebox' import { Type } from '@sinclair/typebox'
import { Channel } from '@prisma/client' import type { Channel } from '@prisma/client'
import { date, id } from './utils.js' import { date, id } from './utils.js'
import { guildExample } from './Guild.js' import { guildExample } from './Guild.js'

View File

@ -1,4 +1,4 @@
import { Guild } from '@prisma/client' import type { Guild } from '@prisma/client'
import { Type } from '@sinclair/typebox' import { Type } from '@sinclair/typebox'
import { date, id } from './utils.js' import { date, id } from './utils.js'

View File

@ -1,5 +1,5 @@
import { Type } from '@sinclair/typebox' import { Type } from '@sinclair/typebox'
import { Member } from '@prisma/client' import type { Member } from '@prisma/client'
import { date, id } from './utils.js' import { date, id } from './utils.js'
import { guildExample } from './Guild.js' import { guildExample } from './Guild.js'

View File

@ -1,4 +1,4 @@
import { Message } from '@prisma/client' import type { Message } from '@prisma/client'
import { Type } from '@sinclair/typebox' import { Type } from '@sinclair/typebox'
import { date, id } from './utils.js' import { date, id } from './utils.js'

View File

@ -5,15 +5,15 @@ import { date, id } from './utils.js'
export const providers = ['Google', 'GitHub', 'Discord'] as const export const providers = ['Google', 'GitHub', 'Discord'] as const
export const strategies = [...providers, 'Local'] as const export const strategies = [...providers, 'Local'] as const
export const strategiesTypebox = strategies.map((strategy) => export const strategiesTypebox = strategies.map((strategy) => {
Type.Literal(strategy) return Type.Literal(strategy)
) })
export const providersTypebox = providers.map((provider) => export const providersTypebox = providers.map((provider) => {
Type.Literal(provider) return Type.Literal(provider)
) })
export type ProviderOAuth = typeof providers[number] export type ProviderOAuth = (typeof providers)[number]
export type AuthenticationStrategy = typeof strategies[number] export type AuthenticationStrategy = (typeof strategies)[number]
export const oauthSchema = { export const oauthSchema = {
id, id,

View File

@ -1,4 +1,4 @@
import { RefreshToken } from '@prisma/client' import type { RefreshToken } from '@prisma/client'
import { Type } from '@sinclair/typebox' import { Type } from '@sinclair/typebox'
import { userExample } from './User.js' import { userExample } from './User.js'

View File

@ -1,7 +1,9 @@
import { User } from '@prisma/client' import type { User } from '@prisma/client'
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { Type } from '@sinclair/typebox'
import { AuthenticationStrategy, strategiesTypebox } from './OAuth.js' import type { AuthenticationStrategy } from './OAuth.js'
import { strategiesTypebox } from './OAuth.js'
import { userSettingsSchema } from './UserSettings.js' import { userSettingsSchema } from './UserSettings.js'
import { date, id } from './utils.js' import { date, id } from './utils.js'

View File

@ -1,5 +1,6 @@
import { UserSetting } from '@prisma/client' import type { UserSetting } from '@prisma/client'
import { Type, Static } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { Type } from '@sinclair/typebox'
import { date, id } from './utils.js' import { date, id } from './utils.js'

View File

@ -34,7 +34,7 @@ export const fastifyErrorsSchema = {
404: { 404: {
statusCode: Type.Literal(404), statusCode: Type.Literal(404),
error: Type.Literal('Not Found'), error: Type.Literal('Not Found'),
message: Type.Literal('Not Found') message: Type.String()
}, },
431: { 431: {
statusCode: Type.Literal(431), statusCode: Type.Literal(431),

View File

@ -0,0 +1,3 @@
import crypto from 'node:crypto'
console.log(crypto.randomBytes(256).toString('base64'))

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../../tools/database/prisma.js' import prisma from '../../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../../models/utils.js' import { fastifyErrors } from '../../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../../tools/database/prisma.js' import prisma from '../../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../../models/utils.js' import { fastifyErrors } from '../../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Type, Static } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import fastifyMultipart from '@fastify/multipart' import fastifyMultipart from '@fastify/multipart'
import prisma from '../../../../../tools/database/prisma.js' import prisma from '../../../../../tools/database/prisma.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,4 +1,4 @@
import { FastifyPluginAsync } from 'fastify' import type { FastifyPluginAsync } from 'fastify'
import { deleteChannelService } from './[channelId]/delete.js' import { deleteChannelService } from './[channelId]/delete.js'
import { getChannelByIdService } from './[channelId]/get.js' import { getChannelByIdService } from './[channelId]/get.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../../tools/database/prisma.js' import prisma from '../../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../../models/utils.js' import { fastifyErrors } from '../../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../../tools/database/prisma.js' import prisma from '../../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../../models/utils.js' import { fastifyErrors } from '../../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import fastifyMultipart from '@fastify/multipart' import fastifyMultipart from '@fastify/multipart'
import authenticateUser from '../../../../tools/plugins/authenticateUser.js' import authenticateUser from '../../../../tools/plugins/authenticateUser.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../../tools/database/prisma.js' import prisma from '../../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../../models/utils.js' import { fastifyErrors } from '../../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../../../tools/database/prisma.js' import prisma from '../../../../../tools/database/prisma.js'
import { import {

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../../../tools/database/prisma.js' import prisma from '../../../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Type, Static } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../tools/database/prisma.js' import prisma from '../../tools/database/prisma.js'
import { fastifyErrors, id } from '../../models/utils.js' import { fastifyErrors, id } from '../../models/utils.js'

View File

@ -1,4 +1,4 @@
import { FastifyPluginAsync } from 'fastify' import type { FastifyPluginAsync } from 'fastify'
import { getGuilds } from './get.js' import { getGuilds } from './get.js'
import { postGuilds } from './post.js' import { postGuilds } from './post.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../tools/database/prisma.js' import prisma from '../../tools/database/prisma.js'
import { fastifyErrors } from '../../models/utils.js' import { fastifyErrors } from '../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,4 +1,4 @@
import { FastifyPluginAsync } from 'fastify' import type { FastifyPluginAsync } from 'fastify'
import { usersService } from './users/index.js' import { usersService } from './users/index.js'
import { guildsService } from './guilds/index.js' import { guildsService } from './guilds/index.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,4 +1,4 @@
import { FastifyPluginAsync } from 'fastify' import type { FastifyPluginAsync } from 'fastify'
import { deleteMessageService } from './[messageId]/delete.js' import { deleteMessageService } from './[messageId]/delete.js'
import { putMessageService } from './[messageId]/put.js' import { putMessageService } from './[messageId]/put.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'
@ -53,7 +54,7 @@ export const getConfirmEmail: FastifyPluginAsync = async (fastify) => {
reply.statusCode = 200 reply.statusCode = 200
return 'Success, your email has been confirmed, you can now signin!' return 'Success, your email has been confirmed, you can now signin!'
} }
await reply.redirect(redirectURI) return await reply.redirect(redirectURI)
} }
}) })
} }

View File

@ -1,4 +1,4 @@
import { FastifyPluginAsync, FastifySchema } from 'fastify' import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,5 +1,5 @@
import { Type } from '@sinclair/typebox' import { Type } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import fastifyMultipart from '@fastify/multipart' import fastifyMultipart from '@fastify/multipart'
import authenticateUser from '../../../../tools/plugins/authenticateUser.js' import authenticateUser from '../../../../tools/plugins/authenticateUser.js'

View File

@ -1,15 +1,16 @@
import { randomUUID } from 'node:crypto' import { randomUUID } from 'node:crypto'
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'
import authenticateUser from '../../../tools/plugins/authenticateUser.js' import authenticateUser from '../../../tools/plugins/authenticateUser.js'
import { userCurrentSchema, userSchema } from '../../../models/User.js' import { userCurrentSchema, userSchema } from '../../../models/User.js'
import { sendEmail } from '../../../tools/email/sendEmail.js' import { sendEmail } from '../../../tools/email/sendEmail.js'
import { API_URL } from '../../../tools/configurations/index.js' import { API_URL } from '../../../tools/configurations.js'
import { Language, Theme } from '../../../models/UserSettings.js' import type { Language, Theme } from '../../../models/UserSettings.js'
import { parseStringNullish } from '../../../tools/utils/parseStringNullish.js' import { parseStringNullish } from '../../../tools/utils/parseStringNullish.js'
const bodyPutServiceSchema = Type.Object({ const bodyPutServiceSchema = Type.Object({
@ -136,7 +137,9 @@ export const putCurrentUser: FastifyPluginAsync = async (fastify) => {
}) })
await fastify.io.emitToAuthorizedUsers({ await fastify.io.emitToAuthorizedUsers({
event: 'users', event: 'users',
isAuthorizedCallback: () => true, isAuthorizedCallback: () => {
return true
},
payload: { payload: {
action: 'update', action: 'update',
item: user item: user

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../../tools/database/prisma.js' import prisma from '../../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../../models/utils.js' import { fastifyErrors } from '../../../../models/utils.js'

View File

@ -1,4 +1,4 @@
import { FastifyPluginAsync } from 'fastify' import type { FastifyPluginAsync } from 'fastify'
import { postSignupUser } from './signup/post.js' import { postSignupUser } from './signup/post.js'
import { getConfirmEmail } from './confirm-email/get.js' import { getConfirmEmail } from './confirm-email/get.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../../tools/database/prisma.js' import prisma from '../../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../../models/utils.js' import { fastifyErrors } from '../../../../models/utils.js'
@ -55,7 +56,9 @@ export const deleteProviderService: FastifyPluginAsync = async (fastify) => {
if (user.current.password != null) { if (user.current.password != null) {
strategies.push('Local') strategies.push('Local')
} }
const oauthProvider = OAuths.find((oauth) => oauth.provider === provider) const oauthProvider = OAuths.find((oauth) => {
return oauth.provider === provider
})
if (oauthProvider == null) { if (oauthProvider == null) {
throw fastify.httpErrors.notFound('You are not using this provider') throw fastify.httpErrors.notFound('You are not using this provider')
} }

View File

@ -7,9 +7,9 @@ import { OAuthStrategy } from '../../../../../tools/utils/OAuthStrategy.js'
export const DISCORD_PROVIDER = 'Discord' export const DISCORD_PROVIDER = 'Discord'
export const DISCORD_BASE_URL = 'https://discord.com/api/v10' export const DISCORD_BASE_URL = 'https://discord.com/api/v10'
export const DISCORD_CLIENT_ID = export const DISCORD_CLIENT_ID =
process.env.DISCORD_CLIENT_ID ?? 'DISCORD_CLIENT_ID' process.env['DISCORD_CLIENT_ID'] ?? 'DISCORD_CLIENT_ID'
export const DISCORD_CLIENT_SECRET = export const DISCORD_CLIENT_SECRET =
process.env.DISCORD_CLIENT_SECRET ?? 'DISCORD_CLIENT_SECRET' process.env['DISCORD_CLIENT_SECRET'] ?? 'DISCORD_CLIENT_SECRET'
export const discordStrategy = new OAuthStrategy(DISCORD_PROVIDER) export const discordStrategy = new OAuthStrategy(DISCORD_PROVIDER)
export interface DiscordUser { export interface DiscordUser {

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { DISCORD_BASE_URL, DISCORD_CLIENT_ID } from '../__utils__/utils.js' import { DISCORD_BASE_URL, DISCORD_CLIENT_ID } from '../__utils__/utils.js'
import authenticateUser from '../../../../../tools/plugins/authenticateUser.js' import authenticateUser from '../../../../../tools/plugins/authenticateUser.js'

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { discordStrategy, getDiscordUserData } from '../__utils__/utils.js' import { discordStrategy, getDiscordUserData } from '../__utils__/utils.js'
import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js' import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { discordStrategy, getDiscordUserData } from '../__utils__/utils.js' import { discordStrategy, getDiscordUserData } from '../__utils__/utils.js'
import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js' import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { DISCORD_BASE_URL, DISCORD_CLIENT_ID } from '../__utils__/utils.js' import { DISCORD_BASE_URL, DISCORD_CLIENT_ID } from '../__utils__/utils.js'

View File

@ -8,9 +8,9 @@ export const GITHUB_PROVIDER = 'GitHub'
export const GITHUB_BASE_URL = 'https://github.com' export const GITHUB_BASE_URL = 'https://github.com'
export const GITHUB_API_BASE_URL = 'https://api.github.com' export const GITHUB_API_BASE_URL = 'https://api.github.com'
export const GITHUB_CLIENT_ID = export const GITHUB_CLIENT_ID =
process.env.GITHUB_CLIENT_ID ?? 'GITHUB_CLIENT_ID' process.env['GITHUB_CLIENT_ID'] ?? 'GITHUB_CLIENT_ID'
export const GITHUB_CLIENT_SECRET = export const GITHUB_CLIENT_SECRET =
process.env.GITHUB_CLIENT_SECRET ?? 'GITHUB_CLIENT_SECRET' process.env['GITHUB_CLIENT_SECRET'] ?? 'GITHUB_CLIENT_SECRET'
export const githubStrategy = new OAuthStrategy(GITHUB_PROVIDER) export const githubStrategy = new OAuthStrategy(GITHUB_PROVIDER)
export interface GitHubUser { export interface GitHubUser {

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { GITHUB_BASE_URL, GITHUB_CLIENT_ID } from '../__utils__/utils.js' import { GITHUB_BASE_URL, GITHUB_CLIENT_ID } from '../__utils__/utils.js'
import authenticateUser from '../../../../../tools/plugins/authenticateUser.js' import authenticateUser from '../../../../../tools/plugins/authenticateUser.js'

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { githubStrategy, getGitHubUserData } from '../__utils__/utils.js' import { githubStrategy, getGitHubUserData } from '../__utils__/utils.js'
import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js' import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { githubStrategy, getGitHubUserData } from '../__utils__/utils.js' import { githubStrategy, getGitHubUserData } from '../__utils__/utils.js'
import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js' import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { GITHUB_BASE_URL, GITHUB_CLIENT_ID } from '../__utils__/utils.js' import { GITHUB_BASE_URL, GITHUB_CLIENT_ID } from '../__utils__/utils.js'

View File

@ -10,9 +10,9 @@ export const GOOGLE_OAUTH2_TOKEN = 'https://oauth2.googleapis.com/token'
export const GOOGLE_USERINFO = export const GOOGLE_USERINFO =
'https://www.googleapis.com/oauth2/v1/userinfo?alt=json' 'https://www.googleapis.com/oauth2/v1/userinfo?alt=json'
export const GOOGLE_CLIENT_ID = export const GOOGLE_CLIENT_ID =
process.env.GOOGLE_CLIENT_ID ?? 'GOOGLE_CLIENT_ID' process.env['GOOGLE_CLIENT_ID'] ?? 'GOOGLE_CLIENT_ID'
export const GOOGLE_CLIENT_SECRET = export const GOOGLE_CLIENT_SECRET =
process.env.GOOGLE_CLIENT_SECRET ?? 'GOOGLE_CLIENT_SECRET' process.env['GOOGLE_CLIENT_SECRET'] ?? 'GOOGLE_CLIENT_SECRET'
export const googleStrategy = new OAuthStrategy(GOOGLE_PROVIDER) export const googleStrategy = new OAuthStrategy(GOOGLE_PROVIDER)
export interface GoogleUser { export interface GoogleUser {

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { GOOGLE_BASE_URL, GOOGLE_CLIENT_ID } from '../__utils__/utils.js' import { GOOGLE_BASE_URL, GOOGLE_CLIENT_ID } from '../__utils__/utils.js'
import authenticateUser from '../../../../../tools/plugins/authenticateUser.js' import authenticateUser from '../../../../../tools/plugins/authenticateUser.js'

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { googleStrategy, getGoogleUserData } from '../__utils__/utils.js' import { googleStrategy, getGoogleUserData } from '../__utils__/utils.js'
import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js' import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { googleStrategy, getGoogleUserData } from '../__utils__/utils.js' import { googleStrategy, getGoogleUserData } from '../__utils__/utils.js'
import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js' import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

View File

@ -1,7 +1,8 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import { API_URL } from '../../../../../tools/configurations/index.js' import { API_URL } from '../../../../../tools/configurations.js'
import { fastifyErrors } from '../../../../../models/utils.js' import { fastifyErrors } from '../../../../../models/utils.js'
import { GOOGLE_BASE_URL, GOOGLE_CLIENT_ID } from '../__utils__/utils.js' import { GOOGLE_BASE_URL, GOOGLE_CLIENT_ID } from '../__utils__/utils.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import jwt from 'jsonwebtoken' import jwt from 'jsonwebtoken'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
@ -9,8 +10,8 @@ import {
jwtSchema, jwtSchema,
expiresIn expiresIn
} from '../../../tools/utils/jwtToken.js' } from '../../../tools/utils/jwtToken.js'
import { UserRefreshJWT } from '../../../models/User.js' import type { UserRefreshJWT } from '../../../models/User.js'
import { JWT_REFRESH_SECRET } from '../../../tools/configurations/index.js' import { JWT_REFRESH_SECRET } from '../../../tools/configurations.js'
const bodyPostRefreshTokenSchema = Type.Object({ const bodyPostRefreshTokenSchema = Type.Object({
refreshToken: jwtSchema.refreshToken refreshToken: jwtSchema.refreshToken

View File

@ -1,14 +1,15 @@
import { randomUUID } from 'node:crypto' import { randomUUID } from 'node:crypto'
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import ms from 'ms' import ms from 'ms'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'
import { userSchema } from '../../../models/User.js' import { userSchema } from '../../../models/User.js'
import { sendEmail } from '../../../tools/email/sendEmail.js' import { sendEmail } from '../../../tools/email/sendEmail.js'
import { Language, Theme } from '../../../models/UserSettings.js' import type { Language, Theme } from '../../../models/UserSettings.js'
const queryPostResetPasswordSchema = Type.Object({ const queryPostResetPasswordSchema = Type.Object({
redirectURI: Type.String({ format: 'uri-reference' }) redirectURI: Type.String({ format: 'uri-reference' })

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import bcrypt from 'bcryptjs' import bcrypt from 'bcryptjs'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'

View File

@ -1,5 +1,6 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import bcrypt from 'bcryptjs' import bcrypt from 'bcryptjs'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'

View File

@ -5,7 +5,7 @@ import jwt from 'jsonwebtoken'
import { application } from '../../../../application.js' import { application } from '../../../../application.js'
import prisma from '../../../../tools/database/prisma.js' import prisma from '../../../../tools/database/prisma.js'
import { refreshTokenExample } from '../../../../models/RefreshToken.js' import { refreshTokenExample } from '../../../../models/RefreshToken.js'
import { UserRefreshJWT } from '../../../../models/User.js' import type { UserRefreshJWT } from '../../../../models/User.js'
await tap.test('POST /users/signout', async (t) => { await tap.test('POST /users/signout', async (t) => {
t.afterEach(() => { t.afterEach(() => {

View File

@ -1,5 +1,5 @@
import { Type } from '@sinclair/typebox' import { Type } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'

View File

@ -1,11 +1,12 @@
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import { Type } from '@sinclair/typebox'
import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import jwt from 'jsonwebtoken' import jwt from 'jsonwebtoken'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'
import { JWT_REFRESH_SECRET } from '../../../tools/configurations/index.js' import { JWT_REFRESH_SECRET } from '../../../tools/configurations.js'
import { UserRefreshJWT } from '../../../models/User.js' import type { UserRefreshJWT } from '../../../models/User.js'
import { jwtSchema } from '../../../tools/utils/jwtToken.js' import { jwtSchema } from '../../../tools/utils/jwtToken.js'
const bodyPostSignoutSchema = Type.Object({ const bodyPostSignoutSchema = Type.Object({

View File

@ -1,18 +1,16 @@
import { randomUUID } from 'node:crypto' import { randomUUID } from 'node:crypto'
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { Type } from '@sinclair/typebox'
import bcrypt from 'bcryptjs' import bcrypt from 'bcryptjs'
import { FastifyPluginAsync, FastifySchema } from 'fastify' import type { FastifyPluginAsync, FastifySchema } from 'fastify'
import prisma from '../../../tools/database/prisma.js' import prisma from '../../../tools/database/prisma.js'
import { fastifyErrors } from '../../../models/utils.js' import { fastifyErrors } from '../../../models/utils.js'
import { import type { BodyUserSchemaType } from '../../../models/User.js'
bodyUserSchema, import { bodyUserSchema, userPublicSchema } from '../../../models/User.js'
BodyUserSchemaType,
userPublicSchema
} from '../../../models/User.js'
import { sendEmail } from '../../../tools/email/sendEmail.js' import { sendEmail } from '../../../tools/email/sendEmail.js'
import { API_URL } from '../../../tools/configurations/index.js' import { API_URL } from '../../../tools/configurations.js'
const queryPostSignupSchema = Type.Object({ const queryPostSignupSchema = Type.Object({
redirectURI: Type.Optional(Type.String({ format: 'uri-reference' })) redirectURI: Type.Optional(Type.String({ format: 'uri-reference' }))

View File

@ -0,0 +1,25 @@
import { URL } from 'node:url'
import dotenv from 'dotenv'
dotenv.config()
export const PORT = parseInt(process.env['PORT'] ?? '8080', 10)
export const HOST = process.env['HOST'] ?? '0.0.0.0'
export const API_URL = process.env['API_URL'] ?? `http://${HOST}:${PORT}`
export const FILE_UPLOADS_API_URL =
process.env['FILE_UPLOADS_API_URL'] ?? 'http://localhost:8000'
export const FILE_UPLOADS_API_KEY =
process.env['FILE_UPLOADS_API_KEY'] ?? 'apiKeySecret'
export const JWT_ACCESS_SECRET =
process.env['JWT_ACCESS_SECRET'] ?? 'accessTokenSecret'
export const JWT_REFRESH_SECRET =
process.env['JWT_REFRESH_SECRET'] ?? 'refreshTokenSecret'
export const JWT_ACCESS_EXPIRES_IN =
process.env['JWT_ACCESS_EXPIRES_IN'] ?? '15 minutes'
export const SRC_URL = new URL('../', import.meta.url)
export const ROOT_URL = new URL('../', SRC_URL)
export const EMAIL_URL = new URL('./email/', ROOT_URL)
export const EMAIL_TEMPLATE_URL = new URL('./email-template.ejs', EMAIL_URL)
export const EMAIL_LOCALES_URL = new URL('./locales/', EMAIL_URL)

View File

@ -1,25 +0,0 @@
import { URL } from 'node:url'
import dotenv from 'dotenv'
dotenv.config()
export const PORT = parseInt(process.env.PORT ?? '8080', 10)
export const HOST = process.env.HOST ?? '0.0.0.0'
export const API_URL = process.env.API_URL ?? `http://${HOST}:${PORT}`
export const FILE_UPLOADS_API_URL =
process.env.FILE_UPLOADS_API_URL ?? 'http://localhost:8000'
export const FILE_UPLOADS_API_KEY =
process.env.FILE_UPLOADS_API_KEY ?? 'apiKeySecret'
export const JWT_ACCESS_SECRET =
process.env.JWT_ACCESS_SECRET ?? 'accessTokenSecret'
export const JWT_REFRESH_SECRET =
process.env.JWT_REFRESH_SECRET ?? 'refreshTokenSecret'
export const JWT_ACCESS_EXPIRES_IN =
process.env.JWT_ACCESS_EXPIRES_IN ?? '15 minutes'
export const SRC_URL = new URL('../../', import.meta.url)
export const ROOT_URL = new URL('../', SRC_URL)
export const EMAIL_URL = new URL('./email/', ROOT_URL)
export const EMAIL_TEMPLATE_URL = new URL('./email-template.ejs', EMAIL_URL)
export const EMAIL_LOCALES_URL = new URL('./locales/', EMAIL_URL)

View File

@ -1,38 +0,0 @@
import dotenv from 'dotenv'
import { readPackage } from 'read-pkg'
import { FastifyDynamicSwaggerOptions } from '@fastify/swagger'
dotenv.config()
const packageJSON = await readPackage()
export const swaggerOptions: FastifyDynamicSwaggerOptions = {
routePrefix: '/documentation',
openapi: {
info: {
title: packageJSON.name,
description: packageJSON.description,
version: packageJSON.version
},
tags: [
{ name: 'users' },
{ name: 'oauth2' },
{ name: 'guilds' },
{ name: 'channels' },
{ name: 'messages' },
{ name: 'members' }
],
components: {
securitySchemes: {
bearerAuth: {
type: 'http',
scheme: 'bearer',
bearerFormat: 'JWT'
}
}
}
},
exposeRoute: true,
staticCSP: true,
hideUntagged: true
}

View File

@ -1,5 +1,6 @@
import { Prisma } from '@prisma/client' import type { Prisma } from '@prisma/client'
import { Static, Type } from '@sinclair/typebox' import type { Static } from '@sinclair/typebox'
import { Type } from '@sinclair/typebox'
export const queryPaginationSchema = { export const queryPaginationSchema = {
/** Maximum number of items to return */ /** Maximum number of items to return */

View File

@ -4,7 +4,7 @@ const { PrismaClient } = Prisma
const prisma = new PrismaClient({ const prisma = new PrismaClient({
log: log:
process.env.NODE_ENV === 'development' process.env['NODE_ENV'] === 'development'
? ['query', 'info', 'warn', 'error'] ? ['query', 'info', 'warn', 'error']
: ['error'] : ['error']
}) })

View File

@ -3,17 +3,17 @@ import nodemailer from 'nodemailer'
import type SMTPTransport from 'nodemailer/lib/smtp-transport/index.js' import type SMTPTransport from 'nodemailer/lib/smtp-transport/index.js'
dotenv.config() dotenv.config()
const EMAIL_PORT = parseInt(process.env.EMAIL_PORT ?? '465', 10) const EMAIL_PORT = parseInt(process.env['EMAIL_PORT'] ?? '465', 10)
export const EMAIL_INFO: SMTPTransport.Options = { export const EMAIL_INFO: SMTPTransport.Options = {
host: process.env.EMAIL_HOST, host: process.env['EMAIL_HOST'],
port: EMAIL_PORT, port: EMAIL_PORT,
secure: EMAIL_PORT === 465, secure: EMAIL_PORT === 465,
auth: { auth: {
user: process.env.EMAIL_USER, user: process.env['EMAIL_USER'],
pass: process.env.EMAIL_PASSWORD pass: process.env['EMAIL_PASSWORD']
}, },
ignoreTLS: process.env.NODE_ENV !== 'production' ignoreTLS: process.env['NODE_ENV'] !== 'production'
} }
export const emailTransporter = nodemailer.createTransport(EMAIL_INFO) export const emailTransporter = nodemailer.createTransport(EMAIL_INFO)

View File

@ -3,11 +3,8 @@ import { URL, fileURLToPath } from 'node:url'
import ejs from 'ejs' import ejs from 'ejs'
import { Language, Theme } from '../../models/UserSettings.js' import type { Language, Theme } from '../../models/UserSettings.js'
import { import { EMAIL_LOCALES_URL, EMAIL_TEMPLATE_URL } from '../configurations.js'
EMAIL_LOCALES_URL,
EMAIL_TEMPLATE_URL
} from '../configurations/index.js'
import { emailTransporter, EMAIL_INFO } from './emailTransporter.js' import { emailTransporter, EMAIL_INFO } from './emailTransporter.js'
interface EmailTranslation { interface EmailTranslation {

View File

@ -3,8 +3,8 @@ import httpErrors from 'http-errors'
import jwt from 'jsonwebtoken' import jwt from 'jsonwebtoken'
import prisma from '../database/prisma.js' import prisma from '../database/prisma.js'
import { UserJWT, UserRequest } from '../../models/User.js' import type { UserJWT, UserRequest } from '../../models/User.js'
import { JWT_ACCESS_SECRET } from '../configurations/index.js' import { JWT_ACCESS_SECRET } from '../configurations.js'
const { Unauthorized, Forbidden, BadRequest } = httpErrors const { Unauthorized, Forbidden, BadRequest } = httpErrors
@ -20,10 +20,10 @@ export const getUserWithBearerToken = async (
throw new Unauthorized() throw new Unauthorized()
} }
const token = tokenSplitted[1] const token = tokenSplitted[1] ?? 'token'
let payload: UserJWT let payload: UserJWT
try { try {
payload = jwt.verify(token, JWT_ACCESS_SECRET) as UserJWT payload = jwt.verify(token, JWT_ACCESS_SECRET) as unknown as UserJWT
} catch { } catch {
throw new Forbidden() throw new Forbidden()
} }

View File

@ -1,9 +1,10 @@
import fastifyPlugin from 'fastify-plugin' import fastifyPlugin from 'fastify-plugin'
import { Server as SocketIoServer, ServerOptions } from 'socket.io' import type { ServerOptions } from 'socket.io'
import { Server as SocketIoServer } from 'socket.io'
import { authorize } from '@thream/socketio-jwt' import { authorize } from '@thream/socketio-jwt'
import prisma from '../database/prisma.js' import prisma from '../database/prisma.js'
import { JWT_ACCESS_SECRET } from '../configurations/index.js' import { JWT_ACCESS_SECRET } from '../configurations.js'
interface EmitEventOptions { interface EmitEventOptions {
event: string event: string

Some files were not shown because too many files have changed in this diff Show More