b5fc6db75d
We have various places with overly simple if statements that could be handled by our logging library. Also a lot of those logs are not marked as debug logs but as info logs, which can cause confusion during debugging. This patch removed unneeded if clauses around debug logging statements, reworks debug log messages towards ECMA templates and add some new logging statements which might be helpful in order to debug things like image uploads. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
53 lines
1.4 KiB
JavaScript
53 lines
1.4 KiB
JavaScript
'use strict'
|
|
|
|
const models = require('../../models')
|
|
const logger = require('../../logger')
|
|
|
|
exports.setReturnToFromReferer = function setReturnToFromReferer (req) {
|
|
var referer = req.get('referer')
|
|
if (!req.session) req.session = {}
|
|
req.session.returnTo = referer
|
|
}
|
|
|
|
exports.passportGeneralCallback = function callback (accessToken, refreshToken, profile, done) {
|
|
var stringifiedProfile = JSON.stringify(profile)
|
|
models.User.findOrCreate({
|
|
where: {
|
|
profileid: profile.id.toString()
|
|
},
|
|
defaults: {
|
|
profile: stringifiedProfile,
|
|
accessToken: accessToken,
|
|
refreshToken: refreshToken
|
|
}
|
|
}).spread(function (user, created) {
|
|
if (user) {
|
|
var needSave = false
|
|
if (user.profile !== stringifiedProfile) {
|
|
user.profile = stringifiedProfile
|
|
needSave = true
|
|
}
|
|
if (user.accessToken !== accessToken) {
|
|
user.accessToken = accessToken
|
|
needSave = true
|
|
}
|
|
if (user.refreshToken !== refreshToken) {
|
|
user.refreshToken = refreshToken
|
|
needSave = true
|
|
}
|
|
if (needSave) {
|
|
user.save().then(function () {
|
|
logger.debug(`user login: ${user.id}`)
|
|
return done(null, user)
|
|
})
|
|
} else {
|
|
logger.debug(`user login: ${user.id}`)
|
|
return done(null, user)
|
|
}
|
|
}
|
|
}).catch(function (err) {
|
|
logger.error('auth callback failed: ' + err)
|
|
return done(err, null)
|
|
})
|
|
}
|