@kne/fastify-account 2.0.0-alpha.0 → 2.0.0-alpha.1

package/index.js

@@ -17,7 +17,10 @@ const user = fp(
         isTest: false,
         jwt: {
           secret: 'super-secret',
-          expires: null
+          expires: null,
+          verify: {
+            extractToken: request => request.headers['x-user-token']
+          }
         },
         defaultPassword: 'Aa000000!',
         sendMessage: async () => {}

package/libs/services/account.js

@@ -160,13 +160,13 @@ const accountService = fp(async (fastify, options) => {
     await passwordAuthentication({ accountId: user.userAccountId, password });
 
     return {
-      token: fastify.jwt.sign({ payload: { id: user.uuid } }),
-      user: Object.assign({}, user.get({ plain: true }), { id: user.uuid })
+      token: fastify.jwt.sign({ payload: { id: user.id } }),
+      user: Object.assign({}, user.get({ plain: true }), { id: user.id })
     };
   };
 
   const resetPassword = async ({ password, userId }) => {
-    const user = await services.user.getUserInstance({ uuid: userId });
+    const user = await services.user.getUserInstance({ id: userId });
     const account = await models.userAccount.create(
       Object.assign({}, await passwordEncryption(password), {
         belongToUserId: user.id

package/libs/services/admin.js

@@ -11,13 +11,13 @@ const adminService = fp(async (fastify, options) => {
         })) > 0) {
             throw new Error('系统已经初始化完成，不能执行该操作');
         }
-        const currentUser = await services.user.getUserInstance({uuid: user.id});
+        const currentUser = await services.user.getUserInstance({id: user.id});
         currentUser.isSuperAdmin = true;
         await currentUser.save();
     };
 
     const checkIsSuperAdmin = async (user) => {
-        const currentUser = await services.user.getUserInstance({uuid: user.id});
+        const currentUser = await services.user.getUserInstance({id: user.id});
         return currentUser.isSuperAdmin === true;
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-account",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "description": "用于用户注册登录认证.",
   "main": "index.js",
   "scripts": {