Merge branch 'wip-v1.1.0' of github.com:crowi/crowi into wip-v1.1.0

app.js

@@ -16,6 +16,7 @@ var express  = require('express')
   , middleware = require('./lib/middlewares')
   , time     = require('time')
   , async    = require('async')
+  , session  = require('express-session')
   , models
   , config
   , server
@@ -27,6 +28,7 @@ time.tzset('Asia/Tokyo');
 
 var app = express();
 var env = app.get('env');
+var days = (1000*3600*24*30);
 
 // mongoUri = mongodb://user:password@host/dbname
 var mongoUri = process.env.MONGOLAB_URI
@@ -38,14 +40,29 @@ mongo.connect(mongoUri);
 
 sessionConfig = {
   rolling: true,
-  secret: process.env.SECRET_TOKEN || 'this is default session secret'
+  secret: process.env.SECRET_TOKEN || 'this is default session secret',
+  resave: false,
+  saveUninitialized: true,
+  cookie: {
+    maxAge: days,
+  },
 };
+var redisUrl = process.env.REDISTOGO_URL
+  || process.env.REDIS_URL
+  || null;
+
+if (redisUrl) {
+  var ru   = require("url").parse(redisUrl);
+  var redis = require("redis");
+  var redisClient = redis.createClient(ru.port, ru.hostname);
+  if (ru.auth) {
+    redisClient.auth(ru.auth.split(":")[1]);
+  }
 
-if (process.env.REDIS_URL) {
-  RedisStore = require('connect-redis')(express);
+  RedisStore = require('connect-redis')(session);
   sessionConfig.store = new RedisStore({
     prefix: 'crowi:sess:',
-    url: process.env.REDIS_URL
+    client: redisClient,
   });
 }
 
@@ -59,7 +76,7 @@ app.set('views', __dirname + '/views');
 app.use(express.methodOverride());
 app.use(express.bodyParser());
 app.use(express.cookieParser());
-app.use(express.session(sessionConfig));
+app.use(session(sessionConfig));
 app.use(flash());
 
 configModel = require('./models/config')(app);
@@ -81,8 +98,7 @@ async.series([
 
     // configure application
     app.use(function(req, res, next) {
-      var days = (1000*3600*24*30)
-        , now = new Date()
+      var now = new Date()
         , fbparams = {}
         , config = app.set('config');
 
@@ -91,9 +107,6 @@ async.series([
 
       req.config = config;
 
-      req.session.cookie.expires = new Date(Date.now() + days);
-      req.session.cookie.maxAge = days;
-
       config.crowi['app:url'] = req.baseUrl = (req.headers['x-forwarded-proto'] == 'https' ? 'https' : req.protocol) + "://" + req.get('host');
       res.locals({
         req: req,

lib/mailer.js

@@ -6,10 +6,12 @@ module.exports = function(app) {
   'use strict';
 
   var debug = require('debug')('crowi:lib:mailer')
-    , nodemailer = require("nodemailer")
+    , nodemailer = require('nodemailer')
+    , swig = require('swig')
     , config = app.set('config')
     , mailConfig = {}
     , mailer = {}
+    , MAIL_TEMPLATE_DIR = app.set('views') + '/mail/'
     ;
 
 
@@ -100,7 +102,19 @@ module.exports = function(app) {
 
   function send(config, callback) {
     if (mailer) {
-      return mailer.sendMail(setupMailConfig(config), callback);
+      var templateVars = config.vars || {};
+      return swig.renderFile(
+        MAIL_TEMPLATE_DIR + config.template,
+        templateVars,
+        function (err, output) {
+          if (err) {
+            throw err;
+          }
+
+          config.text = output;
+          return mailer.sendMail(setupMailConfig(config), callback);
+        }
+      );
     } else {
       debug('Mailer is not completed to set up. Please set up SMTP or AWS setting.');
       return callback(new Error('Mailer is not completed to set up. Please set up SMTP or AWS setting.'), null);

models/user.js

@@ -236,6 +236,15 @@ module.exports = function(app, models) {
 
   };
 
+  userSchema.statics.findAdmins = function(callback) {
+    var User = this;
+    this.find({admin: true})
+      .exec(function(err, admins) {
+        debug('Admins: ', admins);
+        callback(err, admins);
+      });
+  };
+
   userSchema.statics.findUsersWithPagination = function(options, callback) {
     var sort = options.sort || {status: 1, username: 1, createdAt: 1};
 
@@ -405,20 +414,19 @@ module.exports = function(app, models) {
             createdUserList,
             function(user, next) {
               if (user.password === null) {
-                next();
+                return next();
               }
 
               mailer.send({
                   to: user.email,
                   subject: 'Invitation to ' + config.crowi['app:title'],
-                  text: 'Hi, ' + user.email + '\n\n'
-                    + 'You are invited to our Wiki, you can log in with following account:\n\n'
-                    + 'Email: ' + user.email + '\n'
-                    + 'Password: ' + user.password
-                    + '\n (This password was auto generated. Update required at the first time you logging in)\n'
-                    + '\n'
-                    + 'We are waiting for you!\n'
-                    + config.crowi['app:url']
+                  template: 'admin/userInvitation.txt',
+                  vars: {
+                    email: user.email,
+                    password: user.password,
+                    url: config.crowi['app:url'],
+                    appTitle: config.crowi['app:title'],
+                  }
                 },
                 function (err, s) {
                   debug('completed to send email: ', err, s);

package.json

@@ -23,7 +23,7 @@
     "bower": "~1.3.9",
     "cli": "~0.6.4",
     "connect-flash": "~0.1.1",
-    "connect-redis": "^1.4.7",
+    "connect-redis": "^2.1.0",
     "consolidate": "=0.10.0",
     "debug": "^1.0.3",
     "express": "=3.4.4",
@@ -47,7 +47,9 @@
     "socket.io": "~0.9.16",
     "socket.io-client": "~0.9.16",
     "swig": "=1.3.2",
-    "time": "=0.10.0"
+    "time": "=0.10.0",
+    "redis": "~0.12.1",
+    "express-session": "~1.9.3"
   },
   "devDependencies": {},
   "license": [

routes/login.js

@@ -3,10 +3,13 @@ module.exports = function(app) {
 
   var googleapis = require('googleapis')
     , debug = require('debug')('crowi:routes:login')
+    , async    = require('async')
     , models = app.set('models')
     , config = app.set('config')
+    , mailer = app.set('mailer')
     , Page = models.Page
     , User = models.User
+    , Config = models.Config
     , Revision = models.Revision
     , actions = {};
 
@@ -139,7 +142,7 @@ module.exports = function(app) {
     }
 
     // config で closed ならさよなら
-    if (config.crowi['security:registrationMode'] == 'Closed') {
+    if (config.crowi['security:registrationMode'] == Config.SECURITY_REGISTRATION_MODE_CLOSED) {
       return res.redirect('/');
     }
 
@@ -179,6 +182,38 @@ module.exports = function(app) {
             req.flash('registerWarningMessage', 'ユーザー登録に失敗しました。');
             return res.redirect('/login?register=1');
           } else {
+
+            // 作成後、承認が必要なモードなら、管理者に通知する
+            if (config.crowi['security:registrationMode'] === Config.SECURITY_REGISTRATION_MODE_RESTRICTED) {
+              // TODO send mail
+              User.findAdmins(function(err, admins) {
+                async.each(
+                  admins,
+                  function(adminUser, next) {
+                    mailer.send({
+                        to: adminUser.email,
+                        subject: '[' + config.crowi['app:title'] + ':admin] A New User Created and Waiting for Activation',
+                        template: 'admin/userWaitingActivation.txt',
+                        vars: {
+                          createdUser: userData,
+                          adminUser: adminUser,
+                          url: config.crowi['app:url'],
+                          appTitle: config.crowi['app:title'],
+                        }
+                      },
+                      function (err, s) {
+                        debug('completed to send email: ', err, s);
+                        next();
+                      }
+                    );
+                  },
+                  function(err) {
+                    debug('Sending invitation email completed.', err);
+                  }
+                );
+              });
+            }
+
             if (facebookId || googleId) {
               userData.updateGoogleIdAndFacebookId(googleId, facebookId, function(err, userData) {
                 if (err) { // TODO

views/mail/admin/userInvitation.txt

@@ -0,0 +1,14 @@
+Hi, {{ email }}
+
+You are invited to our Wiki, you can log in with following account:
+
+Email: {{ email }}
+Password: {{ password }}
+(This password was auto generated. Update required at the first time you logging in)
+
+We are waiting for you!
+{{ url }}
+
+--
+{{ appTitle }}
+{{ url }}

views/mail/admin/userWaitingActivation.txt

@@ -0,0 +1,21 @@
+Hi, {{ adminUser.name }}
+
+A user registered to {{ appTitle }}.
+
+
+====
+Created user:
+
+Name: {{ createdUser.name }}
+User Name: {{ createdUser.username }}
+Email: {{ createdUser.email }}
+====
+
+Please do some action with following URL:
+{{ url }}/admin/user
+
+
+--
+{{ appTitle }}
+{{ url }}
+