v0.7.7, update user password

Signed-off-by: zensh <admin@zensh.com>

Author: zensh

README.md

@@ -17,6 +17,8 @@
 
     node app.js --dev
 
+**v0.7.7版 升级了账号密码系统，v0.7.6及之前的版本升级后需更新数据库，请运行 `node app.js update-passwd` **
+
 ### 简介 (Introduction)
 
 [JsGen][1]是用纯JavaScript编写的新一代开源社区网站系统，主要用于搭建SNS类型的专业社区，对客户端AngularJS应用稍作修改也可变成多用户博客系统、论坛或者CMS内容管理系统。

app.js

@@ -47,6 +47,7 @@ serverDm.run(function () {
     jsGen.dao.collection = require('./dao/collectionDao.js');
 
     jsGen.thenErrLog = function (defer, err) {
+        console.error(err);
         jsGen.serverlog.error(err);
     };
 
@@ -61,7 +62,6 @@ serverDm.run(function () {
     function exit() {
         redis.close();
         jsGen.dao.db.close();
-        jsGen.serverlog.error(error);
         return process.exit(1);
     }
 
@@ -74,6 +74,14 @@ serverDm.run(function () {
         return;
     }
 
+    // v0.7.5升级至v0.7.6 更新账号密码
+    if (process.argv.indexOf('update-passwd') > 0) {
+        require('./patch/passwd_0.7.5-0.7.6.js')().then(function () {
+            return exit();
+        }).fail(jsGen.thenErrLog);
+        return;
+    }
+
     then.parallel([function (defer) {
         jsGen.dao.index.getGlobalConfig(defer);
     }, function (defer) {

dao/userDao.js

@@ -73,6 +73,18 @@ var that = jsGen.dao.db.bind('users', {
         }).each(callback);
     },
 
+    getFullUsersIndex: function (callback) {
+        callback = callback || callbackFn;
+        that.find({}, {
+            sort: {
+                _id: -1
+            },
+            hint: {
+                _id: 1
+            }
+        }).each(callback);
+    },
+
     getLatestId: function (callback) {
         callback = callback || callbackFn;
         that.findOne({}, {
@@ -541,6 +553,7 @@ module.exports = {
     convertID: that.convertID,
     getUsersNum: that.getUsersNum,
     getUsersIndex: that.getUsersIndex,
+    getFullUsersIndex: that.getFullUsersIndex,
     getLatestId: that.getLatestId,
     getAuth: that.getAuth,
     getSocial: that.getSocial,

lib/redis.js

@@ -42,7 +42,7 @@ function connect() {
 function close() {
     each(client, function (cli) {
         cli.end();
-    })
+    });
 }
 
 function initConfig(configTpl, callback) {

package.json

@@ -5,7 +5,7 @@
         "url": "http://weibo.com/zensh"
     },
     "name": "jsgen",
-    "version": "0.7.6",
+    "version": "0.7.7",
     "description": "",
     "keywords": ["Node.js", "AngularJS", "mongoDB", "jsGen"],
     "homepage": "https://github.com/zensh/jsgen",

patch/passwd_0.7.5-0.7.6.js

@@ -0,0 +1,36 @@
+'use strict';
+/*global require, module, Buffer, jsGen*/
+// v0.7.5升级至v0.7.6 更新账号密码
+var then = jsGen.module.then,
+    HmacSHA256 = jsGen.lib.tools.HmacSHA256;
+
+module.exports = function () {
+    var count = 0, users = [], userDao = jsGen.dao.user;
+    return then(function (defer) {
+        var userDao = jsGen.dao.user;
+        userDao.getFullUsersIndex(function (err, doc) {
+            if (err) {
+                defer(err);
+            } else if (doc) {
+                users.push(doc);
+            } else {
+                console.log(users.length + ' users need to update!');
+                defer(null, users);
+            }
+        });
+    }).each(null, function (defer, user) {
+        var passwd = HmacSHA256(user.passwd, 'jsGen'),
+            data = {
+                _id: user._id,
+                passwd: passwd
+            };
+        userDao.setUserInfo(data, function (error, user) {
+            count += 1;
+            console.log(count + ' : ' + user.name + ' updated.');
+            defer(null, user);
+        });
+    }).then(function (defer, list) {
+        console.log('Total ' + users.length + ' users, ' + list.length + ' users updated.');
+        defer();
+    });
+};

static/Gruntfile.js

@@ -37,7 +37,7 @@ module.exports = function(grunt) {
         src: 'src/js/*.js'
       },
       server: {
-        src: ['../app.js', '../app.js', '../api/*.js', '../dao/*.js', '../lib/*.js']
+        src: ['../app.js', '../app.js', '../api/*.js', '../dao/*.js', '../lib/*.js', '../patch/*.js']
       }
     },
 

static/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jsGen",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "main": "index.html",
   "dependencies": {
     "angular": ">=1.2.0",

static/dist/index.html

@@ -12,7 +12,7 @@
     <link rel="shortcut icon" href="http://cdn.angularjs.cn/favicon.ico"/>
     <link rel="stylesheet" href="http://cdn.angularjs.cn/css/jsgen.min.css?v=9513ac1c7029ce1ee7b19cd43c75e070">
     <link rel="stylesheet" href="http://cdn.angularjs.cn/css/font-awesome.min.css?v=fa6868c22ceca7f65191ec25c68a9bb5">
-    <script src="http://cdn.angularjs.cn/js/reserveLoad.min.js?v=94924aac8b0e21c286d4d5d5c8cf2e1c"></script>
+    <script src="http://cdn.angularjs.cn/js/reserveLoad.min.js?v=74909c4cc9a4f3b7d739701507027e9b"></script>
   </head>
   <!--[if lt IE 8]> <body class="ie pure-g-r"> <![endif]-->
   <!--[if gt IE 7]><!--> <body class="pure-g-r ng-cloak" ng-cloak> <!--<![endif]-->
@@ -72,11 +72,11 @@ <h1>AngularJS中文社区</h1>
           cdn = 'http://cdn.angularjs.cn/';
 
         reserveLoad(
-          IE8 && [cdn + 'js/ie.min.js?v=8439e6ad4b1308834f160aeae9ce7344', '/static/js/ie.min.js?v=8439e6ad4b1308834f160aeae9ce7344', 'JSON'], // load it if lt IE 9
+          IE8 && [cdn + 'js/ie.min.js?v=05705f0fe7b1805a2179e9de544e2c0e', '/static/js/ie.min.js?v=05705f0fe7b1805a2179e9de544e2c0e', 'JSON'], // load it if lt IE 9
           [cdn + 'js/jquery.' + jqVer + '.js', '/static/js/jquery.' + jqVer + '.js', '$'],
-          [cdn + 'js/angular-all.min.js?v=55bb3bb50cd3ab53352673b6026aff2f', '/static/js/angular-all.min.js?v=55bb3bb50cd3ab53352673b6026aff2f', 'angular'],
-          [cdn + 'js/lib.min.js?v=5a028d8e1612728e88b0eab177c40b9a', '/static/js/lib.min.js?v=5a028d8e1612728e88b0eab177c40b9a', 'Sanitize'],
-          [cdn + 'js/jsgen.min.js?v=09acf5e45fb6414c3d3a6684294556ef', '/static/js/jsgen.min.js?v=09acf5e45fb6414c3d3a6684294556ef', 'jsGen'],
+          [cdn + 'js/angular-all.min.js?v=fecf9a082b25b129f313dda0b875fd08', '/static/js/angular-all.min.js?v=fecf9a082b25b129f313dda0b875fd08', 'angular'],
+          [cdn + 'js/lib.min.js?v=0ff8ece699c22170d2fcabeedd8926bf', '/static/js/lib.min.js?v=0ff8ece699c22170d2fcabeedd8926bf', 'Sanitize'],
+          [cdn + 'js/jsgen.min.js?v=57593fee0828c3bcd71fb137249fa236', '/static/js/jsgen.min.js?v=57593fee0828c3bcd71fb137249fa236', 'jsGen'],
           function (errorUrl) {
             if (errorUrl) {
               alert('Error loading: ' + errorUrl);