mirror of
https://github.com/KeyZox71/knl_meowscendence.git
synced 2025-12-31 21:56:41 +01:00
Merge pull request #45 from KeyZox71/test-fix-apis
「🔨」 fix(cors issue): should be working as expected (closes #44)
This commit is contained in:
@ -24,3 +24,5 @@ SMTP_FROM=<the address to send from>
|
|||||||
SMTP_AUTH_USERNAME=<smtp-user>
|
SMTP_AUTH_USERNAME=<smtp-user>
|
||||||
SMTP_AUTH_PASSWORD=<smtp pass>
|
SMTP_AUTH_PASSWORD=<smtp pass>
|
||||||
EMAIL_TO=<mail to send to>
|
EMAIL_TO=<mail to send to>
|
||||||
|
|
||||||
|
CORS_ORIGIN=<the url of origin for cors>
|
||||||
|
|||||||
@ -15,6 +15,7 @@ services:
|
|||||||
- API_TARGET=user
|
- API_TARGET=user
|
||||||
- LOG_FILE_PATH=/var/log/log.log
|
- LOG_FILE_PATH=/var/log/log.log
|
||||||
- JWT_SECRET=${JWT_SECRET}
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
|
- CORS_ORIGIN=${CORS_ORIGIN}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
auth-api:
|
auth-api:
|
||||||
container_name: transcendence-api-auth
|
container_name: transcendence-api-auth
|
||||||
@ -35,6 +36,7 @@ services:
|
|||||||
- API_TARGET=auth
|
- API_TARGET=auth
|
||||||
- LOG_FILE_PATH=/var/log/log.log
|
- LOG_FILE_PATH=/var/log/log.log
|
||||||
- JWT_SECRET=${JWT_SECRET}
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
|
- CORS_ORIGIN=${CORS_ORIGIN}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
scorestore-api:
|
scorestore-api:
|
||||||
container_name: transcendence-api-scoreStore
|
container_name: transcendence-api-scoreStore
|
||||||
|
|||||||
@ -24,7 +24,7 @@ authDB.prepareDB();
|
|||||||
export default async function(fastify, options) {
|
export default async function(fastify, options) {
|
||||||
|
|
||||||
fastify.register(cors, {
|
fastify.register(cors, {
|
||||||
origin: "http://localhost:5173",
|
origin: process.ENV.CORS_ORIGIN || 'http://localhost:5173',
|
||||||
credentials: true,
|
credentials: true,
|
||||||
methods: [ "GET", "POST", "DELETE", "OPTIONS" ]
|
methods: [ "GET", "POST", "DELETE", "OPTIONS" ]
|
||||||
});
|
});
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
import fastifyJWT from '@fastify/jwt';
|
import fastifyJWT from '@fastify/jwt';
|
||||||
import fastifyCookie from '@fastify/cookie';
|
import fastifyCookie from '@fastify/cookie';
|
||||||
|
import cors from '@fastify/cors'
|
||||||
import Database from 'better-sqlite3';
|
import Database from 'better-sqlite3';
|
||||||
|
|
||||||
var env = process.env.NODE_ENV || 'development';
|
var env = process.env.NODE_ENV || 'development';
|
||||||
@ -56,6 +57,13 @@ const deleteFriends = database.prepare('DELETE FROM friends WHERE username = ?;'
|
|||||||
* @param {import('fastify').FastifyPluginOptions} options
|
* @param {import('fastify').FastifyPluginOptions} options
|
||||||
*/
|
*/
|
||||||
export default async function(fastify, options) {
|
export default async function(fastify, options) {
|
||||||
|
|
||||||
|
fastify.register(cors, {
|
||||||
|
origin: process.ENV.CORS_ORIGIN || 'http://localhost:5173',
|
||||||
|
credentials: true,
|
||||||
|
methods: [ "GET", "POST", "DELETE", "OPTIONS" ]
|
||||||
|
});
|
||||||
|
|
||||||
fastify.register(fastifyJWT, {
|
fastify.register(fastifyJWT, {
|
||||||
secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
|
secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
|
||||||
cookie: {
|
cookie: {
|
||||||
|
|||||||
Reference in New Issue
Block a user