Release 1.0.2

~_~ fix response message
Release 1.0.1
2014-08-01 12:05:54 +08:00 · 2014-08-01 12:05:25 +08:00 · 2014-08-01 12:00:33 +08:00 · 2014-08-01 11:58:54 +08:00 · 2014-08-01 11:58:23 +08:00 · 2014-08-01 09:26:04 +08:00
53 changed files with 2819 additions and 418 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ bin/mysql.js
 bin/test.sql
 coverage/
 config/web_readme.md
+.tmp/
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: node_js
 node_js:
  - '0.11'
+script: "make test-travis"
+after_script: "npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"
--- a/History.md
+++ b/History.md
@@ -1,4 +1,78 @@

+1.0.2 / 2014-08-01
+==================
+
+  * ~_~ fix auth error response message
+
+1.0.1 / 2014-08-01
+==================
+
+  * Merge pull request #398 from cnpm/fix-auth
+  * hot fix auth error
+
+1.0.0 / 2014-08-01
+==================
+
+ * add private package list
+
+0.9.2 / 2014-07-30
+==================
+
+ * hotfix save custom user bug
+
+0.9.1 / 2014-07-30
+==================
+
+ * Handle user service auth throw custom error message
+ * add test for config private packages
+ * add config.privatePackages
+ * add more comments in config/index.js
+
+0.9.0 / 2014-07-29
+==================
+
+ * scopes init mv to services/user.js
+ * show user more profile
+ * registry show user support custom user service
+ * support custom user service for user auth
+ * remove session middleware
+ * add DefaultUserService
+ * check scopes in module.getAdapt
+ * test public mode, fix some logic, close #382
+ * move scope.js into publishable.js, add forcePublishWithScope
+ * config.scopes not exist, means do not support scope
+ * add assert scope middleware
+
+0.8.7 / 2014-07-24
+==================
+
+ * fix unpublished info missing maintainers cause TypeError
+
+0.8.6 / 2014-07-23
+==================
+
+ * show unpublished info on web package page. fixes #381
+
+0.8.5 / 2014-07-22
+==================
+
+ * Only private package support default scoped. fixed #378
+
+0.8.4 / 2014-07-22
+==================
+
+ * adapt default scpoe in /@:scope/:name/:version
+
+0.8.3 / 2014-07-22
+==================
+
+ * hot fix download
+
+0.8.2 / 2014-07-22
+==================
+
+ * fix default scope detect
+
 0.8.1 / 2014-07-21
 ==================

--- a/17
+++ b/17
@@ -44,11 +44,26 @@ test-cov cov: install pretest
 		$(TESTS)
 	@./node_modules/.bin/cov coverage

+test-travis: install pretest
+	@NODE_ENV=test node --harmony \
+		node_modules/.bin/istanbul cover --preserve-comments \
+		./node_modules/.bin/_mocha \
+		--report lcovonly \
+		-- \
+		--reporter dot \
+		--timeout $(TIMEOUT) \
+		--require should \
+		--require should-http \
+		--require co-mocha \
+		--require ./test/init.js \
+		$(MOCHA_OPTS) \
+		$(TESTS)
+
 contributors: install
 	@./node_modules/.bin/contributors -f plain -o AUTHORS

 autod: install
-	@./node_modules/.bin/autod -w -e public,view,docs,backup,coverage
+	@./node_modules/.bin/autod -w -e public,view,docs,backup,coverage -k nodemailer
 	@$(MAKE) install

 .PHONY: test
--- a/README.md
+++ b/README.md
@@ -1,9 +1,22 @@
 cnpmjs.org
 =======

-[![Build Status](https://secure.travis-ci.org/cnpm/cnpmjs.org.svg)](http://travis-ci.org/cnpm/cnpmjs.org) [![Dependency Status](https://gemnasium.com/cnpm/cnpmjs.org.svg)](https://gemnasium.com/cnpm/cnpmjs.org)
+[![NPM version][npm-image]][npm-url]
+[![build status][travis-image]][travis-url]
+[![Test coverage][coveralls-image]][coveralls-url]
+[![Gittip][gittip-image]][gittip-url]
+[![David deps][david-image]][david-url]

-[![NPM](https://nodei.co/npm/cnpmjs.org.svg?downloads=true&stars=true)](https://nodei.co/npm/cnpmjs.org/)
+[npm-image]: https://img.shields.io/npm/v/cnpmjs.org.svg?style=flat
+[npm-url]: https://npmjs.org/package/cnpmjs.org
+[travis-image]: https://img.shields.io/travis/cnpm/cnpmjs.org.svg?style=flat
+[travis-url]: https://travis-ci.org/cnpm/cnpmjs.org
+[coveralls-image]: https://img.shields.io/coveralls/cnpm/cnpmjs.org.svg?style=flat
+[coveralls-url]: https://coveralls.io/r/cnpm/cnpmjs.org?branch=master
+[gittip-image]: https://img.shields.io/gittip/fengmk2.svg?style=flat
+[gittip-url]: https://www.gittip.com/fengmk2/
+[david-image]: https://img.shields.io/david/cnpm/cnpmjs.org.svg?style=flat
+[david-url]: https://david-dm.org/cnpm/cnpmjs.org

 ![logo](https://raw.github.com/cnpm/cnpmjs.org/master/logo.png)

--- a/common/logger.js
+++ b/common/logger.js
@@ -35,8 +35,8 @@ var logger = module.exports = Logger({
 });

 var to = [];
-for (var name in config.admins) {
-  to.push(config.admins[name]);
+for (var user in config.admins) {
+  to.push(config.admins[user]);
 }

 function errorFormater(err) {
--- a/common/session.js
+++ b/common/session.js
@@ -1,34 +0,0 @@
-/*!
- * cnpmjs.org - common/session.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- */
-
-'use strict';
-
-/**
- * Module dependencies.
- */
-
-var middlewares = require('koa-middlewares');
-var config = require('../config');
-
-var key = 'AuthSession';
-var cookie = { path: '/', httpOnly: true, maxAge: 3600000 * 24 * 365, signed: false };
-var options = {
-  key: key,
-  cookie: cookie,
-  defer: true,
-  rolling: false
-};
-
-if (!config.debug) {
-  options.store = config.sessionStore || middlewares.RedisStore(config.redis);
-}
-
-module.exports = middlewares.session(options);
--- a/config/index.js
+++ b/config/index.js
@@ -27,16 +27,88 @@ var version = require('../package.json').version;
 var root = path.dirname(__dirname);

 var config = {
+
  version: version,
+
+  /**
+   * Cluster mode
+   */
+  enableCluster: false,
+  numCPUs: os.cpus().length,
+
+  /*
+   * server configure
+   */
  registryPort: 7001,
  webPort: 7002,
  bindingHost: '127.0.0.1', // only binding on 127.0.0.1 for local access
-  enableCluster: false,
-  numCPUs: os.cpus().length,
-  debug: true, // if debug
+
+  // debug mode
+  // if in debug mode, some middleware like limit wont load
+  // logger module will print to stdout
+  debug: true,
+  // session secret
+  sessionSecret: 'cnpmjs.org test session secret',
+  // max request json body size
+  jsonLimit: '10mb',
+  // log dir name
  logdir: path.join(root, '.tmp', 'logs'),
+  // update file template dir
+  uploadDir: path.join(root, '.dist'),
+  // web page viewCache
  viewCache: false,
-  // mysql config
+
+  // config for koa-limit middleware
+  // for limit download rates
+  limit: {
+    enable: false,
+    token: 'koa-limit:download',
+    limit: 1000,
+    interval: 1000 * 60 * 60 * 24,
+    whiteList: [],
+    blackList: [],
+    message: 'request frequency limited, any question, please contact fengmk2@gmail.com',
+  },
+
+  enableCompress: false, // enable gzip response or not
+
+  // default system admins
+  admins: {
+    // name: email
+    fengmk2: 'fengmk2@gmail.com',
+    admin: 'admin@cnpmjs.org',
+    dead_horse: 'dead_horse@qq.com',
+    cnpmjstest10: 'cnpmjstest10@cnpmjs.org',
+  },
+
+  // email notification for errors
+  mail: {
+    appname: 'cnpmjs.org',
+    sender: 'cnpmjs.org mail sender <adderss@gmail.com>',
+    host: 'smtp.gmail.com',
+    port: 465,
+    user: 'address@gmail.com',
+    pass: 'your password',
+    ssl: true,
+    debug: false
+  },
+
+
+  logoURL: '//ww4.sinaimg.cn/large/69c1d4acgw1ebfly5kjlij208202oglr.jpg', // cnpm logo image url
+  customReadmeFile: '', // you can use your custom readme file instead the cnpm one
+  customFooter: '', // you can add copyright and site total script html here
+  npmClientName: 'cnpm', // use `${name} install package`
+  packagePageContributorSearch: true, // package page contributor link to search, default is true
+
+  // max handle number of package.json `dependencies` property
+  maxDependencies: 200,
+  // backup filepath prefix
+  backupFilePrefix: '/cnpm/backup/',
+
+  /**
+   * mysql config
+   */
+
  mysqlServers: [
    {
      host: '127.0.0.1',
@@ -49,74 +121,75 @@ var config = {
  mysqlMaxConnections: 4,
  mysqlQueryTimeout: 5000,

-  sessionSecret: 'cnpmjs.org test session secret',
-  redis: {
-    // host: 'pub-redis-19533.us-east-1-4.3.ec2.garantiadata.com',
-    // port: 19533,
-    // pass: 'cnpmjs_dev'
-  },
-  jsonLimit: '10mb', // max request json body size
-  uploadDir: path.join(root, '.dist'),
+
+  // redis config
+  // use for koa-limit module as storage
+  redis: null,
+
+  // package tarball store in qn by default
  // qiniu cdn: http://www.qiniu.com/, it free for dev.
  qn: {
-    // accessKey: "iN7NgwM31j4-BZacMjPrOQBs34UG1maYCAQmhdCV",
-    // secretKey: "6QTOr2Jg1gcZEWDQXKOGZh5PziC2MCV5KsntT70j",
-    // bucket: "qtestbucket",
-    // domain: "http://qtestbucket.qiniudn.com",
    accessKey: "5UyUq-l6jsWqZMU6tuQ85Msehrs3Dr58G-mCZ9rE",
    secretKey: "YaRsPKiYm4nGUt8mdz2QxeV5Q_yaUzVxagRuWTfM",
    bucket: "qiniu-sdk-test",
    domain: "http://qiniu-sdk-test.qiniudn.com",
  },

-  mail: {
-    appname: 'cnpmjs.org',
-    sender: 'cnpmjs.org mail sender <adderss@gmail.com>',
-    host: 'smtp.gmail.com',
-    port: 465,
-    user: 'address@gmail.com',
-    pass: 'your password',
-    ssl: true,
-    debug: false
-  },
+  // registry url name
+  registryHost: 'r.cnpmjs.org',

+
+  /**
+   * registry mode config
+   */
+
+  // enable private mode, only admin can publish, other use just can sync package from source npm
+  enablePrivate: true,
+
+  // registry scopes, if don't set, means do not support scopes
+  scopes: [
+    '@cnpm',
+    '@cnpmtest'
+  ],
+
+  // redirect @cnpm/private-package => private-package
+  // forward compatbility for update from lower version cnpmjs.org
+  adaptScope: true,
+
+  // force user publish with scope
+  // but admins still can publish without scope
+  forcePublishWithScope: true,
+
+  // some registry already have some private packages in global scope
+  // but we want to treat them as scoped private packages,
+  // so you can use this white list.
+  privatePackages: ['private-package'],
+
+  /**
+   * sync configs
+   */
+
+  // sync dist config
+  // sync node.js dist from nodejs.org
  noticeSyncDistError: true,
  disturl: 'http://nodejs.org/dist',
  syncDist: false,
-  logoURL: '//ww4.sinaimg.cn/large/69c1d4acgw1ebfly5kjlij208202oglr.jpg',
-  registryHost: 'r.cnpmjs.org',
-  // customReadmeFile: __dirname + '/web_readme.md',
-  customReadmeFile: '', // you can use your custom readme file instead the cnpm one
-  customFooter: '', // you can add copyright and site total script html here
-  npmClientName: 'cnpm', // use `${name} install package`
-  packagePageContributorSearch: true, // package page contributor link to search, default is true
-  sourceNpmRegistry: 'http://registry.npmjs.org',
-  enablePrivate: true, // enable private mode, only admin can publish, other use just can sync package from source npm
-  admins: {
-    // name: email
-    fengmk2: 'fengmk2@gmail.com',
-    admin: 'admin@cnpmjs.org',
-    dead_horse: 'dead_horse@qq.com',
-    cnpmjstest10: 'cnpmjstest10@cnpmjs.org',
-  },
-  syncByInstall: true,
-  backupFilePrefix: '/cnpm/backup/', // backup filepath prefix
-  syncModel: 'none', // 'none', 'all', 'exist'
-  syncConcurrency: 1,
-  syncInterval: '10m', // sync interval, default is 10 minutes
-  maxDependencies: 200, // max handle number of package.json `dependencies` property

-  limit: {
-    enable: false,
-    token: 'koa-limit:download',
-    limit: 1000,
-    interval: 1000 * 60 * 60 * 24,
-    whiteList: [],
-    blackList: [],
-    message: 'request frequency limited, any question, please contact fengmk2@gmail.com',
-  },
-  enableCompress: false, // enable gzip response or not
-  defaultScope: '', // default scope name
+  // sync source
+  sourceNpmRegistry: 'http://registry.npmjs.org',
+
+  // if install return 404, try to sync from source registry
+  syncByInstall: true,
+
+  // sync mode select
+  // none: do not sync any module
+  // exist: only sync exist modules
+  // all: sync all modules
+  syncModel: 'none', // 'none', 'all', 'exist'
+
+  syncConcurrency: 1,
+  // sync interval, default is 10 minutes
+  syncInterval: '10m',
 };

 // load config/config.js, everything in config.js will cover the same key in index.js
--- a/controllers/registry/module.js
+++ b/controllers/registry/module.js
@@ -39,6 +39,7 @@ var ModuleDeps = require('../../proxy/module_deps');
 var ModuleStar = require('../../proxy/module_star');
 var ModuleUnpublished = require('../../proxy/module_unpublished');
 var packageService = require('../../services/package');
+var UserService = require('../../services/user');
 var downloadAsReadStream = require('../utils').downloadAsReadStream;

 /**
@@ -56,16 +57,19 @@ exports.show = function* (next) {
  var tags = rs[1];
  var adaptDefaultScope = false;

-  if (tags.length === 0 && config.defaultScope && name.indexOf(config.defaultScope) === 0) {
-    // remove default scope name and retry
-    name = name.split('/')[1];
-    rs = yield [
-      Module.getLastModified(name),
-      Module.listTags(name)
-    ];
-    modifiedTime = rs[0];
-    tags = rs[1];
-    adaptDefaultScope = true;
+  if (tags.length === 0) {
+    var adaptName = yield* Module.getAdaptName(name);
+    if (adaptName) {
+      adaptDefaultScope = true;
+      // remove default scope name and retry
+      name = adaptName;
+      rs = yield [
+        Module.getLastModified(name),
+        Module.listTags(name),
+      ];
+      modifiedTime = rs[0];
+      tags = rs[1];
+    }
  }

  debug('show %s(%s), last modified: %s, tags: %j', name, orginalName, modifiedTime, tags);
@@ -261,25 +265,36 @@ exports.get = function* (next) {
  var version = semver.valid(tag);
  var method = version ? 'get' : 'getByTag';
  var queryLabel = version ? version : tag;
+  var orginalName = name;
+  var adaptDefaultScope = false;
  debug('%s %s with %j', method, name, this.params);

-  var rs = yield [
-    Module[method](name, queryLabel),
-    packageService.listMaintainers(name),
-  ];
-  var mod = rs[0];
+  var mod = yield Module[method](name, queryLabel);
+  if (!mod) {
+    var adaptName = yield* Module.getAdaptName(name);
+    if (adaptName) {
+      name = adaptName;
+      mod = yield Module[method](name, queryLabel);
+      adaptDefaultScope = true;
+    }
+  }
+
  if (mod) {
    common.setDownloadURL(mod.package, this);
    mod.package._cnpm_publish_time = mod.publish_time;
-    var maintainers = rs[1];
+    var maintainers = yield* packageService.listMaintainers(name);
    if (maintainers.length > 0) {
      mod.package.maintainers = maintainers;
    }
+    if (adaptDefaultScope) {
+      mod.package.name = orginalName;
+      mod.package._id = orginalName + '@' + mod.package.version;
+    }
    this.body = mod.package;
    return;
  }
  // if not fond, sync from source registry
-  if (!this.allowSync) {
+  if (!this.allowSync || adaptDefaultScope) {
    this.status = 404;
    this.body = {
      error: 'not exist',
@@ -304,8 +319,8 @@ exports.get = function* (next) {
 var _downloads = {};

 exports.download = function *(next) {
-  var name = this.params.name;
-  var filename = this.params.filename;
+  var name = this.params.name || this.params[0];
+  var filename = this.params.filename || this.params[1];
  var version = filename.slice(name.length + 1, -4);
  var row = yield Module.get(name, version);
  // can not get dist
@@ -315,6 +330,8 @@ exports.download = function *(next) {
    url = nfs.url(common.getCDNKey(name, filename));
  }

+  debug('download %s %s %s %s', name, filename, version, url);
+
  if (!row || !row.package || !row.package.dist) {
    if (!url) {
      return yield* next;
@@ -424,7 +441,7 @@ exports.addPackageAndDist = function *(next) {

  var pkg = this.request.body;
  var username = this.user.name;
-  var name = this.params.name;
+  var name = this.params.name || this.params[0];
  var filename = Object.keys(pkg._attachments || {})[0];
  var version = Object.keys(pkg.versions || {})[0];
  if (!version || !filename) {
@@ -438,6 +455,34 @@ exports.addPackageAndDist = function *(next) {

  var attachment = pkg._attachments[filename];
  var versionPackage = pkg.versions[version];
+
+  // should never happened in normal request
+  if (!versionPackage.maintainers) {
+    this.status = 400;
+    this.body = {
+      error: 'maintainers error',
+      reason: 'request body need maintainers'
+    };
+    return;
+  }
+
+  // notice that admins can not publish to all modules
+  // (but admins can add self to maintainers first)
+
+  // make sure user in auth is in maintainers
+  // should never happened in normal request
+  var m = versionPackage.maintainers.filter(function (maintainer) {
+    return maintainer.name === username;
+  });
+  if (!m.length) {
+    this.status = 403;
+    this.body = {
+      error: 'maintainers error',
+      reason: username + ' does not in maintainer list'
+    };
+    return;
+  }
+
  versionPackage._publish_on_cnpm = true;
  var distTags = pkg['dist-tags'] || {};
  var tags = []; // tag, version
@@ -556,7 +601,9 @@ exports.addPackageAndDist = function *(next) {

 // PUT /:name/-rev/:rev
 exports.updateOrRemove = function* (next) {
-  debug('updateOrRemove module %s, %s, %j', this.url, this.params.name, this.request.body);
+  var name = this.params.name || this.params[0];
+  debug('updateOrRemove module %s, %s, %j', this.url, name, this.request.body);
+
  var body = this.request.body;
  if (body.versions) {
    yield* exports.removeWithVersions.call(this, next);
@@ -568,7 +615,7 @@ exports.updateOrRemove = function* (next) {
 };

 exports.updateMaintainers = function* (next) {
-  var name = this.params.name;
+  var name = this.params.name || this.params[0];
  var body = this.request.body;
  debug('updateMaintainers module %s, %j', name, body);

@@ -596,20 +643,59 @@ exports.updateMaintainers = function* (next) {
    return;
  }

-  var r = yield *packageService.updateMaintainers(name, usernames);
+  if (config.customUserService) {
+    // ensure new authors are vaild
+    var maintainers = yield* packageService.listMaintainerNamesOnly(name);
+    var map = {};
+    var newNames = [];
+    for (var i = 0; i < maintainers.length; i++) {
+      map[maintainers[i]] = 1;
+    }
+    for (var i = 0; i < usernames.length; i++) {
+      var username = usernames[i];
+      if (map[username] !== 1) {
+        newNames.push(username);
+      }
+    }
+    if (newNames.length > 0) {
+      var users = yield* UserService.list(newNames);
+      var map = {};
+      for (var i = 0; i < users.length; i++) {
+        var user = users[i];
+        map[user.login] = 1;
+      }
+      var invailds = [];
+      for (var i = 0; i < newNames.length; i++) {
+        var username = newNames[i];
+        if (map[username] !== 1) {
+          invailds.push(username);
+        }
+      }
+      if (invailds.length > 0) {
+        this.status = 403;
+        this.body = {
+          error: 'invalid user name',
+          reason: 'User: ' + invailds.join(', ') + ' not exists'
+        };
+        return;
+      }
+    }
+  }
+
+  var r = yield* packageService.updateMaintainers(name, usernames);
  debug('result: %j', r);

  this.status = 201;
  this.body = {
    ok: true,
    id: name,
-    rev: this.params.rev,
+    rev: this.params.rev || this.params[1],
  };
 };

 exports.removeWithVersions = function* (next) {
  var username = this.user.name;
-  var name = this.params.name;
+  var name = this.params.name || this.params[0];
  // left versions
  var versions = this.request.body.versions || {};

@@ -696,12 +782,12 @@ exports.removeWithVersions = function* (next) {
 };

 exports.removeTar = function* (next) {
-  debug('remove tarball with filename: %s, id: %s', this.params.filename, this.params.rev);
-  var id = Number(this.params.rev);
-  var filename = this.params.filename;
-  var name = this.params.name;
-  var username = this.user.name;
+  var name = this.params.name || this.params[0];
+  var filename = this.params.filename || this.params[1];
+  var id = Number(this.params.rev || this.params[2]);
+  debug('remove tarball with filename: %s, id: %s', filename, id);

+  var username = this.user.name;
  if (isNaN(id)) {
    return yield* next;
  }
@@ -728,9 +814,10 @@ exports.removeTar = function* (next) {
 };

 exports.removeAll = function* (next) {
-  debug('remove all the module with name: %s, id: %s', this.params.name, this.params.rev);
-  var name = this.params.name;
+  var name = this.params.name || this.params[0];
  var username = this.user.name;
+  var rev = this.params.rev || this.params[1];
+  debug('remove all the module with name: %s, id: %s', name, rev);

  var mods = yield Module.listByName(name);
  debug('removeAll module %s: %d', name, mods.length);
@@ -839,8 +926,8 @@ exports.listAllModuleNames = function *() {
 // PUT /:name/:tag
 exports.updateTag = function* () {
  var version = this.request.body;
-  var tag = this.params.tag;
-  var name = this.params.name;
+  var name = this.params.name || this.params[0];
+  var tag = this.params.tag || this.params[1];
  debug('updateTag: %s %s to %s', name, version, tag);

  if (!version) {
@@ -877,7 +964,7 @@ exports.updateTag = function* () {

  // check permission
  var isMaintainer = yield* packageService.isMaintainer(name, this.user.name);
-  if (!isMaintainer) {
+  if (!isMaintainer && !this.user.isAdmin) {
    this.status = 403;
    this.body = {
      error: 'forbidden user',
--- a/controllers/registry/user.js
+++ b/controllers/registry/user.js
@@ -18,14 +18,31 @@
 var debug = require('debug')('cnpmjs.org:controllers:registry:user');
 var utility = require('utility');
 var crypto = require('crypto');
+var UserService = require('../../services/user');
 var User = require('../../proxy/user');
 var config = require('../../config');
+var common = require('../../lib/common');

-exports.show = function *(next) {
+exports.show = function* (next) {
  var name = this.params.name;
-  var user = yield User.get(name);
+  var isAdmin = common.isAdmin(name);
+  var scopes = config.scopes || [];
+  if (config.customUserService) {
+    var customUser = yield* UserService.get(name);
+    if (customUser) {
+      isAdmin = !!customUser.site_admin;
+      scopes = customUser.scopes;
+
+      var data = {
+        user: customUser
+      };
+      yield* User.saveCustomUser(data);
+    }
+  }
+
+  var user = yield* User.get(name);
  if (!user) {
-    return yield *next;
+    return yield* next;
  }

  var data = user.json;
@@ -40,12 +57,32 @@ exports.show = function *(next) {
      date: user.gmt_modified,
    };
  }
+
+  if (data.login) {
+    // custom user format
+    // convert to npm user format
+    data = {
+      _id: 'org.couchdb.user:' + user.name,
+      _rev: user.rev,
+      name: user.name,
+      email: user.email,
+      type: 'user',
+      roles: [],
+      date: user.gmt_modified,
+      avatar: data.avatar_url,
+      fullname: data.name || data.login,
+      homepage: data.html_url,
+    };
+  }
+
  data._cnpm_meta = {
    id: user.id,
-    npm_user: user.npm_user,
+    npm_user: user.npm_user === 1,
+    custom_user: user.npm_user === 2,
    gmt_create: user.gmt_create,
    gmt_modified: user.gmt_modified,
-    admin: !!config.admins[user.name],
+    admin: isAdmin,
+    scopes: scopes,
  };

  this.body = data;
@@ -85,20 +122,20 @@ function ensurePasswordSalt(user, body) {
 //   'content-length': '258',
 //   connection: 'keep-alive' }
 // { name: 'mk2',
-//   salt: '18d8d51936478446a5466d4fb1633b80f3838b4caaa03649a885ac722cd6',
-//   password_sha: '8f4408912a6db1d96b132a90856d99db029cef3d',
+//   salt: '12351936478446a5466d4fb1633b80f3838b4caaa03649a885ac722cd6',
+//   password_sha: '123408912a6db1d96b132a90856d99db029cef3d',
 //   email: 'fengmk2@gmail.com',
 //   _id: 'org.couchdb.user:mk2',
 //   type: 'user',
 //   roles: [],
 //   date: '2014-03-15T02:39:25.696Z' }
-exports.add = function *() {
+exports.add = function* () {
  var name = this.params.name;
  var body = this.request.body || {};
  var user = {
    name: body.name,
-    salt: body.salt,
-    password_sha: body.password_sha,
+    // salt: body.salt,
+    // password_sha: body.password_sha,
    email: body.email,
    ip: this.ip || '0.0.0.0',
    // roles: body.roles || [],
@@ -106,7 +143,7 @@ exports.add = function *() {

  ensurePasswordSalt(user, body);

-  if (!user.name || !user.salt || !user.password_sha || !user.email) {
+  if (!body.password || !user.name || !user.salt || !user.password_sha || !user.email) {
    this.status = 422;
    this.body = {
      error: 'paramError',
@@ -114,7 +151,47 @@ exports.add = function *() {
    };
    return;
  }
-  debug('add user: %j', user);
+
+  debug('add user: %j', body);
+
+  var loginedUser;
+  try {
+    loginedUser = yield UserService.auth(body.name, body.password);
+  } catch (err) {
+    this.status = err.status || 500;
+    this.body = {
+      error: err.name,
+      reason: err.message
+    };
+    return;
+  }
+  if (loginedUser) {
+    var rev = Date.now() + '-' + loginedUser.login;
+    if (config.customUserService) {
+      // make sure sync user meta to cnpm database
+      var data = user;
+      data.rev = rev;
+      data.user = loginedUser;
+      yield* User.saveCustomUser(data);
+    }
+    this.status = 201;
+    this.body = {
+      ok: true,
+      id: 'org.couchdb.user:' + loginedUser.login,
+      rev: rev,
+    };
+    return;
+  }
+
+  if (config.customUserService) {
+    // user login fail, not allow to add new user
+    this.status = 401;
+    this.body = {
+      error: 'unauthorized',
+      reason: 'Login fail, please check your login name and password'
+    };
+    return;
+  }

  var existUser = yield User.get(name);
  if (existUser) {
@@ -136,24 +213,7 @@ exports.add = function *() {
  };
 };

-exports.authSession = function *() {
-  // body: {"name":"foo","password":"****"}
-  var body = this.request.body || {};
-  var name = body.name;
-  var password = body.password;
-  var user = yield User.auth(name, password);
-  debug('authSession %s: %j', name, user);
-
-  if (!user) {
-    this.status = 401;
-    this.body = {ok: false, name: null, roles: []};
-    return;
-  }
-  var session = yield *this.session;
-  session.name = user.name;
-  this.body = {ok: true, name: user.name, roles: []};
-};
-
+// logined before update, no need to auth user again
 exports.update = function *(next) {
  var name = this.params.name;
  var rev = this.params.rev;
@@ -175,17 +235,19 @@ exports.update = function *(next) {
  var body = this.request.body || {};
  var user = {
    name: body.name,
-    salt: body.salt,
-    password_sha: body.password_sha,
+    // salt: body.salt,
+    // password_sha: body.password_sha,
    email: body.email,
    ip: this.ip || '0.0.0.0',
    rev: body.rev || body._rev,
    // roles: body.roles || [],
  };

+  debug('update user %j', body);
+
  ensurePasswordSalt(user, body);

-  if (!user.name || !user.salt || !user.password_sha || !user.email) {
+  if (!body.password || !user.name || !user.salt || !user.password_sha || !user.email) {
    this.status = 422;
    this.body = {
      error: 'paramError',
--- a/controllers/web/package.js
+++ b/controllers/web/package.js
@@ -32,6 +32,7 @@ var ModuleDeps = require('../../proxy/module_deps');
 var setDownloadURL = require('../../lib/common').setDownloadURL;
 var ModuleStar = require('../../proxy/module_star');
 var packageService = require('../../services/package');
+var ModuleUnpublished = require('../../proxy/module_unpublished');

 exports.display = function* (next) {
  var params = this.params;
@@ -54,12 +55,38 @@ exports.display = function* (next) {
  }

  var pkg = yield Module[getPackageMethod].apply(Module, getPackageArgs);
-  if (!pkg && config.defaultScope && name.indexOf(config.defaultScope) === 0) {
-    name = name.split('/')[1];
-    pkg = yield Module[getPackageMethod].apply(Module, [name, getPackageArgs[1]]);
+  if (!pkg) {
+    var adaptName = yield* Module.getAdaptName(name);
+    if (adaptName) {
+      name = adaptName;
+      pkg = yield Module[getPackageMethod].apply(Module, [name, getPackageArgs[1]]);
+    }
  }

  if (!pkg || !pkg.package) {
+    // check if unpublished
+    var unpublishedInfo = yield* ModuleUnpublished.get(name);
+    debug('show unpublished %j', unpublishedInfo);
+    if (unpublishedInfo) {
+      var data = {
+        name: name,
+        unpublished: unpublishedInfo.package
+      };
+      data.unpublished.time = new Date(data.unpublished.time);
+      if (data.unpublished.maintainers) {
+        for (var i = 0; i < data.unpublished.maintainers.length; i++) {
+          var maintainer = data.unpublished.maintainers[i];
+          if (maintainer.email) {
+            maintainer.gravatar = gravatar.url(maintainer.email, {s: '50', d: 'retro'}, true);
+          }
+        }
+      }
+      yield this.render('package_unpublished', {
+        package: data
+      });
+      return;
+    }
+
    return yield* next;
  }

@@ -215,6 +242,14 @@ exports.displaySync = function* (next) {
  });
 };

+exports.listPrivates = function* () {
+  var packages = yield Module.listPrivates();
+  yield this.render('private', {
+      title: 'private packages',
+      packages: packages
+    });
+};
+
 function setLicense(pkg) {
  var license;
  license = pkg.license || pkg.licenses || pkg.licence || pkg.licences;
--- a/controllers/web/user.js
+++ b/controllers/web/user.js
@@ -1,4 +1,4 @@
-/*!
+/**!
 * cnpmjs.org - controllers/web/package.js
 *
 * Copyright(c) cnpmjs.org and other contributors.
@@ -6,6 +6,7 @@
 *
 * Authors:
 *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
+ *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
 */

 'use strict';
@@ -13,26 +14,66 @@
 /**
 * Module dependencies.
 */
+
+var config = require('../../config');
 var Module = require('../../proxy/module');
 var User = require('../../proxy/user');
+var UserService = require('../../services/user');
+var common = require('../../lib/common');

-exports.display = function *(next) {
+exports.display = function* (next) {
  var name = this.params.name;
+  var isAdmin = common.isAdmin(name);
+  var scopes = config.scopes || [];
+  if (config.customUserService) {
+    var customUser = yield* UserService.get(name);
+    if (customUser) {
+      isAdmin = !!customUser.site_admin;
+      scopes = customUser.scopes;
+      var data = {
+        user: customUser
+      };
+      yield* User.saveCustomUser(data);
+    }
+  }

  var r = yield [Module.listByAuthor(name), User.get(name)];
-  var packages = r[0];
+  var packages = r[0] || [];
  var user = r[1];
  if (!user && !packages.length) {
    return yield* next;
  }
-  user = {
+
+  var data = {
    name: name,
-    email: user && user.email
+    email: user && user.email,
+    json: user && user.json || {}
  };

+  if (data.json.login) {
+    // custom user format
+    // convert to npm user format
+    var json = data.json;
+    data.json = {
+      _id: 'org.couchdb.user:' + user.name,
+      _rev: user.rev,
+      name: user.name,
+      email: user.email,
+      type: 'user',
+      roles: [],
+      date: user.gmt_modified,
+      avatar: json.avatar_url,
+      fullname: json.name || json.login,
+      homepage: json.html_url,
+    };
+  }
+
  yield this.render('profile', {
    title: 'User - ' + name,
-    packages: packages || [],
-    user: user
+    packages: packages,
+    user: data,
+    lastModified: user.gmt_modified,
+    isAdmin: isAdmin,
+    scopes: scopes
  });
 };
--- a/docs/web/readme.md
+++ b/docs/web/readme.md
@@ -177,8 +177,3 @@ Release [History](/history).
 ## npm and cnpm relation

 ![npm&cnpm](https://docs.google.com/drawings/d/12QeQfGalqjsB77mRnf5Iq5oSXHCIUTvZTwECMonqCmw/pub?w=383&h=284)
-
-## 捐赠 Donate
-如果您觉得 [cnpmjs.org](/) 对您有帮助，欢迎请作者一杯咖啡.
-
-[![Donate](https://img.alipay.com/sys/personalprod/style/mc/btn-index.png)](https://me.alipay.com/imk2)
--- a/middleware/auth.js
+++ b/middleware/auth.js
@@ -15,46 +15,50 @@
 */

 var debug = require('debug')('cnpmjs.org:middleware:auth');
-var User = require('../proxy/user');
-var config = require('../config');
-var common = require('../lib/common');
+var UserService = require('../services/user');
+
+/**
+ * Parse the request authorization
+ * get the real user
+ */

 module.exports = function (options) {
-  return function *auth(next) {
-    var session = yield *this.session;
-    debug('%s, %s, %j', this.url, this.sessionId, session);
+  return function* auth(next) {
    this.user = {};

-    if (session.name) {
-      this.user.name = session.name;
-      this.user.isAdmin = common.isAdmin(session.name);
-      debug('auth exists user: %j, headers: %j', this.user, this.header);
-      return yield *next;
-    }
-
    var authorization = (this.get('authorization') || '').split(' ')[1] || '';
    authorization = authorization.trim();
+    debug('%s %s with %j', this.method, this.url, authorization);
    if (!authorization) {
-      return yield *next;
+      return yield* next;
    }

    authorization = new Buffer(authorization, 'base64').toString().split(':');
    if (authorization.length !== 2) {
-      return yield *next;
+      return yield* next;
    }

    var username = authorization[0];
    var password = authorization[1];

-    var row = yield User.auth(username, password);
-    if (!row) {
-      debug('auth fail user: %j, headers: %j', row, this.header);
-      return yield *next;
+    var row;
+    try {
+      row = yield* UserService.auth(username, password);
+    } catch (err) {
+      // do not response error here
+      // many request do not need login
+      this.user.error = err;
    }

-    this.user.name = row.name;
-    this.user.isAdmin = common.isAdmin(row.name);
+    if (!row) {
+      debug('auth fail user: %j, headers: %j', row, this.header);
+      return yield* next;
+    }
+
+    this.user.name = row.login;
+    this.user.isAdmin = row.site_admin;
+    this.user.scopes = row.scopes;
    debug('auth pass user: %j, headers: %j', this.user, this.header);
-    yield *next;
+    yield* next;
  };
 };
--- a/middleware/login.js
+++ b/middleware/login.js
@@ -15,7 +15,17 @@
 */

 module.exports = function *login(next) {
+  if (this.user.error) {
+    this.status = this.user.error.status || 500;
+    this.body = {
+      error: this.user.error.name,
+      reason: this.user.error.message
+    };
+    return;
+  }
+
  if (!this.user.name) {
+
    this.status = 401;
    this.body = {
      error: 'unauthorized',
--- a/middleware/publishable.js
+++ b/middleware/publishable.js
@@ -14,11 +14,14 @@
 * Module dependencies.
 */

+var util = require('util');
 var config = require('../config');
+var debug = require('debug')('cnpmjs.org:middlewares/publishable');

 module.exports = function *publishable(next) {
+  // private mode, only admin user can publish
  if (config.enablePrivate && !this.user.isAdmin) {
-    // private mode, only admin user can publish
+
    this.status = 403;
    this.body = {
      error: 'no_perms',
@@ -26,5 +29,75 @@ module.exports = function *publishable(next) {
    };
    return;
  }
-  yield *next;
+
+  // public mode, all user have permission to publish
+  // but if `config.scopes` exist, only can publish with scopes in `config.scope`
+  // if `config.forcePublishWithScope` set to true, only admins can publish without scope
+
+  var name = this.params.name || this.params[0];
+
+  // check if is private package list in config
+  if (config.privatePackages && config.privatePackages.indexOf(name) !== -1) {
+    return yield* next;
+  }
+
+  // scope
+  if (name[0] === '@') {
+    if (checkScope(name, this)) {
+      return yield* next;
+    }
+    return;
+  }
+
+  // none-scope
+  if (checkNoneScope(this)) {
+    return yield* next;
+  }
 };
+
+/**
+ * check module's scope legal
+ */
+
+function checkScope(name, ctx) {
+  if (!ctx.user.scopes || !ctx.user.scopes.length) {
+    ctx.status = 404;
+    return false;
+  }
+
+  var scope = name.split('/')[0];
+  if (ctx.user.scopes.indexOf(scope) === -1) {
+    debug('assert scope  %s error', name);
+    ctx.status = 400;
+    ctx.body = {
+      error: 'invalid scope',
+      reason: util.format('scope %s not match legal scopes %j', scope, ctx.user.scopes)
+    };
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * check if user have permission to publish without scope
+ */
+
+function checkNoneScope(ctx) {
+  if (!config.scopes
+    || !config.scopes.length
+    || !config.forcePublishWithScope) {
+    return true;
+  }
+
+  // only admins can publish or unpublish non-scope modules
+  if (ctx.user.isAdmin) {
+    return true;
+  }
+
+  ctx.status = 403;
+  ctx.body = {
+    error: 'no_perms',
+    reason: 'only allow publish with ' + ctx.user.scopes.join(',') + ' scope(s)'
+  };
+}
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cnpmjs.org",
-  "version": "0.8.1",
+  "version": "1.0.2",
  "description": "Private npm registry and web for Enterprise, base on MySQL and Simple Store Service",
  "main": "index.js",
  "scripts": {
@@ -43,7 +43,7 @@
    "qn": "0.2.2",
    "ready": "0.1.1",
    "redis": "0.11.0",
-    "semver": "2.3.1",
+    "semver": "3.0.1",
    "thunkify-wrap": "1.0.1",
    "utility": "0.1.16"
  },
--- a/proxy/dist.js
+++ b/proxy/dist.js
@@ -9,6 +9,7 @@
 */

 'use strict';
+/* jshint -W032 */

 /**
 * Module dependencies.
--- a/proxy/download.js
+++ b/proxy/download.js
@@ -9,6 +9,8 @@
 */

 'use strict';
+/* jshint -W032 */
+

 /**
 * Module dependencies.
--- a/proxy/module.js
+++ b/proxy/module.js
@@ -9,6 +9,7 @@
 */

 'use strict';
+/* jshint -W032 */

 /**
 * Module dependencies.
@@ -676,3 +677,65 @@ var DELETE_TAGS_BY_NAMES_SQL = 'DELETE FROM tag WHERE name=? AND tag IN (?);';
 exports.removeTagsByNames = function* (moduleName, tagNames) {
  return yield mysql.query(DELETE_TAGS_BY_NAMES_SQL, [moduleName, tagNames]);
 };
+
+/**
+ * forward compatbility for update from lower version cnpmjs.org
+ * redirect @scope/name => name
+ */
+exports.getAdaptName = function* (name) {
+  if (!config.scopes
+    || !config.scopes.length
+    || !config.adaptScope) {
+    return;
+  }
+
+  var tmp = name.split('/');
+  var scope = tmp[0];
+  name = tmp[1];
+
+  if (config.scopes.indexOf(scope) === -1) {
+    return;
+  }
+
+  var pkg = yield exports.getByTag(name, 'latest');
+  // only private module can adapt
+  if (pkg && pkg.package._publish_on_cnpm) {
+    return name;
+  }
+  return;
+};
+
+exports.listPrivates = function* () {
+  var scopes = config.scopes;
+  if (!scopes || !scopes.length) {
+    return [];
+  }
+  var privatePackages = config.privatePackages || [];
+
+  var args = [];
+  var sql = 'SELECT module_id AS id FROM tag WHERE tag="latest" AND (';
+  var wheres = [];
+
+  scopes.forEach(function (scope) {
+    wheres.push('name LIKE ?');
+    args.push(scope + '%');
+  });
+
+  if (privatePackages.length) {
+    wheres.push('name in (?)');
+    args.push(privatePackages);
+  }
+
+  sql = sql + wheres.join(' OR ') + ')';
+
+  var ids = yield mysql.query(sql, args);
+  ids = ids.map(function (row) {
+    return row.id;
+  });
+
+  if (!ids.length) {
+    return [];
+  }
+
+  return yield mysql.query(QUERY_MODULES_BY_ID_SQL, [ids]);
+};
--- a/proxy/module_deps.js
+++ b/proxy/module_deps.js
@@ -9,6 +9,7 @@
 */

 "use strict";
+/* jshint -W032 */

 /**
 * Module dependencies.
--- a/proxy/module_log.js
+++ b/proxy/module_log.js
@@ -9,6 +9,7 @@
 */

 'use strict';
+/* jshint -W032 */

 /**
 * Module dependencies.
@@ -26,7 +27,7 @@ exports.create = function (data, callback) {
    name: data.name,
    username: data.username,
    log: ''
-  }
+  };
  mysql.query(INSERT_LOG_SQL, [args], function (err, result) {
    if (err) {
      return callback(err);
--- a/proxy/module_star.js
+++ b/proxy/module_star.js
@@ -9,6 +9,7 @@
 */

 'use strict';
+/* jshint -W032 */

 /**
 * Module dependencies.
--- a/proxy/module_unpublished.js
+++ b/proxy/module_unpublished.js
@@ -9,6 +9,7 @@
 */

 'use strict';
+/* jshint -W032 */

 /**
 * Module dependencies.
--- a/proxy/sync_module_worker.js
+++ b/proxy/sync_module_worker.js
@@ -351,13 +351,13 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
      maintainers = [maintainers];
    }

-    maintainers.forEach(function (m) {
-      if (m.name) {
-        npmUsernames[m.name.toLowerCase()] = 1;
-      }
-    });
+    maintainers.forEach(pushName);
+  }
+  function pushName(m) {
+    if (m.name) {
+      npmUsernames[m.name.toLowerCase()] = 1;
+    }
  }
-
  // get the missing star users
  var starUsers = pkg.users || {};
  for (var k in starUsers) {
--- a/proxy/total.js
+++ b/proxy/total.js
@@ -9,6 +9,7 @@
 */

 'use strict';
+/* jshint -W032 */

 /**
 * Module dependencies.
--- a/proxy/user.js
+++ b/proxy/user.js
@@ -9,6 +9,7 @@
 */

 'use strict';
+/* jshint -W032 */

 /**
 * Module dependencies.
@@ -20,52 +21,10 @@ var config = require('../config');
 var mysql = require('../common/mysql');
 var multiline = require('multiline');

-var SELECT_USER_SQL = multiline(function () {;/*
-  SELECT
-    id, rev, name, email, salt, password_sha, ip,
-    roles, json, npm_user, gmt_create, gmt_modified
-  FROM
-    user
-  WHERE
-    name=?;
-*/});
-exports.get = function (name, callback) {
-  mysql.queryOne(SELECT_USER_SQL, [name], function (err, row) {
-    if (row) {
-      try {
-        row.roles = row.roles ? JSON.parse(row.roles) : [];
-      } catch (e) {
-        row.roles = [];
-      }
-      try {
-        row.json = row.json ? JSON.parse(row.json) : null;
-      } catch (e) {
-        row.json = null;
-      }
-    }
-    callback(err, row);
-  });
-};
-
 function passwordSha(password, salt) {
  return utility.sha1(password + salt);
 }

-exports.auth = function (name, password, callback) {
-  exports.get(name, function (err, row) {
-    if (err || !row) {
-      return callback(err, row);
-    }
-
-    var sha = passwordSha(password, row.salt);
-    if (row.password_sha !== sha) {
-      row = null;
-    }
-    callback(null, row);
-  });
-};
-
-
 var INSERT_USER_SQL = 'INSERT INTO user SET ?';
 exports.add = function (user, callback) {
  var roles = user.roles || [];
@@ -143,7 +102,42 @@ thunkify(exports);

 exports.passwordSha = passwordSha;

-exports.saveNpmUser = function *(user) {
+var SELECT_USER_SQL = 'SELECT \
+    id, rev, name, email, salt, password_sha, ip, \
+    roles, json, npm_user, gmt_create, gmt_modified \
+  FROM \
+    user \
+  WHERE \
+    name=?;';
+exports.get = function* (name) {
+  var row = yield mysql.queryOne(SELECT_USER_SQL, [name]);
+  if (row) {
+    try {
+      row.roles = row.roles ? JSON.parse(row.roles) : [];
+    } catch (e) {
+      row.roles = [];
+    }
+    try {
+      row.json = row.json ? JSON.parse(row.json) : null;
+    } catch (e) {
+      row.json = null;
+    }
+  }
+  return row;
+};
+
+exports.auth = function* (name, password) {
+  var row = yield* exports.get(name);
+  if (row) {
+    var sha = passwordSha(password, row.salt);
+    if (row.password_sha !== sha) {
+      row = null;
+    }
+  }
+  return row;
+};
+
+exports.saveNpmUser = function* (user) {
  var sql = 'SELECT id, json FROM user WHERE name=?;';
  var row = yield mysql.queryOne(sql, [user.name]);
  if (!row) {
@@ -156,17 +150,47 @@ exports.saveNpmUser = function *(user) {
  }
 };

-var LIST_BY_NAMES_SQL = multiline(function () {;/*
-  SELECT
-    id, name, email, json
-  FROM
-    user
-  WHERE
-    name in (?);
-*/});
-exports.listByNames = function *(names) {
+exports.saveCustomUser = function* (data) {
+  var sql = 'SELECT id, json FROM user WHERE name=?;';
+  var row = yield mysql.queryOne(sql, [data.user.login]);
+  var salt = data.salt || '0';
+  var password_sha = data.password_sha || '0';
+  var ip = data.ip || '0';
+  var rev = rev || '1-' + data.user.login;
+  var json = JSON.stringify(data.user);
+  if (!row) {
+    sql = 'INSERT INTO user(npm_user, json, rev, name, email, salt, password_sha, ip, gmt_create, gmt_modified) \
+      VALUES(2, ?, ?, ?, ?, ?, ?, ?, now(), now());';
+    yield mysql.query(sql, [
+      json, rev, data.user.login, data.user.email,
+      salt, password_sha, ip
+    ]);
+  } else {
+    sql = 'UPDATE user SET json=?, rev=?, salt=?, password_sha=?, ip=? WHERE id=?;';
+    yield mysql.query(sql, [
+      json, rev,
+      salt, password_sha, ip,
+      row.id
+    ]);
+  }
+};
+
+var LIST_BY_NAMES_SQL = 'SELECT \
+    id, name, email, json \
+  FROM \
+    user \
+  WHERE \
+    name in (?);';
+exports.listByNames = function* (names) {
  if (names.length === 0) {
    return [];
  }
  return yield mysql.query(LIST_BY_NAMES_SQL, [names]);
 };
+
+var SEARCH_SQL = 'SELECT id, name, email, json FROM user WHERE name LIKE ? LIMIT ?;';
+exports.search = function* (query, options) {
+  var limit = options.limit;
+  query = query + '%';
+  return yield mysql.query(SEARCH_SQL, [query, limit]);
+};
--- a/routes/registry.js
+++ b/routes/registry.js
@@ -44,28 +44,35 @@ function routes(app) {

  // module
  // scope package: params: [$name]
-  app.get(/\/(@[\w\-\.]+\/[\w\-\.]+)$/, syncByInstall, mod.show);
+  app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)$/, syncByInstall, mod.show);
  // scope package: params: [$name, $version]
-  app.get(/\/(@[\w\-\.]+\/[\w\-\.]+)\/([\w\.\-]+)$/, syncByInstall, mod.get);
+  app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/([\w\.\-]+)$/, syncByInstall, mod.get);

  app.get('/:name', syncByInstall, mod.show);
  app.get('/:name/:version', syncByInstall, mod.get);
  // try to add module
+  app.put(/^\/(@[\w\-\.]+\/[\w\-\.]+)$/, login, publishable, mod.addPackageAndDist);
  app.put('/:name', login, publishable, mod.addPackageAndDist);

  // sync from source npm
  app.put('/:name/sync', sync.sync);
  app.get('/:name/sync/log/:id', sync.getSyncLog);

+  app.put(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/([\w\-\.]+)$/, login, mod.updateTag);
  app.put('/:name/:tag', login, mod.updateTag);

  // need limit by ip
+  app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/download\/(@[\w\-\.]+\/[\w\-\.]+)$/, limit, mod.download);
  app.get('/:name/download/:filename', limit, mod.download);

  // delete tarball
+  app.delete(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/download\/(@[\w\-\.]+\/[\w\-\.]+)\/\-rev\/([\w\-\.]+)$/,
+    login, publishable, mod.removeTar);
  app.delete('/:name/download/:filename/-rev/:rev', login, publishable, mod.removeTar);

  // update module, unpublish will PUT this
+  app.put(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/\-rev\/([\w\-\.]+)$/, login, publishable, mod.updateOrRemove);
+  app.delete(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/\-rev\/([\w\-\.]+)$/, login, publishable, mod.removeAll);
  app.put('/:name/-rev/:rev', login, publishable, mod.updateOrRemove);
  app.delete('/:name/-rev/:rev', login, publishable, mod.removeAll);

@@ -74,8 +81,6 @@ function routes(app) {
  app.put('/-/user/org.couchdb.user::name', user.add);
  app.get('/-/user/org.couchdb.user::name', user.show);
  app.put('/-/user/org.couchdb.user::name/-rev/:rev', login, user.update);
-  // _session
-  app.post('/_session', user.authSession);
 }

 module.exports = routes;
--- a/routes/web.js
+++ b/routes/web.js
@@ -31,15 +31,15 @@ function routes(app) {
  app.get('/package/:name', pkg.display);
  app.get('/package/:name/:version', pkg.display);

+  app.get('/privates', pkg.listPrivates);
+
  app.get(/\/browse\/keyword\/(@[\w\-\.]+\/[\w\-\.]+)$/, pkg.search);
  app.get('/browse/keyword/:word', pkg.search);

  app.get('/~:name', user.display);

-  app.get(/\/sync\/(@[\w\-\.]+\/[\w\-\.]+)$/, pkg.displaySync);
  app.get('/sync/:name', pkg.displaySync);

-  app.put(/\/sync\/(@[\w\-\.]+\/[\w\-\.]+)$/, sync.sync);
  app.put('/sync/:name', sync.sync);

  // params: [$name, $id]
--- a/servers/registry.js
+++ b/servers/registry.js
@@ -22,7 +22,6 @@ var middlewares = require('koa-middlewares');
 var routes = require('../routes/registry');
 var logger = require('../common/logger');
 var config = require('../config');
-var session = require('../common/session');
 var auth = require('../middleware/auth');
 var staticCache = require('../middleware/static');
 var notFound = require('../middleware/registry_not_found');
@@ -34,7 +33,6 @@ app.use(staticCache);

 app.keys = ['todokey', config.sessionSecret];
 app.proxy = true;
-app.use(session);
 app.use(middlewares.bodyParser({jsonLimit: config.jsonLimit}));
 app.use(auth());
 app.use(notFound);
@@ -57,6 +55,7 @@ routes(app);
 */

 app.on('error', function (err, ctx) {
+  // console.log(err.stack)
  err.url = err.url || ctx.request.url;
  logger.error(err);
 });
--- a/servers/web.js
+++ b/servers/web.js
@@ -21,7 +21,6 @@ var fs = require('fs');
 var koa = require('koa');
 var middlewares = require('koa-middlewares');
 var markdown = require('koa-markdown');
-var session = require('../common/session');
 var opensearch = require('../middleware/opensearch');
 var notFound = require('../middleware/web_not_found');
 var staticCache = require('../middleware/static');
@@ -41,7 +40,6 @@ app.use(staticCache);
 app.use(opensearch);
 app.keys = ['todokey', config.sessionSecret];
 app.proxy = true;
-app.use(session);
 app.use(middlewares.bodyParser());
 app.use(auth());
 app.use(notFound);
--- a/services/default_user_service.js
+++ b/services/default_user_service.js
@@ -0,0 +1,139 @@
+/**!
+ * cnpmjs.org - services/default_user_service.js
+ *
+ * Copyright(c) fengmk2 and other contributors.
+ * MIT Licensed
+ *
+ * Authors:
+ *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+var gravatar = require('gravatar');
+var User = require('../proxy/user');
+var isAdmin = require('../lib/common').isAdmin;
+var config = require('../config');
+
+// User: https://github.com/cnpm/cnpmjs.org/wiki/Use-Your-Own-User-Authorization#user-data-structure
+// {
+//   "login": "fengmk2",
+//   "email": "fengmk2@gmail.com",
+//   "name": "Yuan Feng",
+//   "html_url": "http://fengmk2.github.com",
+//   "avatar_url": "https://avatars3.githubusercontent.com/u/156269?s=460",
+//   "im_url": "",
+//   "site_admin": false,
+//   "scopes": ["@org1", "@org2"]
+// }
+
+module.exports = DefaultUserService;
+
+function convertToUser(row) {
+  var user = {
+    login: row.name,
+    email: row.email,
+    name: row.name,
+    html_url: 'http://cnpmjs.org/~' + row.name,
+    avatar_url: '',
+    im_url: '',
+    site_admin: isAdmin(row.name),
+    scopes: config.scopes
+  };
+  if (row.json) {
+    var data = row.json;
+    if (data.login) {
+      // custom user
+      user = data;
+    } else {
+      // npm user
+      if (data.avatar) {
+        user.avatar_url = data.avatar;
+      }
+      if (data.fullname) {
+        user.name = data.fullname;
+      }
+      if (data.homepage) {
+        user.html_url = data.homepage;
+      }
+      if (data.twitter) {
+        user.im_url = 'https://twitter.com/' + data.twitter;
+      }
+    }
+  }
+  if (!user.avatar_url) {
+    user.avatar_url = gravatar.url(user.email, {s: '50', d: 'retro'}, true);
+  }
+  return user;
+}
+
+function DefaultUserService() {}
+
+var proto = DefaultUserService.prototype;
+
+/**
+ * Auth user with login name and password
+ * @param  {String} login    login name
+ * @param  {String} password login password
+ * @return {User}
+ */
+proto.auth = function* (login, password) {
+  var row = yield* User.auth(login, password);
+  if (!row) {
+    return null;
+  }
+  return convertToUser(row);
+};
+
+/**
+ * Get user by login name
+ * @param  {String} login  login name
+ * @return {User}
+ */
+proto.get = function* (login) {
+  var row = yield* User.get(login);
+  if (!row) {
+    return null;
+  }
+  return convertToUser(row);
+};
+
+/**
+ * List users
+ * @param  {Array<String>} logins  login names
+ * @return {Array<User>}
+ */
+proto.list = function* (logins) {
+  var rows = yield* User.listByNames(logins);
+  var users = [];
+  rows.forEach(function (row) {
+    users.push(convertToUser(row));
+  });
+  return users;
+};
+
+/**
+ * Search users
+ * @param  {String} query  query keyword
+ * @param  {Object} [options] optional query params
+ *  - {Number} limit match users count, default is `20`
+ * @return {Array<User>}
+ */
+proto.search = function* (query, options) {
+  options = options || {};
+  options.limit = parseInt(options.limit);
+  if (!options.limit || options.limit < 0) {
+    options.limit = 20;
+  }
+
+  var rows = yield* User.search(query, options);
+  var users = [];
+  rows.forEach(function (row) {
+    users.push(convertToUser(row));
+  });
+  return users;
+};
--- a/services/package.js
+++ b/services/package.js
@@ -32,6 +32,10 @@ exports.listMaintainers = function* (name) {
  });
 };

+exports.listMaintainerNamesOnly = function* (name) {
+  return yield* ModuleMaintainer.get(name);
+};
+
 exports.updateMaintainers = function* (name, usernames) {
  var rs = yield [
    ModuleMaintainer.update(name, usernames),
@@ -41,10 +45,21 @@ exports.updateMaintainers = function* (name, usernames) {
 };

 exports.isMaintainer = function* (name, username) {
-  var maintainers = yield* ModuleMaintainer.get(name);
+  var rs = yield [
+    ModuleMaintainer.get(name),
+    Module.getLatest(name)
+  ];
+  var maintainers = rs[0];
+  var latestMod = rs[1];
+
+  if (latestMod && !latestMod.package._publish_on_cnpm) {
+    // no one can update public package maintainers
+    // public package only sync from source npm registry
+    return false;
+  }
+
  if (maintainers.length === 0) {
    // if not found maintainers, try to get from latest module package info
-    var latestMod = yield Module.getLatest(name);
    var ms = latestMod && latestMod.package && latestMod.package.maintainers;
    if (ms && ms.length > 0) {
      maintainers = ms.map(function (user) {
--- a/services/user.js
+++ b/services/user.js
@@ -0,0 +1,56 @@
+/**!
+ * cnpmjs.org - services/user.js
+ *
+ * Copyright(c) fengmk2 and other contributors.
+ * MIT Licensed
+ *
+ * Authors:
+ *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+var config = require('../config');
+if (!config.userService) {
+  var DefaultUserService = require('./default_user_service');
+  config.userService = new DefaultUserService();
+  config.customUserService = false;
+} else {
+  config.customUserService = true;
+}
+config.scopes = config.scopes || [];
+
+function convertUser(user) {
+  if (!user) {
+    return null;
+  }
+  user.scopes = user.scopes || [];
+  if (user.scopes.length === 0 && config.scopes.length > 0) {
+    user.scopes = config.scopes.slice();
+  }
+  return user;
+}
+
+exports.auth = function* (login, password) {
+  var user = yield* config.userService.auth(login, password);
+  return convertUser(user);
+};
+
+exports.get = function* (login) {
+  var user = yield* config.userService.get(login);
+  return convertUser(user);
+};
+
+exports.list = function* (logins) {
+  var users = yield* config.userService.list(logins);
+  return users.map(convertUser);
+};
+
+exports.search = function* (query, options) {
+  var users = yield* config.userService.search(query, options);
+  return users.map(convertUser);
+};
--- a/test/controllers/registry/module.test.js
+++ b/test/controllers/registry/module.test.js
@@ -420,6 +420,7 @@ describe('controllers/registry/module.test.js', function () {

    it('should 403 when not maintainer update in public mode', function (done) {
      mm(config, 'enablePrivate', false);
+      mm(config, 'forcePublishWithScope', false);
      request(app)
      .put('/mk2testmodule/-rev/1')
      .send({
@@ -491,6 +492,7 @@ describe('controllers/registry/module.test.js', function () {
    it('should try to add return 400 when not module user and only next module exists',
    function (done) {
      mm(config, 'enablePrivate', false);
+      mm(config, 'forcePublishWithScope', false);
      request(app)
      .put('/' + pkg.name)
      .set('authorization', baseauthOther)
--- a/test/controllers/registry/module/config_private_packages.test.js
+++ b/test/controllers/registry/module/config_private_packages.test.js
@@ -0,0 +1,105 @@
+/*!
+ * cnpmjs.org - test/controllers/registry/module/public_mode.test.js
+ * Copyright(c) 2014 dead_horse <dead_horse@qq.com>
+ * MIT Licensed
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+var should = require('should');
+var request = require('supertest');
+var mm = require('mm');
+var config = require('../../../../config');
+var app = require('../../../../servers/registry');
+var utils = require('../../../utils');
+
+describe('controllers/registry/module/config_private_packages.test.js', function () {
+  beforeEach(function () {
+    mm(config, 'enablePrivate', false);
+    mm(config, 'forcePublishWithScope', true);
+    mm(config, 'privatePackages', ['private-package']);
+  });
+
+  after(mm.restore);
+  it('should publish with tgz base64, addPackageAndDist()', function (done) {
+    var pkg = utils.getPackage('private-package', '0.0.1', utils.otherUser);
+    request(app)
+    .put('/' + pkg.name)
+    .set('authorization', utils.otherUserAuth)
+    .send(pkg)
+    .expect(201, function (err, res) {
+      should.not.exist(err);
+      res.body.should.have.keys('ok', 'rev');
+      res.body.ok.should.equal(true);
+      pkg = utils.getPackage('private-package', '0.0.1', utils.otherUser);
+      // upload again should 403
+      request(app)
+      .put('/' + pkg.name)
+      .set('authorization', utils.otherUserAuth)
+      .send(pkg)
+      .expect(403, function (err, res) {
+        should.not.exist(err);
+        res.body.should.eql({
+          error: 'forbidden',
+          reason: 'cannot modify pre-existing version: 0.0.1'
+        });
+        done();
+      });
+    });
+  });
+
+  it('should other user publish 403', function (done) {
+    var pkg = utils.getPackage('private-package', '0.0.2', utils.secondUser);
+    request(app)
+    .put('/' + pkg.name)
+    .set('authorization', utils.secondUserAuth)
+    .send(pkg)
+    .expect(/forbidden user/)
+    .expect(403, done);
+  });
+
+  it('should admin publish 403', function (done) {
+    var pkg = utils.getPackage('private-package', '0.0.2', utils.admin);
+    request(app)
+    .put('/' + pkg.name)
+    .set('authorization', utils.adminAuth)
+    .send(pkg)
+    .expect(/forbidden user/)
+    .expect(403, done);
+  });
+
+  it('should add again new maintainers', function (done) {
+    request(app)
+    .put('/private-package/-rev/1')
+    .send({
+      maintainers: [{
+        name: 'cnpmjstest101',
+        email: 'cnpmjstest101@cnpmjs.org'
+      }, {
+        name: 'fengmk2',
+        email: 'fengmk2@cnpmjs.org'
+      }]
+    })
+    .set('authorization', utils.otherUserAuth)
+    .expect(201)
+    .expect('content-type', 'application/json; charset=utf-8', done);
+  });
+
+  it('should remove maintainers', function (done) {
+    request(app)
+    .put('/private-package/-rev/1')
+    .send({
+      maintainers: [{
+        name: 'cnpmjstest101',
+        email: 'cnpmjstest101@cnpmjs.org'
+      }]
+    })
+    .set('authorization', utils.otherUserAuth)
+    .expect(201)
+    .expect('content-type', 'application/json; charset=utf-8', done);
+  });
+});
--- a/test/controllers/registry/module/maintainer.test.js
+++ b/test/controllers/registry/module/maintainer.test.js
@@ -0,0 +1,100 @@
+/**!
+ * cnpmjs.org - test/controllers/registry/module/maintainer.test.js
+ *
+ * Copyright(c) fengmk2 and other contributors.
+ * MIT Licensed
+ *
+ * Authors:
+ *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+var should = require('should');
+var request = require('supertest');
+var mm = require('mm');
+var config = require('../../../../config');
+var app = require('../../../../servers/registry');
+var utils = require('../../../utils');
+
+describe('controllers/registry/module/maintainer.test.js', function () {
+  var pkgname = '@cnpm/test-package-maintainer';
+  var pkgURL = '/@' + encodeURIComponent(pkgname.substring(1));
+  before(function (done) {
+    app = app.listen(0, function () {
+      // add scope package
+      var pkg = utils.getPackage(pkgname, '0.0.1', utils.admin);
+
+      request(app)
+      .put(pkgURL)
+      .set('authorization', utils.adminAuth)
+      .send(pkg)
+      .expect(201, done);
+    });
+  });
+
+  beforeEach(function () {
+    mm(config, 'scopes', ['@cnpm', '@cnpmtest']);
+  });
+
+  afterEach(mm.restore);
+
+  it('should add new maintainer without custom user service', function (done) {
+    mm(config, 'customUserService', false);
+    request(app)
+    .put('/@cnpm/test-package-maintainer/-rev/1')
+    .set('authorization', utils.adminAuth)
+    .send({
+      maintainers: [
+        { name: 'new-maintainer', email: 'new-maintainer@cnpmjs.org' },
+        { name: utils.admin, email: utils.admin + '@cnpmjs.org' },
+      ]
+    })
+    .expect(201, done);
+  });
+
+  describe('config.customUserService = true', function () {
+    it('should add new maintainer fail when user not exists', function (done) {
+      mm(config, 'customUserService', true);
+      request(app)
+      .put('/@cnpm/test-package-maintainer/-rev/1')
+      .set('authorization', utils.adminAuth)
+      .send({
+        maintainers: [
+          { name: 'new-maintainer-not-exists', email: 'new-maintainer@cnpmjs.org' },
+          { name: 'new-maintainer-not-exists2', email: 'new-maintainer@cnpmjs.org' },
+          { name: utils.admin, email: utils.admin + '@cnpmjs.org' },
+        ]
+      })
+      .expect({
+        error: 'invalid user name',
+        reason: 'User: new-maintainer-not-exists, new-maintainer-not-exists2 not exists'
+      })
+      .expect(403, done);
+    });
+
+    it('should add new maintainer success when user all exists', function (done) {
+      mm(config, 'customUserService', true);
+      request(app)
+      .put('/@cnpm/test-package-maintainer/-rev/1')
+      .set('authorization', utils.adminAuth)
+      .send({
+        maintainers: [
+          { name: 'cnpmjstest101', email: 'cnpmjstest101@cnpmjs.org' },
+          { name: 'cnpmjstest102', email: 'cnpmjstest102@cnpmjs.org' },
+          { name: utils.admin, email: utils.admin + '@cnpmjs.org' },
+        ]
+      })
+      .expect({
+        ok: true,
+        id: '@cnpm/test-package-maintainer',
+        rev: '1'
+      })
+      .expect(201, done);
+    });
+  });
+});
--- a/test/controllers/registry/module/public_mode.test.js
+++ b/test/controllers/registry/module/public_mode.test.js
@@ -0,0 +1,800 @@
+/*!
+ * cnpmjs.org - test/controllers/registry/module/public_mode.test.js
+ * Copyright(c) 2014 dead_horse <dead_horse@qq.com>
+ * MIT Licensed
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+var should = require('should');
+var request = require('supertest');
+var path = require('path');
+var mm = require('mm');
+var pedding = require('pedding');
+var config = require('../../../../config');
+var app = require('../../../../servers/registry');
+var utils = require('../../../utils');
+var Module = require('../../../../proxy/module');
+
+var fixtures = path.join(__dirname, '..', '..', '..', 'fixtures');
+
+describe('controllers/registry/module/public_module.test.js', function () {
+  beforeEach(function () {
+    mm(config, 'enablePrivate', false);
+  });
+  before(function (done) {
+    mm(config, 'enablePrivate', false);
+    mm(config, 'forcePublishWithScope', false);
+    app = app.listen(0, function () {
+      done = pedding(2, done);
+      // name: publictestmodule
+      var pkg = utils.getPackage('publictestmodule', '0.0.1', utils.otherUser);
+
+      request(app)
+      .put('/' + pkg.name)
+      .set('authorization', utils.otherUserAuth)
+      .send(pkg)
+      .expect(201, function (err) {
+        should.not.exist(err);
+        pkg = utils.getPackage('publictestmodule', '0.0.2', utils.otherUser);
+        // publish 0.0.2
+        request(app)
+        .put('/' + pkg.name)
+        .set('authorization', utils.otherUserAuth)
+        .send(pkg)
+        .expect(201, done);
+      });
+
+      // publicputmodule@0.1.9
+      var testpkg = utils.getPackage('publicputmodule', '0.1.9', utils.otherUser);
+
+      request(app)
+      .put('/' + testpkg.name)
+      .set('authorization', utils.otherUserAuth)
+      .send(pkg)
+      .expect(201, done);
+    });
+  });
+  afterEach(mm.restore);
+
+  describe('PUT /:name/-rev/id updateMaintainers() in public mode', function () {
+    beforeEach(function () {
+      mm(config, 'forcePublishWithScope', false);
+    });
+
+    before(function (done) {
+      mm(config, 'enablePrivate', false);
+      mm(config, 'forcePublishWithScope', false);
+      request(app)
+      .put('/publictestmodule/-rev/1')
+      .send({
+        maintainers: [{
+          name: 'cnpmjstest101',
+          email: 'fengmk2@cnpmjs.org'
+        }]
+      })
+      .set('authorization', utils.otherUserAuth)
+      .expect({"ok":true,"id":"publictestmodule","rev":"1"}, done);
+    });
+
+    it('should add new maintainers', function (done) {
+      request(app)
+      .put('/publictestmodule/-rev/1')
+      .send({
+        maintainers: [{
+          name: 'cnpmjstest10',
+          email: 'fengmk2@cnpmjs.org'
+        }, {
+          name: 'cnpmjstest101',
+          email: 'fengmk2@cnpmjs.org'
+        }]
+      })
+      .set('authorization', utils.otherUserAuth)
+      .expect(201)
+      .expect({
+        ok: true, id: 'publictestmodule', rev: '1'
+      }, function (err) {
+        should.not.exist(err);
+        done = pedding(2, done);
+        // check maintainers update
+        request(app)
+        .get('/publictestmodule')
+        .expect(200, function (err, res) {
+          should.not.exist(err);
+          var pkg = res.body;
+          pkg.maintainers.should.length(2);
+          pkg.maintainers.should.eql(pkg.versions['0.0.1'].maintainers);
+          pkg.maintainers.sort(function (a, b) {
+            return a.name > b.name ? 1 : -1;
+          });
+          pkg.maintainers.should.eql([
+            { name: 'cnpmjstest10', email: 'fengmk2@gmail.com' },
+            { name: 'cnpmjstest101', email: 'fengmk2@gmail.com' },
+          ]);
+          done();
+        });
+
+        // /pkg/0.0.1
+        request(app)
+        .get('/publictestmodule/0.0.1')
+        .expect(200, function (err, res) {
+          should.not.exist(err);
+          var pkg = res.body;
+          pkg.maintainers.should.length(2);
+          pkg.maintainers.sort(function (a, b) {
+            return a.name > b.name ? 1 : -1;
+          });
+          pkg.maintainers.should.eql([
+            { name: 'cnpmjstest10', email: 'fengmk2@gmail.com' },
+            { name: 'cnpmjstest101', email: 'fengmk2@gmail.com' },
+          ]);
+          done();
+        });
+      });
+    });
+
+    it('should add again new maintainers', function (done) {
+      request(app)
+      .put('/publictestmodule/-rev/1')
+      .send({
+        maintainers: [{
+          name: 'cnpmjstest101',
+          email: 'cnpmjstest101@cnpmjs.org'
+        }, {
+          name: 'fengmk2',
+          email: 'fengmk2@cnpmjs.org'
+        }]
+      })
+      .set('authorization', utils.otherUserAuth)
+      .expect(201)
+      .expect('content-type', 'application/json; charset=utf-8', done);
+    });
+
+    it('should add new maintainers by admin', function (done) {
+      request(app)
+      .put('/publictestmodule/-rev/1')
+      .send({
+        maintainers: [{
+          name: 'cnpmjstest101',
+          email: 'cnpmjstest101@cnpmjs.org'
+        }, {
+          name: 'fengmk2',
+          email: 'fengmk2@cnpmjs.org'
+        }]
+      })
+      .set('authorization', utils.adminAuth)
+      .expect(201)
+      .expect('content-type', 'application/json; charset=utf-8', done);
+    });
+
+    it('should rm maintainers', function (done) {
+      request(app)
+      .put('/publictestmodule/-rev/1')
+      .send({
+        maintainers: [{
+          name: 'cnpmjstest101',
+          email: 'cnpmjstest101@cnpmjs.org'
+        }]
+      })
+      .set('authorization', utils.otherUserAuth)
+      .expect(201)
+      .expect('content-type', 'application/json; charset=utf-8', done);
+    });
+
+    it('should rm again maintainers', function (done) {
+      request(app)
+      .put('/publictestmodule/-rev/1')
+      .send({
+        maintainers: [{
+          name: 'cnpmjstest101',
+          email: 'cnpmjstest101@cnpmjs.org'
+        }]
+      })
+      .set('authorization', utils.otherUserAuth)
+      .expect(201)
+      .expect({
+        id: 'publictestmodule',
+        rev: '1',
+        ok: true
+      }, done);
+    });
+
+    it('should rm all maintainers forbidden 403', function (done) {
+      request(app)
+      .put('/publictestmodule/-rev/1')
+      .send({
+        maintainers: []
+      })
+      .set('authorization', utils.otherUserAuth)
+      .expect(403)
+      .expect({error: 'invalid operation', reason: 'Can not remove all maintainers'})
+      .expect('content-type', 'application/json; charset=utf-8', done);
+    });
+
+    it('should 403 when not maintainer update', function (done) {
+      request(app)
+      .put('/publictestmodule/-rev/1')
+      .send({
+        maintainers: [{
+          name: 'cnpmjstest10',
+          email: 'cnpmjstest10@cnpmjs.org'
+        }]
+      })
+      .set('authorization', utils.secondUserAuth)
+      .expect(403)
+      .expect({
+        error: 'forbidden user',
+        reason: 'cnpmjstest102 not authorized to modify publictestmodule'
+      }, done);
+    });
+
+    describe('forcePublishWithScope = true', function () {
+      beforeEach(function () {
+        mm(config, 'forcePublishWithScope', true);
+      });
+
+      before(function (done) {
+        mm(config, 'forcePublishWithScope', true);
+        mm(config, 'enablePrivate', false);
+        var pkg = utils.getPackage('@cnpm/publictestmodule', '0.0.1', utils.otherUser);
+        request(app)
+        .put('/' + pkg.name)
+        .set('authorization', utils.otherUserAuth)
+        .send(pkg)
+        .expect(201, function (err, res) {
+          should.not.exist(err);
+          pkg = utils.getPackage(pkg.name, '0.0.2', utils.otherUser);
+          // publish 0.0.2
+          request(app)
+          .put('/' + pkg.name)
+          .set('authorization', utils.otherUserAuth)
+          .send(pkg)
+          .expect(201, done);
+        });
+      });
+
+      it('should 403 add maintainers without scope', function (done) {
+        request(app)
+        .put('/publictestmodule/-rev/1')
+        .send({
+          maintainers: [{
+            name: 'cnpmjstest101',
+            email: 'cnpmjstest101@cnpmjs.org'
+          }, {
+            name: 'fengmk2',
+            email: 'fengmk2@cnpmjs.org'
+          }]
+        })
+        .set('authorization', utils.otherUserAuth)
+        .expect(403, done);
+      });
+
+      it('should add maintainers ok with scope', function (done) {
+        request(app)
+        .put('/@cnpm/publictestmodule/-rev/1')
+        .send({
+          maintainers: [{
+            name: 'cnpmjstest101',
+            email: 'cnpmjstest101@cnpmjs.org'
+          }, {
+            name: 'fengmk2',
+            email: 'fengmk2@cnpmjs.org'
+          }]
+        })
+        .set('authorization', utils.otherUserAuth)
+        .expect( { ok: true, id: '@cnpm/publictestmodule', rev: '1' })
+        .expect(201, done);
+      });
+    });
+  });
+
+  describe('PUT /:name publish new flow addPackageAndDist()', function () {
+    beforeEach(function () {
+      mm(config, 'enablePrivate', false);
+      mm(config, 'forcePublishWithScope', false);
+    });
+
+    it('should publish with tgz base64, addPackageAndDist()', function (done) {
+      var pkg = utils.getPackage('publicpublishmodule', '0.0.2', utils.otherUser);
+      request(app)
+      .put('/' + pkg.name)
+      .set('authorization', utils.otherUserAuth)
+      .send(pkg)
+      .expect(201, function (err, res) {
+        should.not.exist(err);
+        res.body.should.have.keys('ok', 'rev');
+        res.body.ok.should.equal(true);
+        pkg = utils.getPackage('publicpublishmodule', '0.0.2', utils.otherUser);
+        // upload again should 403
+        request(app)
+        .put('/' + pkg.name)
+        .set('authorization', utils.otherUserAuth)
+        .send(pkg)
+        .expect(403, function (err, res) {
+          should.not.exist(err);
+          res.body.should.eql({
+            error: 'forbidden',
+            reason: 'cannot modify pre-existing version: 0.0.2'
+          });
+          done();
+        });
+      });
+    });
+
+    it('should other user pulbish 403', function (done) {
+      var pkg = utils.getPackage('publicpublishmodule', '0.0.3', utils.secondUser);
+      request(app)
+      .put('/' + pkg.name)
+      .set('authorization', utils.secondUserAuth)
+      .send(pkg)
+      .expect(403, done);
+    });
+
+    it('should admin pulbish 403', function (done) {
+      var pkg = utils.getPackage('publicpublishmodule', '0.0.3', utils.admin);
+      request(app)
+      .put('/' + pkg.name)
+      .set('authorization', utils.adminAuth)
+      .send(pkg)
+      .expect(403, done);
+    });
+
+    it('should publish with scope, addPackageAndDist()', function (done) {
+      mm(config, 'forcePublishWithScope', false);
+      var pkg = utils.getPackage('@cnpm/publicpublishmodule', '0.0.2', utils.otherUser);
+      request(app)
+      .put('/' + pkg.name)
+      .set('authorization', utils.otherUserAuth)
+      .send(pkg)
+      .expect(201, function (err, res) {
+        should.not.exist(err);
+        res.body.should.have.keys('ok', 'rev');
+        res.body.ok.should.equal(true);
+
+        // upload again should 403
+        request(app)
+        .put('/' + pkg.name)
+        .set('authorization', utils.otherUserAuth)
+        .send(pkg)
+        .expect(403, function (err, res) {
+          should.not.exist(err);
+          res.body.should.eql({
+            error: 'forbidden',
+            reason: 'cannot modify pre-existing version: 0.0.2'
+          });
+          done();
+        });
+      });
+    });
+
+    describe('forcePublishWithScope = true', function () {
+      it('should publish without scope 403, addPackageAndDist()', function (done) {
+        mm(config, 'forcePublishWithScope', false);
+        var pkg = utils.getPackage('publicpublishmodule', '0.0.2');
+        request(app)
+        .put('/' + pkg.name)
+        .set('authorization', utils.otherUserAuth)
+        .send(pkg)
+        .expect(403, done);
+      });
+
+      it('should admin publish without scope ok, addPackageAndDist()', function (done) {
+        mm(config, 'forcePublishWithScope', false);
+        var pkg = utils.getPackage('publicpublishmodule1', '0.0.4', utils.admin);
+        request(app)
+        .put('/' + pkg.name)
+        .set('authorization', utils.adminAuth)
+        .send(pkg)
+        .expect(201, done);
+      });
+    });
+  });
+
+  describe('PUT /:name/-rev/:rev removeWithVersions', function () {
+    var withoutScopeRev;
+    before(function (done) {
+      mm(config, 'enablePrivate', false);
+      mm(config, 'forcePublishWithScope', false);
+      var pkg = utils.getPackage('publicremovemodule', '0.0.1', utils.otherUser);
+      request(app)
+      .put('/' + pkg.name)
+      .set('authorization', utils.otherUserAuth)
+      .send(pkg)
+      .expect(201, function (err, res) {
+        should.not.exist(err);
+        res.body.should.have.keys('ok', 'rev');
+        res.body.ok.should.equal(true);
+
+        pkg = utils.getPackage('publicremovemodule', '0.0.2', utils.otherUser);
+        request(app)
+        .put('/' + pkg.name)
+        .set('authorization', utils.otherUserAuth)
+        .send(pkg)
+        .expect(201, function (err, res) {
+          should.not.exist(err);
+          withoutScopeRev = res.body.rev;
+          done();
+        });
+      });
+    });
+
+    it('should remove with version ok', function (done) {
+      mm.empty(Module, 'removeByNameAndVersions');
+      mm.empty(Module, 'removeTagsByIds');
+      request(app)
+      .put('/publicremovemodule/-rev/' + withoutScopeRev)
+      .set('authorization', utils.otherUserAuth)
+      .send({
+        versions: {
+          '0.0.1': {}
+        }
+      })
+      .expect(201, done);
+    });
+
+    it('should no auth user remove 403', function (done) {
+      mm.empty(Module, 'removeByNameAndVersions');
+      mm.empty(Module, 'removeTagsByIds');
+      request(app)
+      .put('/publicremovemodule/-rev/' + withoutScopeRev)
+      .set('authorization', utils.secondUserAuth)
+      .send({
+        versions: {
+          '0.0.1': {}
+        }
+      })
+      .expect(403, done);
+    });
+
+    it('should admin remove ok', function (done) {
+      mm.empty(Module, 'removeByNameAndVersions');
+      mm.empty(Module, 'removeTagsByIds');
+      request(app)
+      .put('/publicremovemodule/-rev/' + withoutScopeRev)
+      .set('authorization', utils.adminAuth)
+      .send({
+        versions: {
+          '0.0.1': {}
+        }
+      })
+      .expect(201, done);
+    });
+
+    describe('forcePublishWithScope = true', function () {
+      var withScopeRev;
+      before(function (done) {
+        mm(config, 'enablePrivate', false);
+        mm(config, 'forcePublishWithScope', true);
+        var pkg = utils.getPackage('@cnpm/publicremovemodule', '0.0.1', utils.otherUser);
+        request(app)
+        .put('/' + pkg.name)
+        .set('authorization', utils.otherUserAuth)
+        .send(pkg)
+        .expect(201, function (err, res) {
+          should.not.exist(err);
+          res.body.should.have.keys('ok', 'rev');
+          res.body.ok.should.equal(true);
+
+          pkg = utils.getPackage('@cnpm/publicremovemodule', '0.0.2', utils.otherUser);
+          request(app)
+          .put('/' + pkg.name)
+          .set('authorization', utils.otherUserAuth)
+          .send(pkg)
+          .expect(201, function (err, res) {
+            should.not.exist(err);
+            withScopeRev = res.body.rev;
+            done();
+          });
+        });
+      });
+
+      it('should remove without scope 403', function (done) {
+        mm(config, 'forcePublishWithScope', true);
+        mm.empty(Module, 'removeByNameAndVersions');
+        mm.empty(Module, 'removeTagsByIds');
+        request(app)
+        .put('/publicremovemodule/-rev/' + withoutScopeRev)
+        .set('authorization', utils.otherUserAuth)
+        .send({
+          versions: {
+            '0.0.1': {}
+          }
+        })
+        .expect(403, done);
+      });
+
+      it('should admin remove without scope ok', function (done) {
+        mm(config, 'forcePublishWithScope', true);
+        mm.empty(Module, 'removeByNameAndVersions');
+        mm.empty(Module, 'removeTagsByIds');
+        request(app)
+        .put('/publicremovemodule/-rev/' + withoutScopeRev)
+        .set('authorization', utils.adminAuth)
+        .send({
+          versions: {
+            '0.0.1': {}
+          }
+        })
+        .expect(201, done);
+      });
+
+      it('should remove with scope ok', function (done) {
+        mm(config, 'forcePublishWithScope', true);
+        mm.empty(Module, 'removeByNameAndVersions');
+        mm.empty(Module, 'removeTagsByIds');
+        request(app)
+        .put('/@cnpm/publicremovemodule/-rev/' + withScopeRev)
+        .set('authorization', utils.otherUserAuth)
+        .send({
+          versions: {
+            '0.0.1': {}
+          }
+        })
+        .expect(201, done);
+      });
+
+      it('should admin remove with scope ok', function (done) {
+        mm(config, 'forcePublishWithScope', true);
+        mm.empty(Module, 'removeByNameAndVersions');
+        mm.empty(Module, 'removeTagsByIds');
+        request(app)
+        .put('/@cnpm/publicremovemodule/-rev/' + withScopeRev)
+        .set('authorization', utils.adminAuth)
+        .send({
+          versions: {
+            '0.0.1': {}
+          }
+        })
+        .expect(201, done);
+      });
+    });
+  });
+
+  describe('DELETE /:name/download/:filename/-rev/:rev', function () {
+    var withoutScopeRev;
+    beforeEach(function () {
+      mm(config, 'enablePrivate', false);
+      mm(config, 'forcePublishWithScope', false);
+    });
+    before(function (done) {
+      mm(config, 'enablePrivate', false);
+      mm(config, 'forcePublishWithScope', false);
+      var pkg = utils.getPackage('public-test-delete-download-module', '0.1.9', utils.otherUser);
+      request(app)
+      .put('/' + pkg.name)
+      .set('content-type', 'application/json')
+      .set('authorization', utils.otherUserAuth)
+      .send(pkg)
+      .expect(201, function (err, res) {
+        should.not.exist(err);
+        withoutScopeRev = res.body.rev;
+        done();
+      });
+    });
+
+    it('should delete 403 when auth error', function (done) {
+      request(app)
+      .del('/public-test-delete-download-module/download/public-test-delete-download-module-0.1.9.tgz/-rev/' + withoutScopeRev)
+      .set('authorization', utils.secondUserAuth)
+      .expect(403, done);
+    });
+
+    it('should delete file ok', function (done) {
+      request(app)
+      .del('/public-test-delete-download-module/download/public-test-delete-download-module-0.1.9.tgz/-rev/' + withoutScopeRev)
+      .set('authorization', utils.otherUserAuth)
+      .expect(200, done);
+    });
+
+    it('should admin delete file ok', function (done) {
+      request(app)
+      .del('/public-test-delete-download-module/download/public-test-delete-download-module-0.1.9.tgz/-rev/' + withoutScopeRev)
+      .set('authorization', utils.adminAuth)
+      .expect(200, done);
+    });
+
+    describe('forcePublishWithScope = true', function () {
+      var withScopeRev;
+      beforeEach(function () {
+        mm(config, 'enablePrivate', false);
+        mm(config, 'forcePublishWithScope', true);
+      });
+      before(function (done) {
+        mm(config, 'enablePrivate', false);
+        mm(config, 'forcePublishWithScope', true);
+        var pkg = utils.getPackage('@cnpm/public-test-delete-download-module', '0.1.9', utils.otherUser);
+        request(app)
+        .put('/' + pkg.name)
+        .set('content-type', 'application/json')
+        .set('authorization', utils.otherUserAuth)
+        .send(pkg)
+        .expect(201, function (err, res) {
+          should.not.exist(err);
+          withScopeRev = res.body.rev;
+          done();
+        });
+      });
+
+      it('should delete file without scope 403', function (done) {
+        request(app)
+        .del('/public-test-delete-download-module/download/public-test-delete-download-module-0.1.9.tgz/-rev/' + withoutScopeRev)
+        .set('authorization', utils.otherUserAuth)
+        .expect(403, done);
+      });
+
+      it('should admin delete file without scope ok', function (done) {
+        request(app)
+        .del('/public-test-delete-download-module/download/public-test-delete-download-module-0.1.9.tgz/-rev/' + withoutScopeRev)
+        .set('authorization', utils.adminAuth)
+        .expect(200, done);
+      });
+      it('should delete file with scope ok', function (done) {
+        request(app)
+        .del('/@cnpm/public-test-delete-download-module/download/@cnpm/public-test-delete-download-module-0.1.9.tgz/-rev/' + withScopeRev)
+        .set('authorization', utils.otherUserAuth)
+        .expect(200, done);
+      });
+
+      it('should admin delete file with scope ok', function (done) {
+        request(app)
+        .del('/@cnpm/public-test-delete-download-module/download/@cnpm/public-test-delete-download-module-0.1.9.tgz/-rev/' + withScopeRev)
+        .set('authorization', utils.adminAuth)
+        .expect(200, done);
+      });
+    });
+  });
+
+  describe('PUT /:name/:tag updateTag()', function () {
+    it('should create new tag ok', function (done) {
+      request(app)
+      .put('/publictestmodule/newtag')
+      .set('content-type', 'application/json')
+      .set('authorization', utils.otherUserAuth)
+      .send('"0.0.1"')
+      .expect(201)
+      .expect({"ok":true}, done);
+    });
+
+    it('shold update tag not maintainer 403', function (done) {
+      request(app)
+      .put('/publictestmodule/newtag')
+      .set('content-type', 'application/json')
+      .set('authorization', utils.secondUserAuth)
+      .send('"0.0.1"')
+      .expect(403, done);
+    });
+
+    it('should admin update tag ok', function (done) {
+      request(app)
+      .put('/publictestmodule/newtag')
+      .set('content-type', 'application/json')
+      .set('authorization', utils.adminAuth)
+      .send('"0.0.1"')
+      .expect(201, done);
+    });
+  });
+
+  describe('DELETE /:name/-rev/:rev', function () {
+    describe('remove all modules by name', function () {
+      beforeEach(function () {
+        mm(config, 'enablePrivate', false);
+        mm(config, 'forcePublishWithScope', false);
+      });
+      before(function (done) {
+        mm(config, 'enablePrivate', false);
+        mm(config, 'forcePublishWithScope', false);
+        var pkg = utils.getPackage('public-remove-all-module', '0.0.1', utils.otherUser);
+        request(app)
+        .put('/public-remove-all-module')
+        .set('content-type', 'application/json')
+        .set('authorization', utils.otherUserAuth)
+        .send(pkg)
+        .expect(201, done);
+      });
+
+      it('shold fail when user not maintainer', function (done) {
+        request(app)
+        .del('/public-remove-all-module/-rev/1')
+        .set('authorization', utils.secondUserAuth)
+        .expect(403, function (err, res) {
+          should.not.exist(err);
+          res.body.should.eql({
+            error: 'forbidden user',
+            reason: 'cnpmjstest102 not authorized to modify public-remove-all-module'
+          });
+          done();
+        });
+      });
+
+      it('shold maintainer remove ok', function (done) {
+        mm.empty(Module, 'removeByName');
+        mm.empty(Module, 'removeTags');
+        request(app)
+        .del('/public-remove-all-module/-rev/1')
+        .set('authorization', utils.otherUserAuth)
+        .expect(200, function (err, res) {
+          should.not.exist(err);
+          should.not.exist(res.headers['set-cookie']);
+          done();
+        });
+      });
+
+      it('shold admin remove ok', function (done) {
+        mm.empty(Module, 'removeByName');
+        mm.empty(Module, 'removeTags');
+        request(app)
+        .del('/public-remove-all-module/-rev/1')
+        .set('authorization', utils.adminAuth)
+        .expect(200, function (err, res) {
+          should.not.exist(err);
+          should.not.exist(res.headers['set-cookie']);
+          done();
+        });
+      });
+
+      describe('forcePublishWithScope = true', function () {
+        before(function (done) {
+          mm(config, 'enablePrivate', false);
+          mm(config, 'forcePublishWithScope', true);
+          var pkg = utils.getPackage('@cnpm/public-remove-all-module', '0.0.1', utils.otherUser);
+          request(app)
+          .put('/@cnpm/public-remove-all-module')
+          .set('content-type', 'application/json')
+          .set('authorization', utils.otherUserAuth)
+          .send(pkg)
+          .expect(201, done);
+        });
+
+        it('should fail when user remove module without scope', function (done) {
+          mm(config, 'forcePublishWithScope', true);
+          request(app)
+          .del('/public-remove-all-module/-rev/1')
+          .set('authorization', utils.otherUserAuth)
+          .expect(403, done);
+        });
+
+        it('shold admin remove module without scope ok', function (done) {
+          mm(config, 'forcePublishWithScope', true);
+          mm.empty(Module, 'removeByName');
+          mm.empty(Module, 'removeTags');
+          request(app)
+          .del('/public-remove-all-module/-rev/1')
+          .set('authorization', utils.adminAuth)
+          .expect(200, done);
+        });
+
+        it('shold maintainer remove ok', function (done) {
+          mm(config, 'forcePublishWithScope', true);
+          mm.empty(Module, 'removeByName');
+          mm.empty(Module, 'removeTags');
+          request(app)
+          .del('/@cnpm/public-remove-all-module/-rev/1')
+          .set('authorization', utils.otherUserAuth)
+          .expect(200, function (err, res) {
+            should.not.exist(err);
+            should.not.exist(res.headers['set-cookie']);
+            done();
+          });
+        });
+
+        it('shold admin remove ok', function (done) {
+          mm(config, 'forcePublishWithScope', true);
+          mm.empty(Module, 'removeByName');
+          mm.empty(Module, 'removeTags');
+          request(app)
+          .del('/@cnpm/public-remove-all-module/-rev/1')
+          .set('authorization', utils.adminAuth)
+          .expect(200, function (err, res) {
+            should.not.exist(err);
+            should.not.exist(res.headers['set-cookie']);
+            done();
+          });
+        });
+      });
+    });
+  });
+});
--- a/test/controllers/registry/module/scope_package.test.js
+++ b/test/controllers/registry/module/scope_package.test.js
@@ -20,6 +20,7 @@ var mm = require('mm');
 var config = require('../../../../config');
 var app = require('../../../../servers/registry');
 var utils = require('../../../utils');
+var Module = require('../../../../proxy/module');

 describe('controllers/registry/module/scope_package.test.js', function () {
  var pkgname = '@cnpm/test-scope-package';
@@ -46,8 +47,25 @@ describe('controllers/registry/module/scope_package.test.js', function () {
    });
  });

+  beforeEach(function () {
+    mm(config, 'scopes', ['@cnpm', '@cnpmtest']);
+  });
+
  afterEach(mm.restore);

+  it('should get 404 when do not support scope', function (done) {
+    mm(config, 'scopes', []);
+    request(app)
+    .get('/@invalid/test')
+    .expect(404, done);
+  });
+
+  it('should get 400 when scope not match', function (done) {
+    request(app)
+    .get('/@invalid/test')
+    .expect(404, done);
+  });
+
  it('should get scope package info: /@scope%2Fname', function (done) {
    request(app)
    .get(pkgURL)
@@ -124,7 +142,14 @@ describe('controllers/registry/module/scope_package.test.js', function () {
    });
  });

-  describe('support defaultScope', function () {
+  it('should download work', function (done) {
+    request(app)
+    .get('/@cnpm/test-scope-package/download/@cnpm/test-scope-package-0.0.2.tgz')
+    .expect('Location', /\.tgz$/)
+    .expect(302, done);
+  });
+
+  describe('support adaptScope', function () {
    before(function (done) {
      var pkg = utils.getPackage('test-default-scope-package', '0.0.1', utils.admin);
      request(app)
@@ -133,45 +158,122 @@ describe('controllers/registry/module/scope_package.test.js', function () {
      .send(pkg)
      .expect(201, done);
    });
+    describe('/@:scope/:name', function () {
+      it('should adapt /@cnpm/test-default-scope-package => /test-default-scope-package', function (done) {
+        mm(config, 'adaptScope', true);
+        request(app)
+        .get('/@cnpm/test-default-scope-package')
+        .expect(200, function (err, res) {
+          should.not.exist(err);
+          var pkg = res.body;
+          pkg._id.should.equal('@cnpm/test-default-scope-package');
+          pkg.name.should.equal('@cnpm/test-default-scope-package');
+          pkg.versions.should.have.keys('0.0.1');
+          pkg['dist-tags'].latest.should.equal('0.0.1');
+          pkg.versions['0.0.1'].name.should.equal('@cnpm/test-default-scope-package');
+          pkg.versions['0.0.1']._id.should.equal('@cnpm/test-default-scope-package@0.0.1');
+          pkg.versions['0.0.1'].dist.tarball
+            .should.containEql('/test-default-scope-package/download/test-default-scope-package-0.0.1.tgz');
+          done();
+        });
+      });

-    it('should adapt /@cnpm/test-default-scope-package => /test-default-scope-package', function (done) {
-      mm(config, 'defaultScope', '@cnpm');
-      request(app)
-      .get('/@cnpm/test-default-scope-package')
-      .expect(200, function (err, res) {
-        should.not.exist(err);
-        var pkg = res.body;
-        pkg._id.should.equal('@cnpm/test-default-scope-package');
-        pkg.name.should.equal('@cnpm/test-default-scope-package');
-        pkg.versions.should.have.keys('0.0.1');
-        pkg['dist-tags'].latest.should.equal('0.0.1');
-        pkg.versions['0.0.1'].name.should.equal('@cnpm/test-default-scope-package');
-        pkg.versions['0.0.1']._id.should.equal('@cnpm/test-default-scope-package@0.0.1');
-        pkg.versions['0.0.1'].dist.tarball
-          .should.containEql('/test-default-scope-package/download/test-default-scope-package-0.0.1.tgz');
-        done();
+      it('should adapt /@cnpmtest/test-default-scope-package => /test-default-scope-package', function (done) {
+        mm(config, 'adaptScope', true);
+        request(app)
+        .get('/@cnpmtest/test-default-scope-package')
+        .expect(200, function (err, res) {
+          should.not.exist(err);
+          var pkg = res.body;
+          pkg._id.should.equal('@cnpmtest/test-default-scope-package');
+          pkg.name.should.equal('@cnpmtest/test-default-scope-package');
+          pkg.versions.should.have.keys('0.0.1');
+          pkg['dist-tags'].latest.should.equal('0.0.1');
+          pkg.versions['0.0.1'].name.should.equal('@cnpmtest/test-default-scope-package');
+          pkg.versions['0.0.1']._id.should.equal('@cnpmtest/test-default-scope-package@0.0.1');
+          pkg.versions['0.0.1'].dist.tarball
+            .should.containEql('/test-default-scope-package/download/test-default-scope-package-0.0.1.tgz');
+          done();
+        });
+      });
+
+      it('should not adapt when adaptScope is false', function (done) {
+        mm(config, 'adaptScope', false);
+        request(app)
+        .get('/@cnpm/test-default-scope-package')
+        .expect(404, done);
+      });
+
+      it('should 404 when pkg not exists', function (done) {
+        mm(config, 'adaptScope', true);
+        request(app)
+        .get('/@cnpm/test-default-scope-package-not-exists')
+        .expect(404, done);
+      });
+
+      it('should show() 404 when adapt package is not private package', function (done) {
+        var getByTag = Module.getByTag;
+        mm(Module, 'getByTag', function* (name, tag) {
+          var pkg = yield getByTag.call(Module, name, tag);
+          pkg && delete pkg.package._publish_on_cnpm;
+          return pkg;
+        });
+        mm(config, 'adaptScope', true);
+        request(app)
+        .get('/@cnpm/test-default-scope-package')
+        .expect(404, done);
      });
    });

-    it('should not adapt when defaultScope is empty', function (done) {
-      mm(config, 'defaultScope', '');
-      request(app)
-      .get('/@cnpm/test-default-scope-package')
-      .expect(404, done);
-    });
+    describe('/@:scope/:name/:tag', function () {
+      it('should adapt /@cnpm/test-default-scope-package/latest => /test-default-scope-package/latest', function (done) {
+        mm(config, 'adaptScope', true);
+        request(app)
+        .get('/@cnpm/test-default-scope-package/latest')
+        .expect(200, function (err, res) {
+          should.not.exist(err);
+          var pkg = res.body;
+          pkg.version.should.have.equal('0.0.1');
+          pkg.name.should.equal('@cnpm/test-default-scope-package');
+          pkg._id.should.equal('@cnpm/test-default-scope-package@0.0.1');
+          pkg.dist.tarball.should.containEql('/test-default-scope-package/download/test-default-scope-package-0.0.1.tgz');
+          done();
+        });
+      });

-    it('should 404 when pkg not exists', function (done) {
-      mm(config, 'defaultScope', '@cnpm');
-      request(app)
-      .get('/@cnpm/test-default-scope-package-not-exists')
-      .expect(404, done);
-    });
+      it('should not adapt when adaptScope is false', function (done) {
+        mm(config, 'adaptScope', false);
+        request(app)
+        .get('/@cnpm/test-default-scope-package/latest')
+        .expect(404, done);
+      });

-    it('should 404 when scope not match', function (done) {
-      mm(config, 'defaultScope', '@cnpm123');
-      request(app)
-      .get('/@cnpm/test-default-scope-package')
-      .expect(404, done);
+      it('should 404 when pkg not exists', function (done) {
+        mm(config, 'adaptScope', true);
+        request(app)
+        .get('/@cnpm/test-default-scope-package-not-exists/latest')
+        .expect(404, done);
+      });
+
+      it('should 404 when pkg version not exists', function (done) {
+        mm(config, 'adaptScope', true);
+        request(app)
+        .get('/@cnpm/test-default-scope-package-not-exists/1.0.0')
+        .expect(404, done);
+      });
+
+      it('should get() 404 when adapt package is not private package', function (done) {
+        var getByTag = Module.getByTag;
+        mm(Module, 'getByTag', function* (name, tag) {
+          var pkg = yield getByTag.call(Module, name, tag);
+          pkg && delete pkg.package._publish_on_cnpm;
+          return pkg;
+        });
+        mm(config, 'adaptScope', true);
+        request(app)
+        .get('/@cnpm/test-default-scope-package/latest')
+        .expect(404, done);
+      });
    });
  });
 });
--- a/test/controllers/registry/user.test.js
+++ b/test/controllers/registry/user.test.js
@@ -20,6 +20,8 @@ var mm = require('mm');
 var app = require('../../../servers/registry');
 var user = require('../../../proxy/user');
 var mysql = require('../../../common/mysql');
+var config = require('../../../config');
+var UserService = require('../../../services/user');

 describe('controllers/registry/user.test.js', function () {
  before(function (done) {
@@ -84,91 +86,51 @@ describe('controllers/registry/user.test.js', function () {
    });

    it('should 409 when already exist', function (done) {
-      mm.data(user, 'get', {name: 'name'});
+      mm(user, 'get', function* () {
+        return {name: 'name'};
+      });
      request(app)
      .put('/-/user/org.couchdb.user:name')
      .send({
        name: 'name',
-        salt: 'salt',
-        password_sha: 'password_sha',
+        password: 'password',
        email: 'email'
      })
      .expect(409, done);
    });

    it('should 500 when user.get error', function (done) {
-      mm.error(user, 'get', 'mock error');
+      mm(user, 'get', function* () {
+        throw new Error('mock User.get error');
+      });
      request(app)
      .put('/-/user/org.couchdb.user:name')
      .send({
        name: 'name',
-        salt: 'salt',
-        password_sha: 'password_sha',
+        password: 'password',
        email: 'email'
      })
      .expect(500, done);
    });

    it('should 201 when user.add ok', function (done) {
-      mm.empty(user, 'get');
-      mm.data(user, 'add', {rev: '1-123'});
+      mm(user, 'get', function* () {
+        return null;
+      });
+      mm(user, 'add', function* () {
+        return {rev: '1-123'};
+      });
      request(app)
      .put('/-/user/org.couchdb.user:name')
      .send({
        name: 'name',
-        salt: 'salt',
-        password_sha: 'password_sha',
+        password: 'password',
        email: 'email'
      })
      .expect(201, done);
    });
  });

-  describe('POST /_session', function () {
-    it('should 500 auth error by user.auth', function (done) {
-      mm.error(user, 'auth', 'mock error');
-      request(app)
-      .post('/_session')
-      .send({
-        name: 'name',
-        password: '123'
-      })
-      .expect(500, done);
-    });
-
-    it('should 401 auth fail by user.auth', function (done) {
-      mm.empty(user, 'auth');
-      request(app)
-      .post('/_session')
-      .send({
-        name: 'name',
-        password: '123'
-      })
-      .expect(401, done);
-    });
-
-    it('should 200 auth pass by user.auth', function (done) {
-      mm.data(user, 'auth', {name: 'name'});
-      request(app)
-      .post('/_session')
-      .send({
-        name: 'name',
-        password: '123'
-      })
-      .expect(200)
-      .expect({
-        ok: true,
-        name: 'name',
-        roles: []
-      }, function (err, res) {
-        should.not.exist(err);
-        should.exist(res.headers['set-cookie']);
-        res.headers['set-cookie'].join(';').should.containEql('AuthSession=');
-        done();
-      });
-    });
-  });
-
  describe('PUT /-/user/:name/-rev/:rev', function () {
    it('should 404 when without a name', function (done) {
      request(app)
@@ -223,4 +185,184 @@ describe('controllers/registry/user.test.js', function () {
      .expect(201, done);
    });
  });
+
+  describe('config.customUserSerivce = true', function () {
+    beforeEach(function () {
+      mm(config, 'customUserService', true);
+    });
+
+    it('should 422 when password missing', function (done) {
+      request(app)
+      .put('/-/user/org.couchdb.user:cnpmjstest10-not-exists')
+      .send({
+        name: 'cnpmjstest10-not-exists',
+        password: '',
+        email: 'cnpmjstest10@cnpmjs.org'
+      })
+      .expect({
+        error: 'paramError',
+        reason: 'params missing, name, email or password missing.'
+      })
+      .expect(422, done);
+    });
+
+    it('should 201 login success', function (done) {
+      request(app)
+      .put('/-/user/org.couchdb.user:cnpmjstest10')
+      .send({
+        name: 'cnpmjstest10',
+        password: 'cnpmjstest10',
+        email: 'cnpmjstest10@cnpmjs.org'
+      })
+      .expect(201, function (err, res) {
+        should.not.exist(err);
+        res.body.should.have.keys('ok', 'id', 'rev');
+        res.body.id.should.equal('org.couchdb.user:cnpmjstest10');
+        res.body.rev.should.match(/\d+\-cnpmjstest10/);
+        res.body.ok.should.equal(true);
+        done();
+      });
+    });
+
+    it('should 401 login fail', function (done) {
+      request(app)
+      .put('/-/user/org.couchdb.user:cnpmjstest10-not-exists')
+      .send({
+        name: 'cnpmjstest10-not-exists',
+        password: 'cnpmjstest10',
+        email: 'cnpmjstest10@cnpmjs.org'
+      })
+      .expect({
+        error: 'unauthorized',
+        reason: 'Login fail, please check your login name and password'
+      })
+      .expect(401, done);
+    });
+  });
+
+  describe('config.customUserService = true', function () {
+    beforeEach(function () {
+      mm(config, 'customUserService', true);
+    });
+
+    afterEach(mm.restore);
+
+    it('should show custom user info: admin', function (done) {
+      mm(UserService, 'get', function* () {
+        return {
+          login: 'mock_custom_user',
+          email: 'mock_custom_user@cnpmjs.org',
+          name: 'mock_custom_user fullname',
+          avatar_url: 'avatar_url',
+          html_url: 'html_url',
+          im_url: '',
+          site_admin: true,
+          scopes: ['@test-user-scope']
+        };
+      });
+      request(app)
+      .get('/-/user/org.couchdb.user:mock_custom_user')
+      .expect(200, function (err, res) {
+        should.not.exist(err);
+        var user = res.body;
+        delete user._cnpm_meta.gmt_create;
+        delete user._cnpm_meta.gmt_modified;
+        delete user._cnpm_meta.id;
+        delete user.date;
+
+        user.should.eql({
+          _id: 'org.couchdb.user:mock_custom_user',
+          _rev: '1-mock_custom_user',
+          name: 'mock_custom_user',
+          email: 'mock_custom_user@cnpmjs.org',
+          type: 'user',
+          roles: [],
+          // date: '2014-07-28T16:46:36.000Z',
+          avatar: 'avatar_url',
+          fullname: 'mock_custom_user fullname',
+          homepage: 'html_url',
+          _cnpm_meta:
+           {
+            //  id: 4,
+             npm_user: false,
+             custom_user: true,
+            //  gmt_create: '2014-07-28T16:46:36.000Z',
+            //  gmt_modified: '2014-07-28T16:46:36.000Z',
+             admin: true,
+             scopes: [ '@test-user-scope' ] }
+        });
+        done();
+      });
+    });
+
+    it('should show custom user info: not admin', function (done) {
+      mm(UserService, 'get', function* () {
+        return {
+          login: 'mock_custom_not_admin_user',
+          email: 'mock_custom_not_admin_user@cnpmjs.org',
+          name: 'mock_custom_not_admin_user fullname',
+          avatar_url: 'avatar_url',
+          html_url: 'html_url',
+          im_url: '',
+          site_admin: false,
+          scopes: ['@test-user-scope']
+        };
+      });
+      request(app)
+      .get('/-/user/org.couchdb.user:mock_custom_not_admin_user')
+      .expect(200, function (err, res) {
+        should.not.exist(err);
+        var user = res.body;
+        delete user._cnpm_meta.gmt_create;
+        delete user._cnpm_meta.gmt_modified;
+        delete user._cnpm_meta.id;
+        delete user.date;
+
+        user.should.eql({
+          _id: 'org.couchdb.user:mock_custom_not_admin_user',
+          _rev: '1-mock_custom_not_admin_user',
+          name: 'mock_custom_not_admin_user',
+          email: 'mock_custom_not_admin_user@cnpmjs.org',
+          type: 'user',
+          roles: [],
+          // date: '2014-07-28T16:46:36.000Z',
+          avatar: 'avatar_url',
+          fullname: 'mock_custom_not_admin_user fullname',
+          homepage: 'html_url',
+          _cnpm_meta:
+           {
+            //  id: 5,
+             npm_user: false,
+             custom_user: true,
+            //  gmt_create: '2014-07-28T16:46:36.000Z',
+            //  gmt_modified: '2014-07-28T16:46:36.000Z',
+             admin: false,
+             scopes: [ '@test-user-scope' ] }
+        });
+        done();
+      });
+    });
+
+    it('should show error json when userSerive.auth throw error', function (done) {
+      mm(UserService, 'auth', function* () {
+        var err = new Error('mock user service auth error, please visit http://ooxx.net/user to sigup first');
+        err.name = 'UserSeriveAuthError';
+        err.status = 401;
+        throw err;
+      });
+
+      request(app)
+      .put('/-/user/org.couchdb.user:cnpmjstest10')
+      .send({
+        name: 'cnpmjstest10',
+        password: 'cnpmjstest10',
+        email: 'cnpmjstest10@cnpmjs.org'
+      })
+      .expect({
+        error: 'UserSeriveAuthError',
+        reason: 'mock user service auth error, please visit http://ooxx.net/user to sigup first'
+      })
+      .expect(401, done);
+    });
+  });
 });
--- a/test/controllers/sync.test.js
+++ b/test/controllers/sync.test.js
@@ -121,10 +121,6 @@ describe('controllers/sync.test.js', function () {
    it('should sync scope package not found', function (done) {
      request(webApp)
      .put('/sync/@cnpm/not-exists-package')
-      .expect({
-        "ok":false,
-        "reason":"can not found @cnpm/not-exists-package in the source registry"
-      })
      .expect(404, done);
    });
  });
--- a/test/controllers/web/package.test.js
+++ b/test/controllers/web/package.test.js
@@ -23,7 +23,9 @@ var mysql = require('../../../common/mysql');
 var app = require('../../../servers/web');
 var registry = require('../../../servers/registry');
 var pkg = require('../../../controllers/web/package');
+var SyncModuleWorker = require('../../../proxy/sync_module_worker');
 var utils = require('../../utils');
+var config = require('../../../config');

 var fixtures = path.join(path.dirname(path.dirname(__dirname)), 'fixtures');

@@ -212,4 +214,45 @@ describe('controllers/web/package.test.js', function () {
      .expect(/Log/, done);
    });
  });
+
+  describe('unpublished package', function () {
+    before(function (done) {
+      var worker = new SyncModuleWorker({
+        name: ['browserjs'],
+        username: 'fengmk2'
+      });
+
+      worker.start();
+      worker.on('end', function () {
+        var names = worker.successes.concat(worker.fails);
+        names.sort();
+        names.should.eql(['browserjs']);
+        done();
+      });
+    });
+
+    it('should display unpublished info', function (done) {
+      request(app)
+      .get('/package/browserjs')
+      .expect(200)
+      .expect(/This package has been unpublished\./, done);
+    });
+  });
+
+  describe('GET /privates', function () {
+    it('should response no private packages', function (done) {
+      mm(config, 'scopes', []);
+      request(app)
+      .get('/privates')
+      .expect(/Can not found private package/)
+      .expect(200, done);
+    });
+
+    it('should response no private packages', function (done) {
+      request(app)
+      .get('/privates')
+      .expect(/Private packages in this registry/)
+      .expect(200, done);
+    });
+  });
 });
--- a/test/controllers/web/package/scope_package.test.js
+++ b/test/controllers/web/package/scope_package.test.js
@@ -22,6 +22,7 @@ var config = require('../../../../config');
 var registry = require('../../../../servers/registry');
 var web = require('../../../../servers/web');
 var utils = require('../../../utils');
+var Module = require('../../../../proxy/module');

 describe('controllers/web/package/scope_package.test.js', function () {
  var pkgname = '@cnpm/test-web-scope-package';
@@ -49,6 +50,10 @@ describe('controllers/web/package/scope_package.test.js', function () {
    web = web.listen(0, done);
  });

+  beforeEach(function () {
+    mm(config, 'scopes', ['@cnpm', '@cnpmtest']);
+  });
+
  afterEach(mm.restore);

  it('should show scope package info page: /@scope%2Fname', function (done) {
@@ -112,7 +117,7 @@ describe('controllers/web/package/scope_package.test.js', function () {
    .expect(302, done);
  });

-  describe('support default scope', function () {
+  describe('support adapt scope', function () {
    before(function (done) {
      var pkg = utils.getPackage('test-default-web-scope-package', '0.0.1', utils.admin);
      request(registry)
@@ -123,7 +128,7 @@ describe('controllers/web/package/scope_package.test.js', function () {
    });

    it('should adapt /@cnpm/test-default-web-scope-package => /test-default-web-scope-package', function (done) {
-      mm(config, 'defaultScope', '@cnpm');
+      mm(config, 'adaptScope', true);
      request(web)
      .get('/package/@cnpm/test-default-web-scope-package')
      .expect(200, function (err, res) {
@@ -135,25 +140,38 @@ describe('controllers/web/package/scope_package.test.js', function () {
      });
    });

-    it('should not adapt', function (done) {
-      mm(config, 'defaultScope', '');
+    it('should not adapt /@cnpm123/test-default-web-scope-package', function (done) {
+      mm(config, 'adaptScope', true);
      request(web)
-      .get('/package/@cnpm/test-default-web-scope-package')
+      .get('/package/@cnpm123/test-default-web-scope-package')
      .expect(404, done);
    });

-    it('should 404 when scope not match', function (done) {
-      mm(config, 'defaultScope', '@cnpm123');
+    it('should not adapt', function (done) {
+      mm(config, 'adaptScope', false);
      request(web)
      .get('/package/@cnpm/test-default-web-scope-package')
      .expect(404, done);
    });

    it('should 404 when pkg not exists', function (done) {
-      mm(config, 'defaultScope', '@cnpm');
+      mm(config, 'adaptScope', true);
      request(web)
      .get('/package/@cnpm/test-default-web-scope-package-not-exists')
      .expect(404, done);
    });
+
+    it('should 404 when pkg is not private package', function (done) {
+      var getByTag = Module.getByTag;
+      mm(Module, 'getByTag', function* (name, tag) {
+        var pkg = yield getByTag.call(Module, name, tag);
+        pkg && delete pkg.package._publish_on_cnpm;
+        return pkg;
+      });
+      mm(config, 'adaptScope', true);
+      request(web)
+      .get('/package/@cnpm/test-default-web-scope-package')
+      .expect(404, done);
+    });
  });
 });
--- a/test/controllers/web/user.test.js
+++ b/test/controllers/web/user.test.js
@@ -30,7 +30,7 @@ describe('controllers/web/user.test.js', function () {
      .expect(200)
      .expect('content-type', 'text/html; charset=utf-8')
      .expect(/<div id="profile">/)
-      .expect(/Packages by /, done);
+      .expect(/Packages by/, done);
    });

    it('should get 404', function (done) {
--- a/test/init.js
+++ b/test/init.js
@@ -20,6 +20,7 @@ var User = require('../proxy/user');

 var usernames = [
  'cnpmjstest101',
+  'cnpmjstest102',
  'cnpmjstest10'
 ];

--- a/test/middleware/auth.test.js
+++ b/test/middleware/auth.test.js
@@ -20,6 +20,8 @@ var request = require('supertest');
 var app = require('../../servers/registry');
 var mm = require('mm');
 var mysql = require('../../common/mysql');
+var config = require('../../config');
+var UserService = require('../../services/user');

 describe('middleware/auth.test.js', function () {
  before(function (done) {
@@ -60,5 +62,29 @@ describe('middleware/auth.test.js', function () {
      .set('authorization', 'basic ' + new Buffer('cnpmjstest10:cnpmjstest10').toString('base64'))
      .expect(500, done);
    });
+
+    describe('config.customUserService = true', function () {
+      beforeEach(function () {
+        mm(config, 'customUserService', true);
+      });
+
+      it('should 401 when user service auth throw error', function (done) {
+        mm(UserService, 'auth', function* () {
+          var err = new Error('mock user service auth error, please visit http://ooxx.net/user to sigup first');
+          err.name = 'UserSeriveAuthError';
+          err.status = 401;
+          throw err;
+        });
+
+        request(app)
+        .put('/-/user/org.couchdb.user:cnpmjstest10/-rev/1')
+        .set('authorization', 'basic ' + new Buffer('cnpmjstest10:cnpmjstest10').toString('base64'))
+        .expect({
+          error: 'UserSeriveAuthError',
+          reason: 'mock user service auth error, please visit http://ooxx.net/user to sigup first'
+        })
+        .expect(401, done);
+      });
+    });
  });
 });
--- a/test/proxy/module.test.js
+++ b/test/proxy/module.test.js
@@ -20,6 +20,7 @@ var fs = require('fs');
 var path = require('path');
 var mysql = require('../../common/mysql');
 var Module = require('../../proxy/module');
+var config = require('../../config');

 var fixtures = path.join(path.dirname(__dirname), 'fixtures');

@@ -173,4 +174,26 @@ describe('proxy/module.test.js', function () {
      yield* Module.removeTagsByNames('foo', ['latest', '1.0']);
    });
  });
+
+  describe('listPrivates()', function () {
+    it('should response [] if scopes not present', function* () {
+      mm(config, 'scopes', []);
+      var modules = yield Module.listPrivates();
+      modules.should.eql([]);
+    });
+
+    it('should response [] if private modules not present', function* () {
+      mm(config, 'privatePackages', []);
+      mm(config, 'scopes', ['@not-exist']);
+      var modules = yield Module.listPrivates();
+      modules.should.eql([]);
+    });
+
+    it('should work', function* () {
+      var modules = yield Module.listPrivates();
+      modules.forEach(function (m) {
+        m.should.have.keys(['name', 'description']);
+      })
+    });
+  });
 });
--- a/test/proxy/user.test.js
+++ b/test/proxy/user.test.js
@@ -51,59 +51,51 @@ describe('proxy/user.test.js', function () {

  describe('get()', function () {
    before(initUser);
-    it('should get user ok', function (done) {
-      user.get('mockuser', function (err, data) {
-        should.not.exist(err);
-        data.should.have.keys('id', 'rev', 'name', 'email', 'salt',
-          'json', 'npm_user',
-          'password_sha', 'ip', 'roles', 'gmt_create', 'gmt_modified');
-        done();
-      });
+    it('should get user ok', function* () {
+      var data = yield* user.get('mockuser');
+      data.should.have.keys('id', 'rev', 'name', 'email', 'salt',
+        'json', 'npm_user',
+        'password_sha', 'ip', 'roles', 'gmt_create', 'gmt_modified');
    });

-    it('should get error when mysql error', function (done) {
+    it('should get error when mysql error', function* () {
      mm.error(mysql, 'query', 'mock error');
-      user.get('mockuser', function (err) {
+      try {
+        yield* user.get('mockuser');
+        new Error('should not run this');
+      } catch (err) {
        err.message.should.equal('mock error');
-        done();
-      });
+      }
    });
  });

  describe('auth()', function () {
    before(initUser);
-    it('should auth user ok', function (done) {
-      user.auth(mockUser.name, mockUser.password, function (err, data) {
-        should.not.exist(err);
-        data.should.have.keys('id', 'rev', 'name', 'email', 'salt',
-          'json', 'npm_user',
-          'password_sha', 'ip', 'roles', 'gmt_create', 'gmt_modified');
-        done();
-      });
+    it('should auth user ok', function* () {
+      var data = yield* user.auth(mockUser.name, mockUser.password);
+      data.should.have.keys('id', 'rev', 'name', 'email', 'salt',
+        'json', 'npm_user',
+        'password_sha', 'ip', 'roles', 'gmt_create', 'gmt_modified');
    });

-    it('should auth user fail when user not exist', function (done) {
-      user.auth('notexistmockuser', '123', function (err, data) {
-        should.not.exist(err);
-        should.not.exist(data);
-        done();
-      });
+    it('should auth user fail when user not exist', function* () {
+      var data = yield* user.auth('notexistmockuser', '123');
+      should.not.exist(data);
    });

-    it('should auth fail when password error', function (done) {
-      user.auth(mockUser.name, '123', function (err, data) {
-        should.not.exist(err);
-        should.not.exist(data);
-        done();
-      });
+    it('should auth fail when password error', function* () {
+      var data = yield* user.auth(mockUser.name, '123');
+      should.not.exist(data);
    });

-    it('should auth error when mysql error', function (done) {
+    it('should auth error when mysql error', function* () {
      mm.error(mysql, 'query', 'mock error');
-      user.auth(mockUser.name, '123', function (err, data) {
+      try {
+        yield* user.auth(mockUser.name, '123');
+        new Error('should not run this');
+      } catch (err) {
        err.message.should.equal('mock error');
-        done();
-      });
+      }
    });
  });

--- a/test/services/default_user_service.test.js
+++ b/test/services/default_user_service.test.js
@@ -0,0 +1,151 @@
+/**!
+ * cnpmjs.org - test/services/default_user_service.test.js
+ *
+ * Copyright(c) fengmk2 and other contributors.
+ * MIT Licensed
+ *
+ * Authors:
+ *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+var should = require('should');
+var mm = require('mm');
+var npm = require('../../proxy/npm');
+var User = require('../../proxy/user');
+var DefaultUserService = require('../../services/default_user_service');
+var config = require('../../config');
+
+describe('services/default_user_service.test.js', function () {
+  var userService = new DefaultUserService();
+
+  before(function* () {
+    var user = yield* npm.getUser('fengmk2');
+    if (!user) {
+      return;
+    }
+    user.fullname = 'Yuan Feng';
+    yield* User.saveNpmUser(user);
+  });
+
+  beforeEach(function () {
+    mm(config, 'scopes', ['@cnpm', '@cnpmtest']);
+  });
+  afterEach(mm.restore);
+
+  describe('auth()', function () {
+    it('should return user when auth success', function* () {
+      var user = yield* userService.auth('cnpmjstest10', 'cnpmjstest10');
+      should.exist(user);
+      user.should.eql({
+        login: 'cnpmjstest10',
+        email: 'fengmk2@gmail.com',
+        name: 'cnpmjstest10',
+        html_url: 'http://cnpmjs.org/~cnpmjstest10',
+        avatar_url: 'https://secure.gravatar.com/avatar/95b9d41231617a05ced5604d242c9670?s=50&d=retro',
+        im_url: '',
+        site_admin: true,
+        scopes: ['@cnpm', '@cnpmtest'],
+      });
+    });
+
+    it('should return null when auth fail', function* () {
+      var user = yield* userService.auth('cnpmjstest10', 'wrong');
+      should.not.exist(user);
+    });
+  });
+
+  describe('get()', function () {
+    it('should get a cnpm admin user by login name', function* () {
+      var user = yield* userService.get('cnpmjstest10');
+      should.exist(user);
+      user.should.eql({
+        login: 'cnpmjstest10',
+        email: 'fengmk2@gmail.com',
+        name: 'cnpmjstest10',
+        html_url: 'http://cnpmjs.org/~cnpmjstest10',
+        avatar_url: 'https://secure.gravatar.com/avatar/95b9d41231617a05ced5604d242c9670?s=50&d=retro',
+        im_url: '',
+        site_admin: true,
+        scopes: ['@cnpm', '@cnpmtest'],
+      });
+    });
+
+    it('should get a cnpm normal user by login name', function* () {
+      var user = yield* userService.get('cnpmjstest101');
+      should.exist(user);
+      user.should.eql({
+        login: 'cnpmjstest101',
+        email: 'fengmk2@gmail.com',
+        name: 'cnpmjstest101',
+        html_url: 'http://cnpmjs.org/~cnpmjstest101',
+        avatar_url: 'https://secure.gravatar.com/avatar/95b9d41231617a05ced5604d242c9670?s=50&d=retro',
+        im_url: '',
+        site_admin: false,
+        scopes: ['@cnpm', '@cnpmtest'],
+      });
+    });
+
+    it('should get a npm sync user by login name', function* () {
+      var user = yield* userService.get('fengmk2');
+      should.exist(user);
+      user.should.eql({
+        login: 'fengmk2',
+        email: 'fengmk2@gmail.com',
+        name: 'Yuan Feng',
+        html_url: 'http://fengmk2.github.com',
+        avatar_url: 'https://secure.gravatar.com/avatar/95b9d41231617a05ced5604d242c9670?s=50&d=retro',
+        im_url: 'https://twitter.com/fengmk2',
+        site_admin: true,
+        scopes: ['@cnpm', '@cnpmtest'],
+      });
+    });
+
+    it('should get null when user not exists', function* () {
+      var user = yield* userService.get('not-exists');
+      should.not.exist(user);
+    });
+  });
+
+  describe('list()', function () {
+    it('should return all exists users', function* () {
+      var users = yield* userService.list(['cnpmjstest10', 'fengmk2', 'cnpmjstest101']);
+      users.should.length(3);
+    });
+
+    it('should return some exists users', function* () {
+      var users = yield* userService.list(['cnpmjstest10', 'fengmk2123', 'cnpmjstest101']);
+      users.should.length(2);
+    });
+
+    it('should return []', function* () {
+      var users = yield* userService.list([]);
+      users.should.length(0);
+
+      var users = yield* userService.list(['not1', 'not2']);
+      users.should.length(0);
+    });
+  });
+
+  describe('search()', function () {
+    it('should return login name matched users', function* () {
+      var users = yield* userService.search('cnpm');
+      users.length.should.above(2);
+    });
+
+    it('should return limit 1 user', function* () {
+      var users = yield* userService.search('cnpm', {limit: 1});
+      users.should.length(1);
+    });
+
+    it('should return []', function* () {
+      var users = yield* userService.search('not-cnpm');
+      users.should.length(0);
+    });
+  });
+});
--- a/test/utils.js
+++ b/test/utils.js
@@ -25,6 +25,9 @@ exports.adminAuth = 'Basic ' + new Buffer(admin + ':' + admin).toString('base64'
 var otherUser = exports.otherUser = 'cnpmjstest101';
 exports.otherUserAuth = 'Basic ' + new Buffer(otherUser + ':' + otherUser).toString('base64');

+var secondUser = exports.secondUser = 'cnpmjstest102';
+exports.secondUserAuth = 'Basic ' + new Buffer(secondUser + ':' + secondUser).toString('base64');
+
 var _pkg = fs.readFileSync(path.join(fixtures, 'package_and_tgz.json'));

 exports.getPackage = function (name, version, user) {
--- a/view/web/package_unpublished.html
+++ b/view/web/package_unpublished.html
@@ -0,0 +1,71 @@
+<div id="package">
+  <h1>
+    <%= package.name %>
+    <small>
+    (<a href="/sync/<%= package.name %>" target="_blank">SYNC</a> again from source npm registry)
+    </small>
+  </h1>
+
+  <p class="description">This package has been unpublished.</p>
+
+  <ul class="nav nav-tabs">
+    <li class="active"><a href="#meta">package.json</a></li>
+  </ul>
+
+  <table class="metadata active">
+    <% if (package.unpublished.description) { %>
+    <tr>
+      <th>Description</th>
+      <td>
+        <%= package.unpublished.description %>
+      </td>
+    </tr>
+    <% } %>
+
+    <tr>
+      <th>Unpublished By</th>
+      <td>
+        <span class="user">
+          <a class="username" href="/~<%= package.unpublished.name %>">
+            <%= package.unpublished.name %>
+          </a>
+        </span>
+      </td>
+    </tr>
+
+    <tr>
+      <th>Unpublished On</th>
+      <td>
+        <%- package.unpublished.time %>
+      </td>
+    </tr>
+
+    <% if (package.unpublished.maintainers) { %>
+    <tr>
+      <th>Maintainers</th>
+      <td>
+      <% package.unpublished.maintainers.forEach(function (m) { %>
+        <span class="user">
+          <a class="username" href="/~<%= m.name %>">
+            <% if (m.gravatar) { %>
+            <img src="<%- m.gravatar %>" class="avatar">
+            <% } %>
+            <%= m.name %>
+          </a>
+        </span>
+      <% }) %>
+      </td>
+    </tr>
+    <% } %>
+
+    <% if (package.unpublished.versions) { %>
+    <tr>
+      <th>Versions (<%- package.unpublished.versions.length %>)</th>
+      <td>
+      <%- package.unpublished.versions.reverse().slice(0, 20).join(', ') %> ...
+      </td>
+    </tr>
+    <% } %>
+
+  </table>
+</div>
--- a/view/web/private.html
+++ b/view/web/private.html
@@ -0,0 +1,33 @@
+<style>
+#private .package {
+  padding: 10px;
+  font-size: 18px;
+  border-bottom: 1px solid #ddd;
+}
+
+#private .alert a {
+  font-size: 20px;
+}
+
+</style>
+<div id="private">
+  <% if (!packages.length) { %>
+    <div class="alert alert-warning">
+      Can not found private package
+    </div>
+  <% } else {%>
+    <h1>
+      Private packages in this registry
+    </h1>
+    <hr />
+
+    <% for (var i = 0; i < packages.length; i++) {
+      var item = packages[i];
+    %>
+      <div class="package">
+        <a href="/package/<%= item.name %>" class="package-name"><%= item.name %></a>
+        <span class="package-description"><%= item.description %></span>
+      </div>
+    <% } %>
+  <% } %>
+</div>
--- a/view/web/profile.html
+++ b/view/web/profile.html
@@ -7,14 +7,49 @@
 </style>
 <div id="profile">
  <h1>
-    Packages by <span style="color:#09f;"><%= user.name %></span>
+    Packages by
+      <% if (user.json.homepage) { %>
+        <span class="user">
+          <a class="username" target="_blank" href="<%= user.json.homepage %>">
+            <% if (user.json.avatar) { %>
+            <img src="<%= user.json.avatar %>" class="avatar">
+            <% } %>
+            <%= user.name %>
+          </a>
+        </span>
+      <% } else { %>
+        <span style="color:#09f;"><%= user.name %></span>
+      <% } %>
+    <% if (user.json.fullname) { %>
+      <small>(<%= user.json.fullname %>)</small>
+    <% } %>
    <% if (user.email) { %>
      <small>(<a href="mailto:<%= user.email %>"><%= user.email %></a>)</small>
    <% } %>
  </h1>
+  <table class="downloads">
+    <tbody>
+      <tr>
+        <th>Name</th>
+        <th>Last modified</th>
+        <th>Is admin</th>
+        <th>Publish scopes</th>
+      </tr>
+      <tr>
+        <td>@<%= user.json.fullname || user.name %></td>
+        <td><%- lastModified %></td>
+        <td><%- isAdmin %></td>
+        <td>
+          <%- scopes.map(function (scope) {
+            return '<a href="/browse/keyword/' + scope + '" target="_blank">' + scope +  '</a>';
+          }).join(' , ') %>
+        </td>
+      </tr>
+    </tbody>
+  </table>
  <hr />
  <% if (!packages.length) { %>
-    <div class="alert alert-warning">Can not found package by <%= user.name %>.</div>
+    <div class="alert alert-warning">Can not found any package by <%= user.name %>.</div>
  <% } %>
  <% for (var i = 0; i < packages.length; i++) { %>
    <div class="package">
Author	SHA1	Message	Date
dead_horse	fe319b06ba	Release 1.0.2	2014-08-01 12:05:54 +08:00
dead_horse	d829600ed0	~_~ fix response message	2014-08-01 12:05:25 +08:00
dead_horse	4dd59cb300	Release 1.0.1	2014-08-01 12:00:33 +08:00
dead_horse	5ff25474c0	Merge pull request #398 from cnpm/fix-auth hot fix auth error	2014-08-01 11:58:54 +08:00
dead_horse	6d49a859c6	hot fix auth error	2014-08-01 11:58:23 +08:00
fengmk2	63a57b906e	Release 1.0.0	2014-08-01 09:26:04 +08:00
fengmk2	a09e6b142d	Merge pull request #394 from cnpm/list-pravites add private package list	2014-08-01 08:55:11 +08:00
dead_horse	bca9341e5d	add private package list	2014-08-01 01:43:13 +08:00
fengmk2	71b0662d49	Release 0.9.2	2014-07-30 23:15:11 +08:00
fengmk2	b894c0fa2b	hotfix save custom user bug	2014-07-30 23:14:53 +08:00
fengmk2	4127fa1f07	Release 0.9.1	2014-07-30 17:20:17 +08:00
dead_horse	5ee2a6e8fd	Merge pull request #390 from cnpm/handle-user-service-auth-throw-error Handle user service auth throw custom error message	2014-07-30 10:16:24 +08:00
fengmk2	8baa34145b	Handle user service auth throw custom error message	2014-07-30 10:05:55 +08:00
fengmk2	4acb819356	Merge pull request #389 from cnpm/private-white-list Private white list	2014-07-30 08:21:43 +08:00
dead_horse	2a84e39aee	add test for config private packages	2014-07-30 00:52:44 +08:00
dead_horse	2019d72e36	add config.privatePackages	2014-07-29 23:55:42 +08:00
dead_horse	b9fa7e7f98	add more comments in config/index.js	2014-07-29 23:31:22 +08:00
fengmk2	694795e451	Release 0.9.0	2014-07-29 10:24:56 +08:00
dead_horse	fae67880a5	Merge pull request #388 from cnpm/user-service Custom user service. fixed #385	2014-07-29 10:17:08 +08:00
fengmk2	0929748cbd	listMaintainers only return name and email	2014-07-29 10:06:28 +08:00
fengmk2	a87945c6a0	remove sessions	2014-07-29 01:55:18 +08:00
fengmk2	d7345dcc76	scopes init mv to services/user.js	2014-07-29 01:51:32 +08:00
fengmk2	1a9ea8c6cf	show user more profile	2014-07-29 01:42:02 +08:00
fengmk2	8f0ada7bf8	registry show user support custom user service	2014-07-29 00:54:18 +08:00
fengmk2	ddd9c9557d	support custom user service for user auth	2014-07-29 00:11:34 +08:00
fengmk2	9b2a846865	remove session middleware	2014-07-28 09:17:42 +08:00
fengmk2	b1b238e20c	add DefaultUserService	2014-07-28 09:17:42 +08:00
fengmk2	26031a49d2	Merge pull request #383 from cnpm/issue382-limit-scope Issue382 limit scope	2014-07-28 09:15:39 +08:00
dead_horse	8bfc8ce71d	check scopes in module.getAdapt	2014-07-27 23:32:58 +08:00
dead_horse	dffae785ca	test public mode, fix some logic, close #382	2014-07-27 23:28:38 +08:00
dead_horse	078d7ddf3d	fix sync scope test	2014-07-27 23:28:38 +08:00
dead_horse	8ec082db89	move scope.js into publishable.js, add forcePublishWithScope	2014-07-27 23:28:38 +08:00
dead_horse	040b727878	config.scopes not exist, means do not support scope	2014-07-27 23:28:38 +08:00
dead_horse	02e1ba63d6	fix scope test cases	2014-07-25 09:39:33 +08:00
dead_horse	a16883618e	add test, fix middleware	2014-07-25 00:23:26 +08:00
dead_horse	7bd1c85d4e	fix adapt scope	2014-07-25 00:12:01 +08:00
dead_horse	336e6f0da8	fix debug info	2014-07-24 23:55:07 +08:00
dead_horse	d43266670e	add assert scope middleware	2014-07-24 23:54:53 +08:00
fengmk2	8fdbbf0b04	Release 0.8.7	2014-07-24 00:05:47 +08:00
fengmk2	b62a3b78fb	fix unpublished info missing maintainers cause TypeError	2014-07-24 00:05:28 +08:00
fengmk2	d6cf093844	Release 0.8.6	2014-07-23 13:07:33 +08:00
fengmk2	081f0cb4f8	show unpublished info on web package page. fixes #381	2014-07-23 13:06:20 +08:00
fengmk2	0bf18639b6	Release 0.8.5	2014-07-22 23:38:58 +08:00
dead_horse	cbe7a165b0	Merge pull request #380 from cnpm/private-package-default-scoped Only private package support default scoped. fixed #378	2014-07-22 23:14:31 +08:00
fengmk2	7cadfb4007	Only private package support default scoped. fixed #378	2014-07-22 21:55:45 +08:00
fengmk2	ec51fcf70c	Release 0.8.4	2014-07-22 13:32:47 +08:00
fengmk2	565a7d3cfe	Merge pull request #379 from cnpm/get-adapt adapt default scpoe in /@:scope/:name/:version	2014-07-22 12:51:53 +08:00
dead_horse	4ac857fba2	adapt default scpoe in /@:scope/:name/:version	2014-07-22 11:42:18 +08:00
fengmk2	af7c952d2f	Release 0.8.3	2014-07-22 10:14:12 +08:00
fengmk2	6705172d4b	hot fix download	2014-07-22 10:13:55 +08:00
fengmk2	c0295ecc77	Release 0.8.2	2014-07-22 01:00:38 +08:00
fengmk2	aaf7f04d08	fix default scope detect	2014-07-22 01:00:22 +08:00