|
|
@@ -8,14 +8,17 @@ module.exports = UserController =
|
|
|
getLoggedInUsersPersonalInfo: (req, res, next = (error) ->) ->
|
|
|
# this is funcky as hell, we don't use the current session to get the user
|
|
|
# we use the auth token, actually destroying session from the chat api request
|
|
|
- req.session.destroy()
|
|
|
+ if req.query?.auth_token?
|
|
|
+ req.session.destroy()
|
|
|
logger.log user: req.user, "reciving request for getting logged in users personal info"
|
|
|
return next(new Error("User is not logged in")) if !req.user?
|
|
|
- UserController.sendFormattedPersonalInfo(req.user, res, next)
|
|
|
+ UserGetter.getUser req.session.user._id, { first_name: true, last_name: true, role:true, institution:true }, (error, user) ->
|
|
|
+ UserController.sendFormattedPersonalInfo(user, res, next)
|
|
|
|
|
|
getPersonalInfo: (req, res, next = (error) ->) ->
|
|
|
- UserGetter.getUser req.params.user_id, { _id: true, first_name: true, last_name: true, email: true }, (error, user) ->
|
|
|
- logger.log user: req.params.user_id, "reciving request for getting users personal info"
|
|
|
+ UserGetter.getUser req.params.user_id, { _id: true, first_name: true, last_name: true, email: true}, (error, user) ->
|
|
|
+ logger.log user_id: req.params.user_id, "reciving request for getting users personal info"
|
|
|
+ console.log user
|
|
|
return next(error) if error?
|
|
|
return res.send(404) if !user?
|
|
|
UserController.sendFormattedPersonalInfo(user, res, next)
|
|
|
@@ -39,6 +42,7 @@ module.exports = UserController =
|
|
|
sendFormattedPersonalInfo: (user, res, next = (error) ->) ->
|
|
|
UserController._formatPersonalInfo user, (error, info) ->
|
|
|
return next(error) if error?
|
|
|
+ console.log info
|
|
|
res.send JSON.stringify(info)
|
|
|
|
|
|
_formatPersonalInfo: (user, callback = (error, info) ->) ->
|
|
|
@@ -48,6 +52,8 @@ module.exports = UserController =
|
|
|
last_name: user.last_name
|
|
|
email: user.email
|
|
|
signUpDate: user.signUpDate
|
|
|
+ role: user.role
|
|
|
+ institution: user.institution
|
|
|
}
|
|
|
|
|
|
|