refactor(app): large app refactor, mostly es6-ification, some minor code style tweaks

Author: Awk34

Diff for: app/templates/client/app/admin(auth)/admin.controller.js

@@ -3,7 +3,6 @@
 (function() {
 
 class AdminController {
-
   constructor(User) {
     // Use the User $resource to fetch all users
     this.users = User.query();

Diff for: app/templates/client/components/auth(auth)/auth.service.js

@@ -20,31 +20,31 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
      * @param  {Function} callback - optional, function(error, user)
      * @return {Promise}
      */
-    login: function(user, callback) {
+    login(user, callback) {
       return $http.post('/auth/local', {
         email: user.email,
         password: user.password
       })
-      .then(function(res) {
-        $cookies.put('token', res.data.token);
-        currentUser = User.get();
-        return currentUser.$promise;
-      })
-      .then(function(user) {
-        safeCb(callback)(null, user);
-        return user;
-      })
-      .catch(function(err) {
-        Auth.logout();
-        safeCb(callback)(err.data);
-        return $q.reject(err.data);
-      });
+        .then(res => {
+          $cookies.put('token', res.data.token);
+          currentUser = User.get();
+          return currentUser.$promise;
+        })
+        .then(user => {
+          safeCb(callback)(null, user);
+          return user;
+        })
+        .catch(err => {
+          Auth.logout();
+          safeCb(callback)(err.data);
+          return $q.reject(err.data);
+        });
     },
 
     /**
      * Delete access token and user info
      */
-    logout: function() {
+    logout() {
       $cookies.remove('token');
       currentUser = {};
     },
@@ -56,7 +56,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
      * @param  {Function} callback - optional, function(error, user)
      * @return {Promise}
      */
-    createUser: function(user, callback) {
+    createUser(user, callback) {
       return User.save(user,
         function(data) {
           $cookies.put('token', data.token);
@@ -77,7 +77,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
      * @param  {Function} callback    - optional, function(error, user)
      * @return {Promise}
      */
-    changePassword: function(oldPassword, newPassword, callback) {
+    changePassword(oldPassword, newPassword, callback) {
       return User.changePassword({ id: currentUser._id }, {
         oldPassword: oldPassword,
         newPassword: newPassword
@@ -95,18 +95,18 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
      * @param  {Function|*} callback - optional, funciton(user)
      * @return {Object|Promise}
      */
-    getCurrentUser: function(callback) {
+    getCurrentUser(callback) {
       if (arguments.length === 0) {
         return currentUser;
       }
 
       var value = (currentUser.hasOwnProperty('$promise')) ?
         currentUser.$promise : currentUser;
       return $q.when(value)
-        .then(function(user) {
+        .then(user => {
           safeCb(callback)(user);
           return user;
-        }, function() {
+        }, () => {
           safeCb(callback)({});
           return {};
         });
@@ -119,13 +119,13 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
      * @param  {Function|*} callback - optional, function(is)
      * @return {Bool|Promise}
      */
-    isLoggedIn: function(callback) {
+    isLoggedIn(callback) {
       if (arguments.length === 0) {
         return currentUser.hasOwnProperty('role');
       }
 
       return Auth.getCurrentUser(null)
-        .then(function(user) {
+        .then(user => {
           var is = user.hasOwnProperty('role');
           safeCb(callback)(is);
           return is;
@@ -140,7 +140,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
       * @param  {Function|*} callback - optional, function(has)
       * @return {Bool|Promise}
       */
-    hasRole: function(role, callback) {
+    hasRole(role, callback) {
       var hasRole = function(r, h) {
         return userRoles.indexOf(r) >= userRoles.indexOf(h);
       };
@@ -150,7 +150,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
       }
 
       return Auth.getCurrentUser(null)
-        .then(function(user) {
+        .then(user => {
           var has = (user.hasOwnProperty('role')) ?
             hasRole(user.role, role) : false;
           safeCb(callback)(has);
@@ -165,7 +165,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
       * @param  {Function|*} callback - optional, function(is)
       * @return {Bool|Promise}
       */
-    isAdmin: function() {
+    isAdmin() {
       return Auth.hasRole
         .apply(Auth, [].concat.apply(['admin'], arguments));
     },
@@ -175,7 +175,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
      *
      * @return {String} - a token string used for authenticating
      */
-    getToken: function() {
+    getToken() {
       return $cookies.get('token');
     }
   };

Diff for: app/templates/client/components/auth(auth)/interceptor.service.js

@@ -6,7 +6,7 @@ function authInterceptor($rootScope, $q, $cookies<% if (filters.ngroute) { %>, $
   <% if (filters.uirouter) { %>var state;
   <% } %>return {
     // Add authorization token to headers
-    request: function(config) {
+    request(config) {
       config.headers = config.headers || {};
       if ($cookies.get('token') && Util.isSameOrigin(config.url)) {
         config.headers.Authorization = 'Bearer ' + $cookies.get('token');
@@ -15,7 +15,7 @@ function authInterceptor($rootScope, $q, $cookies<% if (filters.ngroute) { %>, $
     },
 
     // Intercept 401s and redirect you to login
-    responseError: function(response) {
+    responseError(response) {
       if (response.status === 401) {
         <% if (filters.ngroute) { %>$location.path('/login');<% } if (filters.uirouter) { %>(state || (state = $injector.get('$state'))).go('login');<% } %>
         // remove any stale tokens

Diff for: app/templates/client/components/auth(auth)/user.service.js

@@ -5,8 +5,7 @@
 function UserResource($resource) {
   return $resource('/api/users/:id/:controller', {
     id: '@_id'
-  },
-  {
+  }, {
     changePassword: {
       method: 'PUT',
       params: {

Diff for: app/templates/client/components/footer/footer.directive.js

@@ -5,7 +5,7 @@ angular.module('<%= scriptAppName %>')
     return {
       templateUrl: 'components/footer/footer.html',
       restrict: 'E',
-      link: function (scope, element) {
+      link: function(scope, element) {
         element.addClass('footer');
       }
     };

Diff for: app/templates/client/components/modal(uibootstrap)/modal.service.js

@@ -8,10 +8,8 @@ angular.module('<%= scriptAppName %>')
      * @param  {String} modalClass - (optional) class(es) to be applied to the modal
      * @return {Object}            - the instance $modal.open() returns
      */
-    function openModal(scope, modalClass) {
+    function openModal(scope = {}, modalClass = 'modal-default') {
       var modalScope = $rootScope.$new();
-      scope = scope || {};
-      modalClass = modalClass || 'modal-default';
 
       angular.extend(modalScope, scope);
 
@@ -33,9 +31,7 @@ angular.module('<%= scriptAppName %>')
          * @param  {Function} del - callback, ran when delete is confirmed
          * @return {Function}     - the function to open the modal (ex. myModalFn)
          */
-        delete: function(del) {
-          del = del || angular.noop;
-
+        delete(del = angular.noop) {
           /**
            * Open a delete confirmation modal
            * @param  {String} name   - name or info to show on modal

Diff for: app/templates/client/components/mongoose-error(auth)/mongoose-error.directive.js

@@ -4,14 +4,12 @@
  * Removes server error when user updates input
  */
 angular.module('<%= scriptAppName %>')
-  .directive('mongooseError', function () {
+  .directive('mongooseError', function() {
     return {
       restrict: 'A',
       require: 'ngModel',
       link: function(scope, element, attrs, ngModel) {
-        element.on('keydown', function() {
-          return ngModel.$setValidity('mongoose', true);
-        });
+        element.on('keydown', () => ngModel.$setValidity('mongoose', true));
       }
     };
   });

Diff for: app/templates/client/components/socket(socketio)/socket.service.js

@@ -3,20 +3,17 @@
 
 angular.module('<%= scriptAppName %>')
   .factory('socket', function(socketFactory) {
-
     // socket.io now auto-configures its connection when we ommit a connection url
     var ioSocket = io('', {
       // Send auth token on connection, you will need to DI the Auth service above
       // 'query': 'token=' + Auth.getToken()
       path: '/socket.io-client'
     });
 
-    var socket = socketFactory({
-      ioSocket: ioSocket
-    });
+    var socket = socketFactory({ ioSocket });
 
     return {
-      socket: socket,
+      socket,
 
       /**
        * Register listeners to sync an array with updates on a model
@@ -28,7 +25,7 @@ angular.module('<%= scriptAppName %>')
        * @param {Array} array
        * @param {Function} cb
        */
-      syncUpdates: function (modelName, array, cb) {
+      syncUpdates(modelName, array, cb) {
         cb = cb || angular.noop;
 
         /**
@@ -66,7 +63,7 @@ angular.module('<%= scriptAppName %>')
        *
        * @param modelName
        */
-      unsyncUpdates: function (modelName) {
+      unsyncUpdates(modelName) {
         socket.removeAllListeners(modelName + ':save');
         socket.removeAllListeners(modelName + ':remove');
       }

Diff for: app/templates/client/components/util/util.service.js

@@ -6,16 +6,14 @@
  * The Util service is for thin, globally reusable, utility functions
  */
 function UtilService($window) {
-
   var Util = {
-
     /**
      * Return a callback or noop function
      *
      * @param  {Function|*} cb - a 'potential' function
      * @return {Function}
      */
-    safeCb: function(cb) {
+    safeCb(cb) {
       return (angular.isFunction(cb)) ? cb : angular.noop;
     },
 
@@ -25,7 +23,7 @@ function UtilService($window) {
      * @param  {String} url - the url to parse
      * @return {Object}     - the parsed url, anchor element
      */
-    urlParse: function(url) {
+    urlParse(url) {
       var a = document.createElement('a');
       a.href = url;
       return a;
@@ -38,7 +36,7 @@ function UtilService($window) {
      * @param  {String|String[]}  [origins] - additional origins to test against
      * @return {Boolean}                    - true if url is same origin
      */
-    isSameOrigin: function(url, origins) {
+    isSameOrigin(url, origins) {
       url = Util.urlParse(url);
       origins = (origins && [].concat(origins)) || [];
       origins = origins.map(Util.urlParse);
@@ -50,7 +48,6 @@ function UtilService($window) {
       });
       return (origins.length >= 1);
     }
-
   };
 
   return Util;

Diff for: app/templates/server/api/user(auth)/index.js

@@ -1,10 +1,10 @@
 'use strict';
 
-import express from 'express';
-import controller from './user.controller';
-import auth from '../../auth/auth.service';
+import {Router} from 'express';
+import * as controller from './user.controller';
+import * as auth from '../../auth/auth.service';
 
-var router = express.Router();
+var router = new Router();
 
 router.get('/', auth.hasRole('admin'), controller.index);
 router.delete('/:id', auth.hasRole('admin'), controller.destroy);
@@ -13,4 +13,4 @@ router.put('/:id/password', auth.isAuthenticated(), controller.changePassword);
 router.get('/:id', auth.isAuthenticated(), controller.show);
 router.post('/', controller.create);
 
-module.exports = router;
+export default router;

Diff for: app/templates/server/api/user(auth)/index.spec.js

@@ -12,10 +12,10 @@ var userCtrlStub = {
 };
 
 var authServiceStub = {
-  isAuthenticated: function() {
+  isAuthenticated() {
     return 'authService.isAuthenticated';
   },
-  hasRole: function(role) {
+  hasRole(role) {
     return 'authService.hasRole.' + role;
   }
 };
@@ -30,7 +30,7 @@ var routerStub = {
 // require the index with our stubbed out modules
 var userIndex = proxyquire('./index', {
   'express': {
-    Router: function() {
+    Router() {
       return routerStub;
     }
   },