diff --git a/.jshintrc b/.jshintrc index 40377ba..dd0dc18 100644 --- a/.jshintrc +++ b/.jshintrc @@ -7,7 +7,6 @@ "curly": true, "eqeqeq": true, "immed": true, - "indent": 2, "latedef": true, "newcap": true, "noarg": true, diff --git a/app/scripts/services/auth.js b/app/scripts/services/auth.js index e9f90c5..e1d3092 100644 --- a/app/scripts/services/auth.js +++ b/app/scripts/services/auth.js @@ -1,111 +1,108 @@ 'use strict'; angular.module('robotoPromotoApp') - .factory('Auth', function Auth($location, $rootScope, Session, User, $cookieStore) { - +.factory('Auth', function Auth($location, $rootScope, Session, User, $cookieStore) { + // Get currentUser from cookie $rootScope.currentUser = $cookieStore.get('user') || null; $cookieStore.remove('user'); return { - /** - * Authenticate user - * - * @param {Object} user - login info - * @param {Function} callback - optional - * @return {Promise} - */ - login: function(user, callback) { - var cb = callback || angular.noop; + /** + * Authenticate user + * + * @param {Object} user - login info + * @param {Function} callback - optional + * @return {Promise} + */ + login: function(user, callback) { + var cb = callback || angular.noop; - return Session.save({ - email: user.email, - password: user.password - }, function(user) { - $rootScope.currentUser = user; - return cb(); - }, function(err) { - return cb(err); - }).$promise; - }, + return Session.save({ + email: user.email, + password: user.password + }, function(user) { + $rootScope.currentUser = user; + return cb(); + }, function(err) { + return cb(err); + }).$promise; + }, - /** - * Unauthenticate user - * - * @param {Function} callback - optional - * @return {Promise} - */ - logout: function(callback) { - var cb = callback || angular.noop; + /** + * Unauthenticate user + * + * @param {Function} callback - optional + * @return {Promise} + */ + logout: function(callback) { + var cb = callback || angular.noop; - return Session.delete(function() { - $rootScope.currentUser = null; - return cb(); - }, - function(err) { - return cb(err); - }).$promise; - }, + return Session.delete(function() { + $rootScope.currentUser = null; + return cb(); + }, + function(err) { + return cb(err); + }).$promise; + }, - /** - * Create a new user - * - * @param {Object} user - user info - * @param {Function} callback - optional - * @return {Promise} - */ - createUser: function(user, callback) { - var cb = callback || angular.noop; + /** + * Create a new user + * + * @param {Object} user - user info + * @param {Function} callback - optional + * @return {Promise} + */ + createUser: function(user, callback) { + var cb = callback || angular.noop; + return User.save(user, function(user) { + $rootScope.currentUser = user; + return cb(user); + }, function(err) { + return cb(err); + }).$promise; + }, - return User.save(user, - function(user) { - $rootScope.currentUser = user; - return cb(user); - }, - function(err) { - return cb(err); - }).$promise; - }, + /** + * Change password + * + * @param {String} oldPassword + * @param {String} newPassword + * @param {Function} callback - optional + * @return {Promise} + */ + changePassword: function(oldPassword, newPassword, callback) { + var cb = callback || angular.noop; - /** - * Change password - * - * @param {String} oldPassword - * @param {String} newPassword - * @param {Function} callback - optional - * @return {Promise} - */ - changePassword: function(oldPassword, newPassword, callback) { - var cb = callback || angular.noop; + return User.update({ + oldPassword: oldPassword, + newPassword: newPassword + }, function(user) { + return cb(user); + }, function(err) { + return cb(err); + }).$promise; + }, - return User.update({ - oldPassword: oldPassword, - newPassword: newPassword - }, function(user) { - return cb(user); - }, function(err) { - return cb(err); - }).$promise; - }, + /** + * Gets all available info on authenticated user + * + * @return {Object} user + */ + currentUser: function() { + return User.get(); + }, - /** - * Gets all available info on authenticated user - * - * @return {Object} user - */ - currentUser: function() { - return User.get(); - }, - - /** - * Simple check to see if a user is logged in - * - * @return {Boolean} - */ - isLoggedIn: function() { - var user = $rootScope.currentUser; - return !!user; - }, + /** + * Simple check to see if a user is logged in + * + * @return {Boolean} + */ + isLoggedIn: function() { + var user = $rootScope.currentUser; + return !!user; + }, }; - }); \ No newline at end of file +}); diff --git a/app/scripts/services/session.js b/app/scripts/services/session.js index f53a3a0..e912525 100644 --- a/app/scripts/services/session.js +++ b/app/scripts/services/session.js @@ -1,6 +1,6 @@ 'use strict'; angular.module('robotoPromotoApp') - .factory('Session', function ($resource) { - return $resource('/api/session/'); - }); + .factory('Session', function ($resource) { + return $resource('/api/session/'); + }); diff --git a/app/scripts/services/user.js b/app/scripts/services/user.js index b202741..e27c6af 100644 --- a/app/scripts/services/user.js +++ b/app/scripts/services/user.js @@ -1,19 +1,19 @@ 'use strict'; angular.module('robotoPromotoApp') - .factory('User', function ($resource) { - return $resource('/api/users/:id', { - id: '@id' - }, { //parameters default - update: { - method: 'PUT', - params: {} - }, - get: { - method: 'GET', - params: { - id:'me' - } - } - }); - }); + .factory('User', function ($resource) { + return $resource('/api/users/:id', { + id: '@id' + }, { //parameters default + update: { + method: 'PUT', + params: {} + }, + get: { + method: 'GET', + params: { + id:'me' + } + } + }); + }); diff --git a/app/views/index.html b/app/views/index.html index 4838b5d..07e15ef 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -27,7 +27,6 @@
-