fix: 逻辑修正

src/apis/auth/auth.controller.ts

@@ -0,0 +1,14 @@
+import { Request, Response, NextFunction } from 'express'
+
+class AuthController {
+  /**
+   * 获取个人简介
+   */
+  public static async getProfile(req: Request, res: Response, next: NextFunction) {
+    const user = req.user
+
+    return res.send({ user })
+  }
+}
+
+export { AuthController }

src/apis/auth/auth.route.ts

@@ -1,28 +1,32 @@
 import { LocalAuthController } from '@/apis/auth/local-auth.controller'
+import { AuthController } from './auth.controller'
 
 /** 公共路由 */
-const AuthRoutes: App.Route[] = [
-  //  登录
+const authRoutes: App.Route[] = [
   {
     path: '/login',
     method: 'POST',
     middlewares: [LocalAuthController.login],
     permission: 'public'
   },
-  //  注册
   {
     path: '/register',
     method: 'POST',
     middlewares: [LocalAuthController.register],
     permission: 'public'
   },
-  //  登出
   {
     path: '/logout',
     method: 'POST',
     middlewares: [LocalAuthController.register],
     permission: 'public'
+  },
+  {
+    path: '/profile',
+    method: 'GET',
+    middlewares: [AuthController.getProfile],
+    permission: 'user'
   }
 ]
 
-export { AuthRoutes }
+export { authRoutes }

src/apis/auth/local-auth.controller.ts

@@ -5,10 +5,9 @@ import { NextFunction, Request, Response } from 'express'
 import sessionInfoDao from '@/dao/sessionInfo.dao'
 import { SessionInfoProps } from '@/entities/sessionInfo.model'
 import { UserFilter, UserProps } from '@/entities/auth/user.model'
-import UserStore from '@/business/user/user.store'
 import { LocalAuthStore } from '@/business/auth/local/local-auth.store'
 import { AppError } from '@/lib/error'
-import { encryptStringUsingSH512, genRandom32BitsHexString, genUniqString, genPBK } from '@/lib/encryption/crypto'
+import { genRandom32BitsHexString, genUniqString, genPBK } from '@/lib/encryption/crypto'
 import { Types } from 'mongoose'
 
 /** 用户登录信息 */
@@ -56,9 +55,7 @@ class LocalAuthController {
       const [createSessionInfoErr] = await callAsync(sessionInfoDao.create(sessionInfoProps))
       if (createSessionInfoErr) console.log(`记录sessionInfo失败 => ${createSessionInfoErr}`)
 
-      const profile = _.pick(user, UserStore.theProfileKeys())
-
-      return res.send(profile)
+      return res.sendStatus(200)
     })
   }
 
@@ -83,10 +80,10 @@ class LocalAuthController {
       password,
       salt
     }
-    const [createUserErr, user] = await callAsync(UserDao.create(newUserProps))
+    const [createUserErr] = await callAsync(UserDao.create(newUserProps))
     if (createUserErr) return next(new AppError({ message: `创建用户失败 => ${createUserErr} ` }))
 
-    return res.send(user)
+    return res.sendStatus(200)
   }
 
   public static async logout(req: Request<null, number, null>, res: Response, next: NextFunction) {

src/lib/http/cookie.ts

@@ -0,0 +1,17 @@
+/**
+ * 将cookie字符串转为Map
+ * @param {string} cookieStr - cookie字符串
+ * @returns {Map} cookie Map
+ */
+export function cookieStr2Map(cookieStr: string): Map<string, string> {
+  const cookie = new Map<string, string>()
+  cookieStr.split(';').forEach(item => {
+    if (!item) return
+    const kv = item.split('=')
+    const key = kv[0].trim()
+    const val = kv[1].trim()
+    cookie.set(key, val)
+  })
+
+  return cookie
+}

src/loaders/express.ts

@@ -10,7 +10,6 @@ import { Redis } from 'ioredis'
 import RedisStore from 'connect-redis'
 
 import { config } from '@/_config/config'
-import { permissionValidatorRegister } from '@/loaders/rbac/validator'
 import { localSerialize, localDeserialize } from '@/loaders/auth/local-auth'
 
 /**
@@ -58,8 +57,6 @@ function loadExpress(app: express.Express) {
   /** passport 本地策略 */
   passport.serializeUser(localSerialize)
   passport.deserializeUser(localDeserialize)
-  /** 注册权限校验器 */
-  app.use(permissionValidatorRegister)
 }
 
 export default loadExpress

src/loaders/index.ts

@@ -1,7 +1,6 @@
 import express from 'express'
 import loadMongoDB from './mongo'
 import loadExpress from './express'
-import initRbac from './rbac'
 import loadRouters from './router'
 import { executScripts } from './script'
 import { makeLogDir } from './log'
@@ -21,7 +20,6 @@ async function initApp(app: express.Express, config: App.Config) {
   loadRouters(app)
 
   // 业务逻辑初始化
-  initRbac()
   await executScripts(config.scriptDir)
 
   // 定时任务

src/loaders/rbac/index.ts

@@ -1,13 +1,42 @@
-import { __roles } from './roles'
+/** 系统角色 */
+enum SysRole {
+  /** 匿名用户（游客） */
+  ANON = 'anon',
+  /** 普通用户 */
+  USER = 'user',
+  /** 系统管理员 */
+  ADMIN = 'admin'
+}
+
+/** 系统权限 */
+enum SysPerm {
+  PUBLIC = 'public',
+  OPEN = 'open',
+  ANON = 'anon',
+  USER = 'user',
+  ADMIN = 'admin'
+}
+
+/**
+ * 全局变量——系统角色
+ */
+const __rolesMap = new Map<string, App.Role>()
+__rolesMap.set(SysRole.ANON, { permissions: [SysPerm.ANON] })
+__rolesMap.set(SysRole.USER, { permissions: [SysPerm.USER] })
+__rolesMap.set(SysRole.ADMIN, { permissions: [SysPerm.ADMIN, SysPerm.USER] })
+
+/**
+ * 获取某角色的权限
+ */
+function getPermsByRole(role: string): string[] {
+  return __rolesMap.get(role).permissions
+}
 
 /**
- * 【初始化】加载角色权限系统
+ * 判断
  */
-async function loadRbac() {
-  // 每一个角色添加“公开”权限
-  for (const roleName in __roles) {
-    __roles[roleName]['permissions'].unshift('public')
-  }
+function judgeRoleHasPerm(role: string, perm: string): boolean {
+  return __rolesMap.get(role).permissions.includes(perm)
 }
 
-export default loadRbac
+export { SysRole, SysPerm, getPermsByRole, judgeRoleHasPerm }

src/loaders/router/index.ts

@@ -1,31 +1,31 @@
 import express from 'express'
 
-import registerRouter from '@/loaders/router/register'
+import { registerRoutes } from '@/loaders/router/register'
 import errorHandler from '../errorHandler'
 
-import __adminRoutes from '@/loaders/router/admin.route'
-import __moduleRoutes from '@/loaders/router/module.route'
-import __publicRoutes from '@/loaders/router/public.route'
-
-//  路由字典
-export const routesMap = new Map()
+import { __adminRoutes } from '@/loaders/router/routes/admin.route'
+import { __userRoutes } from '@/loaders/router/routes/user.route'
+import { __publicRoutes } from '@/loaders/router/routes/public.route'
+import { __openRoutes } from '@/loaders/router/routes/open.route'
 
 /**
- * 初始化路由器。
+ * 加载路由。
  */
 function loadRouters(app: express.Express) {
-  // 监听系统管理层级路由
   const adminRouter = express.Router()
-  registerRouter(adminRouter, __adminRoutes, 'admin')
+  registerRoutes(adminRouter, __adminRoutes, 'admin')
+  app.use('/', adminRouter)
+
+  const userRouter = express.Router()
+  registerRoutes(userRouter, __userRoutes, 'user')
+  app.use('/', userRouter)
 
-  //  监听业务路由
-  const moduleRouter = express.Router()
-  registerRouter(moduleRouter, __moduleRoutes, 'user')
-  app.use('/', moduleRouter)
+  const openRouter = express.Router()
+  registerRoutes(openRouter, __openRoutes, 'open')
+  app.use('/', openRouter)
 
-  //  监听公开路由
   const publicRouter = express.Router()
-  registerRouter(publicRouter, __publicRoutes, 'public')
+  registerRoutes(publicRouter, __publicRoutes, 'public')
   app.use('/', publicRouter)
 
   // 添加错误处理器