feat: support custom tokenService (#1658)

cnpm · Jul 28, 2021 · d28af7f · d28af7f
1 parent e258241
commit d28af7f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/controllers/registry/token/create.js b/controllers/registry/token/create.js
@@ -44,7 +44,9 @@ module.exports = function* createToken() {
     return;
   }
 
-  var token = yield tokenService.createToken(this.user.name, {
+  var tokenServiceImpl = this.tokenService || tokenService;
+
+  var token = yield tokenServiceImpl.createToken(this.user.name, {
     readonly: !!readonly,
     cidrWhitelist: cidrWhitelist || [],
   });

diff --git a/controllers/sync_module_worker.js b/controllers/sync_module_worker.js
@@ -697,7 +697,6 @@ function* _listStarUsers(modName) {
 }
 
 function* _saveNpmUser(username) {
-  var user = yield npmSerivce.getUser(username);
   if (!user) {
     var existsUser = yield User.findByName(username);
     if (existsUser && existsUser.isNpmUser) {

diff --git a/test/controllers/registry/token/create.test.js b/test/controllers/registry/token/create.test.js
@@ -5,6 +5,7 @@ var request = require('supertest');
 var app = require('../../../../servers/registry');
 var tokenService = require('../../../../services/token');
 var TestUtil = require('../../../utils');
+var create = require('../../../../controllers/registry/token/create');
 
 describe('test/controllers/registry/token/create.test.js', function () {
   describe('POST /-/npm/v1/tokens', function () {
@@ -76,4 +77,28 @@ describe('test/controllers/registry/token/create.test.js', function () {
       });
     });
   });
+
+  describe('inject tokenService', () => {
+    it('should work', function* () {
+      const ctx = {
+        request: {
+          body: {
+            readonly: false,
+            cidr_whitelist: [],
+            password: TestUtil.admin,
+          },
+        },
+        user: {
+          name: TestUtil.admin,
+        },
+        tokenService: {
+          createToken(userId) {
+            return `${userId}:token`
+          }
+        },
+      };
+      yield Reflect.apply(create, ctx, []);
+      ctx.body.should.equal(`${TestUtil.admin}:token`);
+    });
+  });
 });