fix(server): fix setting TTL index on collection : sessions error

Author: DaftMonk

Diff for: app/templates/Gruntfile.js

@@ -675,7 +675,7 @@ module.exports = function (grunt) {
     setTimeout(function () {
       grunt.log.writeln('Done waiting!');
       done();
-    }, 500);
+    }, 1500);
   });
 
   grunt.registerTask('express-keepalive', 'Keep grunt running', function() {
@@ -684,7 +684,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('serve', function (target) {
     if (target === 'dist') {
-      return grunt.task.run(['build', 'env:all', 'env:prod', 'express:prod', 'open', 'express-keepalive']);
+      return grunt.task.run(['build', 'env:all', 'env:prod', 'express:prod', 'wait', 'open', 'express-keepalive']);
     }
 
     if (target === 'debug') {

Diff for: app/templates/server/app.js

@@ -24,11 +24,17 @@ var socketio = require('socket.io').listen(server);
 require('./config/socketio')(socketio);<% } %>
 require('./config/express')(app);
 require('./routes')(app);
-
+<% if (filters.twitterAuth) { %>
+mongoose.connection.on('connected', function () {
+	// Start server
+	server.listen(config.port, config.ip, function() {
+	    console.log('Express server listening on %d, in %s mode', config.port, app.get('env'));
+	});
+});<% } else { %>
 // Start server
 server.listen(config.port, config.ip, function () {
   console.log('Express server listening on %d, in %s mode', config.port, app.get('env'));
-});
+});<% } %>
 
 // Expose app
 exports = module.exports = app;

Diff for: app/templates/server/config/express.js

@@ -16,7 +16,8 @@ var path = require('path');
 var config = require('./environment');<% if (filters.auth) { %>
 var passport = require('passport');<% } %><% if (filters.twitterAuth) { %>
 var session = require('express-session');
-var mongoStore = require('connect-mongo')(session);<% } %>
+var mongoStore = require('connect-mongo')(session);
+var mongoose = require('mongoose');<% } %>
 
 module.exports = function(app) {
   var env = app.get('env');
@@ -32,19 +33,16 @@ module.exports = function(app) {
   app.use(cookieParser());
   <% if (filters.auth) { %>app.use(passport.initialize());<% } %><% if (filters.twitterAuth) { %>
 
-  // Persist sessions with mongoStore
-  // We need to enable sessions for passport twitter because its an oauth 1.0 strategy
-  app.use(session({
-    secret: config.secrets.session,
-    resave: true,
-    saveUninitialized: true,
-    store: new mongoStore({
-      url: config.mongo.uri,
-      collection: 'sessions'
-    }, function () {
-      console.log('db connection open' );
-    })
-  }));<% } %>
+  mongoose.connection.on('connected', function () {
+    // Persist sessions with mongoStore
+    // We need to enable sessions for passport twitter because its an oauth 1.0 strategy
+    app.use(session({
+      secret: config.secrets.session,
+      resave: true,
+      saveUninitialized: true,
+      store: new mongoStore({ mongoose_connection: mongoose.connection })
+    }));
+  });<% } %>
 
   if ('production' === env) {
     app.use(favicon(path.join(config.root, 'public', 'favicon.ico')));

Diff for: test/fixtures/package.json

@@ -20,6 +20,7 @@
     "passport-local": "~0.1.6",
     "passport-facebook": "latest",
     "passport-twitter": "latest",
+    "passport-google-oauth": "latest",
     "composable-middleware": "^0.3.0",
     "connect-mongo": "^0.4.1",
     "socket.io": "~0.9.16",

Diff for: test/test-file-creation.js

@@ -157,7 +157,7 @@ describe('angular-fullstack generator', function () {
 //      });
     });
 
-    describe('with other preprocessors', function() {
+    describe('with other preprocessors and oauth', function() {
       beforeEach(function() {
         helpers.mockPrompt(gen, {
           script: 'coffee',
@@ -166,7 +166,7 @@ describe('angular-fullstack generator', function () {
           router: 'uirouter',
           mongoose: true,
           auth: true,
-          oauth: [],
+          oauth: ['twitterAuth', 'facebookAuth', 'googleAuth'],
           socketio: true
         });
       });