Skip to content
Merged

Fix #77

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 38 additions & 37 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,67 +1,68 @@
import express from 'express';
import userRouter from './router/userRouter.js';
import followRouter from './router/followRouter.js';
import ratingRouter from './router/ratingRouter.js';
import notificationRouter from './router/notificationRouter.js';
import { swaggerSpec, swaggerUi } from './swagger/swagger.js';
import authRouter from './router/authRouter.js';
import socket from './config/socket.js';
import cors from 'cors';
import http from 'http';
import { Server } from 'socket.io';
import cors from "cors";
import express from "express";
import http from "http";
import { Server } from "socket.io";
import socket from "./config/socket.js";
import authRouter from "./router/authRouter.js";
import followRouter from "./router/followRouter.js";
import notificationRouter from "./router/notificationRouter.js";
import ratingRouter from "./router/ratingRouter.js";
import userRouter from "./router/userRouter.js";
import { swaggerSpec, swaggerUi } from "./swagger/swagger.js";

const app = express();
const server = http.createServer(app);

app.use(
cors({
origin: [
'http://localhost:3000',
'http://127.0.0.1',
'https://localhost:3000',
'https://127.0.0.1:3000',
'https://my.sjcpop.com',
'https://www.my.sjcpop.com',
"http://localhost:3000",
"http://127.0.0.1",
"https://localhost:3000",
"https://127.0.0.1:3000",
"https://my.sjcpop.com",
"https://www.my.sjcpop.com",
],
credentials: true,
methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
methods: "GET,HEAD,PUT,PATCH,POST,DELETE",
})
);
app.use(express.json());
app.use('/api/v1/user', userRouter);
app.use('/api/v1/follow', followRouter);
app.use('/api/v1/rating', ratingRouter);
app.use('/api/v1/auth', authRouter);
app.use('/api/v1/notification', notificationRouter);
app.use("/api/v1/user", userRouter);
app.use("/api/v1/follow", followRouter);
app.use("/api/v1/rating", ratingRouter);
app.use("/api/v1/auth", authRouter);
app.use("/api/v1/notification", notificationRouter);
app.use(
'/api/v1/api-docs',
"/api/v1/api-docs",
swaggerUi.serve,
swaggerUi.setup(swaggerSpec, { explorer: true })
);

const io = new Server(server, {
cors: {
origin: [
'http://localhost:3000',
'https://localhost:3000',
'http://my.sjcpop.com',
'http://www.my.sjcpop.com',
'https://my.sjcpop.com',
'https://www.my.sjcpop.com',
'http://127.0.0.1:3000',
'https://127.0.0.1:3000',
"http://localhost:3000",
"https://localhost:3000",
"http://my.sjcpop.com",
"http://www.my.sjcpop.com",
"https://my.sjcpop.com",
"https://www.my.sjcpop.com",
"http://127.0.0.1:3000",
"https://127.0.0.1:3000",
"http://local.sjcpop.com",
],
credentials: true,
methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
methods: "GET,HEAD,PUT,PATCH,POST,DELETE",
},
transports: ['websocket', 'polling'],
path: '/socket.io/',
transports: ["websocket", "polling"],
path: "/socket.io/",
allowEIO4: true,
});

socket(io);
app.set('io', io);
app.set("io", io);

server.listen(3001, () => {
console.log(`🏇${app.get('port')}에서 서버가 실행중입니다!🚴🏻 `);
console.log(`🏇${app.get("port")}에서 서버가 실행중입니다!🚴🏻 `);
});
34 changes: 17 additions & 17 deletions config/cookie.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
const accessTokenOption = {
httpOnly: true,
secure: false,
sameSite: 'None',
secure: true,
sameSite: "None",
maxAge: 1000 * 60 * 60 * 3,
path: '/',
// domain: '.sjcpop.com',
path: "/",
domain: ".sjcpop.com",
};

const refreshTokenOption = {
httpOnly: true,
secure: false,
sameSite: 'None',
secure: true,
sameSite: "None",
maxAge: 1000 * 60 * 60 * 24 * 7,
path: '/',
// domain: '.sjcpop.com',
path: "/",
domain: ".sjcpop.com",
};

const clearAccessTokenOption = {
httpOnly: true,
secure: false,
sameSite: 'None',
secure: true,
sameSite: "None",
maxAge: 0,
path: '/',
// domain: '.sjcpop.com',
path: "/",
domain: ".sjcpop.com",
};

const clearRefreshTokenOption = {
httpOnly: true,
secure: false,
sameSite: 'None',
secure: true,
sameSite: "None",
maxAge: 0,
path: '/',
// domain: '.sjcpop.com',
path: "/",
domain: ".sjcpop.com",
};

export {
accessTokenOption,
refreshTokenOption,
clearAccessTokenOption,
clearRefreshTokenOption,
refreshTokenOption,
};
16 changes: 8 additions & 8 deletions controllers/authController.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import authService from '../services/authService.js';
import { client } from '../config/redis.js';
import { client } from "../config/redis.js";
import authService from "../services/authService.js";

/**
{
Expand All @@ -17,16 +17,16 @@ const handleSpringAuth = async (req, res) => {
await client.set(String(userId), JSON.stringify(result));

// 쿠키에 토큰 저장
res.cookie('accessToken', result.accessToken, {
res.cookie("accessToken", result.accessToken, {
httpOnly: true,
secure: false,
sameSite: 'None',
secure: true,
sameSite: "None",
});

res.cookie('refreshToken', result.refreshToken, {
res.cookie("refreshToken", result.refreshToken, {
httpOnly: true,
secure: false,
sameSite: 'None',
secure: true,
sameSite: "None",
});

return res.status(200).json({ status: { success: true } });
Expand Down
Loading