Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
festivelo_backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Festivelo
festivelo_backend
Commits
a130bb41
Commit
a130bb41
authored
5 months ago
by
nahyun
Browse files
Options
Downloads
Patches
Plain Diff
refector: 코드 정리
parent
abf22885
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app.js
+26
-74
26 additions, 74 deletions
app.js
config/passport.js
+1
-2
1 addition, 2 deletions
config/passport.js
middleware/authMiddleware.js
+0
-1
0 additions, 1 deletion
middleware/authMiddleware.js
with
27 additions
and
77 deletions
app.js
+
26
−
74
View file @
a130bb41
const
express
=
require
(
'
express
'
);
const
app
=
express
();
const
mongoose
=
require
(
'
mongoose
'
);
const
cors
=
require
(
'
cors
'
);
app
.
use
(
express
.
urlencoded
({
extended
:
false
}));
const
passport
=
require
(
'
./config/passport
'
);
app
.
use
(
passport
.
initialize
());
//const session = require('express-session');
const
jwt
=
require
(
'
jsonwebtoken
'
);
require
(
'
dotenv
'
).
config
();
const
secretKey
=
process
.
env
.
JWT_SECRET
;
// 실제 환경에서는 환경 변수로 관리하세요.
const
http
=
require
(
'
http
'
);
const
WebSocketServer
=
require
(
'
./WebSocket
'
);
//middleware
app
.
use
(
cors
({
origin
:
"
http://localhost:3000
"
,
credentials
:
true
,
}));
//비밀번호 변경 라우트 등록
// const passwordRoutes = require('./route/conf_password');
// //닉네임 변경 라우트 등록
// const confNameRoutes = require('./route/conf_name.js');
// //회원 탈퇴 라우트 등록
// const deleteUser = require('./route/del_user');
// //비밀번호 암호화용 모듈
const
bcrypt
=
require
(
'
bcrypt
'
);
//User define
require
(
'
dotenv
'
).
config
();
// Models
const
User
=
require
(
'
./models/user
'
);
//Trip define
const
Trip
=
require
(
'
./models/trips
'
);
//Favorite define
const
Favorite
=
require
(
'
./models/favorite
'
);
// JSON 요청 본문을 파싱하는 미들웨어 추가
app
.
use
(
express
.
json
());
//비밀번호 변경 라우트 추가
// app.use('/conf_password',passwordRoutes);
// //이름 변경 라우트
// app.use('/conf_name', confNameRoutes);
// //회원 탈퇴 라우트
// app.use('/del_user', deleteUser);
//사용자 관리 라우트
const
userManagementRoutes
=
require
(
'
./route/userManagement
'
);
app
.
use
(
'
/userManagement
'
,
userManagementRoutes
);
//여행 라우트
const
tripRoutes
=
require
(
'
./route/tripRoute
'
);
// 라우트 파일 경로
// Routes
app
.
use
(
'
/api/trips
'
,
tripRoutes
);
//리뷰 라우트
const
reviewRoutes
=
require
(
'
./route/review
'
);
// 라우트 파일 경로
app
.
use
(
'
/api/review
'
,
reviewRoutes
);
//dotenv
require
(
'
dotenv
'
).
config
();
//favorite 라우트
const
favoriteRoutes
=
require
(
'
./route/favorites
'
);
// 라우트 파일 경로
app
.
use
(
'
/favorites
'
,
favoriteRoutes
);
const
userManagementRoutes
=
require
(
'
./route/userManagement
'
);
const
tripRoutes
=
require
(
'
./route/tripRoute
'
);
const
reviewRoutes
=
require
(
'
./route/review
'
);
const
favoriteRoutes
=
require
(
'
./route/favorites
'
);
// Middleware
const
authenticateToken
=
require
(
'
./middleware/authMiddleware.js
'
);
// 보호된 라우트에 미들웨어 적용
// app.use('/conf_password', authenticateToken, passwordRoutes);
// app.use('/conf_name', authenticateToken, confNameRoutes);
// app.use('/del_user', authenticateToken, deleteUser);
// Middleware Setup
app
.
use
(
cors
({
origin
:
"
http://localhost:3000
"
,
credentials
:
true
,
}));
app
.
use
(
express
.
json
());
app
.
use
(
express
.
urlencoded
({
extended
:
false
}));
app
.
use
(
passport
.
initialize
());
// Routes Setup
app
.
use
(
'
/userManagement
'
,
authenticateToken
,
userManagementRoutes
);
app
.
use
(
'
/api/trips
'
,
tripRoutes
);
app
.
use
(
'
/api/review
'
,
reviewRoutes
);
app
.
use
(
'
/favorites
'
,
favoriteRoutes
);
//
확인
//
Environment Variables Check
console
.
log
(
'
GOOGLE_CLIENT_ID:
'
,
process
.
env
.
GOOGLE_CLIENT_ID
);
console
.
log
(
'
GOOGLE_CLIENT_SECRET:
'
,
process
.
env
.
GOOGLE_CLIENT_SECRET
);
// // MongoDB 연결
// mongoose.connect('mongodb://localhost:27017/logininfo', {
// useNewUrlParser: true,
// useUnifiedTopology: true,
// }).then(() => console.log('MongoDB 연결 성공'))
// .catch(err => console.error('MongoDB 연결 오류:', err));
// application/x-www-form-urlencoded
app
.
use
(
express
.
urlencoded
({
extended
:
false
}));
const
secretKey
=
process
.
env
.
JWT_SECRET
;
// db connect
mongoose
...
...
@@ -113,7 +74,7 @@ app.get('/googlelogin',
passport
.
authenticate
(
'
google
'
,
{
scope
:
[
'
profile
'
,
'
email
'
],
session
:
false
})
);
//
jwt 전
--------------------------------------
//
세션 로그인
--------------------------------------
// app.get('/googlelogin/redirect',
// passport.authenticate('google', { failureRedirect: '/' }),
// (req, res) => {
...
...
@@ -130,7 +91,7 @@ app.get('/googlelogin',
// );
//----------------------------------------------
//jwt
후
-----------------------------------------
//jwt-----------------------------------------
app
.
get
(
'
/googlelogin/redirect
'
,
passport
.
authenticate
(
'
google
'
,
{
failureRedirect
:
'
/
'
,
session
:
false
}),
(
req
,
res
)
=>
{
...
...
@@ -159,6 +120,7 @@ app.get('/googlelogin/redirect',
// 로그아웃
app
.
get
(
'
/logout
'
,
(
req
,
res
)
=>
{
//세션 로그인
// req.logout((err) => {
// if (err) { return next(err); }
// res.redirect('/');
...
...
@@ -169,7 +131,7 @@ app.get('/logout', (req, res) => {
// 대시보드
app
.
get
(
'
/dashboard
'
,
authenticateToken
,
(
req
,
res
)
=>
{
//세션 로그인
//const hasPassword = !!req.user.password; // 비밀번호가 있는지 확인
//const userName = req.user.name || req.user.email || 'Guest';
...
...
@@ -183,16 +145,6 @@ app.get('/dashboard', authenticateToken, (req, res) => {
`
);
});
// // 홈
// app.get('/', (req, res) => {
// res.send(`
// <h1>Google OAuth Login</h1>
// <a href="/googlelogin">Login with Google</a>
// `);
// });
//session
// app.get('/conf_password', (req, res) => {
...
...
This diff is collapsed.
Click to expand it.
config/passport.js
+
1
−
2
View file @
a130bb41
...
...
@@ -9,7 +9,7 @@ passport.use(new GoogleStrategy({
clientID
:
process
.
env
.
GOOGLE_CLIENT_ID
,
clientSecret
:
process
.
env
.
GOOGLE_CLIENT_SECRET
,
callbackURL
:
`http://localhost:
${
process
.
env
.
PORT
}
/googlelogin/redirect`
},
async
(
accessToken
,
refreshToken
,
profile
,
done
)
=>
{
},
async
(
_
,
__
,
profile
,
done
)
=>
{
const
{
id
,
displayName
,
emails
}
=
profile
;
try
{
// 사용자가 존재하는지 확인
...
...
@@ -20,7 +20,6 @@ passport.use(new GoogleStrategy({
googleId
:
id
,
displayName
,
email
:
emails
[
0
].
value
,
//profilePicture: photos[0].value
});
}
done
(
null
,
user
);
...
...
This diff is collapsed.
Click to expand it.
middleware/authMiddleware.js
+
0
−
1
View file @
a130bb41
// authMiddleware.js
const
jwt
=
require
(
'
jsonwebtoken
'
);
require
(
'
dotenv
'
).
config
();
const
secretKey
=
process
.
env
.
JWT_SECRET
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment