Fix linting warnings; promisify some back-end authentication operations

Author: joedotjs

generated/browser/js/fsa/fsa-pre-built.js

@@ -7,7 +7,7 @@
 
     var app = angular.module('fsaPreBuilt', []);
 
-    app.factory('Socket', function ($location) {
+    app.factory('Socket', function () {
         if (!window.io) throw new Error('socket.io not found!');
         return window.io(window.location.origin);
     });
@@ -34,7 +34,7 @@
         return {
             responseError: function (response) {
                 $rootScope.$broadcast(statusDict[response.status], response);
-                return $q.reject(response);
+                return $q.reject(response)
             }
         };
     });
@@ -50,6 +50,13 @@
 
     app.service('AuthService', function ($http, Session, $rootScope, AUTH_EVENTS, $q) {
 
+        function onSuccessfulLogin(response) {
+            var data = response.data;
+            Session.create(data.id, data.user);
+            $rootScope.$broadcast(AUTH_EVENTS.loginSuccess);
+            return data.user;
+        }
+
         // Uses the session factory to see if an
         // authenticated user is currently registered.
         this.isAuthenticated = function () {
@@ -78,7 +85,7 @@
         this.login = function (credentials) {
             return $http.post('/login', credentials)
                 .then(onSuccessfulLogin)
-                .catch(function (response) {
+                .catch(function () {
                     return $q.reject({ message: 'Invalid login credentials.' });
                 });
         };
@@ -90,13 +97,6 @@
             });
         };
 
-        function onSuccessfulLogin(response) {
-            var data = response.data;
-            Session.create(data.id, data.user);
-            $rootScope.$broadcast(AUTH_EVENTS.loginSuccess);
-            return data.user;
-        }
-
     });
 
     app.service('Session', function ($rootScope, AUTH_EVENTS) {

generated/server/app/configure/authentication/facebook.js

@@ -1,5 +1,4 @@
 'use strict';
-var path = require('path');
 var passport = require('passport');
 var FacebookStrategy = require('passport-facebook').Strategy;
 var mongoose = require('mongoose');
@@ -17,26 +16,25 @@ module.exports = function (app) {
 
     var verifyCallback = function (accessToken, refreshToken, profile, done) {
 
-        UserModel.findOne({ 'facebook.id': profile.id }, function (err, user) {
-
-            if (err) return done(err);
-
-            if (user) {
-                done(null, user);
-            } else {
-                UserModel.create({
-                    facebook: {
-                        id: profile.id
-                    }
-                }).then(function (user) {
-                    done(null, user);
-                }, function (err) {
-                    console.error('Error creating user from Facebook authentication', err);
-                    done(err);
-                });
-            }
-
-        });
+        UserModel.findOne({ 'facebook.id': profile.id }).exec()
+            .then(function (user) {
+
+                if (user) {
+                    return user;
+                } else {
+                    return UserModel.create({
+                        facebook: {
+                            id: profile.id
+                        }
+                    });
+                }
+
+            }).then(function (userToLogin) {
+                done(null, userToLogin);
+            }).catch(function (err) {
+                console.error('Error creating user from Facebook authentication', err);
+                done(err);
+            });
 
     };
 

generated/server/app/configure/authentication/google.js

@@ -17,26 +17,25 @@ module.exports = function (app) {
 
     var verifyCallback = function (accessToken, refreshToken, profile, done) {
 
-        UserModel.findOne({ 'google.id': profile.id }, function (err, user) {
-
-            if (err) return done(err);
-
-            if (user) {
-                done(null, user);
-            } else {
-                UserModel.create({
-                    google: {
-                        id: profile.id
-                    }
-                }).then(function (user) {
-                    done(null, user);
-                }, function (err) {
-                    console.error('Error creating user from Google authentication', err);
-                    done(err);
-                });
-            }
-
-        });
+        UserModel.findOne({ 'google.id': profile.id }).exec()
+            .then(function (user) {
+
+                if (user) {
+                    return user;
+                } else {
+                    return UserModel.create({
+                        google: {
+                            id: profile.id
+                        }
+                    });
+                }
+
+            }).then(function (userToLogin) {
+                done(null, userToLogin);
+            }).catch(function (err) {
+                console.error('Error creating user from Google authentication', err);
+                done(err);
+            });
 
     };
 

generated/server/app/configure/authentication/local.js

@@ -35,9 +35,9 @@ module.exports = function (app) {
             }
 
             // req.logIn will establish our session.
-            req.logIn(user, function (err) {
-                if (err) return next(err);
-                // We respond with a reponse object that has user with _id and email.
+            req.logIn(user, function (loginErr) {
+                if (loginErr) return next(loginErr);
+                // We respond with a response object that has user with _id and email.
                 res.status(200).send({ user: _.omit(user.toJSON(), ['password', 'salt']) });
             });
 

generated/server/app/configure/authentication/twitter.js

@@ -17,7 +17,6 @@ module.exports = function (app) {
     };
 
     var createNewUser = function (token, tokenSecret, profile) {
-
             return UserModel.create({
                 twitter: {
                     id: profile.id,
@@ -26,7 +25,6 @@ module.exports = function (app) {
                     tokenSecret: tokenSecret
                 }
             });
-
     };
 
     var updateUserCredentials = function (user, token, tokenSecret, profile) {
@@ -45,24 +43,19 @@ module.exports = function (app) {
 
     var verifyCallback = function (token, tokenSecret, profile, done) {
 
-        UserModel.findOne({ 'twitter.id': profile.id }, function (err, user) {
-
-            if (err) return done(err);
-
-            if (user) { // If a user with this twitter id already exists.
-                updateUserCredentials(user, token, tokenSecret, profile).then(function () {
-                    done(null, user);
-                });
-            } else { // If this twitter id has never been seen before and no user is attached.
-                createNewUser(token, tokenSecret, profile).then(function (createdUser) {
-                    done(null, createdUser);
-                }, function (err) {
-                    console.error('Error creating user from Twitter authentication', err);
-                    done(err);
-                });
-            }
-
-        });
+        UserModel.findOne({ 'twitter.id': profile.id }).exec()
+            .then(function (user) {
+                if (user) { // If a user with this twitter id already exists.
+                    return updateUserCredentials(user, token, tokenSecret, profile);
+                } else { // If this twitter id has never been seen before and no user is attached.
+                    return createNewUser(token, tokenSecret, profile);
+                }
+            }).then(function (user) {
+                done(null, user);
+            }).catch(function (err) {
+                console.error('Error creating user from Twitter authentication', err);
+                done(err);
+            });
 
     };
 

generated/server/app/index.js

@@ -35,6 +35,6 @@ app.get('/*', function (req, res) {
 
 // Error catching endware.
 app.use(function (err, req, res, next) {
-    console.error(err);
+    console.error(err, typeof next);
     res.status(err.status || 500).send(err.message || 'Internal server error.');
 });

generated/server/io/index.js

@@ -8,7 +8,7 @@ module.exports = function (server) {
 
     io = socketio(server);
 
-    io.on('connection', function (socket) {
+    io.on('connection', function () {
         // Now have access to socket, wowzers!
     });