@smplcty/auth 11.1.0 → 12.0.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.
Files changed (40) hide show
  1. package/README.md +16 -12
  2. package/dist/http/handlers.d.ts.map +1 -1
  3. package/dist/http/handlers.js +69 -23
  4. package/dist/http/handlers.js.map +1 -1
  5. package/dist/http/index.d.ts +1 -1
  6. package/dist/http/index.d.ts.map +1 -1
  7. package/dist/http/types.d.ts +43 -3
  8. package/dist/http/types.d.ts.map +1 -1
  9. package/dist/index.d.ts +2 -2
  10. package/dist/index.d.ts.map +1 -1
  11. package/dist/index.js +1 -1
  12. package/dist/index.js.map +1 -1
  13. package/dist/methods/email-code/index.d.ts.map +1 -1
  14. package/dist/methods/email-code/index.js +3 -0
  15. package/dist/methods/email-code/index.js.map +1 -1
  16. package/dist/methods/errors.d.ts +12 -0
  17. package/dist/methods/errors.d.ts.map +1 -1
  18. package/dist/methods/errors.js +15 -0
  19. package/dist/methods/errors.js.map +1 -1
  20. package/dist/methods/oidc/credentials.d.ts +76 -0
  21. package/dist/methods/oidc/credentials.d.ts.map +1 -0
  22. package/dist/methods/oidc/credentials.js +164 -0
  23. package/dist/methods/oidc/credentials.js.map +1 -0
  24. package/dist/methods/oidc/index.d.ts +26 -8
  25. package/dist/methods/oidc/index.d.ts.map +1 -1
  26. package/dist/methods/oidc/index.js +45 -2
  27. package/dist/methods/oidc/index.js.map +1 -1
  28. package/dist/methods/router.d.ts +3 -1
  29. package/dist/methods/router.d.ts.map +1 -1
  30. package/dist/methods/router.js +22 -5
  31. package/dist/methods/router.js.map +1 -1
  32. package/dist/methods/twilio/index.d.ts.map +1 -1
  33. package/dist/methods/twilio/index.js +5 -0
  34. package/dist/methods/twilio/index.js.map +1 -1
  35. package/dist/methods/types.d.ts +19 -3
  36. package/dist/methods/types.d.ts.map +1 -1
  37. package/package.json +26 -17
  38. package/schema/tables/auth_domain_credentials.yaml +86 -0
  39. package/schema/tables/auth_domains.yaml +8 -6
  40. package/schema/tables/tenant_email_domains.yaml +9 -5
@@ -0,0 +1,76 @@
1
+ import { webcrypto } from 'node:crypto';
2
+ import type { Queryable } from '../../types.js';
3
+ /** What a stored credential is, passed to the cipher with every call. */
4
+ export interface CredentialContext {
5
+ authDomainId: number;
6
+ purpose: 'client_secret' | 'private_key';
7
+ }
8
+ /**
9
+ * Encrypts and decrypts a stored client credential. The app supplies it, for
10
+ * example with an AWS KMS data key, so the library picks no key-management
11
+ * vendor and the database never holds plaintext. Use the context to bind each
12
+ * ciphertext to its row (a KMS encryption context, say), so a ciphertext copied
13
+ * to another auth domain won't decrypt.
14
+ */
15
+ export interface CredentialCipher {
16
+ encrypt(plaintext: string, context: CredentialContext): Promise<string>;
17
+ decrypt(ciphertext: string, context: CredentialContext): Promise<string>;
18
+ }
19
+ /** The public half of an auth domain's generated key, to give its IdP. */
20
+ export interface ClientPublicKey {
21
+ /** A JWKS with the one key, carrying `kid`, `x5c` and `x5t#S256`. */
22
+ jwks: {
23
+ keys: webcrypto.JsonWebKey[];
24
+ };
25
+ /** A self-signed X.509 certificate (PEM), for IdPs that take a certificate, such as Entra. */
26
+ certificatePem: string;
27
+ }
28
+ /** What an admin can see about an auth domain's credential: never the secret or private key. */
29
+ export interface ClientCredentialStatus {
30
+ secretSetAt: Date | null;
31
+ privateKeySetAt: Date | null;
32
+ /** The public key, when one has been generated. */
33
+ publicKey: ClientPublicKey | null;
34
+ }
35
+ /**
36
+ * Set or replace an auth domain's client secret, encrypted through `cipher`.
37
+ * Run it on the admin's session client (e.g. inside `withSession`): only the
38
+ * tenant's security or settings admin may. It takes effect on the next sign-in.
39
+ */
40
+ export declare function setClientSecret(db: Queryable, input: {
41
+ authDomainId: number;
42
+ secret: string;
43
+ cipher: CredentialCipher;
44
+ }): Promise<void>;
45
+ /**
46
+ * Generate (or replace) an auth domain's RSA key pair for `private_key_jwt`.
47
+ * The private key is stored encrypted through `cipher`; the public half comes
48
+ * back, and stays readable through {@link getClientCredentialStatus}, for the
49
+ * admin to upload to their IdP. Run it on the admin's session client.
50
+ *
51
+ * Needs the optional peers `@peculiar/x509` and `reflect-metadata` (for the
52
+ * certificate), loaded only here, so apps that never generate a key needn't
53
+ * install them.
54
+ */
55
+ export declare function generateClientKey(db: Queryable, input: {
56
+ authDomainId: number;
57
+ cipher: CredentialCipher;
58
+ subject?: string;
59
+ validityDays?: number;
60
+ }): Promise<ClientPublicKey>;
61
+ /**
62
+ * Whether an auth domain has a secret and a key, when each was last set, and
63
+ * the public key. Never the secret or private key. Run it on the admin's
64
+ * session client; returns null for an auth domain they can't see or that has
65
+ * no credential.
66
+ */
67
+ export declare function getClientCredentialStatus(db: Queryable, authDomainId: number): Promise<ClientCredentialStatus | null>;
68
+ /** The decrypted client secret, read fresh for this exchange; undefined when none is stored. */
69
+ export declare function loadClientSecret(db: Queryable, authDomainId: number, cipher: CredentialCipher | undefined): Promise<string | undefined>;
70
+ /** The private key and its certificate thumbprints, read fresh for this exchange; undefined when none is stored. */
71
+ export declare function loadClientKey(db: Queryable, authDomainId: number, cipher: CredentialCipher | undefined): Promise<{
72
+ key: CryptoKey;
73
+ x5tS256: string;
74
+ x5t: string;
75
+ } | undefined>;
76
+ //# sourceMappingURL=credentials.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../../src/methods/oidc/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,yEAAyE;AACzE,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,eAAe,GAAG,aAAa,CAAC;CAC1C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACxE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1E;AAED,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,IAAI,EAAE;QAAE,IAAI,EAAE,SAAS,CAAC,UAAU,EAAE,CAAA;KAAE,CAAC;IACvC,8FAA8F;IAC9F,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,gGAAgG;AAChG,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,IAAI,GAAG,IAAI,CAAC;IAC7B,mDAAmD;IACnD,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;CACnC;AAsCD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,EAAE,EAAE,SAAS,EACb,KAAK,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,GACxE,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,SAAS,EACb,KAAK,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GACjG,OAAO,CAAC,eAAe,CAAC,CA0C1B;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,SAAS,EACb,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAoBxC;AA6CD,gGAAgG;AAChG,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,SAAS,EACb,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,gBAAgB,GAAG,SAAS,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI7B;AAED,oHAAoH;AACpH,wBAAsB,aAAa,CACjC,EAAE,EAAE,SAAS,EACb,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,gBAAgB,GAAG,SAAS,GACnC,OAAO,CAAC;IAAE,GAAG,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAWvE"}
@@ -0,0 +1,164 @@
1
+ import { createHash, webcrypto } from 'node:crypto';
2
+ import { InvalidInputError } from '../../errors.js';
3
+ const RSA = {
4
+ name: 'RSASSA-PKCS1-v1_5',
5
+ hash: 'SHA-256',
6
+ modulusLength: 2048,
7
+ publicExponent: new Uint8Array([1, 0, 1]),
8
+ };
9
+ // Admin writes run on the admin's session client, as app_rls, so RLS admits
10
+ // only the tenant's security or settings admin. app_rls can write these columns
11
+ // but not read the ciphertext back. Update-then-insert, since ON CONFLICT DO
12
+ // UPDATE would need SELECT on the excluded ciphertext columns.
13
+ async function writeCredential(db, authDomainId, set) {
14
+ const cols = Object.keys(set);
15
+ const values = Object.values(set);
16
+ const update = await db.query(`UPDATE auth_domain_credentials SET ${cols.map((c, i) => `${c} = $${i + 2}`).join(', ')}
17
+ WHERE auth_domain_id = $1`, [authDomainId, ...values]);
18
+ if (update.rowCount)
19
+ return;
20
+ try {
21
+ const insert = await db.query(`INSERT INTO auth_domain_credentials (auth_domain_id, ${cols.join(', ')})
22
+ SELECT $1, ${cols.map((_, i) => `$${i + 2}`).join(', ')}
23
+ WHERE NOT EXISTS (SELECT 1 FROM auth_domain_credentials WHERE auth_domain_id = $1)
24
+ ON CONFLICT DO NOTHING`, [authDomainId, ...values]);
25
+ if (insert.rowCount)
26
+ return;
27
+ }
28
+ catch (err) {
29
+ // An RLS refusal: not a live auth domain this admin may configure.
30
+ if (err.code !== '42501')
31
+ throw err;
32
+ }
33
+ throw new InvalidInputError(`auth domain ${authDomainId} is not a live auth domain you may configure`);
34
+ }
35
+ /**
36
+ * Set or replace an auth domain's client secret, encrypted through `cipher`.
37
+ * Run it on the admin's session client (e.g. inside `withSession`): only the
38
+ * tenant's security or settings admin may. It takes effect on the next sign-in.
39
+ */
40
+ export async function setClientSecret(db, input) {
41
+ const { authDomainId, secret, cipher } = input;
42
+ if (typeof secret !== 'string' || secret.length === 0)
43
+ throw new InvalidInputError('secret must be a non-empty string');
44
+ const ciphertext = await cipher.encrypt(secret, { authDomainId, purpose: 'client_secret' });
45
+ await writeCredential(db, authDomainId, { secret_ciphertext: ciphertext, secret_set_at: new Date() });
46
+ }
47
+ /**
48
+ * Generate (or replace) an auth domain's RSA key pair for `private_key_jwt`.
49
+ * The private key is stored encrypted through `cipher`; the public half comes
50
+ * back, and stays readable through {@link getClientCredentialStatus}, for the
51
+ * admin to upload to their IdP. Run it on the admin's session client.
52
+ *
53
+ * Needs the optional peers `@peculiar/x509` and `reflect-metadata` (for the
54
+ * certificate), loaded only here, so apps that never generate a key needn't
55
+ * install them.
56
+ */
57
+ export async function generateClientKey(db, input) {
58
+ const { authDomainId, cipher } = input;
59
+ const validityDays = input.validityDays ?? 730;
60
+ await import('reflect-metadata');
61
+ const x509 = await import('@peculiar/x509');
62
+ x509.cryptoProvider.set(webcrypto);
63
+ const keys = await webcrypto.subtle.generateKey(RSA, true, ['sign', 'verify']);
64
+ const notBefore = new Date();
65
+ const cert = await x509.X509CertificateGenerator.createSelfSigned({
66
+ serialNumber: Buffer.from(webcrypto.getRandomValues(new Uint8Array(16)))
67
+ .toString('hex')
68
+ .replace(/^[89a-f]/, '1'),
69
+ name: `CN=${input.subject ?? `auth-domain-${authDomainId}`}`,
70
+ notBefore,
71
+ notAfter: new Date(notBefore.getTime() + validityDays * 86_400_000),
72
+ keys: keys,
73
+ signingAlgorithm: RSA,
74
+ });
75
+ const der = Buffer.from(cert.rawData);
76
+ const thumbprint = createHash('sha256').update(der).digest('base64url');
77
+ const jwk = {
78
+ ...(await webcrypto.subtle.exportKey('jwk', keys.publicKey)),
79
+ kid: thumbprint,
80
+ alg: 'RS256',
81
+ use: 'sig',
82
+ x5c: [der.toString('base64')],
83
+ 'x5t#S256': thumbprint,
84
+ };
85
+ delete jwk.key_ops;
86
+ delete jwk.ext;
87
+ const pkcs8 = Buffer.from(await webcrypto.subtle.exportKey('pkcs8', keys.privateKey)).toString('base64');
88
+ const ciphertext = await cipher.encrypt(pkcs8, { authDomainId, purpose: 'private_key' });
89
+ const certificatePem = cert.toString('pem');
90
+ await writeCredential(db, authDomainId, {
91
+ private_key_ciphertext: ciphertext,
92
+ private_key_set_at: notBefore,
93
+ public_jwk: JSON.stringify(jwk),
94
+ certificate: certificatePem,
95
+ });
96
+ return { jwks: { keys: [jwk] }, certificatePem };
97
+ }
98
+ /**
99
+ * Whether an auth domain has a secret and a key, when each was last set, and
100
+ * the public key. Never the secret or private key. Run it on the admin's
101
+ * session client; returns null for an auth domain they can't see or that has
102
+ * no credential.
103
+ */
104
+ export async function getClientCredentialStatus(db, authDomainId) {
105
+ const { rows } = await db.query(`SELECT secret_set_at AS "secretSetAt", private_key_set_at AS "privateKeySetAt",
106
+ public_jwk AS "publicJwk", certificate
107
+ FROM auth_domain_credentials WHERE auth_domain_id = $1`, [authDomainId]);
108
+ const row = rows[0];
109
+ if (!row)
110
+ return null;
111
+ return {
112
+ secretSetAt: row.secretSetAt,
113
+ privateKeySetAt: row.privateKeySetAt,
114
+ publicKey: row.publicJwk && row.certificate ? { jwks: { keys: [row.publicJwk] }, certificatePem: row.certificate } : null,
115
+ };
116
+ }
117
+ // ─── Read for the token exchange (privileged, pre-session) ─────────────────
118
+ // Joined to a live auth domain, so a soft-deleted one's credential is never used.
119
+ const SELECT_CREDENTIAL = `
120
+ SELECT c.secret_ciphertext AS "secretCiphertext", c.private_key_ciphertext AS "privateKeyCiphertext",
121
+ c.public_jwk AS "publicJwk"
122
+ FROM auth_domain_credentials c
123
+ JOIN auth_domains ad ON ad.auth_domain_id = c.auth_domain_id AND ad.deleted_at IS NULL
124
+ WHERE c.auth_domain_id = $1
125
+ `;
126
+ async function storedCredential(db, authDomainId) {
127
+ const { rows } = await db.query(SELECT_CREDENTIAL, [authDomainId]);
128
+ return rows[0];
129
+ }
130
+ async function decrypt(cipher, ciphertext, context) {
131
+ if (!cipher) {
132
+ throw new InvalidInputError(`auth domain ${context.authDomainId} has a stored credential but no cipher is configured`);
133
+ }
134
+ try {
135
+ return await cipher.decrypt(ciphertext, context);
136
+ }
137
+ catch {
138
+ // The plaintext never existed here, but keep the hook's error (which may
139
+ // echo its input) out of anything that gets logged or returned.
140
+ throw new Error(`could not decrypt the ${context.purpose.replace('_', ' ')} for auth domain ${context.authDomainId}`);
141
+ }
142
+ }
143
+ /** The decrypted client secret, read fresh for this exchange; undefined when none is stored. */
144
+ export async function loadClientSecret(db, authDomainId, cipher) {
145
+ const stored = await storedCredential(db, authDomainId);
146
+ if (!stored?.secretCiphertext)
147
+ return undefined;
148
+ return decrypt(cipher, stored.secretCiphertext, { authDomainId, purpose: 'client_secret' });
149
+ }
150
+ /** The private key and its certificate thumbprints, read fresh for this exchange; undefined when none is stored. */
151
+ export async function loadClientKey(db, authDomainId, cipher) {
152
+ const stored = await storedCredential(db, authDomainId);
153
+ if (!stored?.privateKeyCiphertext || !stored.publicJwk)
154
+ return undefined;
155
+ const pkcs8 = await decrypt(cipher, stored.privateKeyCiphertext, { authDomainId, purpose: 'private_key' });
156
+ const key = await webcrypto.subtle.importKey('pkcs8', Buffer.from(pkcs8, 'base64'), RSA, false, ['sign']);
157
+ const der = Buffer.from(stored.publicJwk.x5c[0], 'base64');
158
+ return {
159
+ key: key,
160
+ x5tS256: stored.publicJwk['x5t#S256'],
161
+ x5t: createHash('sha1').update(der).digest('base64url'),
162
+ };
163
+ }
164
+ //# sourceMappingURL=credentials.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../../src/methods/oidc/credentials.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,16 @@
1
1
  import * as oauth from 'oauth4webapi';
2
2
  import type { Queryable } from '../../types.js';
3
3
  import type { AuthDomain, ResolvedUser } from '../types.js';
4
+ import { type CredentialCipher } from './credentials.js';
5
+ export { generateClientKey, getClientCredentialStatus, setClientSecret, type ClientCredentialStatus, type ClientPublicKey, type CredentialCipher, type CredentialContext, } from './credentials.js';
6
+ /** How the client authenticates at the token endpoint (OIDC registration's `token_endpoint_auth_method`). */
7
+ export type TokenEndpointAuthMethod = 'none' | 'client_secret_basic' | 'client_secret_post' | 'private_key_jwt';
4
8
  /**
5
9
  * The OIDC provider config read from `auth_domains.integration_params`.
6
- * Public values only — the `client_secret` is supplied out-of-band via
7
- * {@link OidcHandlerOptions.clientSecret} (from the app's secret store), never
8
- * stored here.
10
+ * Public values only. The client's credential never goes here: it is stored
11
+ * encrypted in `auth_domain_credentials` (see {@link setClientSecret} and
12
+ * {@link generateClientKey}), or supplied by the app's
13
+ * {@link OidcHandlerOptions.clientSecret} resolver.
9
14
  */
10
15
  export interface OidcParams {
11
16
  /** Provider issuer URL (discovery is fetched from `${issuer}/.well-known/openid-configuration`). */
@@ -16,6 +21,13 @@ export interface OidcParams {
16
21
  redirectUri: string;
17
22
  /** OAuth scope. Defaults to `openid email profile`. */
18
23
  scope?: string;
24
+ /**
25
+ * How the client authenticates at the token endpoint; only this method is
26
+ * ever sent, and a failure is never retried with another. Leave it out to
27
+ * keep the behavior from before it existed: `client_secret_post` when the
28
+ * {@link OidcHandlerOptions.clientSecret} resolver returns a secret, else none.
29
+ */
30
+ tokenEndpointAuthMethod?: TokenEndpointAuthMethod;
19
31
  }
20
32
  /**
21
33
  * The transient login state produced by {@link OidcHandler.initiate} that the
@@ -36,11 +48,18 @@ export interface OidcAuthorization {
36
48
  }
37
49
  export interface OidcHandlerOptions {
38
50
  /**
39
- * Resolve the confidential client secret for an `auth_domains` row, from the
40
- * app's secret store (Vercel/SSM) — NOT from the database. Return `undefined`
41
- * for a public (PKCE-only) client.
51
+ * Resolve a client secret the app holds itself, from its own secret store.
52
+ * When it returns a secret, that secret is used, ahead of one stored with
53
+ * {@link setClientSecret}; return `undefined` to fall back to the stored one.
42
54
  */
43
55
  clientSecret?: (authDomain: AuthDomain<OidcParams>) => string | undefined | Promise<string | undefined>;
56
+ /**
57
+ * Decrypts credentials stored with {@link setClientSecret} and
58
+ * {@link generateClientKey} (the same cipher that encrypted them). Each is
59
+ * read and decrypted on every sign-in, never cached, so a replaced credential
60
+ * takes effect on the next one.
61
+ */
62
+ cipher?: CredentialCipher;
44
63
  /**
45
64
  * Provision a user when a verified identity has no existing communication
46
65
  * method. The app owns the writes + audit attribution (it knows the tenant
@@ -76,7 +95,7 @@ type ValidatedClaims = NonNullable<ReturnType<typeof oauth.getValidatedIdTokenCl
76
95
  * this is an authentication-authority boundary, not a scope boundary.
77
96
  *
78
97
  * ```ts
79
- * const oidc = oidcHandler({ clientSecret: (ad) => secrets.get(ad.tenantId) });
98
+ * const oidc = oidcHandler({ cipher }); // or clientSecret: (ad) => secrets.get(ad.tenantId)
80
99
  * const { redirectUrl, loginState } = await oidc.initiate(authDomain);
81
100
  * // ...store loginState in a signed cookie keyed by loginState.state, redirect...
82
101
  * const user = await oidc.complete({ db: pool, authDomain, callbackUrl, loginState });
@@ -96,5 +115,4 @@ export interface OidcHandler {
96
115
  }): Promise<ResolvedUser>;
97
116
  }
98
117
  export declare function oidcHandler(options?: OidcHandlerOptions): OidcHandler;
99
- export {};
100
118
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/methods/oidc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACzB,oGAAoG;IACpG,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,oFAAoF;IACpF,WAAW,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,4DAA4D;IAC5D,WAAW,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,UAAU,EAAE,cAAc,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACxG;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QACtB,EAAE,EAAE,SAAS,CAAC;QACd,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;QACnC,MAAM,EAAE,eAAe,CAAC;KACzB,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5B,8EAA8E;IAC9E,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AAED,KAAK,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;AAEvF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxG,QAAQ,CAAC,KAAK,EAAE;QACd,EAAE,EAAE,SAAS,CAAC;QACd,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;QACnC,4EAA4E;QAC5E,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC;QAC1B,UAAU,EAAE,cAAc,CAAC;KAC5B,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC3B;AA+BD,wBAAgB,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,WAAW,CAiGzE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/methods/oidc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAmC,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE1F,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,eAAe,EACf,KAAK,sBAAsB,EAC3B,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,GACvB,MAAM,kBAAkB,CAAC;AAE1B,6GAA6G;AAC7G,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG,qBAAqB,GAAG,oBAAoB,GAAG,iBAAiB,CAAC;AAShH;;;;;;GAMG;AACH,MAAM,WAAW,UAAU;IACzB,oGAAoG;IACpG,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,oFAAoF;IACpF,WAAW,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;CACnD;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,4DAA4D;IAC5D,WAAW,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,UAAU,EAAE,cAAc,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACxG;;;;;OAKG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QACtB,EAAE,EAAE,SAAS,CAAC;QACd,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;QACnC,MAAM,EAAE,eAAe,CAAC;KACzB,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5B,8EAA8E;IAC9E,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AAED,KAAK,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;AAEvF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxG,QAAQ,CAAC,KAAK,EAAE;QACd,EAAE,EAAE,SAAS,CAAC;QACd,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;QACnC,4EAA4E;QAC5E,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC;QAC1B,UAAU,EAAE,cAAc,CAAC;KAC5B,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC3B;AA4ED,wBAAgB,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,WAAW,CAgGzE"}
@@ -3,6 +3,14 @@ import { InvalidInputError } from '../../errors.js';
3
3
  import { findUserByCommunicationMethod } from '../../find-user-by-communication-method.js';
4
4
  import { emailDomainOf, tenantHasVerifiedDomain } from '../../internal/email-domain.js';
5
5
  import { EmailDomainNotVerifiedError, VerificationFailedError } from '../errors.js';
6
+ import { loadClientKey, loadClientSecret } from './credentials.js';
7
+ export { generateClientKey, getClientCredentialStatus, setClientSecret, } from './credentials.js';
8
+ const TOKEN_ENDPOINT_AUTH_METHODS = [
9
+ 'none',
10
+ 'client_secret_basic',
11
+ 'client_secret_post',
12
+ 'private_key_jwt',
13
+ ];
6
14
  function paramsOf(authDomain) {
7
15
  if (authDomain.integrationType !== 'oidc') {
8
16
  throw new InvalidInputError(`OidcHandler requires integration_type 'oidc', got '${authDomain.integrationType}'`);
@@ -11,8 +19,44 @@ function paramsOf(authDomain) {
11
19
  if (!p.issuer || !p.clientId || !p.redirectUri) {
12
20
  throw new InvalidInputError('OIDC integration_params must include issuer, clientId, and redirectUri');
13
21
  }
22
+ if (p.tokenEndpointAuthMethod !== undefined && !TOKEN_ENDPOINT_AUTH_METHODS.includes(p.tokenEndpointAuthMethod)) {
23
+ throw new InvalidInputError(`OIDC tokenEndpointAuthMethod must be one of ${TOKEN_ENDPOINT_AUTH_METHODS.join(', ')}, got ${JSON.stringify(p.tokenEndpointAuthMethod)}`);
24
+ }
14
25
  return p;
15
26
  }
27
+ /**
28
+ * The client authentication for this exchange: the auth domain's declared
29
+ * method and nothing else, with its credential read and decrypted now.
30
+ */
31
+ async function clientAuthFor(db, authDomain, params, as, options) {
32
+ const method = params.tokenEndpointAuthMethod;
33
+ const id = authDomain.authDomainId;
34
+ if (method === undefined) {
35
+ const secret = options.clientSecret ? await options.clientSecret(authDomain) : undefined;
36
+ return secret ? oauth.ClientSecretPost(secret) : oauth.None();
37
+ }
38
+ if (method === 'none')
39
+ return oauth.None();
40
+ if (method === 'private_key_jwt') {
41
+ const stored = await loadClientKey(db, id, options.cipher);
42
+ if (!stored)
43
+ throw new InvalidInputError(`auth domain ${id} uses private_key_jwt but has no key; generate one`);
44
+ return oauth.PrivateKeyJwt({ key: stored.key, kid: stored.x5tS256 }, {
45
+ // Entra identifies the certificate by thumbprint, not kid, and wants the
46
+ // token endpoint as the audience; oauth4webapi defaults aud to the issuer.
47
+ [oauth.modifyAssertion]: (header, payload) => {
48
+ Object.assign(header, { 'x5t#S256': stored.x5tS256, x5t: stored.x5t });
49
+ if (as.token_endpoint)
50
+ payload.aud = as.token_endpoint;
51
+ },
52
+ });
53
+ }
54
+ const secret = (options.clientSecret ? await options.clientSecret(authDomain) : undefined) ??
55
+ (await loadClientSecret(db, id, options.cipher));
56
+ if (!secret)
57
+ throw new InvalidInputError(`auth domain ${id} uses ${method} but has no client secret; set one`);
58
+ return method === 'client_secret_basic' ? oauth.ClientSecretBasic(secret) : oauth.ClientSecretPost(secret);
59
+ }
16
60
  // Discovery is cached per issuer for the process lifetime (warm-start friendly).
17
61
  // Failures are not cached.
18
62
  const discoveryCache = new Map();
@@ -59,8 +103,7 @@ export function oidcHandler(options = {}) {
59
103
  const params = paramsOf(authDomain);
60
104
  const as = await authorizationServer(params.issuer, options.fetch);
61
105
  const client = { client_id: params.clientId };
62
- const secret = options.clientSecret ? await options.clientSecret(authDomain) : undefined;
63
- const clientAuth = secret ? oauth.ClientSecretPost(secret) : oauth.None();
106
+ const clientAuth = await clientAuthFor(db, authDomain, params, as, options);
64
107
  const currentUrl = typeof callbackUrl === 'string' ? new URL(callbackUrl) : callbackUrl;
65
108
  const fetchOption = options.fetch ? { [oauth.customFetch]: options.fetch } : undefined;
66
109
  let claims;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/methods/oidc/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/methods/oidc/index.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,6 @@
1
- import type { MethodRouter, MethodRouterOptions } from './types.js';
1
+ import type { IdentifierKind, MethodRouter, MethodRouterOptions } from './types.js';
2
+ /** An identifier containing `@` is an email; anything else is a phone. */
3
+ export declare function identifierKind(identifier: string): IdentifierKind;
2
4
  /**
3
5
  * Build the tenant-centric sign-in router: **discovery** (`signInOptions`) and
4
6
  * the **user-bound OTP path** (`initiateOtp`/`completeOtp`). Code sign-in is
@@ -1 +1 @@
1
- {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/methods/router.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAGV,YAAY,EACZ,mBAAmB,EAGpB,MAAM,YAAY,CAAC;AAyBpB;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CA2D7E"}
1
+ {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/methods/router.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,cAAc,EAEd,YAAY,EACZ,mBAAmB,EAGpB,MAAM,YAAY,CAAC;AAEpB,0EAA0E;AAC1E,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,CAEjE;AAyBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAqE7E"}
@@ -1,6 +1,10 @@
1
1
  import { InvalidInputError } from '../errors.js';
2
2
  import { emailDomainOf, ssoRequiredDomain, ssoRequiredDomainForUser } from '../internal/email-domain.js';
3
3
  import { OtpNotAllowedError, SsoRequiredError } from './errors.js';
4
+ /** An identifier containing `@` is an email; anything else is a phone. */
5
+ export function identifierKind(identifier) {
6
+ return identifier.includes('@') ? 'email' : 'phone';
7
+ }
4
8
  const SELECT_TENANT_BY_SLUG = `
5
9
  SELECT tenant_id AS "tenantId"
6
10
  FROM tenants
@@ -39,10 +43,18 @@ const SELECT_AUTH_DOMAINS_BY_TENANT = `
39
43
  export function createMethodRouter(options) {
40
44
  const { otpHandler } = options;
41
45
  const q = options.db;
42
- function requireOtpHandler() {
46
+ const otpAllowed = !!otpHandler && ('initiate' in otpHandler || !!(otpHandler.email || otpHandler.phone));
47
+ /** The handler for this identifier: the single one, or the one for its kind. */
48
+ function handlerFor(identifier) {
43
49
  if (!otpHandler)
44
50
  throw new OtpNotAllowedError('No OTP handler is configured');
45
- return otpHandler;
51
+ if ('initiate' in otpHandler)
52
+ return otpHandler;
53
+ const kind = identifierKind(identifier);
54
+ const handler = otpHandler[kind];
55
+ if (!handler)
56
+ throw new OtpNotAllowedError(`Code sign-in by ${kind} is not offered`);
57
+ return handler;
46
58
  }
47
59
  return {
48
60
  async signInOptions({ tenantSlug }) {
@@ -63,19 +75,24 @@ export function createMethodRouter(options) {
63
75
  authDomainId: Number(d.authDomainId),
64
76
  tenantId: Number(d.tenantId),
65
77
  })),
66
- otpAllowed: !!otpHandler,
78
+ otpAllowed,
67
79
  };
68
80
  },
69
81
  async initiateOtp({ identifier }) {
70
82
  if (typeof identifier !== 'string' || identifier.length === 0) {
71
83
  throw new InvalidInputError('identifier must be a non-empty string');
72
84
  }
73
- const handler = requireOtpHandler();
85
+ const handler = handlerFor(identifier);
74
86
  // Don't send a code to an address that could never use it.
75
87
  const domain = emailDomainOf(identifier);
76
88
  const required = domain ? await ssoRequiredDomain(q, [domain]) : null;
77
89
  if (required)
78
90
  throw new SsoRequiredError(required);
91
+ // The same verdict completeOtp reaches on the resolved user, with the same
92
+ // response an unknown identifier gets, so it doesn't reveal whose a phone is.
93
+ const user = await handler.resolveUser?.({ db: options.db, identifier });
94
+ if (user && (await ssoRequiredDomainForUser(q, user.userId)))
95
+ return { otpSent: true };
79
96
  return handler.initiate({ db: options.db, identifier });
80
97
  },
81
98
  async completeOtp({ identifier, credential }) {
@@ -85,7 +102,7 @@ export function createMethodRouter(options) {
85
102
  if (typeof credential !== 'string' || credential.length === 0) {
86
103
  throw new InvalidInputError('credential must be a non-empty string');
87
104
  }
88
- const user = await requireOtpHandler().complete({ db: options.db, identifier, credential });
105
+ const user = await handlerFor(identifier).complete({ db: options.db, identifier, credential });
89
106
  // Checked on the resolved user, not just the identifier: someone whose
90
107
  // email is at an SSO-required domain can't sign in by phone either.
91
108
  const required = await ssoRequiredDomainForUser(q, user.userId);
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/methods/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/methods/router.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/methods/twilio/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAK/E,OAAO,KAAK,EAEV,aAAa,EAId,MAAM,aAAa,CAAC;AAErB;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,0BAA0B;IACzC,2EAA2E;IAC3E,MAAM,EAAE,kBAAkB,CAAC;IAC3B;+BAC2B;IAC3B,cAAc,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,eAAe,CAAC;CAC1D;AAiBD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,aAAa,CA2CtF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/methods/twilio/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAK/E,OAAO,KAAK,EAEV,aAAa,EAId,MAAM,aAAa,CAAC;AAErB;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,0BAA0B;IACzC,2EAA2E;IAC3E,MAAM,EAAE,kBAAkB,CAAC;IAC3B;+BAC2B;IAC3B,cAAc,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,eAAe,CAAC;CAC1D;AAiBD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,aAAa,CAiDtF"}
@@ -41,6 +41,11 @@ export function twilioVerifyHandler(options) {
41
41
  const { client } = options;
42
42
  const resolveChannel = options.resolveChannel ?? defaultResolveChannel;
43
43
  return {
44
+ async resolveUser(ctx) {
45
+ const identifier = requireIdentifier(ctx.identifier);
46
+ const { channelName } = resolveChannel(identifier);
47
+ return findUserByCommunicationMethod(ctx.db, { channel: channelName, code: identifier });
48
+ },
44
49
  async initiate(ctx) {
45
50
  const identifier = requireIdentifier(ctx.identifier);
46
51
  const { channelName, verifyChannel } = resolveChannel(identifier);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/methods/twilio/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/methods/twilio/index.ts"],"names":[],"mappings":"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"}
@@ -55,16 +55,32 @@ export interface MethodCompleteContext extends MethodInitiateContext {
55
55
  export interface MethodHandler {
56
56
  initiate(ctx: MethodInitiateContext): Promise<MethodInitiateResult>;
57
57
  complete(ctx: MethodCompleteContext): Promise<ResolvedUser>;
58
+ /** The user `complete` would resolve for `identifier`, or null for an unknown
59
+ * one, without sending or verifying anything. When present, the router uses
60
+ * it to send no code to someone `completeOtp` would refuse. */
61
+ resolveUser?(ctx: MethodInitiateContext): Promise<ResolvedUser | null>;
58
62
  }
59
63
  /**
60
64
  * Options for {@link createMethodRouter}.
61
65
  */
66
+ /** What an identifier is: one containing `@` is an email, anything else a phone. */
67
+ export type IdentifierKind = 'email' | 'phone';
68
+ /**
69
+ * Code-sign-in handlers by identifier kind, e.g. `{ email: emailCodeHandler(…),
70
+ * phone: twilioVerifyHandler(…) }`. The router picks one per identifier and
71
+ * keeps every check (including `resolveUser`) for both, so an app needn't write
72
+ * its own dispatcher. A kind with no handler isn't offered.
73
+ */
74
+ export interface OtpHandlers {
75
+ email?: MethodHandler;
76
+ phone?: MethodHandler;
77
+ }
62
78
  export interface MethodRouterOptions {
63
79
  /** Used to look up tenants and their `auth_domains`. */
64
80
  db: Queryable;
65
- /** The user-bound OTP handler (e.g. a `TwilioVerifyHandler`). Omit it for an
66
- * SSO-only product. */
67
- otpHandler?: MethodHandler;
81
+ /** The user-bound code handler: one for every identifier, or one per
82
+ * {@link IdentifierKind}. Omit it for an SSO-only product. */
83
+ otpHandler?: MethodHandler | OtpHandlers;
68
84
  }
69
85
  /**
70
86
  * The sign-in methods available for a tenant — what the app renders.
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/methods/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC3D,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,yCAAyC;IACzC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,yCAAyC;IACzC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,yBAAyB,EAAE,MAAM,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC;IACvB,qDAAqD;IACrD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACpE,QAAQ,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC7D;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,wDAAwD;IACxD,EAAE,EAAE,SAAS,CAAC;IACd;4BACwB;IACxB,UAAU,CAAC,EAAE,aAAa,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B;;;;;qBAKiB;IACjB,QAAQ,CAAC,WAAW,EAAE,SAAS,UAAU,EAAE,CAAC;IAC5C;wEACoE;IACpE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAED;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B;8BAC0B;IAC1B,aAAa,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAC5E;;wCAEoC;IACpC,WAAW,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC1E;;yDAEqD;IACrD,WAAW,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CACvF"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/methods/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC3D,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,yCAAyC;IACzC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,yCAAyC;IACzC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,yBAAyB,EAAE,MAAM,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC;IACvB,qDAAqD;IACrD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACpE,QAAQ,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5D;;oEAEgE;IAChE,WAAW,CAAC,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;CACxE;AAED;;GAEG;AACH,oFAAoF;AACpF,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,OAAO,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,wDAAwD;IACxD,EAAE,EAAE,SAAS,CAAC;IACd;mEAC+D;IAC/D,UAAU,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;CAC1C;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B;;;;;qBAKiB;IACjB,QAAQ,CAAC,WAAW,EAAE,SAAS,UAAU,EAAE,CAAC;IAC5C;wEACoE;IACpE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAED;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B;8BAC0B;IAC1B,aAAa,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAC5E;;wCAEoC;IACpC,WAAW,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC1E;;yDAEqD;IACrD,WAAW,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CACvF"}