@soulcode/bexio-oauth 0.1.0 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/claims.d.ts +1 -1
- package/dist/claims.d.ts.map +1 -1
- package/dist/claims.js +2 -2
- package/dist/claims.js.map +1 -1
- package/dist/client.d.ts +4 -137
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +18 -629
- package/dist/client.js.map +1 -1
- package/dist/config.d.ts +22 -0
- package/dist/config.d.ts.map +1 -0
- package/dist/config.js +57 -0
- package/dist/config.js.map +1 -0
- package/dist/connect-flow.d.ts +15 -0
- package/dist/connect-flow.d.ts.map +1 -0
- package/dist/connect-flow.js +123 -0
- package/dist/connect-flow.js.map +1 -0
- package/dist/crypto.d.ts.map +1 -1
- package/dist/crypto.js +15 -10
- package/dist/crypto.js.map +1 -1
- package/dist/external-tokens.d.ts +8 -0
- package/dist/external-tokens.d.ts.map +1 -0
- package/dist/external-tokens.js +73 -0
- package/dist/external-tokens.js.map +1 -0
- package/dist/flow-cookie.d.ts +23 -0
- package/dist/flow-cookie.d.ts.map +1 -0
- package/dist/flow-cookie.js +44 -0
- package/dist/flow-cookie.js.map +1 -0
- package/dist/grants.d.ts +36 -0
- package/dist/grants.d.ts.map +1 -0
- package/dist/grants.js +115 -0
- package/dist/grants.js.map +1 -0
- package/dist/idle-sweep.d.ts +11 -0
- package/dist/idle-sweep.d.ts.map +1 -0
- package/dist/idle-sweep.js +70 -0
- package/dist/idle-sweep.js.map +1 -0
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/migrations.generated.d.ts +3 -0
- package/dist/migrations.generated.d.ts.map +1 -0
- package/dist/migrations.generated.js +40 -0
- package/dist/migrations.generated.js.map +1 -0
- package/dist/oidc.d.ts +30 -0
- package/dist/oidc.d.ts.map +1 -0
- package/dist/oidc.js +67 -0
- package/dist/oidc.js.map +1 -0
- package/dist/refresh.d.ts +30 -0
- package/dist/refresh.d.ts.map +1 -0
- package/dist/refresh.js +139 -0
- package/dist/refresh.js.map +1 -0
- package/dist/return-to.d.ts +8 -0
- package/dist/return-to.d.ts.map +1 -0
- package/dist/return-to.js +31 -0
- package/dist/return-to.js.map +1 -0
- package/dist/sql.d.ts +6 -1
- package/dist/sql.d.ts.map +1 -1
- package/dist/sql.js +8 -12
- package/dist/sql.js.map +1 -1
- package/dist/store/postgres.d.ts +1 -1
- package/dist/store/postgres.d.ts.map +1 -1
- package/dist/store/postgres.js +11 -2
- package/dist/store/postgres.js.map +1 -1
- package/dist/types.d.ts +150 -0
- package/dist/types.d.ts.map +1 -0
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -0
- package/package.json +3 -1
package/dist/grants.js
ADDED
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import * as oidc from "openid-client";
|
|
2
|
+
import { decodeJwt } from "jose";
|
|
3
|
+
import { grantBinding, mapClaims } from "./claims.js";
|
|
4
|
+
import { BexioOAuthError } from "./errors.js";
|
|
5
|
+
import { fetchRole } from "./permissions.js";
|
|
6
|
+
/** The app-facing view of a stored grant: no token material. */
|
|
7
|
+
export function toGrant(r) {
|
|
8
|
+
return {
|
|
9
|
+
id: r.id,
|
|
10
|
+
ownerId: r.ownerId,
|
|
11
|
+
companyId: r.companyId,
|
|
12
|
+
companyName: r.companyName,
|
|
13
|
+
userId: r.userId,
|
|
14
|
+
userName: r.userName,
|
|
15
|
+
userEmail: r.userEmail,
|
|
16
|
+
companyUserId: r.companyUserId,
|
|
17
|
+
role: r.role,
|
|
18
|
+
status: r.status,
|
|
19
|
+
scope: r.scope,
|
|
20
|
+
accessExpiresAt: r.accessExpiresAt,
|
|
21
|
+
lastRefreshedAt: r.lastRefreshedAt,
|
|
22
|
+
createdAt: r.createdAt,
|
|
23
|
+
updatedAt: r.updatedAt,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
/** The binding a grant's ciphertexts are encrypted under. */
|
|
27
|
+
export function bindingOf(record) {
|
|
28
|
+
return grantBinding(record.ownerId, record.companyId, record.userId);
|
|
29
|
+
}
|
|
30
|
+
export function decryptFor(cipher, record, value) {
|
|
31
|
+
return cipher.decrypt(value, bindingOf(record));
|
|
32
|
+
}
|
|
33
|
+
/** Decrypts the grant's access token for the caller. */
|
|
34
|
+
export async function issue(cipher, record) {
|
|
35
|
+
return {
|
|
36
|
+
accessToken: await decryptFor(cipher, record, record.accessToken),
|
|
37
|
+
expiresAt: record.accessExpiresAt,
|
|
38
|
+
grant: toGrant(record),
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
/** Exactly one grant of the owner, or `not_connected` / `ambiguous_grant`. */
|
|
42
|
+
export async function resolveGrant(store, selector) {
|
|
43
|
+
if (!selector?.ownerId)
|
|
44
|
+
throw new BexioOAuthError("invalid_config", "ownerId is required");
|
|
45
|
+
const rows = await store.findGrants(selector);
|
|
46
|
+
if (rows.length === 0)
|
|
47
|
+
throw new BexioOAuthError("not_connected", "owner has no matching grant");
|
|
48
|
+
if (rows.length > 1) {
|
|
49
|
+
throw new BexioOAuthError("ambiguous_grant", "owner has several grants; pass companyId or grantId");
|
|
50
|
+
}
|
|
51
|
+
return rows[0];
|
|
52
|
+
}
|
|
53
|
+
/** The token's claims if it is a JWT, else none (Bexio access tokens usually are). */
|
|
54
|
+
export function decodeIfJwt(token) {
|
|
55
|
+
try {
|
|
56
|
+
return decodeJwt(token);
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
return {};
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Adds userinfo claims, only when the tokens lack the company claims. Token
|
|
64
|
+
* claims win over userinfo; a userinfo failure keeps the token claims.
|
|
65
|
+
*/
|
|
66
|
+
export async function withUserInfo(ctx, claims, accessToken) {
|
|
67
|
+
if (claims.company_id !== undefined)
|
|
68
|
+
return claims;
|
|
69
|
+
try {
|
|
70
|
+
const info = await oidc.fetchUserInfo(await ctx.oidc.config(), accessToken, typeof claims.sub === "string" ? claims.sub : oidc.skipSubjectCheck);
|
|
71
|
+
return { ...info, ...claims };
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
return claims;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
/** Encrypts the tokens, reads the role and upserts the grant for the identity in `claims`. */
|
|
78
|
+
export async function saveTokens(ctx, input) {
|
|
79
|
+
const identity = mapClaims(input.claims);
|
|
80
|
+
const binding = grantBinding(input.ownerId, identity.companyId, identity.userId);
|
|
81
|
+
const role = (await fetchRole(ctx.fetchImpl, ctx.apiBaseUrl, input.accessToken)) ??
|
|
82
|
+
"member";
|
|
83
|
+
return ctx.store.upsertGrant({
|
|
84
|
+
ownerId: input.ownerId,
|
|
85
|
+
...identity,
|
|
86
|
+
role,
|
|
87
|
+
accessToken: await ctx.cipher.encrypt(input.accessToken, binding),
|
|
88
|
+
refreshToken: input.refreshToken
|
|
89
|
+
? await ctx.cipher.encrypt(input.refreshToken, binding)
|
|
90
|
+
: null,
|
|
91
|
+
accessExpiresAt: input.accessExpiresAt,
|
|
92
|
+
refreshExpiresAt: input.refreshExpiresAt,
|
|
93
|
+
scope: input.scope,
|
|
94
|
+
now: ctx.clock(),
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
export async function listGrants(store, query) {
|
|
98
|
+
if (!query?.ownerId)
|
|
99
|
+
throw new BexioOAuthError("invalid_config", "ownerId is required");
|
|
100
|
+
return (await store.findGrants({ ownerId: query.ownerId })).map(toGrant);
|
|
101
|
+
}
|
|
102
|
+
export async function disconnect(ctx, selector) {
|
|
103
|
+
const record = await resolveGrant(ctx.store, selector);
|
|
104
|
+
try {
|
|
105
|
+
const c = await ctx.oidc.config();
|
|
106
|
+
if (record.refreshToken && c.serverMetadata().revocation_endpoint) {
|
|
107
|
+
await oidc.tokenRevocation(c, await decryptFor(ctx.cipher, record, record.refreshToken), { token_type_hint: "refresh_token" });
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
catch {
|
|
111
|
+
// Revocation is best effort; the grant is deleted either way.
|
|
112
|
+
}
|
|
113
|
+
await ctx.store.deleteGrant(record.id);
|
|
114
|
+
}
|
|
115
|
+
//# sourceMappingURL=grants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"grants.js","sourceRoot":"","sources":["../src/grants.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { ClientContext } from "./config.js";
|
|
2
|
+
import { type Duration } from "./duration.js";
|
|
3
|
+
import type { RefreshIdleResult } from "./types.js";
|
|
4
|
+
export declare const DEFAULT_IDLE_LIMIT = 100;
|
|
5
|
+
/** `BexioOAuth.refreshIdle`: refreshes idle grants one after another. */
|
|
6
|
+
export declare function refreshIdle(ctx: ClientContext, options: {
|
|
7
|
+
idleFor: Duration;
|
|
8
|
+
limit?: number;
|
|
9
|
+
timeBudget?: Duration;
|
|
10
|
+
}): Promise<RefreshIdleResult>;
|
|
11
|
+
//# sourceMappingURL=idle-sweep.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"idle-sweep.d.ts","sourceRoot":"","sources":["../src/idle-sweep.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAQ,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC,yEAAyE;AACzE,wBAAsB,WAAW,CAC/B,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE;IAAE,OAAO,EAAE,QAAQ,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,QAAQ,CAAA;CAAE,GACpE,OAAO,CAAC,iBAAiB,CAAC,CA2D5B"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { toMs } from "./duration.js";
|
|
2
|
+
import { isBexioOAuthError } from "./errors.js";
|
|
3
|
+
import { lockWindow, refreshLocked } from "./refresh.js";
|
|
4
|
+
export const DEFAULT_IDLE_LIMIT = 100;
|
|
5
|
+
/** `BexioOAuth.refreshIdle`: refreshes idle grants one after another. */
|
|
6
|
+
export async function refreshIdle(ctx, options) {
|
|
7
|
+
const { store, clock } = ctx;
|
|
8
|
+
const idleMs = toMs(options?.idleFor, "idleFor");
|
|
9
|
+
const budgetMs = options.timeBudget === undefined
|
|
10
|
+
? Infinity
|
|
11
|
+
: toMs(options.timeBudget, "timeBudget");
|
|
12
|
+
const startedAt = clock().getTime();
|
|
13
|
+
const result = {
|
|
14
|
+
refreshed: 0,
|
|
15
|
+
skipped: 0,
|
|
16
|
+
reauthRequired: 0,
|
|
17
|
+
failed: 0,
|
|
18
|
+
remaining: 0,
|
|
19
|
+
};
|
|
20
|
+
const refreshedBefore = new Date(startedAt - idleMs);
|
|
21
|
+
const idle = await store.listIdleGrants({
|
|
22
|
+
refreshedBefore,
|
|
23
|
+
limit: options.limit ?? DEFAULT_IDLE_LIMIT,
|
|
24
|
+
});
|
|
25
|
+
if (idle.length === 0)
|
|
26
|
+
return result;
|
|
27
|
+
try {
|
|
28
|
+
await ctx.oidc.config();
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
// Bexio unreachable: report, don't throw; the next run retries.
|
|
32
|
+
result.failed = idle.length;
|
|
33
|
+
return result;
|
|
34
|
+
}
|
|
35
|
+
for (const [index, grant] of idle.entries()) {
|
|
36
|
+
// Stop before taking the next lock, so a function timeout can't cut a
|
|
37
|
+
// refresh in half. The oldest grants come first, so the next run
|
|
38
|
+
// continues where this one stopped.
|
|
39
|
+
if (clock().getTime() - startedAt >= budgetMs) {
|
|
40
|
+
result.remaining = idle.length - index;
|
|
41
|
+
break;
|
|
42
|
+
}
|
|
43
|
+
const window = lockWindow(ctx, clock());
|
|
44
|
+
const locked = await store.acquireRefreshLock({
|
|
45
|
+
id: grant.id,
|
|
46
|
+
...window,
|
|
47
|
+
refreshedBefore,
|
|
48
|
+
});
|
|
49
|
+
if (!locked) {
|
|
50
|
+
result.skipped++;
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
try {
|
|
54
|
+
if (await refreshLocked(ctx, locked, window.lockToken))
|
|
55
|
+
result.refreshed++;
|
|
56
|
+
else
|
|
57
|
+
result.skipped++;
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
if (isBexioOAuthError(error, "reauth_required")) {
|
|
61
|
+
result.reauthRequired++;
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
result.failed++;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return result;
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=idle-sweep.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"idle-sweep.js","sourceRoot":"","sources":["../src/idle-sweep.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAiB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGzD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAEtC,yEAAyE;AACzE,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAkB,EAClB,OAAqE;IAErE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;IAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACjD,MAAM,QAAQ,GACZ,OAAO,CAAC,UAAU,KAAK,SAAS;QAC9B,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;IACpC,MAAM,MAAM,GAAsB;QAChC,SAAS,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;QACV,cAAc,EAAE,CAAC;QACjB,MAAM,EAAE,CAAC;QACT,SAAS,EAAE,CAAC;KACb,CAAC;IACF,MAAM,eAAe,GAAG,IAAI,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC;QACtC,eAAe;QACf,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,kBAAkB;KAC3C,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IACrC,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,gEAAgE;QAChE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5C,sEAAsE;QACtE,iEAAiE;QACjE,oCAAoC;QACpC,IAAI,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAC;YAC9C,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACvC,MAAM;QACR,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAAC;YAC5C,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,GAAG,MAAM;YACT,eAAe;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,SAAS;QACX,CAAC;QACD,IAAI,CAAC;YACH,IAAI,MAAM,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC;gBACpD,MAAM,CAAC,SAAS,EAAE,CAAC;;gBAChB,MAAM,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC;gBAChD,MAAM,CAAC,cAAc,EAAE,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
export { createBexioOAuth
|
|
1
|
+
export { createBexioOAuth } from "./client.js";
|
|
2
|
+
export type { AccessToken, BexioOAuth, BexioOAuthConfig, CallbackOptions, CallbackResult, ExternalTokens, Grant, GrantSelector, RefreshIdleResult, } from "./types.js";
|
|
2
3
|
export { BASE_SCOPES, BEXIO_API_BASE_URL, BEXIO_ISSUER, mapClaims, type BexioIdentity, } from "./claims.js";
|
|
3
4
|
export { generateKey, type Keyring } from "./crypto.js";
|
|
4
5
|
export type { Duration } from "./duration.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,YAAY,EACV,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,cAAc,EACd,KAAK,EACL,aAAa,EACb,iBAAiB,GAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,KAAK,aAAa,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,WAAW,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AACxD,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,KAAK,mBAAmB,GACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACpE,YAAY,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EACX,UAAU,EACV,WAAW,EACX,WAAW,GACZ,MAAM,kBAAkB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { createBexioOAuth
|
|
1
|
+
export { createBexioOAuth } from "./client.js";
|
|
2
2
|
export { BASE_SCOPES, BEXIO_API_BASE_URL, BEXIO_ISSUER, mapClaims, } from "./claims.js";
|
|
3
3
|
export { generateKey } from "./crypto.js";
|
|
4
4
|
export { BexioOAuthError, isBexioOAuthError, } from "./errors.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAY/C,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,YAAY,EACZ,SAAS,GAEV,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,WAAW,EAAgB,MAAM,aAAa,CAAC;AAExD,OAAO,EACL,eAAe,EACf,iBAAiB,GAElB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAa,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAkB,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrations.generated.d.ts","sourceRoot":"","sources":["../src/migrations.generated.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,eAAO,MAAM,UAAU,EAAE,SAAS,SAAS,EAsC1C,CAAC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
export const MIGRATIONS = [
|
|
2
|
+
{
|
|
3
|
+
number: 1,
|
|
4
|
+
name: "0001_bexio_grants.sql",
|
|
5
|
+
sql: `-- @soulcode/bexio-oauth 0001: the grants table.
|
|
6
|
+
-- One row per (owner, Bexio company, Bexio user). Token columns hold JWE
|
|
7
|
+
-- ciphertext; only your server-side database role should be able to read them.
|
|
8
|
+
|
|
9
|
+
CREATE TABLE IF NOT EXISTS bexio_grants (
|
|
10
|
+
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
11
|
+
owner_id text NOT NULL,
|
|
12
|
+
bexio_company_id text NOT NULL,
|
|
13
|
+
bexio_user_id text NOT NULL,
|
|
14
|
+
bexio_company_user_id integer,
|
|
15
|
+
company_name text,
|
|
16
|
+
user_name text,
|
|
17
|
+
user_email text,
|
|
18
|
+
role text NOT NULL DEFAULT 'member' CHECK (role IN ('admin', 'member')),
|
|
19
|
+
status text NOT NULL DEFAULT 'active' CHECK (status IN ('active', 'reauth_required')),
|
|
20
|
+
access_token text NOT NULL,
|
|
21
|
+
refresh_token text,
|
|
22
|
+
access_expires_at timestamptz,
|
|
23
|
+
refresh_expires_at timestamptz,
|
|
24
|
+
scope text,
|
|
25
|
+
refresh_locked_until timestamptz,
|
|
26
|
+
refresh_lock_token text,
|
|
27
|
+
last_refreshed_at timestamptz NOT NULL DEFAULT now(),
|
|
28
|
+
created_at timestamptz NOT NULL DEFAULT now(),
|
|
29
|
+
updated_at timestamptz NOT NULL DEFAULT now(),
|
|
30
|
+
CONSTRAINT bexio_grants_owner_company_user_key UNIQUE (owner_id, bexio_company_id, bexio_user_id)
|
|
31
|
+
);
|
|
32
|
+
|
|
33
|
+
-- refreshIdle(): active grants by last refresh.
|
|
34
|
+
CREATE INDEX IF NOT EXISTS bexio_grants_idle_idx
|
|
35
|
+
ON bexio_grants (last_refreshed_at)
|
|
36
|
+
WHERE status = 'active';
|
|
37
|
+
`,
|
|
38
|
+
},
|
|
39
|
+
];
|
|
40
|
+
//# sourceMappingURL=migrations.generated.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrations.generated.js","sourceRoot":"","sources":["../src/migrations.generated.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,UAAU,GAAyB;IAC9C;QACE,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,uBAAuB;QAC7B,GAAG,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgCR;KACE;CACF,CAAC"}
|
package/dist/oidc.d.ts
ADDED
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import * as oidc from "openid-client";
|
|
2
|
+
import { createRemoteJWKSet } from "jose";
|
|
3
|
+
/** Per HTTP request to Bexio. Kept well below the default refresh lock TTL. */
|
|
4
|
+
export declare const HTTP_TIMEOUT_SECONDS = 10;
|
|
5
|
+
/**
|
|
6
|
+
* A safe summary of an upstream error for `BexioOAuthError.cause`: the OAuth
|
|
7
|
+
* error code and HTTP status, never response bodies or token values.
|
|
8
|
+
*/
|
|
9
|
+
export declare function describe(error: unknown): {
|
|
10
|
+
name: string;
|
|
11
|
+
error?: string;
|
|
12
|
+
status?: number;
|
|
13
|
+
};
|
|
14
|
+
export type KeySet = ReturnType<typeof createRemoteJWKSet>;
|
|
15
|
+
/** Bexio's OIDC metadata and signing keys, loaded lazily. */
|
|
16
|
+
export interface Oidc {
|
|
17
|
+
/** The discovered configuration; a failed discovery is retried on the next call. */
|
|
18
|
+
config(): Promise<oidc.Configuration>;
|
|
19
|
+
/** Bexio's signing keys (cached, refetched on an unknown key id). */
|
|
20
|
+
keySet(): Promise<KeySet>;
|
|
21
|
+
}
|
|
22
|
+
export declare function createOidc(options: {
|
|
23
|
+
issuer: string;
|
|
24
|
+
clientId: string;
|
|
25
|
+
clientSecret: string;
|
|
26
|
+
/** Allow plain http (local mocks only). */
|
|
27
|
+
allowInsecure: boolean;
|
|
28
|
+
fetchImpl: typeof fetch;
|
|
29
|
+
}): Oidc;
|
|
30
|
+
//# sourceMappingURL=oidc.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../src/oidc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAkC,MAAM,MAAM,CAAC;AAG1E,+EAA+E;AAC/E,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAeA;AAED,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE3D,6DAA6D;AAC7D,MAAM,WAAW,IAAI;IACnB,oFAAoF;IACpF,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACtC,qEAAqE;IACrE,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,OAAO,KAAK,CAAC;CACzB,GAAG,IAAI,CA+CP"}
|
package/dist/oidc.js
ADDED
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import * as oidc from "openid-client";
|
|
2
|
+
import { createRemoteJWKSet, customFetch as joseCustomFetch } from "jose";
|
|
3
|
+
import { BexioOAuthError } from "./errors.js";
|
|
4
|
+
/** Per HTTP request to Bexio. Kept well below the default refresh lock TTL. */
|
|
5
|
+
export const HTTP_TIMEOUT_SECONDS = 10;
|
|
6
|
+
/**
|
|
7
|
+
* A safe summary of an upstream error for `BexioOAuthError.cause`: the OAuth
|
|
8
|
+
* error code and HTTP status, never response bodies or token values.
|
|
9
|
+
*/
|
|
10
|
+
export function describe(error) {
|
|
11
|
+
if (error instanceof oidc.ResponseBodyError) {
|
|
12
|
+
return { name: error.name, error: error.error, status: error.status };
|
|
13
|
+
}
|
|
14
|
+
if (error instanceof oidc.AuthorizationResponseError) {
|
|
15
|
+
return { name: error.name, error: error.error };
|
|
16
|
+
}
|
|
17
|
+
if (error instanceof Error) {
|
|
18
|
+
const code = error.code;
|
|
19
|
+
return {
|
|
20
|
+
name: error.name,
|
|
21
|
+
...(typeof code === "string" ? { error: code } : {}),
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
return { name: "unknown" };
|
|
25
|
+
}
|
|
26
|
+
export function createOidc(options) {
|
|
27
|
+
const { issuer, clientId, clientSecret, allowInsecure, fetchImpl } = options;
|
|
28
|
+
const issuerUrl = new URL(issuer);
|
|
29
|
+
const customFetch = (url, init) => fetchImpl(url, init);
|
|
30
|
+
let discovered;
|
|
31
|
+
function config() {
|
|
32
|
+
discovered ??= oidc
|
|
33
|
+
.discovery(issuerUrl, clientId, clientSecret, undefined, {
|
|
34
|
+
execute: allowInsecure ? [oidc.allowInsecureRequests] : [],
|
|
35
|
+
// Well below the refresh lock TTL, so a slow IdP can't outlive the lock.
|
|
36
|
+
timeout: HTTP_TIMEOUT_SECONDS,
|
|
37
|
+
[oidc.customFetch]: customFetch,
|
|
38
|
+
})
|
|
39
|
+
.then((c) => {
|
|
40
|
+
c[oidc.customFetch] = customFetch;
|
|
41
|
+
oidc.enableNonRepudiationChecks(c);
|
|
42
|
+
return c;
|
|
43
|
+
})
|
|
44
|
+
.catch((cause) => {
|
|
45
|
+
discovered = undefined;
|
|
46
|
+
throw new BexioOAuthError("idp_error", `OIDC discovery failed for ${issuer}`, { cause: describe(cause) });
|
|
47
|
+
});
|
|
48
|
+
return discovered;
|
|
49
|
+
}
|
|
50
|
+
// Cached, refetched on an unknown key id, with a timeout and a cooldown so a
|
|
51
|
+
// bad token can't hammer the issuer.
|
|
52
|
+
let jwks;
|
|
53
|
+
async function keySet() {
|
|
54
|
+
if (!jwks) {
|
|
55
|
+
const uri = (await config()).serverMetadata().jwks_uri;
|
|
56
|
+
if (!uri)
|
|
57
|
+
throw new BexioOAuthError("idp_error", "issuer publishes no jwks_uri");
|
|
58
|
+
jwks = createRemoteJWKSet(new URL(uri), {
|
|
59
|
+
timeoutDuration: HTTP_TIMEOUT_SECONDS * 1000,
|
|
60
|
+
[joseCustomFetch]: fetchImpl,
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
return jwks;
|
|
64
|
+
}
|
|
65
|
+
return { config, keySet };
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=oidc.js.map
|
package/dist/oidc.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../src/oidc.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import * as oidc from "openid-client";
|
|
2
|
+
import type { ClientContext } from "./config.js";
|
|
3
|
+
import type { GrantRecord } from "./store/types.js";
|
|
4
|
+
import type { AccessToken, GrantSelector } from "./types.js";
|
|
5
|
+
/** Refresh a little before the access token really expires. */
|
|
6
|
+
export declare const EXPIRY_SKEW_MS = 30000;
|
|
7
|
+
export type TokenResponse = oidc.TokenEndpointResponse & oidc.TokenEndpointResponseHelpers;
|
|
8
|
+
/** Absolute expiries from a token response's `expires_in` / `refresh_expires_in`. */
|
|
9
|
+
export declare function tokenExpiry(tokens: TokenResponse, now: Date): {
|
|
10
|
+
accessExpiresAt: Date | null;
|
|
11
|
+
refreshExpiresAt: Date | null;
|
|
12
|
+
};
|
|
13
|
+
/** True while the access token is valid for longer than the skew. */
|
|
14
|
+
export declare function isFresh(record: GrantRecord, now: Date): boolean;
|
|
15
|
+
/** A new lock holder's token and lease, starting at `now`. */
|
|
16
|
+
export declare function lockWindow(ctx: ClientContext, now: Date): {
|
|
17
|
+
now: Date;
|
|
18
|
+
lockUntil: Date;
|
|
19
|
+
lockToken: `${string}-${string}-${string}-${string}-${string}`;
|
|
20
|
+
};
|
|
21
|
+
/**
|
|
22
|
+
* Refreshes a grant whose lock the caller holds (`lockToken`). Every write
|
|
23
|
+
* is fenced by the token: if the lock was lost (expired and taken over, or
|
|
24
|
+
* the grant was reconnected meanwhile), the write changes nothing and this
|
|
25
|
+
* returns `null`: the caller re-reads the grant.
|
|
26
|
+
*/
|
|
27
|
+
export declare function refreshLocked(ctx: ClientContext, record: GrantRecord, lockToken: string): Promise<GrantRecord | null>;
|
|
28
|
+
/** `BexioOAuth.getAccessToken`. */
|
|
29
|
+
export declare function getAccessToken(ctx: ClientContext, selector: GrantSelector): Promise<AccessToken>;
|
|
30
|
+
//# sourceMappingURL=refresh.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE7D,+DAA+D;AAC/D,eAAO,MAAM,cAAc,QAAS,CAAC;AAIrC,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,GACpD,IAAI,CAAC,4BAA4B,CAAC;AAEpC,qFAAqF;AACrF,wBAAgB,WAAW,CACzB,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,IAAI,GACR;IAAE,eAAe,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,gBAAgB,EAAE,IAAI,GAAG,IAAI,CAAA;CAAE,CAajE;AAED,qEAAqE;AACrE,wBAAgB,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAK/D;AAED,8DAA8D;AAC9D,wBAAgB,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,IAAI;;;;EAMvD;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CA0D7B;AAID,mCAAmC;AACnC,wBAAsB,cAAc,CAClC,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,aAAa,GACtB,OAAO,CAAC,WAAW,CAAC,CAmDtB"}
|
package/dist/refresh.js
ADDED
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import * as oidc from "openid-client";
|
|
3
|
+
import { BexioOAuthError, isBexioOAuthError } from "./errors.js";
|
|
4
|
+
import { bindingOf, decryptFor, issue, resolveGrant } from "./grants.js";
|
|
5
|
+
import { describe } from "./oidc.js";
|
|
6
|
+
import { fetchRole } from "./permissions.js";
|
|
7
|
+
/** Refresh a little before the access token really expires. */
|
|
8
|
+
export const EXPIRY_SKEW_MS = 30_000;
|
|
9
|
+
/** Extra time `getAccessToken` waits for a concurrent refresh beyond the lock TTL. */
|
|
10
|
+
const WAIT_GRACE_MS = 5_000;
|
|
11
|
+
/** Absolute expiries from a token response's `expires_in` / `refresh_expires_in`. */
|
|
12
|
+
export function tokenExpiry(tokens, now) {
|
|
13
|
+
const expiresIn = tokens.expiresIn();
|
|
14
|
+
const refreshExpiresIn = Number(tokens.refresh_expires_in);
|
|
15
|
+
return {
|
|
16
|
+
accessExpiresAt: expiresIn === undefined
|
|
17
|
+
? null
|
|
18
|
+
: new Date(now.getTime() + expiresIn * 1000),
|
|
19
|
+
refreshExpiresAt: Number.isFinite(refreshExpiresIn) && refreshExpiresIn > 0
|
|
20
|
+
? new Date(now.getTime() + refreshExpiresIn * 1000)
|
|
21
|
+
: null,
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
/** True while the access token is valid for longer than the skew. */
|
|
25
|
+
export function isFresh(record, now) {
|
|
26
|
+
return (record.accessExpiresAt !== null &&
|
|
27
|
+
record.accessExpiresAt.getTime() - EXPIRY_SKEW_MS > now.getTime());
|
|
28
|
+
}
|
|
29
|
+
/** A new lock holder's token and lease, starting at `now`. */
|
|
30
|
+
export function lockWindow(ctx, now) {
|
|
31
|
+
return {
|
|
32
|
+
now,
|
|
33
|
+
lockUntil: new Date(now.getTime() + ctx.lockTtlMs),
|
|
34
|
+
lockToken: randomUUID(),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Refreshes a grant whose lock the caller holds (`lockToken`). Every write
|
|
39
|
+
* is fenced by the token: if the lock was lost (expired and taken over, or
|
|
40
|
+
* the grant was reconnected meanwhile), the write changes nothing and this
|
|
41
|
+
* returns `null`: the caller re-reads the grant.
|
|
42
|
+
*/
|
|
43
|
+
export async function refreshLocked(ctx, record, lockToken) {
|
|
44
|
+
const { store, cipher, clock } = ctx;
|
|
45
|
+
if (!record.refreshToken) {
|
|
46
|
+
await store.markReauthRequired(record.id, lockToken, clock());
|
|
47
|
+
throw new BexioOAuthError("reauth_required", "grant has no refresh token; reconnect required");
|
|
48
|
+
}
|
|
49
|
+
let refreshToken;
|
|
50
|
+
try {
|
|
51
|
+
refreshToken = await decryptFor(cipher, record, record.refreshToken);
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
// Usually a keyring mistake (a key removed too early): don't burn the
|
|
55
|
+
// grant, so restoring the key fixes it.
|
|
56
|
+
await store.releaseRefreshLock(record.id, lockToken);
|
|
57
|
+
throw error;
|
|
58
|
+
}
|
|
59
|
+
let tokens;
|
|
60
|
+
try {
|
|
61
|
+
tokens = await oidc.refreshTokenGrant(await ctx.oidc.config(), refreshToken);
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
if (error instanceof oidc.ResponseBodyError &&
|
|
65
|
+
error.error === "invalid_grant") {
|
|
66
|
+
await store.markReauthRequired(record.id, lockToken, clock());
|
|
67
|
+
throw new BexioOAuthError("reauth_required", "Bexio rejected the refresh token; reconnect required", { cause: describe(error) });
|
|
68
|
+
}
|
|
69
|
+
await store.releaseRefreshLock(record.id, lockToken);
|
|
70
|
+
if (isBexioOAuthError(error))
|
|
71
|
+
throw error;
|
|
72
|
+
throw new BexioOAuthError("idp_error", "token refresh failed", {
|
|
73
|
+
cause: describe(error),
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
const now = clock();
|
|
77
|
+
const binding = bindingOf(record);
|
|
78
|
+
// null: lock lost while refreshing (someone reconnected, or our lock
|
|
79
|
+
// expired and another caller took over). Their write wins.
|
|
80
|
+
return store.saveRefreshed(record.id, lockToken, {
|
|
81
|
+
accessToken: await cipher.encrypt(tokens.access_token, binding),
|
|
82
|
+
refreshToken: tokens.refresh_token
|
|
83
|
+
? await cipher.encrypt(tokens.refresh_token, binding)
|
|
84
|
+
: null,
|
|
85
|
+
...tokenExpiry(tokens, now),
|
|
86
|
+
scope: tokens.scope ?? null,
|
|
87
|
+
role: await fetchRole(ctx.fetchImpl, ctx.apiBaseUrl, tokens.access_token),
|
|
88
|
+
now,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
92
|
+
/** `BexioOAuth.getAccessToken`. */
|
|
93
|
+
export async function getAccessToken(ctx, selector) {
|
|
94
|
+
const { store, clock } = ctx;
|
|
95
|
+
let record = await resolveGrant(store, selector);
|
|
96
|
+
const deadline = clock().getTime() + ctx.lockTtlMs + WAIT_GRACE_MS;
|
|
97
|
+
let wait = 50;
|
|
98
|
+
const reread = async (id) => {
|
|
99
|
+
const current = await store.getGrant(id);
|
|
100
|
+
if (!current)
|
|
101
|
+
throw new BexioOAuthError("not_connected", "grant was deleted");
|
|
102
|
+
return current;
|
|
103
|
+
};
|
|
104
|
+
for (;;) {
|
|
105
|
+
if (record.status === "reauth_required") {
|
|
106
|
+
throw new BexioOAuthError("reauth_required", "grant needs to be reconnected");
|
|
107
|
+
}
|
|
108
|
+
const now = clock();
|
|
109
|
+
if (isFresh(record, now))
|
|
110
|
+
return issue(ctx.cipher, record);
|
|
111
|
+
// Every iteration that would do more work is bounded, whether the last
|
|
112
|
+
// one waited for another refresher or lost its own lock.
|
|
113
|
+
if (now.getTime() > deadline) {
|
|
114
|
+
throw new BexioOAuthError("idp_error", "timed out waiting for a concurrent token refresh");
|
|
115
|
+
}
|
|
116
|
+
// Discovery outside the lock, so a cold start doesn't eat into it.
|
|
117
|
+
await ctx.oidc.config();
|
|
118
|
+
const window = lockWindow(ctx, clock());
|
|
119
|
+
const locked = await store.acquireRefreshLock({
|
|
120
|
+
id: record.id,
|
|
121
|
+
...window,
|
|
122
|
+
accessExpiresBefore: new Date(now.getTime() + EXPIRY_SKEW_MS),
|
|
123
|
+
});
|
|
124
|
+
if (locked) {
|
|
125
|
+
const refreshed = await refreshLocked(ctx, locked, window.lockToken);
|
|
126
|
+
if (refreshed)
|
|
127
|
+
return issue(ctx.cipher, refreshed);
|
|
128
|
+
// Lost the lock to a reconnect or another refresher: look at their
|
|
129
|
+
// result before anything else (it may be fresh, or reauth_required).
|
|
130
|
+
record = await reread(record.id);
|
|
131
|
+
continue;
|
|
132
|
+
}
|
|
133
|
+
// Someone else is refreshing (or just did): wait for their result.
|
|
134
|
+
await sleep(wait);
|
|
135
|
+
wait = Math.min(wait * 2, 1_000);
|
|
136
|
+
record = await reread(record.id);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=refresh.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Only same-origin relative paths: blocks open redirects via `returnTo`.
|
|
3
|
+
* Parsed with the URL parser (the same one the redirect will go through), so
|
|
4
|
+
* tricks like `/\t/evil.example` are caught, and normalized to path+query+hash.
|
|
5
|
+
* Returns `fallback` for an empty value; throws `invalid_config` otherwise.
|
|
6
|
+
*/
|
|
7
|
+
export declare function safeReturnTo(value: string | undefined, fallback: string): string;
|
|
8
|
+
//# sourceMappingURL=return-to.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"return-to.d.ts","sourceRoot":"","sources":["../src/return-to.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,MAAM,GACf,MAAM,CAqBR"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { BexioOAuthError } from "./errors.js";
|
|
2
|
+
const RETURN_TO_BASE = "https://return-to.invalid";
|
|
3
|
+
/**
|
|
4
|
+
* Only same-origin relative paths: blocks open redirects via `returnTo`.
|
|
5
|
+
* Parsed with the URL parser (the same one the redirect will go through), so
|
|
6
|
+
* tricks like `/\t/evil.example` are caught, and normalized to path+query+hash.
|
|
7
|
+
* Returns `fallback` for an empty value; throws `invalid_config` otherwise.
|
|
8
|
+
*/
|
|
9
|
+
export function safeReturnTo(value, fallback) {
|
|
10
|
+
if (!value)
|
|
11
|
+
return fallback;
|
|
12
|
+
const invalid = () => new BexioOAuthError("invalid_config", "returnTo must be a relative path like /settings");
|
|
13
|
+
// eslint-disable-next-line no-control-regex
|
|
14
|
+
if (!value.startsWith("/") || /[\u0000-\u001f\\]/.test(value))
|
|
15
|
+
throw invalid();
|
|
16
|
+
let url;
|
|
17
|
+
try {
|
|
18
|
+
url = new URL(value, RETURN_TO_BASE);
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
throw invalid();
|
|
22
|
+
}
|
|
23
|
+
if (url.origin !== RETURN_TO_BASE)
|
|
24
|
+
throw invalid();
|
|
25
|
+
// Dot segments can collapse to "//host" (e.g. "/.//evil.example"), which a
|
|
26
|
+
// browser reads as protocol-relative: check the normalized result too.
|
|
27
|
+
if (url.pathname.startsWith("//"))
|
|
28
|
+
throw invalid();
|
|
29
|
+
return `${url.pathname}${url.search}${url.hash}`;
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=return-to.js.map
|