ki9
/
tracman-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better errors

master
Keith Irwin 2016-04-27 21:14:32 +00:00
parent 1764718c5a
commit 6fd2c20f85
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/auth.js
View File

@ -11,7 +11,7 @@ passport.use(new GoogleStrategy({
passReqToCallback: true
}, function(req, accessToken, refreshToken, profile, done) {
User.findOne({googleID: profile.id}, function(err, user){
if(err) { console.log(err); }
if(err) { console.log('Error finding user with google ID: '+profile.id+'\n'+err); }
if (!err && user !== null) { // Log in
if (!user.name) {
user.name = profile.displayName;
@ -24,12 +24,17 @@ passport.use(new GoogleStrategy({
} else { // No existing user with google auth
if (req.session.passport) { // Creating new user
User.findById(req.session.passport.user, function(err, user){
if (err){ console.log(err); }
if (err){
console.log('Error finding invited user with passport session ID: '+req.session.passport.user+'\n'+err);
var failMessage = 'Something went wrong finding your session. Would you like to <a href="/bug">report this error</a>?'; }
user.googleID = profile.id;
user.lastLogin = Date.now();
user.save(function(err){
if (err) { console.log(err); }
done(null, user, {success: 'Your account has been created. Next maybe you should download the <a href="/android">android app</a>. '});
if (err) {
console.log('Error saving new (invited) user '+err);
var failMessage = 'Something went wrong finding your session. Would you like to <a href="/bug">report this error</a>?';
} else { successMessage = 'Your account has been created. Next maybe you should download the <a href="/android">android app</a>. '
done(null, user, { success:successMessage, failure:failMessage });
});
});
} else { // User wasn't invited
@ -43,11 +48,13 @@ passport.use(new GoogleTokenStrategy({
clientID: secret.googleClientId
}, function(parsedToken, googleId, done) {
User.findOne({googleID:googleId}, function(err, user) {
if (err) { console.log(err); }
if (err) {
console.log('Error finding user for gToken login with google profile ID: '+googleId+'\n'+err); }
if (!err && user !== null) { // Log in
user.lastLogin = Date.now();
user.save(function (err) {
if (err) { console.log(err); }
if (err) {
console.log('Error saving user\'s lastLogin for gToken login with google profile ID: '+googleId+'\n'+err); }
});
return done(err, user);
} else { // No such user

2
config/mail.js
View File

@ -10,7 +10,7 @@ var mailgun = require('mailgun-js')({
var renderMail = function(template, params, next) {
new emailTemplate(path.join(templateDir, template))
.render(params, function (err, msg) {
if (err) { console.log(err); }
if (err) { console.log('Error rendering mail. Params: \n'+params+'\n'+err); }
next(msg);
});
}

2
config/middleware.js
View File

@ -1,7 +1,7 @@
module.exports = {
throwErr: function(req,err){
console.log(err);
console.log('Middleware error:'+err+'\nfor request:\n'+req);
req.flash('error-message',err);
req.flash('error', (err.message||'')+'<br>Would you like to <a href="/bug">report this error</a>?');
},