Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
10110d1a36 | |||
73d2da66b2 | |||
b07a62de8b | |||
8a327eb7c7 | |||
78d7dbdb3f | |||
e30a66eeb6 | |||
12dcabccb3 | |||
224d3b3764 |
@ -1,7 +1,3 @@
|
||||
{
|
||||
"extends": ["@commitlint/config-conventional"],
|
||||
"rules": {
|
||||
"body-max-length": [0, "always"],
|
||||
"body-max-line-length": [0, "always"]
|
||||
}
|
||||
"extends": ["@commitlint/config-conventional"]
|
||||
}
|
||||
|
@ -3,6 +3,8 @@
|
||||
"dockerComposeFile": "./docker-compose.yml",
|
||||
"service": "workspace",
|
||||
"workspaceFolder": "/workspace",
|
||||
"customizations": {
|
||||
"vscode": {
|
||||
"settings": {
|
||||
"remote.autoForwardPorts": false
|
||||
},
|
||||
@ -14,7 +16,9 @@
|
||||
"prisma.prisma",
|
||||
"mikestead.dotenv",
|
||||
"ms-azuretools.vscode-docker"
|
||||
],
|
||||
]
|
||||
}
|
||||
},
|
||||
"forwardPorts": [8080, 5555, 5432, 1080],
|
||||
"postAttachCommand": ["npm", "install"],
|
||||
"remoteUser": "node"
|
||||
|
@ -12,7 +12,7 @@ services:
|
||||
- 'host.docker.internal:host-gateway'
|
||||
|
||||
thream-database:
|
||||
image: 'postgres:15.0'
|
||||
image: 'postgres:15.3'
|
||||
environment:
|
||||
POSTGRES_USER: 'user'
|
||||
POSTGRES_PASSWORD: 'password'
|
||||
@ -21,10 +21,5 @@ services:
|
||||
- 'postgres-data:/var/lib/postgresql/data'
|
||||
restart: 'unless-stopped'
|
||||
|
||||
thream-maildev:
|
||||
image: 'maildev/maildev:1.1.0'
|
||||
ports:
|
||||
- '1080:80'
|
||||
|
||||
volumes:
|
||||
postgres-data:
|
||||
|
@ -1,9 +1,6 @@
|
||||
.vscode
|
||||
.git
|
||||
.env
|
||||
.*
|
||||
!.npmrc
|
||||
!.swcrc
|
||||
build
|
||||
coverage
|
||||
.nyc_output
|
||||
node_modules
|
||||
tmp
|
||||
temp
|
||||
|
@ -4,13 +4,9 @@
|
||||
"parserOptions": {
|
||||
"project": "./tsconfig.json"
|
||||
},
|
||||
"env": {
|
||||
"node": true
|
||||
},
|
||||
"rules": {
|
||||
"prettier/prettier": "error",
|
||||
"import/extensions": ["error", "always"],
|
||||
"unicorn/prevent-abbreviations": "error",
|
||||
"unicorn/prefer-node-protocol": "error"
|
||||
"unicorn/prevent-abbreviations": "error"
|
||||
}
|
||||
}
|
||||
|
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -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. -->
|
||||
|
||||
## What changes this PR introduce?
|
||||
# What changes this PR introduce?
|
||||
|
||||
## List any relevant issue numbers
|
||||
|
||||
|
2
.github/workflows/analyze.yml
vendored
2
.github/workflows/analyze.yml
vendored
@ -16,7 +16,7 @@ jobs:
|
||||
language: ['javascript']
|
||||
|
||||
steps:
|
||||
- uses: 'actions/checkout@v3.0.0'
|
||||
- uses: 'actions/checkout@v3.5.2'
|
||||
|
||||
- name: 'Initialize CodeQL'
|
||||
uses: 'github/codeql-action/init@v2'
|
||||
|
12
.github/workflows/build.yml
vendored
12
.github/workflows/build.yml
vendored
@ -10,16 +10,18 @@ jobs:
|
||||
build:
|
||||
runs-on: 'ubuntu-latest'
|
||||
steps:
|
||||
- uses: 'actions/checkout@v3.1.0'
|
||||
- uses: 'actions/checkout@v3.5.2'
|
||||
|
||||
- name: 'Use Node.js'
|
||||
uses: 'actions/setup-node@v3.5.1'
|
||||
- name: 'Setup Node.js'
|
||||
uses: 'actions/setup-node@v3.6.0'
|
||||
with:
|
||||
node-version: '18.x'
|
||||
cache: 'npm'
|
||||
|
||||
- name: 'Install'
|
||||
run: 'npm install'
|
||||
- name: 'Install dependencies'
|
||||
run: 'npm clean-install'
|
||||
|
||||
- name: 'Build'
|
||||
run: 'npm run build'
|
||||
|
||||
- run: 'npm run build:typescript'
|
||||
|
19
.github/workflows/lint.yml
vendored
19
.github/workflows/lint.yml
vendored
@ -10,16 +10,16 @@ jobs:
|
||||
lint:
|
||||
runs-on: 'ubuntu-latest'
|
||||
steps:
|
||||
- uses: 'actions/checkout@v3.1.0'
|
||||
- uses: 'actions/checkout@v3.5.2'
|
||||
|
||||
- name: 'Use Node.js'
|
||||
uses: 'actions/setup-node@v3.5.1'
|
||||
- name: 'Setup Node.js'
|
||||
uses: 'actions/setup-node@v3.6.0'
|
||||
with:
|
||||
node-version: '18.x'
|
||||
cache: 'npm'
|
||||
|
||||
- name: 'Install'
|
||||
run: 'npm install'
|
||||
- name: 'Install dependencies'
|
||||
run: 'npm clean-install'
|
||||
|
||||
- name: 'lint:commit'
|
||||
run: 'npm run lint:commit -- --to "${{ github.sha }}"'
|
||||
@ -30,8 +30,8 @@ jobs:
|
||||
- name: 'lint:markdown'
|
||||
run: 'npm run lint:markdown'
|
||||
|
||||
- name: 'lint:typescript'
|
||||
run: 'npm run lint:typescript'
|
||||
- name: 'lint:eslint'
|
||||
run: 'npm run lint:eslint'
|
||||
|
||||
- name: 'lint:prettier'
|
||||
run: 'npm run lint:prettier'
|
||||
@ -41,10 +41,5 @@ jobs:
|
||||
with:
|
||||
github_token: ${{ secrets.github_token }}
|
||||
|
||||
- name: 'lint:docker'
|
||||
uses: 'hadolint/hadolint-action@v1.6.0'
|
||||
with:
|
||||
dockerfile: './Dockerfile'
|
||||
|
||||
- name: 'prisma:validate'
|
||||
run: 'cp .env.example .env && npm run prisma:validate'
|
||||
|
20
.github/workflows/release.yml
vendored
20
.github/workflows/release.yml
vendored
@ -8,30 +8,32 @@ jobs:
|
||||
release:
|
||||
runs-on: 'ubuntu-latest'
|
||||
steps:
|
||||
- uses: 'actions/checkout@v3.1.0'
|
||||
- uses: 'actions/checkout@v3.5.2'
|
||||
with:
|
||||
fetch-depth: 0
|
||||
persist-credentials: false
|
||||
|
||||
- name: 'Import GPG key'
|
||||
uses: 'crazy-max/ghaction-import-gpg@v3.2.0'
|
||||
uses: 'crazy-max/ghaction-import-gpg@v5.3.0'
|
||||
with:
|
||||
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
git-user-signingkey: true
|
||||
git-commit-gpgsign: true
|
||||
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
git_user_signingkey: true
|
||||
git_commit_gpgsign: true
|
||||
|
||||
- name: 'Use Node.js'
|
||||
uses: 'actions/setup-node@v3.5.1'
|
||||
- name: 'Setup Node.js'
|
||||
uses: 'actions/setup-node@v3.6.0'
|
||||
with:
|
||||
node-version: '18.x'
|
||||
cache: 'npm'
|
||||
|
||||
- name: 'Install'
|
||||
run: 'npm install'
|
||||
- name: 'Install dependencies'
|
||||
run: 'npm clean-install'
|
||||
|
||||
- name: 'Build'
|
||||
run: 'npm run build'
|
||||
|
||||
- run: 'npm run build:typescript'
|
||||
|
||||
- name: 'Release'
|
||||
run: 'npm run release'
|
||||
env:
|
||||
|
10
.github/workflows/test.yml
vendored
10
.github/workflows/test.yml
vendored
@ -10,16 +10,16 @@ jobs:
|
||||
test:
|
||||
runs-on: 'ubuntu-latest'
|
||||
steps:
|
||||
- uses: 'actions/checkout@v3.1.0'
|
||||
- uses: 'actions/checkout@v3.5.2'
|
||||
|
||||
- name: 'Use Node.js'
|
||||
uses: 'actions/setup-node@v3.5.1'
|
||||
- name: 'Setup Node.js'
|
||||
uses: 'actions/setup-node@v3.6.0'
|
||||
with:
|
||||
node-version: '18.x'
|
||||
cache: 'npm'
|
||||
|
||||
- name: 'Install'
|
||||
run: 'npm install'
|
||||
- name: 'Install dependencies'
|
||||
run: 'npm clean-install'
|
||||
|
||||
- name: 'Build'
|
||||
run: 'npm run build'
|
||||
|
@ -3,3 +3,4 @@
|
||||
|
||||
npm run lint:staged
|
||||
npm run build
|
||||
npm run build:typescript
|
||||
|
@ -1,10 +1,11 @@
|
||||
{
|
||||
"config": {
|
||||
"extends": "markdownlint/style/prettier",
|
||||
"relative-links": true,
|
||||
"default": true,
|
||||
"MD013": false,
|
||||
"MD033": false,
|
||||
"MD041": false
|
||||
"MD033": false
|
||||
},
|
||||
"globs": ["**/*.{md,mdx}"],
|
||||
"ignores": ["**/node_modules"]
|
||||
"ignores": ["**/node_modules"],
|
||||
"customRules": ["markdownlint-rule-relative-links"]
|
||||
}
|
||||
|
@ -60,7 +60,7 @@ representative at an online or offline event.
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
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 community leaders are obligated to respect the privacy and security of the
|
||||
|
@ -29,31 +29,7 @@ If you're adding new features to **Thream/api**, please include tests.
|
||||
|
||||
## Commits
|
||||
|
||||
The commit message guidelines respect
|
||||
[@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.
|
||||
The commit message guidelines adheres to [Conventional Commits](https://www.conventionalcommits.org/) and [Semantic Versioning](https://semver.org/) for releases.
|
||||
|
||||
### Examples
|
||||
|
||||
|
@ -1,15 +1,15 @@
|
||||
FROM node:18.12.1 AS dependencies
|
||||
FROM node:18.16.0 AS dependencies
|
||||
WORKDIR /usr/src/app
|
||||
COPY ./package*.json ./
|
||||
RUN npm install
|
||||
|
||||
FROM node:18.12.1 AS builder
|
||||
FROM node:18.16.0 AS builder
|
||||
WORKDIR /usr/src/app
|
||||
COPY --from=dependencies /usr/src/app/node_modules ./node_modules
|
||||
COPY ./ ./
|
||||
RUN npm run prisma:generate && npm run build
|
||||
|
||||
FROM node:18.12.1 AS runner
|
||||
FROM node:18.16.0 AS runner
|
||||
WORKDIR /usr/src/app
|
||||
ENV NODE_ENV=production
|
||||
COPY --from=builder /usr/src/app/node_modules ./node_modules
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
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
|
||||
|
||||
@ -42,6 +42,7 @@ cp .env.example .env
|
||||
|
||||
# Install
|
||||
npm install
|
||||
npm run prisma:generate
|
||||
```
|
||||
|
||||
You will need to configure the environment variables by creating an `.env` file at
|
||||
|
21159
package-lock.json
generated
21159
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
130
package.json
130
package.json
@ -1,105 +1,113 @@
|
||||
{
|
||||
"name": "@thream/api",
|
||||
"version": "1.2.2",
|
||||
"version": "1.2.6",
|
||||
"description": "Thream's application programming interface to stay close with your friends and communities.",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Thream/api"
|
||||
"imports": {
|
||||
"#src/*": "./build/*"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=16.0.0",
|
||||
"npm": ">=8.0.0"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Thream/api"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "rimraf ./build && swc ./src --out-dir ./build && tsc",
|
||||
"build:dev": "swc ./src --out-dir ./build --watch",
|
||||
"build": "rimraf ./build && swc ./src --out-dir ./build",
|
||||
"build:typescript": "tsc",
|
||||
"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:jwt-secret": "node ./build/scripts/generate-jwt-secret.js",
|
||||
"lint:commit": "commitlint",
|
||||
"lint:editorconfig": "editorconfig-checker",
|
||||
"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:staged": "lint-staged",
|
||||
"test": "cross-env NODE_ENV=test c8 tap",
|
||||
"prisma:validate": "prisma validate",
|
||||
"prisma:generate": "prisma generate",
|
||||
"prisma:studio": "prisma studio",
|
||||
"prisma:studio": "prisma studio --browser=none",
|
||||
"prisma:migrate:dev": "prisma migrate dev",
|
||||
"prisma:migrate:deploy": "prisma migrate deploy",
|
||||
"release": "semantic-release",
|
||||
"postinstall": "husky install"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fastify/cors": "8.2.0",
|
||||
"@fastify/helmet": "10.0.2",
|
||||
"@fastify/multipart": "7.3.0",
|
||||
"@fastify/rate-limit": "7.5.0",
|
||||
"@fastify/sensible": "5.1.1",
|
||||
"@fastify/swagger": "8.1.0",
|
||||
"@fastify/swagger-ui": "1.2.0",
|
||||
"@prisma/client": "4.5.0",
|
||||
"@sinclair/typebox": "0.25.3",
|
||||
"@thream/socketio-jwt": "3.0.1",
|
||||
"axios": "1.1.3",
|
||||
"@fastify/cors": "8.2.1",
|
||||
"@fastify/helmet": "10.1.1",
|
||||
"@fastify/multipart": "7.6.0",
|
||||
"@fastify/rate-limit": "8.0.0",
|
||||
"@fastify/sensible": "5.2.0",
|
||||
"@fastify/swagger": "8.3.1",
|
||||
"@fastify/swagger-ui": "1.8.1",
|
||||
"@prisma/client": "4.14.0",
|
||||
"@sinclair/typebox": "0.28.10",
|
||||
"@thream/socketio-jwt": "3.1.0",
|
||||
"axios": "1.4.0",
|
||||
"bcryptjs": "2.4.3",
|
||||
"dotenv": "16.0.3",
|
||||
"ejs": "3.1.8",
|
||||
"fastify": "4.9.2",
|
||||
"fastify-plugin": "4.3.0",
|
||||
"ejs": "3.1.9",
|
||||
"fastify": "4.17.0",
|
||||
"fastify-plugin": "4.5.0",
|
||||
"form-data": "4.0.0",
|
||||
"http-errors": "2.0.0",
|
||||
"jsonwebtoken": "8.5.1",
|
||||
"jsonwebtoken": "9.0.0",
|
||||
"ms": "2.1.3",
|
||||
"nodemailer": "6.8.0",
|
||||
"read-pkg": "7.1.0",
|
||||
"socket.io": "4.5.3"
|
||||
"nodemailer": "6.9.2",
|
||||
"read-pkg": "8.0.0",
|
||||
"socket.io": "4.6.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "17.2.0",
|
||||
"@commitlint/config-conventional": "17.2.0",
|
||||
"@saithodev/semantic-release-backmerge": "2.1.2",
|
||||
"@commitlint/cli": "17.6.3",
|
||||
"@commitlint/config-conventional": "17.6.3",
|
||||
"@saithodev/semantic-release-backmerge": "3.2.0",
|
||||
"@semantic-release/git": "10.0.1",
|
||||
"@swc/cli": "0.1.57",
|
||||
"@swc/core": "1.3.14",
|
||||
"@swc/cli": "0.1.62",
|
||||
"@swc/core": "1.3.57",
|
||||
"@tsconfig/strictest": "2.0.1",
|
||||
"@types/bcryptjs": "2.4.2",
|
||||
"@types/busboy": "1.5.0",
|
||||
"@types/ejs": "3.1.1",
|
||||
"@types/http-errors": "1.8.2",
|
||||
"@types/jsonwebtoken": "8.5.9",
|
||||
"@types/ejs": "3.1.2",
|
||||
"@types/http-errors": "2.0.1",
|
||||
"@types/jsonwebtoken": "9.0.2",
|
||||
"@types/ms": "0.7.31",
|
||||
"@types/node": "18.11.9",
|
||||
"@types/nodemailer": "6.4.6",
|
||||
"@types/sinon": "10.0.13",
|
||||
"@types/tap": "15.0.7",
|
||||
"@typescript-eslint/eslint-plugin": "5.42.1",
|
||||
"@typescript-eslint/parser": "5.42.1",
|
||||
"c8": "7.12.0",
|
||||
"concurrently": "7.5.0",
|
||||
"@types/node": "20.1.4",
|
||||
"@types/nodemailer": "6.4.7",
|
||||
"@types/sinon": "10.0.14",
|
||||
"@types/tap": "15.0.8",
|
||||
"@typescript-eslint/eslint-plugin": "5.59.5",
|
||||
"@typescript-eslint/parser": "5.59.5",
|
||||
"c8": "7.13.0",
|
||||
"concurrently": "8.0.1",
|
||||
"cross-env": "7.0.3",
|
||||
"editorconfig-checker": "4.0.2",
|
||||
"eslint": "8.27.0",
|
||||
"eslint-config-conventions": "5.0.0",
|
||||
"eslint-config-prettier": "8.5.0",
|
||||
"eslint-plugin-import": "2.26.0",
|
||||
"editorconfig-checker": "5.0.1",
|
||||
"eslint": "8.40.0",
|
||||
"eslint-config-conventions": "9.0.0",
|
||||
"eslint-config-prettier": "8.8.0",
|
||||
"eslint-plugin-import": "2.27.5",
|
||||
"eslint-plugin-prettier": "4.2.1",
|
||||
"eslint-plugin-promise": "6.1.1",
|
||||
"eslint-plugin-unicorn": "44.0.2",
|
||||
"husky": "8.0.2",
|
||||
"lint-staged": "13.0.3",
|
||||
"markdownlint-cli2": "0.5.1",
|
||||
"nodemon": "2.0.20",
|
||||
"plop": "3.1.1",
|
||||
"prettier": "2.7.1",
|
||||
"prisma": "4.5.0",
|
||||
"rimraf": "3.0.2",
|
||||
"semantic-release": "19.0.5",
|
||||
"sinon": "14.0.2",
|
||||
"tap": "16.3.0",
|
||||
"typescript": "4.8.4"
|
||||
"eslint-plugin-unicorn": "47.0.0",
|
||||
"husky": "8.0.3",
|
||||
"lint-staged": "13.2.2",
|
||||
"maildev": "2.0.5",
|
||||
"markdownlint-cli2": "0.7.1",
|
||||
"markdownlint-rule-relative-links": "1.2.0",
|
||||
"nodemon": "2.0.22",
|
||||
"plop": "3.1.2",
|
||||
"prettier": "2.8.8",
|
||||
"prisma": "4.14.0",
|
||||
"rimraf": "5.0.0",
|
||||
"semantic-release": "21.0.2",
|
||||
"sinon": "15.0.4",
|
||||
"tap": "16.3.4",
|
||||
"typescript": "5.0.4"
|
||||
}
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ import fastifySocketIo from './tools/plugins/socket-io.js'
|
||||
dotenv.config()
|
||||
const packageJSON = await readPackage()
|
||||
export const application = fastify({
|
||||
logger: process.env.NODE_ENV === 'development',
|
||||
logger: process.env['NODE_ENV'] === 'development',
|
||||
ajv: {
|
||||
customOptions: {
|
||||
strict: 'log',
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { application } from './application.js'
|
||||
import { HOST, PORT } from './tools/configurations.js'
|
||||
import { HOST, PORT } from '#src/tools/configurations.js'
|
||||
|
||||
const address = await application.listen({
|
||||
port: PORT,
|
||||
|
@ -12,8 +12,8 @@ export const providersTypebox = providers.map((provider) => {
|
||||
return Type.Literal(provider)
|
||||
})
|
||||
|
||||
export type ProviderOAuth = typeof providers[number]
|
||||
export type AuthenticationStrategy = typeof strategies[number]
|
||||
export type ProviderOAuth = (typeof providers)[number]
|
||||
export type AuthenticationStrategy = (typeof strategies)[number]
|
||||
|
||||
export const oauthSchema = {
|
||||
id,
|
||||
|
@ -54,7 +54,7 @@ export const getConfirmEmail: FastifyPluginAsync = async (fastify) => {
|
||||
reply.statusCode = 200
|
||||
return 'Success, your email has been confirmed, you can now signin!'
|
||||
}
|
||||
await reply.redirect(redirectURI)
|
||||
return await reply.redirect(redirectURI)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
@ -7,9 +7,9 @@ import { OAuthStrategy } from '../../../../../tools/utils/OAuthStrategy.js'
|
||||
export const DISCORD_PROVIDER = 'Discord'
|
||||
export const DISCORD_BASE_URL = 'https://discord.com/api/v10'
|
||||
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 =
|
||||
process.env.DISCORD_CLIENT_SECRET ?? 'DISCORD_CLIENT_SECRET'
|
||||
process.env['DISCORD_CLIENT_SECRET'] ?? 'DISCORD_CLIENT_SECRET'
|
||||
export const discordStrategy = new OAuthStrategy(DISCORD_PROVIDER)
|
||||
|
||||
export interface DiscordUser {
|
||||
|
@ -8,9 +8,9 @@ export const GITHUB_PROVIDER = 'GitHub'
|
||||
export const GITHUB_BASE_URL = 'https://github.com'
|
||||
export const GITHUB_API_BASE_URL = 'https://api.github.com'
|
||||
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 =
|
||||
process.env.GITHUB_CLIENT_SECRET ?? 'GITHUB_CLIENT_SECRET'
|
||||
process.env['GITHUB_CLIENT_SECRET'] ?? 'GITHUB_CLIENT_SECRET'
|
||||
export const githubStrategy = new OAuthStrategy(GITHUB_PROVIDER)
|
||||
|
||||
export interface GitHubUser {
|
||||
|
@ -10,9 +10,9 @@ export const GOOGLE_OAUTH2_TOKEN = 'https://oauth2.googleapis.com/token'
|
||||
export const GOOGLE_USERINFO =
|
||||
'https://www.googleapis.com/oauth2/v1/userinfo?alt=json'
|
||||
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 =
|
||||
process.env.GOOGLE_CLIENT_SECRET ?? 'GOOGLE_CLIENT_SECRET'
|
||||
process.env['GOOGLE_CLIENT_SECRET'] ?? 'GOOGLE_CLIENT_SECRET'
|
||||
export const googleStrategy = new OAuthStrategy(GOOGLE_PROVIDER)
|
||||
|
||||
export interface GoogleUser {
|
||||
|
@ -4,19 +4,19 @@ 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 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'
|
||||
process.env['FILE_UPLOADS_API_URL'] ?? 'http://localhost:8000'
|
||||
export const FILE_UPLOADS_API_KEY =
|
||||
process.env.FILE_UPLOADS_API_KEY ?? 'apiKeySecret'
|
||||
process.env['FILE_UPLOADS_API_KEY'] ?? 'apiKeySecret'
|
||||
export const JWT_ACCESS_SECRET =
|
||||
process.env.JWT_ACCESS_SECRET ?? 'accessTokenSecret'
|
||||
process.env['JWT_ACCESS_SECRET'] ?? 'accessTokenSecret'
|
||||
export const JWT_REFRESH_SECRET =
|
||||
process.env.JWT_REFRESH_SECRET ?? 'refreshTokenSecret'
|
||||
process.env['JWT_REFRESH_SECRET'] ?? 'refreshTokenSecret'
|
||||
export const JWT_ACCESS_EXPIRES_IN =
|
||||
process.env.JWT_ACCESS_EXPIRES_IN ?? '15 minutes'
|
||||
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)
|
||||
|
@ -4,7 +4,7 @@ const { PrismaClient } = Prisma
|
||||
|
||||
const prisma = new PrismaClient({
|
||||
log:
|
||||
process.env.NODE_ENV === 'development'
|
||||
process.env['NODE_ENV'] === 'development'
|
||||
? ['query', 'info', 'warn', 'error']
|
||||
: ['error']
|
||||
})
|
||||
|
@ -3,17 +3,17 @@ import nodemailer from 'nodemailer'
|
||||
import type SMTPTransport from 'nodemailer/lib/smtp-transport/index.js'
|
||||
|
||||
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 = {
|
||||
host: process.env.EMAIL_HOST,
|
||||
host: process.env['EMAIL_HOST'],
|
||||
port: EMAIL_PORT,
|
||||
secure: EMAIL_PORT === 465,
|
||||
auth: {
|
||||
user: process.env.EMAIL_USER,
|
||||
pass: process.env.EMAIL_PASSWORD
|
||||
user: process.env['EMAIL_USER'],
|
||||
pass: process.env['EMAIL_PASSWORD']
|
||||
},
|
||||
ignoreTLS: process.env.NODE_ENV !== 'production'
|
||||
ignoreTLS: process.env['NODE_ENV'] !== 'production'
|
||||
}
|
||||
|
||||
export const emailTransporter = nodemailer.createTransport(EMAIL_INFO)
|
||||
|
@ -20,10 +20,10 @@ export const getUserWithBearerToken = async (
|
||||
throw new Unauthorized()
|
||||
}
|
||||
|
||||
const token = tokenSplitted[1]
|
||||
const token = tokenSplitted[1] ?? 'token'
|
||||
let payload: UserJWT
|
||||
try {
|
||||
payload = jwt.verify(token, JWT_ACCESS_SECRET) as UserJWT
|
||||
payload = jwt.verify(token, JWT_ACCESS_SECRET) as unknown as UserJWT
|
||||
} catch {
|
||||
throw new Forbidden()
|
||||
}
|
||||
|
@ -48,10 +48,10 @@ export const uploadFile = async (
|
||||
`File should be less than ${MAXIMUM_FILE_SIZE}mb.`
|
||||
)
|
||||
}
|
||||
if (files.length !== 1) {
|
||||
const file = files[0]
|
||||
if (files.length !== 1 || file == null) {
|
||||
throw fastify.httpErrors.badRequest('You must upload at most one file.')
|
||||
}
|
||||
const file = files[0]
|
||||
const formData = new FormData()
|
||||
formData.append('file', fs.createReadStream(file.filepath))
|
||||
try {
|
||||
|
@ -1,4 +1,5 @@
|
||||
{
|
||||
"extends": "@tsconfig/strictest/tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"target": "ESNext",
|
||||
"module": "ESNext",
|
||||
@ -6,9 +7,12 @@
|
||||
"moduleResolution": "Node",
|
||||
"outDir": "./build",
|
||||
"rootDir": "./src",
|
||||
"baseUrl": ".",
|
||||
"paths": {
|
||||
"#src/*": ["./src/*"]
|
||||
},
|
||||
"noEmit": true,
|
||||
"strict": true,
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true
|
||||
"exactOptionalPropertyTypes": false,
|
||||
"checkJs": false
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user