bjx-auth 1.1.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bjx-auth",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "exports": {
     ".": {
       "require": "./dist/bjx-auth-api.umd.js",
@@ -23,12 +23,14 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
+    "@rollup/plugin-babel": "^6.0.4",
     "axios": "^1.11.0",
     "crypto-js": "^4.2.0",
     "jsencrypt": "^3.5.4",
     "passport": "^0.4.0"
   },
   "devDependencies": {
+    "@babel/preset-env": "^7.28.3",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-replace": "^6.0.2",

package/src/config.js

@@ -20,6 +20,9 @@ const config = {
   // logger.js
   debug: false,
   debugApiUrl: '',
+
+  // 缓存koa的app对象
+  app: null,
 }
 
 function setKey(key, val) {

package/src/strategy/handle.js

@@ -32,12 +32,20 @@ async function getToken(cookies, isRefresh, { headers, ctx }) {
 }
 
 async function getUserInfo(token, type, { headers, ctx }) {
+  // 兼容老的token 以支持老版本APP嵌入页面
+  const tokenHeader = {}
+  if (token.startsWith('Bearer ')) {
+    tokenHeader['Authorization'] = token
+  } else {
+    tokenHeader['AuthToken'] = token
+  }
+
   return getUserInfoApi(
     {
       __type__: type,
       headers: {
-        AuthToken: token,
         ...headers,
+        ...tokenHeader,
       },
     },
     {

package/src/strategy/strategy.js

@@ -44,11 +44,12 @@ class BjxStrategy extends Strategy {
 
     // 假如不存在 则认证失败
     if (!hasRequiredCookies && !(this.handleHeadrToken && hasRequiredHeaders)) {
-      return this.fail(new Error('Missing required cookies or headers'))
+      debugLogger('认证失败', hasRequiredCookies, '(', this.handleHeadrToken, hasRequiredHeaders, ')')
+      return this.fail()
     }
 
     if (this.handleHeadrToken && hasRequiredHeaders) {
-      this.executeCosplayAuthentication(req, hasRequiredHeaders)
+      this.executeCosplayAuthentication(req)
         .then((user) => {
           this.success(user)
         })
@@ -81,8 +82,17 @@ class BjxStrategy extends Strategy {
     }
   }
 
-  async executeCosplayAuthentication(req, token) {
-    token = token.replace('Bearer ', '')
+  async executeCosplayAuthentication(req) {
+    // 以Bearer开始的 为Authorization头 否则为Authtoken头
+    let token = ''
+    let isAuthorization = false
+    if (req.headers?.authtoken) {
+      token = req.headers.authtoken
+    } else if (req.headers?.authorization) {
+      token = req.headers.authorization.replace('Bearer ', '')
+      isAuthorization = true
+    }
+
     const su = req?.session?.passport?.user || {}
     if (su.token?.access_token === token) {
       throw new Error('__goto_next__')
@@ -90,16 +100,34 @@ class BjxStrategy extends Strategy {
 
     // 假如session里面没有不是该token说明换了 需要重新获取
     su.info = null
-    const userInfo = await this.getUserInfoWithRefresh(token, req, {})
+    const userInfo = await this.getUserInfoWithRefresh(
+      (isAuthorization ? 'Bearer ' : '') + token,
+      req,
+      {},
+    )
     if (userInfo) {
-      return {
-        token: {
-          bjx_token_flag: 'This token from authtoken/authorization header',
-          token_type: '',
-          access_token: token,
-          expires_at: (Date.now() / 1000 + 4 * 600) | 0,
-        },
-        info: userInfo,
+      debugLogger(
+        `通过${isAuthorization ? 'Authorization' : 'Authtoken'}头信息登录系统`,
+      )
+      if (isAuthorization) {
+        return {
+          token: {
+            token_type: 'Bearer',
+            access_token: token,
+            expires_at: (Date.now() / 1000 + 4 * 600) | 0,
+          },
+          info: userInfo,
+        }
+      } else {
+        return {
+          token: {
+            bjx_token_flag: 'This token from authtoken/authorization header',
+            token_type: '',
+            access_token: token,
+            expires_at: (Date.now() / 1000 + 4 * 600) | 0,
+          },
+          info: userInfo,
+        }
       }
     } else {
       throw new Error('Invalid headers token')
@@ -163,7 +191,7 @@ class BjxStrategy extends Strategy {
     // 假如存在token 还到这一步 说明是刷新token
     const isRefresh = !!su.token
     if (isRefresh) {
-      debugLogger('更新令牌')
+      debugLogger('刷新令牌')
     }
 
     // 获取新token
@@ -204,22 +232,28 @@ class BjxStrategy extends Strategy {
 // Koa中间件
 function createBjxAuthMiddleware(passport) {
   return async (ctx, next) => {
+    // 缓存app对象 方便打印日志
+    if (!getConfig('app')) {
+      setConfig('app', ctx.app)
+    }
+
+    // 等待每次鉴权结果
     await new Promise((resolve) => {
       passport.authenticate('bjx', (err, user, info, status) => {
         if (err) {
-          // this.error()
+          // this.error()进到这里
           errorLogger(err)
           ctx.logout()
         } else if (user) {
-          // this.success()
+          // this.success()进到这里
           ctx.login(user)
         } else {
-          // this.fail()
+          // this.fail()进到这里
           ctx.logout()
         }
         resolve()
       })(ctx, () => {
-        // this.pass()
+        // this.pass()进到这里
         resolve()
       })
     })