Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/templates/server/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@
"undef": true,
"smarttabs": true,
"asi": true,
"debug": true
}
"debug": true,
"globals": {
"rootRequire": false
}
}
4 changes: 2 additions & 2 deletions app/templates/server/api/user(auth)/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

var express = require('express');
var controller = require('./user.controller');
var config = require('../../config/environment');
var auth = require('../../auth/auth.service');
var config = rootRequire('config/environment');
var auth = rootRequire('auth/auth.service');

var router = express.Router();

Expand Down
2 changes: 1 addition & 1 deletion app/templates/server/api/user(auth)/user.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var User = require('./user.model');
var passport = require('passport');
var config = require('../../config/environment');
var config = rootRequire('config/environment');
var jwt = require('jsonwebtoken');

var validationError = function(res, err) {
Expand Down
10 changes: 9 additions & 1 deletion app/templates/server/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

'use strict';

var path = require('path');

// a better require statement starting from `server/`
global.rootRequire = function (name) {
return require(path.normalize(__dirname + '/' + name));
};


// Set default node environment to development
process.env.NODE_ENV = process.env.NODE_ENV || 'development';

Expand Down Expand Up @@ -31,4 +39,4 @@ server.listen(config.port, config.ip, function () {
});

// Expose app
exports = module.exports = app;
exports = module.exports = app;
6 changes: 3 additions & 3 deletions app/templates/server/auth(auth)/auth.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

var mongoose = require('mongoose');
var passport = require('passport');
var config = require('../config/environment');
var config = rootRequire('config/environment');
var jwt = require('jsonwebtoken');
var expressJwt = require('express-jwt');
var compose = require('composable-middleware');
var User = require('../api/user/user.model');
var User = rootRequire('api/user/user.model');
var validateJwt = expressJwt({ secret: config.secrets.session });

/**
Expand Down Expand Up @@ -73,4 +73,4 @@ function setTokenCookie(req, res) {
exports.isAuthenticated = isAuthenticated;
exports.hasRole = hasRole;
exports.signToken = signToken;
exports.setTokenCookie = setTokenCookie;
exports.setTokenCookie = setTokenCookie;
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var express = require('express');
var passport = require('passport');
var auth = require('../auth.service');
var auth = rootRequire('auth/auth.service');

var router = express.Router();

Expand All @@ -18,4 +18,4 @@ router
session: false
}), auth.setTokenCookie);

module.exports = router;
module.exports = router;
4 changes: 2 additions & 2 deletions app/templates/server/auth(auth)/google(googleAuth)/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var express = require('express');
var passport = require('passport');
var auth = require('../auth.service');
var auth = rootRequire('auth/auth.service');

var router = express.Router();

Expand All @@ -21,4 +21,4 @@ router
session: false
}), auth.setTokenCookie);

module.exports = router;
module.exports = router;
6 changes: 3 additions & 3 deletions app/templates/server/auth(auth)/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

var express = require('express');
var passport = require('passport');
var config = require('../config/environment');
var User = require('../api/user/user.model');
var config = rootRequire('config/environment');
var User = rootRequire('api/user/user.model');

// Passport Configuration
require('./local/passport').setup(User, config);<% if (filters.facebookAuth) { %>
Expand All @@ -18,4 +18,4 @@ router.use('/facebook', require('./facebook'));<% } %><% if (filters.twitterAuth
router.use('/twitter', require('./twitter'));<% } %><% if (filters.googleAuth) { %>
router.use('/google', require('./google'));<% } %>

module.exports = router;
module.exports = router;
4 changes: 2 additions & 2 deletions app/templates/server/auth(auth)/local/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var express = require('express');
var passport = require('passport');
var auth = require('../auth.service');
var auth = rootRequire('auth/auth.service');

var router = express.Router();

Expand All @@ -17,4 +17,4 @@ router.post('/', function(req, res, next) {
})(req, res, next)
});

module.exports = router;
module.exports = router;
4 changes: 2 additions & 2 deletions app/templates/server/auth(auth)/twitter(twitterAuth)/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var express = require('express');
var passport = require('passport');
var auth = require('../auth.service');
var auth = rootRequire('auth/auth.service');

var router = express.Router();

Expand All @@ -17,4 +17,4 @@ router
session: false
}), auth.setTokenCookie);

module.exports = router;
module.exports = router;
6 changes: 3 additions & 3 deletions app/templates/server/config/seed(mongoose).js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

'use strict';

var Thing = require('../api/thing/thing.model');
<% if (filters.auth) { %>var User = require('../api/user/user.model');<% } %>
var Thing = rootRequire('api/thing/thing.model');
<% if (filters.auth) { %>var User = rootRequire('api/user/user.model');<% } %>

Thing.find({}).remove(function() {
Thing.create({
Expand Down Expand Up @@ -46,4 +46,4 @@ User.find({}).remove(function() {
console.log('finished populating users');
}
);
});<% } %>
});<% } %>
4 changes: 2 additions & 2 deletions app/templates/server/config/socketio(socketio).js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function onConnect(socket) {
});

// Insert sockets below
require('../api/thing/thing.socket').register(socket);
rootRequire('api/thing/thing.socket').register(socket);
}

module.exports = function (socketio) {
Expand Down Expand Up @@ -54,4 +54,4 @@ module.exports = function (socketio) {
onConnect(socket);
console.info('[%s] CONNECTED', socket.address);
});
};
};