Merge branch 'release/0.7.0'

42Zavattas · Feb 7, 2015 · 2b38819 · 2b38819
2 parents c9667c1 + 16b7ce9
commit 2b38819
Show file tree

Hide file tree

Showing 42 changed files with 848 additions and 73 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ Bump versions of `package.json` and `bower.json` files using *Semantic Versionin
   - [filter](https://github.com/42Zavattas/generator-bangular#filter)
   - [font](https://github.com/42Zavattas/generator-bangular#font)
   - [route](https://github.com/42Zavattas/generator-bangular#route)
-  - [service](https://github.com/42Zavattas/generator-bangular#service)
+  - [service / factory](https://github.com/42Zavattas/generator-bangular#service)
   - [style](https://github.com/42Zavattas/generator-bangular#style)
  - Server
   - [api](https://github.com/42Zavattas/generator-bangular#api)
@@ -117,8 +117,9 @@ The **name** parameter is required. This will create in `client/views/`:
 ## Service
 
     yo bangular:service <name>
+    yo bangular:factory <name>
 
-The **name** parameter is required. The service and its spec file will be generated at `client/services/`.
+The **name** parameter is required. The service / factory and its spec file will be generated at `client/services/`.
 
 ## Style
 

diff --git a/app/index.js b/app/index.js
@@ -99,13 +99,22 @@ var BangularGenerator = yeoman.generators.Base.extend({
       }
 
       if (props.backend === 'mongo') {
-        self.prompt({
+        self.prompt([{
           type: 'confirm',
           name: 'sockets',
           message: 'Do you want to add socket support?',
           default: false
-        }, function (props) {
+        }, {
+          type: 'confirm',
+          name: 'auth',
+          message: 'Do you want to scaffold a passport authentication process?',
+          default: false
+        }], function (props) {
           self.filters.sockets = props.sockets;
+          self.filters.auth = props.auth;
+          if (props.auth) {
+            self.filters['ngCookies'] = true;
+          }
           done();
         });
       } else {

diff --git a/app/templates/#.jshintrc b/app/templates/#.jshintrc
@@ -17,7 +17,6 @@
   "undef": true,
   "unused": true,
   "strict": true,
-  "maxparams": 3,
   "maxdepth": 3,
   "maxlen": 80,
 
@@ -35,6 +34,8 @@
     "describe": true,
     "inject": true,
     "expect": true,
+    "afterEach": true,
+    "alert": true,
     "beforeEach": true
   }
 }
diff --git a/app/templates/client/app.js b/app/templates/client/app.js
@@ -8,13 +8,45 @@ angular.module('<%= appname %>', [
   'ngAnimate'<% } %><% if (filters.sockets) { %>,
   'btford.socket-io'<% } %>
 ])
-  .config(function ($routeProvider, $locationProvider) {
+  .config(function ($routeProvider, $locationProvider<% if (filters.auth) { %>, $httpProvider<% } %>) {
 
     $routeProvider
       .otherwise({
         redirectTo: '/'
       });
 
-    $locationProvider.html5Mode(true);
+    $locationProvider.html5Mode(true);<% if (filters.auth) { %>
+    $httpProvider.interceptors.push('authInterceptor');<% } %>
 
-  });
+  })<% if (filters.auth) { %>
+  .factory('authInterceptor',
+  function ($rootScope, $q, $cookieStore, $location) {
+    return {
+
+      request: function (config) {
+        config.headers = config.headers || {};
+        if ($cookieStore.get('token')) {
+          config.headers.Authorization = 'Bearer ' + $cookieStore.get('token');
+        }
+        return config;
+      },
+
+      responseError: function (response) {
+        if (response.status === 401) {
+          $location.path('/login');
+          $cookieStore.remove('token');
+          return $q.reject(response);
+        }
+        else {
+          return $q.reject(response);
+        }
+      }
+
+    };
+  })
+
+  .run(function ($rootScope, Auth) {
+
+    $rootScope.Auth = Auth;
+
+  })<% } %>;
diff --git a/app/templates/client/index.html b/app/templates/client/index.html
@@ -22,20 +22,40 @@
   </head>
   <body>
 
-    <strong><%= appname %></strong>
+    <strong><%= appname %></strong><% if (filters.auth) { %>
+
+    <nav>
+      <ul>
+        <li>
+          <a href="/">home</a>
+        </li>
+        <li ng-if="!Auth.isLogged()">
+          <a href="/signup">signup</a>
+        </li>
+        <li ng-if="!Auth.isLogged()">
+          <a href="/login">login</a>
+        </li>
+        <li ng-if="Auth.isLogged()">
+          <a href="" ng-click="Auth.logout()">logout</a>
+        </li>
+      </ul>
+    </nav>
+
+    <pre>logged in: {{ Auth.isLogged() }}</pre><% } %>
+
+    <div ng-view></div><% if (filters.sockets) { %>
 
-    <div ng-view></div>
-
-    <!-- build:js app.js --><% if (filters.sockets) { %>
     <script src="socket.io/socket.io.js"></script><% } %>
+
+    <!-- build:js app.js -->
       <!-- bower:js -->
       <!-- endinject -->
 
       <!-- inject:js -->
       <!-- endinject -->
     <!-- endbuild -->
 
-  <script src="http://localhost:35729/livereload.js?snipver=1"></script>
+    <script src="http://localhost:35729/livereload.js?snipver=1"></script>
 
   </body>
 </html>
diff --git a/app/templates/client/karma.conf.js b/app/templates/client/karma.conf.js
@@ -37,7 +37,11 @@ module.exports = function (config) {
       'directives/**/*.js',
       'directives/**/*.html',
       'filters/**/*.js'
-    ],
+    ],<% if (filters.sockets) { %>
+
+    exclude: [
+      'services/socket/socket.service.js',
+    ],<% } %>
 
     reporters: ['progress'],
 

diff --git a/app/templates/client/services/auth(auth)/auth.js b/app/templates/client/services/auth(auth)/auth.js
@@ -0,0 +1,84 @@
+'use strict';
+
+angular.module('<%= appname %>')
+  .service('Auth', function ($rootScope, $cookieStore, $q, $http) {
+
+    var _user = {};
+
+    if($cookieStore.get('token')) {
+      $http.get('/api/users/me')
+        .then(function (res) {
+          _user = res.data;
+        })
+        .catch(function (err) {
+          console.log(err);
+        });
+    }
+
+    /**
+     * Signup
+     *
+     * @param user
+     * @returns {promise}
+     */
+    this.signup = function (user) {
+      var deferred = $q.defer();
+      $http.post('/api/users', user)
+        .then(function (res) {
+          _user = res.data.user;
+          $cookieStore.put('token', res.data.token);
+          deferred.resolve();
+        })
+        .catch(function (err) {
+          deferred.reject(err.data);
+        });
+      return deferred.promise;
+    };
+
+    /**
+     * Login
+     *
+     * @param user
+     * @returns {promise}
+     */
+    this.login = function (user) {
+      var deferred = $q.defer();
+      $http.post('/auth/local', user)
+        .then(function (res) {
+          _user = res.data.user;
+          $cookieStore.put('token', res.data.token);
+          deferred.resolve();
+        })
+        .catch(function (err) {
+          deferred.reject(err.data);
+        });
+      return deferred.promise;
+    };
+
+    /**
+     * Logout
+     */
+    this.logout = function () {
+      $cookieStore.remove('token');
+      _user = {};
+    };
+
+    /**
+     * Check if user is logged
+     *
+     * @returns {boolean}
+     */
+    this.isLogged = function () {
+      return _user.hasOwnProperty('email');
+    };
+
+    /**
+     * Returns the user
+     *
+     * @returns {object}
+     */
+    this.getUser = function () {
+      return _user;
+    };
+
+  });
diff --git a/app/templates/client/services/auth(auth)/auth.spec.js b/app/templates/client/services/auth(auth)/auth.spec.js
@@ -0,0 +1,34 @@
+'use strict';
+
+describe('Service: Auth', function () {
+
+  beforeEach(module('<%= appname %>'));
+
+  var Auth,
+    $httpBackend,
+    $cookieStore;
+
+  beforeEach(inject(function (_Auth_, _$httpBackend_, _$cookieStore_) {
+    Auth = _Auth_;
+    $httpBackend = _$httpBackend_;
+    $cookieStore = _$cookieStore_;
+    $cookieStore.remove('token');
+  }));
+
+  afterEach(function() {
+    $httpBackend.verifyNoOutstandingExpectation();
+    $httpBackend.verifyNoOutstandingRequest();
+  });
+
+  it('should log user', function () {
+    expect(Auth.isLogged()).toBe(false);
+    Auth.login({ email: 'test@test.com', password: 'test' });
+    $httpBackend.expectPOST('/auth/local')
+      .respond({ token: 'abcde', user: { email: 'test@test.com' } });
+    $httpBackend.flush();
+    expect($cookieStore.get('token')).toBe('abcde');
+    expect(Auth.getUser().email).toBe('test@test.com');
+    expect(Auth.isLogged()).toBe(true);
+  });
+
+});
diff --git a/app/templates/client/services/socket(sockets)/socket.mock.js b/app/templates/client/services/socket(sockets)/socket.mock.js
@@ -0,0 +1,17 @@
+'use strict';
+
+angular.module('<%= appname %>')
+  .factory('Socket', function (socketFactory) {
+
+    return {
+      socket: {
+        connect: angular.noop,
+        on: angular.noop,
+        emit: angular.noop,
+        receive: angular.noop
+      },
+      syncModel: angular.noop,
+      unsyncModel: angular.noop
+    };
+
+  });
diff --git a/app/templates/client/views/home/home.spec.js b/app/templates/client/views/home/home.spec.js
@@ -1,6 +1,6 @@
 'use strict';
 
-describe('HomeCtrl', function () {
+describe('Controller: HomeCtrl', function () {
 
   beforeEach(module('<%= appname %>'));
 

diff --git a/app/templates/client/views/login(auth)/login.controller.js b/app/templates/client/views/login(auth)/login.controller.js
@@ -0,0 +1,32 @@
+'use strict';
+
+angular.module('<%= appname %>')
+  .controller('LoginCtrl', function (Auth, $location) {
+
+    var vm = this;
+
+    angular.extend(vm, {
+
+      name: 'LoginCtrl',
+
+      /**
+       * User credentials
+       */
+      user: { email: 'test@test.com', password: 'test' },
+
+      /**
+       * Login method
+       */
+      login: function () {
+        Auth.login(vm.user)
+          .then(function () {
+            $location.path('/');
+          })
+          .catch(function (err) {
+            vm.error = err;
+          });
+      }
+
+    });
+
+  });
diff --git a/app/templates/client/views/login(auth)/login.html b/app/templates/client/views/login(auth)/login.html
@@ -0,0 +1,17 @@
+<div>
+  {{ vm.name }}
+</div>
+
+<form ng-submit="vm.login()">
+	<input type="email"
+				 ng-model="vm.user.email"
+				 placeholder="email">
+	<input type="password"
+				 ng-model="vm.user.password"
+				 placeholder="password">
+	<button type="submit">
+		login
+	</button>
+</form>
+
+<pre ng-if="vm.error">{{ vm.error | json }}</pre>
diff --git a/app/templates/client/views/login(auth)/login.js b/app/templates/client/views/login(auth)/login.js
@@ -0,0 +1,11 @@
+'use strict';
+
+angular.module('<%= appname %>')
+  .config(function ($routeProvider) {
+    $routeProvider
+      .when('/login', {
+        templateUrl: 'views/login/login.html',
+        controller: 'LoginCtrl',
+        controllerAs: 'vm'
+      });
+  });