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>
		
			
				
	
	
		
			62 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			62 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| 'use strict'
 | |
| 
 | |
| const Router = require('express').Router
 | |
| const passport = require('passport')
 | |
| const OpenIDStrategy = require('@passport-next/passport-openid').Strategy
 | |
| const config = require('../../../config')
 | |
| const models = require('../../../models')
 | |
| const logger = require('../../../logger')
 | |
| const { urlencodedParser } = require('../../utils')
 | |
| const { setReturnToFromReferer } = require('../utils')
 | |
| 
 | |
| let openIDAuth = module.exports = Router()
 | |
| 
 | |
| passport.use(new OpenIDStrategy({
 | |
|   returnURL: config.serverURL + '/auth/openid/callback',
 | |
|   realm: config.serverURL,
 | |
|   profile: true
 | |
| }, function (openid, profile, done) {
 | |
|   var stringifiedProfile = JSON.stringify(profile)
 | |
|   models.User.findOrCreate({
 | |
|     where: {
 | |
|       profileid: openid
 | |
|     },
 | |
|     defaults: {
 | |
|       profile: stringifiedProfile
 | |
|     }
 | |
|   }).spread(function (user, created) {
 | |
|     if (user) {
 | |
|       var needSave = false
 | |
|       if (user.profile !== stringifiedProfile) {
 | |
|         user.profile = stringifiedProfile
 | |
|         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)
 | |
|   })
 | |
| }))
 | |
| 
 | |
| openIDAuth.post('/auth/openid', urlencodedParser, function (req, res, next) {
 | |
|   setReturnToFromReferer(req)
 | |
|   passport.authenticate('openid')(req, res, next)
 | |
| })
 | |
| 
 | |
| // openID auth callback
 | |
| openIDAuth.get('/auth/openid/callback',
 | |
|   passport.authenticate('openid', {
 | |
|     successReturnToOrRedirect: config.serverURL + '/',
 | |
|     failureRedirect: config.serverURL + '/'
 | |
|   })
 | |
| )
 |