Workforce: bearer token only, strip OAuth, pass location fields from departments
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
75d373c2c5
commit
5d6a9ea3cd
2 changed files with 18 additions and 50 deletions
|
|
@ -1,9 +1,7 @@
|
|||
const SETTINGS_URL = process.env.SETTINGS_URL || 'http://10.10.10.106:3080'
|
||||
const SETTINGS_SECRET = process.env.SETTINGS_SECRET || ''
|
||||
|
||||
// Credential + token caches
|
||||
let _credsCache = null // { creds, expires_at }
|
||||
let _tokenCache = null // { access_token, base_url, expires_at }
|
||||
let _credsCache = null // { creds, expires_at }
|
||||
|
||||
async function getWorkforceCreds() {
|
||||
if (_credsCache && Date.now() < _credsCache.expires_at) return _credsCache.creds
|
||||
|
|
@ -13,49 +11,16 @@ async function getWorkforceCreds() {
|
|||
})
|
||||
if (!res.ok) throw new Error(`Failed to fetch Workforce credentials from settings: ${res.status}`)
|
||||
const creds = await res.json()
|
||||
if (!creds.bearer_token && (!creds.email || !creds.password)) {
|
||||
throw new Error('Workforce credentials not configured in settings — set a bearer token or email/password')
|
||||
}
|
||||
if (!creds.bearer_token) throw new Error('Workforce bearer token not configured in settings')
|
||||
_credsCache = { creds, expires_at: Date.now() + 5 * 60_000 }
|
||||
return creds
|
||||
}
|
||||
|
||||
async function getWorkforceToken() {
|
||||
async function wfFetch(path) {
|
||||
const creds = await getWorkforceCreds()
|
||||
const baseUrl = creds.base_url || 'https://my.workforce.com'
|
||||
|
||||
// Use bearer token directly if configured — no OAuth exchange needed
|
||||
if (creds.bearer_token) {
|
||||
return { token: creds.bearer_token, baseUrl }
|
||||
}
|
||||
|
||||
if (_tokenCache && _tokenCache.base_url === baseUrl && Date.now() < _tokenCache.expires_at) {
|
||||
return { token: _tokenCache.access_token, baseUrl }
|
||||
}
|
||||
const res = await fetch(`${baseUrl}/api/oauth/token`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: new URLSearchParams({
|
||||
grant_type: 'password',
|
||||
username: creds.email,
|
||||
password: creds.password,
|
||||
scope: 'platform',
|
||||
}).toString(),
|
||||
signal: AbortSignal.timeout(10000),
|
||||
})
|
||||
if (!res.ok) {
|
||||
const body = await res.text().catch(() => '')
|
||||
throw new Error(`Workforce OAuth failed: ${res.status}${body ? ': ' + body.slice(0, 300) : ''}`)
|
||||
}
|
||||
const data = await res.json()
|
||||
_tokenCache = { access_token: data.access_token, base_url: baseUrl, expires_at: Date.now() + 50 * 60_000 }
|
||||
return { token: data.access_token, baseUrl }
|
||||
}
|
||||
|
||||
async function wfFetch(path) {
|
||||
const { token, baseUrl } = await getWorkforceToken()
|
||||
const res = await fetch(`${baseUrl}${path}`, {
|
||||
headers: { Authorization: `Bearer ${token}` },
|
||||
headers: { Authorization: `Bearer ${creds.bearer_token}` },
|
||||
signal: AbortSignal.timeout(10000),
|
||||
})
|
||||
if (!res.ok) {
|
||||
|
|
@ -71,7 +36,7 @@ async function wfFetchPaged(path) {
|
|||
while (true) {
|
||||
const sep = path.includes('?') ? '&' : '?'
|
||||
const data = await wfFetch(`${path}${sep}page=${page}&page_size=100`)
|
||||
const items = Array.isArray(data) ? data : (data.users ?? data.departments ?? [])
|
||||
const items = Array.isArray(data) ? data : (data.users ?? data.departments ?? data.teams ?? [])
|
||||
results.push(...items)
|
||||
if (items.length < 100) break
|
||||
page++
|
||||
|
|
@ -85,11 +50,9 @@ export async function findEmployeeByEmail(email) {
|
|||
return users.length > 0 ? users[0] : null
|
||||
}
|
||||
|
||||
// Try direct ID lookup first (standard REST); returns null if endpoint not supported
|
||||
export async function findEmployeeById(wfUserId) {
|
||||
try {
|
||||
const data = await wfFetch(`/api/v2/users/${wfUserId}`)
|
||||
// Some APIs wrap in { user: ... }, others return the object directly
|
||||
return data?.id ? data : (data?.user ?? null)
|
||||
} catch {
|
||||
return null
|
||||
|
|
@ -115,8 +78,6 @@ export async function getSyncConfig() {
|
|||
return { syncHours: parseFloat(creds.sync_hours ?? '6') }
|
||||
}
|
||||
|
||||
// Invalidate caches (e.g. after credentials updated in settings)
|
||||
export function invalidateCache() {
|
||||
_credsCache = null
|
||||
_tokenCache = null
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue