fix: admin can not publish non scoped package on "none" sync model

cnpm · Feb 2, 2015 · 6dc779a · 6dc779a
1 parent 24d6831
commit 6dc779a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/middleware/publishable.js b/middleware/publishable.js
@@ -90,7 +90,7 @@ function checkNoneScope(ctx) {
   }
 
   // only admins can publish or unpublish non-scope modules
-  if (ctx.user.isAdmin) {
+  if (ctx.user.isAdmin && config.syncModel !== 'none') {
     return true;
   }
 

diff --git a/test/controllers/registry/package/deprecate.test.js b/test/controllers/registry/package/deprecate.test.js
@@ -225,7 +225,7 @@ describe('controllers/registry/package/deprecate.test.js', function () {
       })
       .expect({
         error: 'no_perms',
-        reason: 'Private mode enable, only admin can publish this module'
+        reason: 'only allow publish with @cnpm, @cnpmtest scope(s)'
       })
       .expect(403, done);
     });

diff --git a/test/controllers/registry/package/dist_tag.test.js b/test/controllers/registry/package/dist_tag.test.js
@@ -20,7 +20,6 @@ var pedding = require('pedding');
 var should = require('should');
 var app = require('../../../../servers/registry');
 var utils = require('../../../utils');
-var config = require('../../../../config');
 
 describe('controllers/registry/package/dist_tag.test.js', function () {
   afterEach(mm.restore);

diff --git a/test/controllers/registry/package/remove.test.js b/test/controllers/registry/package/remove.test.js
@@ -48,7 +48,7 @@ describe('controllers/registry/package/remove.test.js', function () {
     .del('/testmodule-remove-1/-rev/1')
     .expect({
       error: 'unauthorized',
-      reason: 'Login first.'
+      reason: 'Login first'
     })
     .expect(401, done);
   });