hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-16 14:10:48 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix QR login: pass userSearchUrl into auth middleware for token+empNo verify.

Browse source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-09-08 02:37:08 +08:00
parent b535714000
commit 74a86ff832
3 changed files with 54 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
uds-auth/lib/middleware/auth-middleware.js
View file

@ -34,7 +34,12 @@ export function createAuthMiddleware(config, sessionStore, rolesStore) {
* empNo + token → 调用户搜索接口；返回解析后的 profile 或 null
*/
async function verifyEmpNoAndToken(empNo, token) {
if (!userSearchUrl || !empNo || !token) return null
if (!userSearchUrl || !empNo || !token) {
console.warn('[uds-auth] verifyEmpNoAndToken skipped: missing', {
hasUrl: !!userSearchUrl, hasEmpNo: !!empNo, hasToken: !!token,
})
return null
}
try {
const targetUrl = new URL(userSearchUrl)
const body = JSON.stringify({
@ -55,7 +60,7 @@ export function createAuthMiddleware(config, sessionStore, rolesStore) {
const isHttps = targetUrl.protocol === 'https:'
const mod = await import(isHttps ? 'node:https' : 'node:http')
const result = await new Promise((resolve, reject) => {
const { statusCode, result } = await new Promise((resolve, reject) => {
const req = mod.request({
hostname: targetUrl.hostname,
port: targetUrl.port || (isHttps ? 443 : 80),
@ -67,7 +72,9 @@ export function createAuthMiddleware(config, sessionStore, rolesStore) {
let data = ''
res.on('data', (c) => { data += c })
res.on('end', () => {
try { resolve(JSON.parse(data)) } catch { resolve(null) }
let parsed = null
try { parsed = JSON.parse(data) } catch { parsed = { raw: String(data).slice(0, 300) } }
resolve({ statusCode: res.statusCode, result: parsed })
})
})
req.on('error', reject)
@ -76,12 +83,21 @@ export function createAuthMiddleware(config, sessionStore, rolesStore) {
req.end()
})
const code = result?.code?.code || result?.code
if (code !== '0000' && code !== 0 && code !== '0') return null
const code = result?.code?.code ?? result?.code
if (code !== '0000' && code !== 0 && code !== '0') {
console.warn('[uds-auth] userSearch failed:', {
empNo, statusCode, code, msg: result?.code?.msg || result?.msg || result?.raw,
})
return null
}
const list = Array.isArray(result?.bo) ? result.bo
: Array.isArray(result?.bo?.rows) ? result.bo.rows
: []
if (!list.length) return null
: Array.isArray(result?.bo?.list) ? result.bo.list
: []
if (!list.length) {
console.warn('[uds-auth] userSearch empty bo:', { empNo, statusCode, keys: result && Object.keys(result) })
return null
}
const emp = list[0]
const resolvedEmpNo = String(
emp.employeeShortId || emp.employeeNO || emp.empUIID || emp.empNo || empNo,