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

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 () => {}
@@ -45,7 +48,12 @@ const user = fp(
           {
             user: async request => {
               const { services } = fastify[options.name];
-              const info = await request.jwtVerify();
+              let info;
+              try {
+                info = await request.jwtVerify();
+              } catch (e) {
+                throw Unauthorized('身份认证失败');
+              }
               //这里判断失效时间
               if (options.jwt.expires && Date.now() - info.iat * 1000 > options.jwt.expires) {
                 throw Unauthorized('身份认证超时');

package/libs/controllers/user.js

@@ -1,17 +1,76 @@
 const fp = require('fastify-plugin');
 
 const userController = fp(async (fastify, options) => {
-  const { authenticate } = fastify[options.name];
+  const { authenticate, services } = fastify[options.name];
 
   fastify.get(
     `${options.prefix}/user/getUserInfo`,
     {
-      onRequest: [authenticate.user]
+      onRequest: [authenticate.user],
+      schema: {
+        tags: ['用户'],
+        summary: '获取用户信息',
+        response: {
+          200: {
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'object',
+                  properties: {
+                    userInfo: {
+                      type: 'object',
+                      properties: {
+                        id: { type: 'string', description: '用户id' },
+                        avatar: { type: 'string', description: '头像图片id' },
+                        nickname: { type: 'string', description: '用户昵称' },
+                        email: { type: 'string', description: '邮箱' },
+                        phone: { type: 'string', description: '电话' },
+                        gender: { type: 'string', description: '性别' },
+                        birthday: { type: 'string', format: 'date', description: '出生日期' },
+                        description: { type: 'string', description: '个人简介' },
+                        status: { type: 'number', description: '状态' }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     },
     async request => {
       return { userInfo: request.userInfo };
     }
   );
+
+  fastify.post(
+    `${options.prefix}/user/saveUserInfo`,
+    {
+      onRequest: [authenticate.user],
+      schema: {
+        tags: ['用户'],
+        summary: '更新用户信息',
+        body: {
+          type: 'object',
+          properties: {
+            avatar: { type: 'string', description: '头像图片id' },
+            nickname: { type: 'string', description: '用户昵称' },
+            email: { type: 'string', description: '邮箱' },
+            phone: { type: 'string', description: '电话' },
+            gender: { type: 'string', description: '性别' },
+            birthday: { type: 'string', format: 'date', description: '出生日期' },
+            description: { type: 'string', description: '个人简介' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id } = request.authenticatePayload;
+      await services.user.saveUser(Object.assign({}, request.body, { id }));
+      return {};
+    }
+  );
 });
 
 module.exports = userController;

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/libs/services/user.js

@@ -99,7 +99,7 @@ const userService = fp(async (fastify, options) => {
   };
 
   const saveUser = async ({ id, ...otherInfo }) => {
-    const user = await getUserInstance(id);
+    const user = await getUserInstance({id});
 
     if ((await accountIsExists({ phone: otherInfo.phone, email: otherInfo.email }, user)) > 0) {
       throw new Error('手机号或者邮箱都不能重复');

package/package.json

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