bjx-auth 1.0.3 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bjx-auth",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "exports": {
     ".": {
       "require": "./dist/bjx-auth-api.umd.js",

package/src/config.js

@@ -32,7 +32,7 @@ async function setConfig(key, val) {
     for (const k in key) {
       setKey(k, key[k])
     }
-  } else {
+  } else if (key) {
     setKey(key, val)
   }
 }

package/src/strategy/handle.js

@@ -1,5 +1,6 @@
 const {
   setConfig,
+  getConfig,
   getToken: getTokenApi,
   getUserInfo: getUserInfoApi,
 } = require('../request')
@@ -31,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,
       },
     },
     {
@@ -51,6 +60,7 @@ async function getUserInfo(token, type, { headers, ctx }) {
 
 module.exports = {
   setConfig,
+  getConfig,
   getToken,
   getUserInfo,
 }

package/src/strategy/strategy.js

@@ -1,5 +1,5 @@
 const { Strategy } = require('passport')
-const { setConfig, getToken, getUserInfo } = require('./handle')
+const { setConfig, getConfig, getToken, getUserInfo } = require('./handle')
 const { errorLogger, debugLogger } = require('../logger')
 
 class BjxStrategy extends Strategy {
@@ -13,11 +13,14 @@ class BjxStrategy extends Strategy {
     this.loadUserInfo = options.loadUserInfo || false
     this.userInfoDuration = this.normalizeDuration(options.loadUserInfo)
     this.userInfoType = options.userInfoType || ''
-    this.authConfig = options.authConfig || {}
+    this.handleHeadrToken = options.handleHeadrToken || false
     this.verify = verify || ((user, done) => done(null, user))
 
     // 设置配置缓存
-    setConfig(this.authConfig)
+    setConfig(options.authConfig)
+    if (options.authConfig.debug) {
+      debugLogger('配置项', getConfig())
+    }
   }
 
   normalizeDuration(val) {
@@ -35,27 +38,99 @@ class BjxStrategy extends Strategy {
       req.cookies.get('idsrv.session') &&
       req.cookies.get('.AspNetCore.Identity.Application')
 
+    // 检查必要的header
+    const hasRequiredHeaders =
+      req.headers && (req.headers.authtoken || req.headers.authorization)
+
     // 假如不存在 则认证失败
-    if (!hasRequiredCookies) {
-      return this.fail(new Error('Missing required cookies'))
-    }
-
-    // 否则 执行认证流程
-    this.executeAuthentication(req)
-      .then((user) =>
-        // 创建策略时 可传入回调函数 已追加认证逻辑
-        this.verify(user, (err, verifiedUser) => {
-          if (err) return this.error(err)
-          this.success(verifiedUser)
-        }),
+    if (!hasRequiredCookies && !(this.handleHeadrToken && hasRequiredHeaders)) {
+      return this.fail(new Error('Missing required cookies or headers'))
+    }
+
+    if (this.handleHeadrToken && hasRequiredHeaders) {
+      this.executeCosplayAuthentication(req)
+        .then((user) => {
+          this.success(user)
+        })
+        .catch((err) => {
+          if (err.message === '__goto_next__') {
+            this.pass()
+          } else {
+            this.error(err)
+          }
+        })
+    } else if (hasRequiredCookies) {
+      // 否则 执行认证流程
+      this.executeAuthentication(req)
+        .then((user) =>
+          // 创建策略时 可传入回调函数 已追加认证逻辑
+          this.verify(user, (err, verifiedUser) => {
+            if (err) return this.error(err)
+            this.success(verifiedUser)
+          }),
+        )
+        .catch((err) => {
+          if (err.message === '__goto_next__') {
+            this.pass()
+          } else {
+            this.error(err)
+          }
+        })
+    } else {
+      this.pass()
+    }
+  }
+
+  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__')
+    }
+
+    // 假如session里面没有不是该token说明换了 需要重新获取
+    su.info = null
+    const userInfo = await this.getUserInfoWithRefresh(
+      (isAuthorization ? 'Bearer ' : '') + token,
+      req,
+      {},
+    )
+    if (userInfo) {
+      debugLogger(
+        `通过${isAuthorization ? 'Authorization' : 'Authtoken'}头信息登录系统`,
       )
-      .catch((err) => {
-        if (err.message === '__goto_next__') {
-          this.pass()
-        } else {
-          this.error(err)
+      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')
+    }
   }
 
   async executeAuthentication(req) {

package/src/strategy/utils.js

@@ -188,13 +188,16 @@ function getLoginCenterUrl(opts, type = '') {
   } = opts || {}
   if (!site && !ctx) throw new Error('site is required')
   if (!returnUrl && !ctx) throw new Error('returnUrl is required')
+
   const { clientId, login: loginCenter } = config
+
   const pp = objToQs({
     BA: BA || ctx?.query?.ba || config.ba || '',
     BP: BP || ctx?.query?.bp || config.bp || '',
     OS: OS || config.os || 1,
     EQP: EQP || config.eqp || '',
   })
+
   let sr
   if (ctx && (!site || !returnUrl)) {
     sr = handleCtx(ctx, !site)