Skip to content

Commit e2ac73f

Browse files
committed
refactor(app.js): Extract /me page
1 parent e3fde01 commit e2ac73f

2 files changed

Lines changed: 37 additions & 28 deletions

File tree

app.js

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -199,34 +199,7 @@ app.use(require('./lib/web/baseRouter'))
199199
app.use(require('./lib/web/statusRouter'))
200200
app.use(require('./lib/web/auth'))
201201
app.use(require('./lib/web/historyRouter'))
202-
203-
// get me info
204-
app.get('/me', function (req, res) {
205-
if (req.isAuthenticated()) {
206-
models.User.findOne({
207-
where: {
208-
id: req.user.id
209-
}
210-
}).then(function (user) {
211-
if (!user) { return response.errorNotFound(res) }
212-
var profile = models.User.getProfile(user)
213-
res.send({
214-
status: 'ok',
215-
id: req.user.id,
216-
name: profile.name,
217-
photo: profile.photo
218-
})
219-
}).catch(function (err) {
220-
logger.error('read me failed: ' + err)
221-
return response.errorInternalError(res)
222-
})
223-
} else {
224-
res.send({
225-
status: 'forbidden'
226-
})
227-
}
228-
})
229-
202+
app.use(require('./lib/web/userRouter'))
230203
// upload image
231204
app.post('/uploadimage', function (req, res) {
232205
var form = new formidable.IncomingForm()

lib/web/userRouter.js

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
'use strict'
2+
3+
const Router = require('express').Router
4+
5+
const response = require('../response')
6+
const models = require('../models')
7+
const logger = require('../logger')
8+
9+
const UserRouter = module.exports = Router()
10+
11+
// get me info
12+
UserRouter.get('/me', function (req, res) {
13+
if (req.isAuthenticated()) {
14+
models.User.findOne({
15+
where: {
16+
id: req.user.id
17+
}
18+
}).then(function (user) {
19+
if (!user) { return response.errorNotFound(res) }
20+
var profile = models.User.getProfile(user)
21+
res.send({
22+
status: 'ok',
23+
id: req.user.id,
24+
name: profile.name,
25+
photo: profile.photo
26+
})
27+
}).catch(function (err) {
28+
logger.error('read me failed: ' + err)
29+
return response.errorInternalError(res)
30+
})
31+
} else {
32+
res.send({
33+
status: 'forbidden'
34+
})
35+
}
36+
})

0 commit comments

Comments
 (0)