Updated to Express 4 (most other packages updated as well)

Gruntfile.js

@@ -330,7 +330,7 @@ module.exports = function (grunt) {
         html: ['<%= yeoman.views %>/*.html']
       }
     },
-    ngmin: {
+    ngAnnotate: {
       dist: {
         files: [{
           expand: true,
@@ -383,7 +383,7 @@ module.exports = function (grunt) {
     'concurrent:dist',
     'autoprefixer',
     'concat',
-    'ngmin',
+    'ngAnnotate',
     'copy:dist',
     'cdnify',
     'cssmin',

README.md

@@ -15,7 +15,12 @@ Try out the app: <http://angular-passport.herokuapp.com> (Heroku app may have go
 
 ## How to use angular-passport
 
-Before you continue, make sure you have MongoDB installed <http://www.mongodb.org/downloads/>. 
+Before you continue, make sure you have the following installed;
+
+* MongoDB <http://www.mongodb.org/downloads/>
+* Ruby <https://www.ruby-lang.org/en/downloads/>
+    * compass (gem install compass) <http://compass-style.org/install/>
+* grunt-cli (npm install -g grunt-cli) <http://gruntjs.com/getting-started>
 
 ### Setup
 Run `npm install`, followed by `bower install` to grab the dependencies.

app/scripts/app.js

@@ -8,7 +8,7 @@ angular.module('angularPassportApp', [
   'http-auth-interceptor',
   'ui.bootstrap'
 ])
-  .config(function ($routeProvider, $locationProvider) {
+  .config(['$routeProvider', '$locationProvider', function ($routeProvider, $locationProvider) {
     $routeProvider
       .when('/', {
         templateUrl: 'partials/main.html',
@@ -42,15 +42,26 @@ angular.module('angularPassportApp', [
         redirectTo: '/'
       });
     $locationProvider.html5Mode(true);
-  })
+  }])
 
-  .run(function ($rootScope, $location, Auth) {
+  .run(['$rootScope', '$location', 'Auth', function ($rootScope, $location, Auth) {
 
     //watching the value of the currentUser variable.
     $rootScope.$watch('currentUser', function(currentUser) {
       // if no currentUser and on a page that requires authorization then try to update it
       // will trigger 401s if user does not have a valid session
-      if (!currentUser && (['/', '/login', '/logout', '/signup'].indexOf($location.path()) == -1 )) {
+      var isValidPath = false, validPaths = [/^\/$/, /^\/blogs$/, /^\/blogs\/[0-9a-zA-Z]*$/, /^\/login$/, /^\/logout$/, /^\/signup$/];
+      var path = $location.path();
+      // because /blogs/create matches one of the regular expressions, leave isValidPath=false
+      if (path != '/blogs/create') {
+        for (var i = 0; i < validPaths.length; i++) {
+          if (path.search(validPaths[i]) >= 0) {
+            isValidPath = true;
+            break;
+          }
+        }
+      }
+      if (!currentUser && !isValidPath) {
         Auth.currentUser();
       }
     });
@@ -60,4 +71,4 @@ angular.module('angularPassportApp', [
       $location.path('/login');
       return false;
     });
-  });
+  }]);

app/scripts/controllers/blogs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .controller('BlogsCtrl', function ($scope, Blogs, $location, $routeParams, $rootScope) {
+  .controller('BlogsCtrl', ['$scope', 'Blogs', '$location', '$routeParams', '$rootScope', function ($scope, Blogs, $location, $routeParams, $rootScope) {
 
     $scope.create = function() {
       var blog = new Blogs({
@@ -46,4 +46,4 @@ angular.module('angularPassportApp')
         $scope.blog = blog;
       });
     };
-  });
+  }]);

app/scripts/controllers/login.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .controller('LoginCtrl', function ($scope, Auth, $location) {
+  .controller('LoginCtrl', ['$scope', 'Auth', '$location', function ($scope, Auth, $location) {
     $scope.error = {};
     $scope.user = {};
 
@@ -24,4 +24,4 @@ angular.module('angularPassportApp')
           }
       });
     };
-  });
+  }]);

app/scripts/controllers/main.js

@@ -1,5 +1,5 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .controller('MainCtrl', function ($scope) {
-  });
+  .controller('MainCtrl', ['$scope', function ($scope) {
+  }]);

app/scripts/controllers/navbar.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .controller('NavbarCtrl', function ($scope, Auth, $location) {
+  .controller('NavbarCtrl', ['$scope', 'Auth', '$location', function ($scope, Auth, $location) {
     $scope.menu = [{
       "title": "Blogs",
       "link": "blogs"
@@ -19,4 +19,4 @@ angular.module('angularPassportApp')
         }
       });
     };
-  });
+  }]);

app/scripts/controllers/signup.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .controller('SignupCtrl', function ($scope, Auth, $location) {
+  .controller('SignupCtrl', ['$scope', 'Auth', '$location', function ($scope, Auth, $location) {
     $scope.register = function(form) {
       Auth.createUser({
           email: $scope.user.email,
@@ -22,4 +22,4 @@ angular.module('angularPassportApp')
         }
       );
     };
-  });
+  }]);

app/scripts/directives/uniqueUsername.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .directive('uniqueUsername', function ($http) {
+  .directive('uniqueUsername', ['$http', function ($http) {
     return {
       restrict: 'A',
       require: 'ngModel',
@@ -25,5 +25,4 @@ angular.module('angularPassportApp')
         }, validate);
       }
     };
-  });
-
+  }]);

app/scripts/services/Auth.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .factory('Auth', function Auth($location, $rootScope, Session, User, $cookieStore) {
+  .factory('Auth', ['$location', '$rootScope', 'Session', 'User', '$cookieStore', function Auth($location, $rootScope, Session, User, $cookieStore) {
     $rootScope.currentUser = $cookieStore.get('user') || null;
     $cookieStore.remove('user');
 
@@ -78,4 +78,4 @@ angular.module('angularPassportApp')
         });
       }
     };
-  })
+  }]);

app/scripts/services/Blogs.js

@@ -1,12 +1,12 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .factory('Blogs', function ($resource) {
+  .factory('Blogs', ['$resource', function ($resource) {
     return $resource('api/blogs/:blogId', {
       blogId: '@_id'
     }, {
       update: {
         method: 'PUT'
       }
     });
-  });
+  }]);

app/scripts/services/Session.js

@@ -1,6 +1,6 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .factory('Session', function ($resource) {
+  .factory('Session', ['$resource', function ($resource) {
     return $resource('/auth/session/');
-  });
+  }]);

app/scripts/services/User.js

@@ -1,11 +1,11 @@
 'use strict';
 
 angular.module('angularPassportApp')
-  .factory('User', function ($resource) {
+  .factory('User', ['$resource', function ($resource) {
     return $resource('/auth/users/:id/', {},
       {
         'update': {
           method:'PUT'
         }
       });
-  });
+  }]);

app/views/index.html

@@ -15,7 +15,7 @@
         <!-- build:css(.tmp) styles/main.css -->
         <link rel="stylesheet" href="styles/main.css">
         <!-- endbuild -->
-</head>
+  </head>
   <body ng-app="angularPassportApp">
     <!--[if lt IE 7]>
       <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
@@ -31,41 +31,43 @@
     <div class="container" ng-view=""></div>
 
     <!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
-     <script>
-       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-       m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-       })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    <!--
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-       ga('create', 'UA-XXXXX-X');
-       ga('send', 'pageview');
+      ga('create', 'UA-XXXXX-X');
+      ga('send', 'pageview');
     </script>
+    -->
 
     <script src="bower_components/angular/angular.js"></script>
 
-        <!-- build:js(app) scripts/modules.js -->
-        <script src="bower_components/angular-resource/angular-resource.js"></script>
-        <script src="bower_components/angular-cookies/angular-cookies.js"></script>
-        <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
-        <script src="bower_components/angular-route/angular-route.js"></script>
-        <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-        <script src="bower_components/angular-http-auth/src/http-auth-interceptor.js"></script>
-        <!-- endbuild -->
+    <!-- build:js(app) scripts/modules.js -->
+    <script src="bower_components/angular-resource/angular-resource.js"></script>
+    <script src="bower_components/angular-cookies/angular-cookies.js"></script>
+    <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
+    <script src="bower_components/angular-route/angular-route.js"></script>
+    <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+    <script src="bower_components/angular-http-auth/src/http-auth-interceptor.js"></script>
+    <!-- endbuild -->
 
-        <!-- build:js({.tmp,app}) scripts/scripts.js -->
-        <script src="scripts/app.js"></script>
-        <script src="scripts/controllers/main.js"></script>
-        <script src="scripts/controllers/login.js"></script>
-        <script src="scripts/controllers/navbar.js"></script>
-        <script src="scripts/controllers/signup.js"></script>
-        <script src="scripts/controllers/blogs.js"></script>
-        <script src="scripts/directives/uniqueUsername.js"></script>
-        <script src="scripts/services/Auth.js"></script>
-        <script src="scripts/services/User.js"></script>
-        <script src="scripts/directives/onFocus.js"></script>
-        <script src="scripts/directives/mongooseError.js"></script>
-        <script src="scripts/services/Session.js"></script>
-        <script src="scripts/services/Blogs.js"></script>
-        <!-- endbuild -->
-</body>
+    <!-- build:js({.tmp,app}) scripts/scripts.js -->
+    <script src="scripts/app.js"></script>
+    <script src="scripts/controllers/main.js"></script>
+    <script src="scripts/controllers/login.js"></script>
+    <script src="scripts/controllers/navbar.js"></script>
+    <script src="scripts/controllers/signup.js"></script>
+    <script src="scripts/controllers/blogs.js"></script>
+    <script src="scripts/directives/uniqueUsername.js"></script>
+    <script src="scripts/services/Auth.js"></script>
+    <script src="scripts/services/User.js"></script>
+    <script src="scripts/directives/onFocus.js"></script>
+    <script src="scripts/directives/mongooseError.js"></script>
+    <script src="scripts/services/Session.js"></script>
+    <script src="scripts/services/Blogs.js"></script>
+    <!-- endbuild -->
+  </body>
 </html>

app/views/partials/navbar.html

@@ -20,7 +20,7 @@
             <li class="dropdown">
                 <a class="dropdown-toggle">Welcome, {{ currentUser.username }} <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                    <li><a ng-click="logout()"><span class="glyphicon-log-out"></span> Logout</a></li>
+                    <li><a ng-click="logout()"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
                 </ul>
             </li>
         </ul>

bower.json

@@ -2,20 +2,23 @@
   "name": "angular-passport",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "~1.2.1",
-    "json3": "~3.2.4",
-    "es5-shim": "~2.1.0",
-    "jquery": "~1.10.2",
-    "sass-bootstrap": "~3.0.0",
-    "angular-resource": "~1.2.0",
-    "angular-cookies": "~1.2.0",
-    "angular-sanitize": "~1.2.0",
-    "angular-route": "~1.2.0",
-    "angular-http-auth": "*",
-    "angular-bootstrap": "~0.7.0"
+    "angular": "~1.2.23",
+    "json3": "~3.3.2",
+    "es5-shim": "~4.0.3",
+    "jquery": "~1.11.1",
+    "sass-bootstrap": "*",
+    "angular-resource": "~1.2.23",
+    "angular-cookies": "~1.2.23",
+    "angular-sanitize": "~1.2.23",
+    "angular-route": "~1.2.23",
+    "angular-http-auth": "~1.2.1",
+    "angular-bootstrap": "~0.11.0"
   },
   "devDependencies": {
-    "angular-mocks": "~1.2.0",
-    "angular-scenario": "~1.2.0"
+    "angular-mocks": "~1.2.23",
+    "angular-scenario": "~1.2.23"
+  },
+  "resolutions": {
+    "angular": "~1.2.23"
   }
 }

karma.conf.js

@@ -11,7 +11,7 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'app/bower_components/jquery/jquery.js',
+      'app/bower_components/jquery/dist/jquery.js',
       'app/bower_components/angular/angular.js',
       'app/bower_components/angular-mocks/angular-mocks.js',
       'app/bower_components/angular-resource/angular-resource.js',
@@ -21,8 +21,7 @@ module.exports = function(config) {
       'app/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
       'app/bower_components/angular-http-auth/src/http-auth-interceptor.js',
       'app/scripts/*.js',
-      'app/scripts/**/*.js',
-      'test/mock/**/*.js',
+      'app/scripts/**/*.js', //'test/mock/**/*.js',
       'test/spec/**/*.js'
     ],
 

lib/config/auth.js

@@ -5,7 +5,7 @@
  */
 exports.ensureAuthenticated = function ensureAuthenticated(req, res, next) {
   if (req.isAuthenticated()) { return next(); }
-  res.send(401);
+  res.status(401).end();
 }
 
 /**
@@ -14,7 +14,7 @@ exports.ensureAuthenticated = function ensureAuthenticated(req, res, next) {
 exports.blog = {
   hasAuthorization: function(req, res, next) {
     if (req.blog.creator._id.toString() !== req.user._id.toString()) {
-      return res.send(403);
+      return res.status(403).end();
     }
     next();
   }

lib/config/config.js

@@ -1,5 +1,5 @@
 module.exports = {
-	port: process.env.PORT || 3000,
+    port: process.env.PORT || 3000,
     db: process.env.MONGOLAB_URI ||
     process.env.MONGOHQ_URL ||
     'mongodb://localhost/test'