Merge branch 'master' of https://github.com/DaftMonk/generator-angular-fullstack into canary

* 'master' of https://github.com/DaftMonk/generator-angular-fullstack:
  docs(gen:readme): update david-dm badge URLs
  docs(gen:readme): switch travis badge to codeship badge
  fix(navbar): fix controller constructor with ng-route + auth
  docs(changelog): remove extra `# 3.0.0`
  3.0.2
  docs(changelog): 3.0.1 & 3.0.2
  refactor(gen:endpoint): code style / slight refactor
  fix(api:user): remove `password` before sending user objects instead of `hashedPassword`

Conflicts:
	app/templates/server/api/user(auth)/user.controller.js

Author: Awk34

CHANGELOG.md

@@ -1,8 +1,22 @@
+<a name="3.0.2"></a>
+## [3.0.2](https://github.com/DaftMonk/generator-angular-fullstack/compare/3.0.1...3.0.2) (2015-12-05)
+
+
+### Bug Fixes
+
+* **api:user:** remove `password` before sending user objects instead of `hashedPassword` ([c08bd95](https://github.com/DaftMonk/generator-angular-fullstack/commit/c08bd95)), closes [#1459](https://github.com/DaftMonk/generator-angular-fullstack/issues/1459)
+* **client:auth:** remove decorator logic ([3229acd](https://github.com/DaftMonk/generator-angular-fullstack/commit/3229acd)), closes [#1455](https://github.com/DaftMonk/generator-angular-fullstack/issues/1455)
+
+<a name="3.0.1"></a>
+## [3.0.1](https://github.com/DaftMonk/generator-angular-fullstack/compare/3.0.0...3.0.1) (2015-12-04)
+
+
+This version just changes the recommended Node version to ^4.2.3, since it fixes some vulnerabilities. Also, the Travis-CI config has been changed to loosely test Node 5.1.1 instead of 5.0.0.
+
+
 <a name="3.0.0"></a>
 # [3.0.0](https://github.com/DaftMonk/generator-angular-fullstack/compare/2.1.1...3.0.0) (2015-12-06)
 
-# 3.0.0
-
 ### New Features
 
  * **Sequelize** - You can now choose between MongoDB + Mongoose or SQLite3 + Sequelize

app/templates/client/components/navbar/navbar.controller.js

@@ -10,7 +10,7 @@ class NavbarController {
   isCollapsed = true;
   //end-non-standard
 
-  constructor(<% if(!filters.uirouter) { %>$location<% } %><% if (filters.auth) { %>Auth<% } %>) {<% if(!filters.uirouter) { %>
+  constructor(<% if(!filters.uirouter) { %>$location<% } if(!filters.uirouter && filters.auth) { %>, <% } if (filters.auth) { %>Auth<% } %>) {<% if(!filters.uirouter) { %>
     this.$location = $location;<% } %>
     <% if (filters.auth) { %>this.isLoggedIn = Auth.isLoggedIn;
     this.isAdmin = Auth.isAdmin;

app/templates/server/api/user(auth)/user.controller.js

@@ -32,7 +32,7 @@ function respondWith(res, statusCode) {
  * restriction: 'admin'
  */
 export function index(req, res) {
-  <% if (filters.mongooseModels) { %>User.findAsync({}, '-salt -hashedPassword')<% }
+  <% if (filters.mongooseModels) { %>User.findAsync({}, '-salt -password')<% }
      if (filters.sequelizeModels) { %>User.findAll({
     attributes: [
       '_id',
@@ -139,7 +139,7 @@ export function changePassword(req, res, next) {
 export function me(req, res, next) {
   var userId = req.user._id;
 
-  <% if (filters.mongooseModels) { %>User.findOneAsync({ _id: userId }, '-salt -hashedPassword')<% }
+  <% if (filters.mongooseModels) { %>User.findOneAsync({ _id: userId }, '-salt -password')<% }
      if (filters.sequelizeModels) { %>User.find({
     where: {
       _id: userId

endpoint/generator.js

@@ -32,7 +32,7 @@ export default class Generator extends NamedBase {
 
   prompting() {
     var done = this.async();
-    var promptCb = function (props) {
+    var promptCb = (props) => {
       if(props.route.charAt(0) !== '/') {
         props.route = '/' + props.route;
       }
@@ -49,7 +49,7 @@ export default class Generator extends NamedBase {
         this.filters[props.models + 'Models'] = true;
       }
       done();
-    }.bind(this);
+    };
 
     if (this.options.route) {
       if (this.filters.mongoose && this.filters.sequelize) {
@@ -76,27 +76,19 @@ export default class Generator extends NamedBase {
       name = name + 's';
     }
 
-    var self = this;
-    var prompts = [
-      {
-        name: 'route',
-        message: 'What will the url of your endpoint be?',
-        default: base + name
-      },
-      {
-        type: 'list',
-        name: 'models',
-        message: 'What would you like to use for the endpoint\'s models?',
-        choices: [ 'Mongoose', 'Sequelize' ],
-        default: self.filters.sequelizeModels ? 1 : 0,
-        filter: function( val ) {
-          return val.toLowerCase();
-        },
-        when: function() {
-          return self.filters.mongoose && self.filters.sequelize;
-        }
-      }
-    ];
+    var prompts = [{
+      name: 'route',
+      message: 'What will the url of your endpoint be?',
+      default: base + name
+    }, {
+      type: 'list',
+      name: 'models',
+      message: 'What would you like to use for the endpoint\'s models?',
+      choices: [ 'Mongoose', 'Sequelize' ],
+      default: this.filters.sequelizeModels ? 1 : 0,
+      filter: (val) => val.toLowerCase(),
+      when: () => this.filters.mongoose && this.filters.sequelize
+    }];
 
     this.prompt(prompts, promptCb);
   }
@@ -141,8 +133,7 @@ export default class Generator extends NamedBase {
 
     if (this.filters.sequelize && this.config.get('insertModels')) {
       var modelsFile = this.config.get('registerModelsFile');
-      var reqPath = this.relativeRequire(this.routeDest + '/' + this.basename +
-        '.model', modelsFile);
+      var reqPath = this.relativeRequire(this.routeDest + '/' + this.basename + '.model', modelsFile);
       var modelConfig = {
         file: modelsFile,
         needle: this.config.get('modelsNeedle'),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-angular-fullstack",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node",
   "keywords": [
     "yeoman-generator",

readme.md

@@ -1,8 +1,8 @@
 # AngularJS Full-Stack generator
-[![Build Status](https://travis-ci.org/DaftMonk/generator-angular-fullstack.svg?branch=master)](http://travis-ci.org/DaftMonk/generator-angular-fullstack)
+![Build Status](https://codeship.com/projects/26128390-800a-0133-c5f7-6a23b0487a18/status?branch=master)
 [![npm version](https://badge.fury.io/js/generator-angular-fullstack.svg)](http://badge.fury.io/js/generator-angular-fullstack)
-[![Dependency Status](https://david-dm.org/daftmonk/generator-angular-fullstack.svg)](https://david-dm.org/daftmonk/generator-angular-fullstack)
-[![Dev-Dependency Status](https://david-dm.org/daftmonk/generator-angular-fullstack/dev-status.svg)](https://david-dm.org/daftmonk/generator-angular-fullstack#info=devDependencies)
+[![Dependency Status](https://david-dm.org/angular-fullstack/generator-angular-fullstack.svg)](https://david-dm.org/angular-fullstack/generator-angular-fullstack)
+[![Dev-Dependency Status](https://david-dm.org/angular-fullstack/generator-angular-fullstack/dev-status.svg)](https://david-dm.org/angular-fullstack/generator-angular-fullstack#info=devDependencies)
 [![Gitter chat](https://badges.gitter.im/DaftMonk/generator-angular-fullstack.svg)](https://gitter.im/DaftMonk/generator-angular-fullstack)
 > Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node - lets you quickly set up a project following best practices.