From bd9f6571a55f58b6ee6bb6515dd3dad600dba112 Mon Sep 17 00:00:00 2001
From: jysperm <jysperm@gmail.com>
Date: Tue, 20 May 2014 14:31:09 +0800
Subject: [PATCH] router/admin

---
 core/index.coffee          |  1 +
 core/router/account.coffee | 14 +++++++-------
 core/router/admin.coffee   | 16 ++++++++--------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/core/index.coffee b/core/index.coffee
index ce002d0..3451f09 100644
--- a/core/index.coffee
+++ b/core/index.coffee
@@ -10,6 +10,7 @@ i18n = require './i18n'
 
 bindRouters = (app) ->
   app.use '/account', require './router/account'
+  app.use '/admin', require './router/admin'
 
   plugin = require './plugin'
   plugin.loadPlugins app
diff --git a/core/router/account.coffee b/core/router/account.coffee
index 115f426..2e2dc41 100644
--- a/core/router/account.coffee
+++ b/core/router/account.coffee
@@ -8,13 +8,13 @@ mAccount = require '../model/account'
 
 module.exports = exports = express.Router()
 
-exports.get '/signup/', renderAccount, (req, res) ->
+exports.get '/signup', renderAccount, (req, res) ->
   res.render 'account/signup'
 
-exports.get '/login/', renderAccount, (req, res) ->
+exports.get '/login', renderAccount, (req, res) ->
   res.render 'account/login'
 
-exports.post '/signup/', errorHandling, (req, res) ->
+exports.post '/signup', errorHandling, (req, res) ->
   unless utils.username.test req.body.username
     return res.error 'invalid_username'
 
@@ -43,7 +43,7 @@ exports.post '/signup/', errorHandling, (req, res) ->
           res.json
             id: account._id
 
-exports.post '/login/', errorHandling, (req, res) ->
+exports.post '/login', errorHandling, (req, res) ->
   mAccount.byUsernameOrEmailOrId req.body.username, (account) ->
     unless account
       return res.error 'auth_failed'
@@ -59,16 +59,16 @@ exports.post '/login/', errorHandling, (req, res) ->
         id: account._id
         token: token
 
-exports.post '/logout/', requestAuthenticate, (req, res) ->
+exports.post '/logout', requestAuthenticate, (req, res) ->
   mAccount.removeToken req.token, ->
     res.clearCookie 'token'
     res.json {}
 
-exports.post '/update_passwd/', requestAuthenticate, (req, res) ->
+exports.post '/update_passwd', requestAuthenticate, (req, res) ->
   unless mAccount.matchPasswd account, req.body.old_passwd
     return res.error 'auth_failed'
 
-  unless req.body.new_passwd or not /^.+$/.test req.body.new_passwd
+  unless utils.passwd.test req.body.passwd
     return res.error 'invalid_passwd'
 
   mAccount.updatePasswd account, req.body.new_passwd, ->
diff --git a/core/router/admin.coffee b/core/router/admin.coffee
index 77eebea..c9521a8 100644
--- a/core/router/admin.coffee
+++ b/core/router/admin.coffee
@@ -1,12 +1,12 @@
-api = require './index'
+express = require 'express'
+
+{renderAccount} = require './middleware'
 
 mAccount = require '../model/account'
 
-module.exports =
-  get:
-    '/admin/': api.accountAdminAuthenticateRender (req, res, account, renderer) ->
-      mAccount.find {}, {}, (accounts) ->
-        renderer 'admin/index',
-          accounts: accounts
+module.exports = exports = express.Router()
 
-  post:{}
+exports.get '/', renderAccount, (req, res) ->
+  mAccount.find {}, {}, (accounts) ->
+    res.render 'admin/index',
+      accounts: accounts