@smplcty/auth 11.0.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.
- package/README.md +49 -4
- package/dist/http/handlers.d.ts.map +1 -1
- package/dist/http/handlers.js +69 -23
- package/dist/http/handlers.js.map +1 -1
- package/dist/http/index.d.ts +1 -1
- package/dist/http/index.d.ts.map +1 -1
- package/dist/http/types.d.ts +43 -3
- package/dist/http/types.d.ts.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/methods/email-code/index.d.ts +44 -0
- package/dist/methods/email-code/index.d.ts.map +1 -0
- package/dist/methods/email-code/index.js +153 -0
- package/dist/methods/email-code/index.js.map +1 -0
- package/dist/methods/errors.d.ts +12 -0
- package/dist/methods/errors.d.ts.map +1 -1
- package/dist/methods/errors.js +15 -0
- package/dist/methods/errors.js.map +1 -1
- package/dist/methods/oidc/credentials.d.ts +76 -0
- package/dist/methods/oidc/credentials.d.ts.map +1 -0
- package/dist/methods/oidc/credentials.js +164 -0
- package/dist/methods/oidc/credentials.js.map +1 -0
- package/dist/methods/oidc/index.d.ts +26 -8
- package/dist/methods/oidc/index.d.ts.map +1 -1
- package/dist/methods/oidc/index.js +45 -2
- package/dist/methods/oidc/index.js.map +1 -1
- package/dist/methods/router.d.ts +3 -1
- package/dist/methods/router.d.ts.map +1 -1
- package/dist/methods/router.js +22 -5
- package/dist/methods/router.js.map +1 -1
- package/dist/methods/twilio/index.d.ts.map +1 -1
- package/dist/methods/twilio/index.js +5 -0
- package/dist/methods/twilio/index.js.map +1 -1
- package/dist/methods/types.d.ts +19 -3
- package/dist/methods/types.d.ts.map +1 -1
- package/package.json +31 -17
- package/schema/tables/auth_domain_credentials.yaml +86 -0
- package/schema/tables/auth_domains.yaml +8 -6
- package/schema/tables/email_sign_in_codes.yaml +39 -0
- package/schema/tables/tenant_email_domains.yaml +9 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/methods/oidc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAExF,OAAO,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/methods/oidc/index.ts"],"names":[],"mappings":"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"}
|
package/dist/methods/router.d.ts
CHANGED
|
@@ -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,
|
|
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"}
|
package/dist/methods/router.js
CHANGED
|
@@ -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
|
-
|
|
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
|
-
|
|
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
|
|
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 =
|
|
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
|
|
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":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAEzG,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
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,
|
|
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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"}
|
package/dist/methods/types.d.ts
CHANGED
|
@@ -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
|
|
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;
|
|
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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smplcty/auth",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "12.0.0",
|
|
4
4
|
"description": "Robust, type-safe session and role-based authentication primitives for PostgreSQL apps using Row-Level Security.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -22,6 +22,11 @@
|
|
|
22
22
|
"import": "./dist/methods/twilio/index.js",
|
|
23
23
|
"default": "./dist/methods/twilio/index.js"
|
|
24
24
|
},
|
|
25
|
+
"./email-code": {
|
|
26
|
+
"types": "./dist/methods/email-code/index.d.ts",
|
|
27
|
+
"import": "./dist/methods/email-code/index.js",
|
|
28
|
+
"default": "./dist/methods/email-code/index.js"
|
|
29
|
+
},
|
|
25
30
|
"./flat-tenant": {
|
|
26
31
|
"types": "./dist/scope/flat-tenant.d.ts",
|
|
27
32
|
"import": "./dist/scope/flat-tenant.js",
|
|
@@ -96,9 +101,12 @@
|
|
|
96
101
|
]
|
|
97
102
|
},
|
|
98
103
|
"peerDependencies": {
|
|
104
|
+
"@peculiar/x509": ">=3.0.0",
|
|
105
|
+
"@smplcty/schema-flow": ">=0.25.0",
|
|
99
106
|
"@smplcty/twilio": ">=0.1.0",
|
|
100
107
|
"oauth4webapi": ">=3.0.0",
|
|
101
|
-
"pg": ">=8.0.0"
|
|
108
|
+
"pg": ">=8.0.0",
|
|
109
|
+
"reflect-metadata": ">=0.2.0"
|
|
102
110
|
},
|
|
103
111
|
"peerDependenciesMeta": {
|
|
104
112
|
"@smplcty/twilio": {
|
|
@@ -106,35 +114,41 @@
|
|
|
106
114
|
},
|
|
107
115
|
"oauth4webapi": {
|
|
108
116
|
"optional": true
|
|
117
|
+
},
|
|
118
|
+
"@smplcty/schema-flow": {
|
|
119
|
+
"optional": true
|
|
120
|
+
},
|
|
121
|
+
"@peculiar/x509": {
|
|
122
|
+
"optional": true
|
|
123
|
+
},
|
|
124
|
+
"reflect-metadata": {
|
|
125
|
+
"optional": true
|
|
109
126
|
}
|
|
110
127
|
},
|
|
111
128
|
"devDependencies": {
|
|
129
|
+
"@peculiar/x509": "^3.1.0",
|
|
112
130
|
"@release-it/keep-a-changelog": "^8.0.1",
|
|
113
|
-
"@smplcty/schema-flow": "^0.
|
|
131
|
+
"@smplcty/schema-flow": "^0.26.0",
|
|
114
132
|
"@smplcty/twilio": "^0.1.1",
|
|
115
|
-
"@testcontainers/postgresql": "^12.2.
|
|
116
|
-
"@types/node": "^
|
|
133
|
+
"@testcontainers/postgresql": "^12.2.1",
|
|
134
|
+
"@types/node": "^26.6.6",
|
|
117
135
|
"@types/pg": "^8.23.1",
|
|
118
136
|
"husky": "^9.1.7",
|
|
119
|
-
"jose": "^6.2.
|
|
137
|
+
"jose": "^6.2.14",
|
|
120
138
|
"lint-staged": "^17.6.0",
|
|
121
139
|
"oauth4webapi": "^3.8.8",
|
|
122
|
-
"oxlint": "^1.
|
|
140
|
+
"oxlint": "^1.90.0",
|
|
123
141
|
"pg": "^8.23.1",
|
|
124
142
|
"prettier": "^3.9.10",
|
|
125
|
-
"
|
|
143
|
+
"reflect-metadata": "^0.2.2",
|
|
144
|
+
"release-it": "^21.1.2",
|
|
126
145
|
"typescript": "^7.0.2",
|
|
127
|
-
"vite": "^8.3.
|
|
128
|
-
"vitest": "^5.0.
|
|
146
|
+
"vite": "^8.3.5",
|
|
147
|
+
"vitest": "^5.0.5"
|
|
129
148
|
},
|
|
130
149
|
"dependencies": {
|
|
131
150
|
"@smplcty/db": "^4.3.0",
|
|
132
|
-
"@smplcty/schema-std": "^0.0
|
|
133
|
-
"otplib": "^13.
|
|
134
|
-
},
|
|
135
|
-
"pnpm": {
|
|
136
|
-
"overrides": {
|
|
137
|
-
"undici@7.29.0": "7.29.1"
|
|
138
|
-
}
|
|
151
|
+
"@smplcty/schema-std": "^0.1.0",
|
|
152
|
+
"otplib": "^13.6.0"
|
|
139
153
|
}
|
|
140
154
|
}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
table: auth_domain_credentials
|
|
2
|
+
# The client credential an auth domain (a tenant's IdP) uses at the token
|
|
3
|
+
# endpoint: a client secret, and/or a generated private key for private_key_jwt.
|
|
4
|
+
# One row per auth domain. The tenant's security or settings admin sets it from
|
|
5
|
+
# the app; nobody provisions it through infrastructure.
|
|
6
|
+
#
|
|
7
|
+
# Never plaintext: the app encrypts through its own hook (for example a KMS data
|
|
8
|
+
# key) before writing, and decrypts only in memory during a token exchange.
|
|
9
|
+
#
|
|
10
|
+
# Grants. No role reachable from a tenant session can read a secret or private
|
|
11
|
+
# key back, by any route: app_rls gets column grants that write the ciphertext
|
|
12
|
+
# columns but SELECT only the public and status columns. (SELECT is also what a
|
|
13
|
+
# WHERE clause needs, so the ciphertext can't be probed with UPDATE … WHERE
|
|
14
|
+
# either.) Only app_privileged, the pre-session sign-in machinery, reads the
|
|
15
|
+
# ciphertext, for the token exchange.
|
|
16
|
+
mixins: [audit]
|
|
17
|
+
grants:
|
|
18
|
+
- to: app_rls
|
|
19
|
+
privileges: [SELECT]
|
|
20
|
+
columns: [auth_domain_id, secret_set_at, private_key_set_at, public_jwk, certificate, created_at, updated_at]
|
|
21
|
+
- to: app_rls
|
|
22
|
+
privileges: [INSERT]
|
|
23
|
+
columns:
|
|
24
|
+
[
|
|
25
|
+
auth_domain_id,
|
|
26
|
+
secret_ciphertext,
|
|
27
|
+
secret_set_at,
|
|
28
|
+
private_key_ciphertext,
|
|
29
|
+
private_key_set_at,
|
|
30
|
+
public_jwk,
|
|
31
|
+
certificate,
|
|
32
|
+
]
|
|
33
|
+
- to: app_rls
|
|
34
|
+
privileges: [UPDATE]
|
|
35
|
+
columns: [secret_ciphertext, secret_set_at, private_key_ciphertext, private_key_set_at, public_jwk, certificate]
|
|
36
|
+
- to: app_privileged
|
|
37
|
+
privileges: [SELECT]
|
|
38
|
+
columns:
|
|
39
|
+
- name: auth_domain_id
|
|
40
|
+
type: bigint
|
|
41
|
+
primary_key: true
|
|
42
|
+
references:
|
|
43
|
+
table: auth_domains
|
|
44
|
+
column: auth_domain_id
|
|
45
|
+
# The client secret, encrypted by the app's hook. NULL when none is set.
|
|
46
|
+
- name: secret_ciphertext
|
|
47
|
+
type: text
|
|
48
|
+
- name: secret_set_at
|
|
49
|
+
type: timestamptz
|
|
50
|
+
# The PKCS#8 private key for private_key_jwt, encrypted by the app's hook.
|
|
51
|
+
- name: private_key_ciphertext
|
|
52
|
+
type: text
|
|
53
|
+
- name: private_key_set_at
|
|
54
|
+
type: timestamptz
|
|
55
|
+
# The public half, readable by the tenant admin to upload to their IdP: a
|
|
56
|
+
# JWK (with kid, x5c and x5t#S256) and a self-signed X.509 certificate (PEM),
|
|
57
|
+
# which is what Entra's certificate upload takes.
|
|
58
|
+
- name: public_jwk
|
|
59
|
+
type: jsonb
|
|
60
|
+
- name: certificate
|
|
61
|
+
type: text
|
|
62
|
+
checks:
|
|
63
|
+
- name: auth_domain_credentials_secret_pair_check
|
|
64
|
+
expression: '(secret_ciphertext IS NULL) = (secret_set_at IS NULL)'
|
|
65
|
+
- name: auth_domain_credentials_key_pair_check
|
|
66
|
+
expression: '(private_key_ciphertext IS NULL) = (private_key_set_at IS NULL)'
|
|
67
|
+
# RLS. Whoever may configure the tenant's SSO (its security or settings admin)
|
|
68
|
+
# may write its credentials, for live auth domains only. A soft-deleted auth
|
|
69
|
+
# domain's credential is also never used: the token exchange reads it joined to
|
|
70
|
+
# a live auth_domains row.
|
|
71
|
+
rls: true
|
|
72
|
+
policies:
|
|
73
|
+
- name: auth_domain_credentials_sso_admin
|
|
74
|
+
for: ALL
|
|
75
|
+
to: app_rls
|
|
76
|
+
permissive: true
|
|
77
|
+
using: >-
|
|
78
|
+
EXISTS (SELECT 1 FROM auth_domains ad
|
|
79
|
+
WHERE ad.auth_domain_id = auth_domain_credentials.auth_domain_id
|
|
80
|
+
AND ad.deleted_at IS NULL
|
|
81
|
+
AND (auth_has_role('security', ad.tenant_id) OR auth_has_role('settings', ad.tenant_id)))
|
|
82
|
+
check: >-
|
|
83
|
+
EXISTS (SELECT 1 FROM auth_domains ad
|
|
84
|
+
WHERE ad.auth_domain_id = auth_domain_credentials.auth_domain_id
|
|
85
|
+
AND ad.deleted_at IS NULL
|
|
86
|
+
AND (auth_has_role('security', ad.tenant_id) OR auth_has_role('settings', ad.tenant_id)))
|
|
@@ -45,15 +45,17 @@ columns:
|
|
|
45
45
|
type: jsonb
|
|
46
46
|
nullable: false
|
|
47
47
|
default: "'{}'::jsonb"
|
|
48
|
-
# RLS.
|
|
49
|
-
#
|
|
50
|
-
# in itself reads auth_domains through the bypass pool pre-session,
|
|
51
|
-
# users never need direct access here.)
|
|
48
|
+
# RLS. Setting up a tenant's SSO is a job for its security or settings admin:
|
|
49
|
+
# they see and maintain the auth_domains of the tenants they hold either role
|
|
50
|
+
# for. (Sign-in itself reads auth_domains through the bypass pool pre-session,
|
|
51
|
+
# so ordinary users never need direct access here.)
|
|
52
52
|
rls: true
|
|
53
53
|
policies:
|
|
54
|
+
# The policy keeps its original name, from when only settings admins were admitted:
|
|
55
|
+
# renaming it would leave the old policy behind as a blocked destructive drop.
|
|
54
56
|
- name: auth_domains_settings
|
|
55
57
|
for: ALL
|
|
56
58
|
to: app_rls
|
|
57
59
|
permissive: true
|
|
58
|
-
using: auth_has_role('settings', auth_domains.tenant_id)
|
|
59
|
-
check: auth_has_role('settings', auth_domains.tenant_id)
|
|
60
|
+
using: auth_has_role('security', auth_domains.tenant_id) OR auth_has_role('settings', auth_domains.tenant_id)
|
|
61
|
+
check: auth_has_role('security', auth_domains.tenant_id) OR auth_has_role('settings', auth_domains.tenant_id)
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
table: email_sign_in_codes
|
|
2
|
+
# A one-time sign-in code emailed by emailCodeHandler. Rows are kept after use,
|
|
3
|
+
# expiry or replacement; they are the record of every code issued.
|
|
4
|
+
# Credentials: app_rls gets nothing; only the pre-auth machinery touches them.
|
|
5
|
+
grants:
|
|
6
|
+
- to: app_privileged
|
|
7
|
+
privileges: [SELECT, INSERT, UPDATE]
|
|
8
|
+
columns:
|
|
9
|
+
- name: email_sign_in_code_id
|
|
10
|
+
type: bigserial
|
|
11
|
+
primary_key: true
|
|
12
|
+
- name: user_communication_method_id
|
|
13
|
+
type: bigint
|
|
14
|
+
nullable: false
|
|
15
|
+
references:
|
|
16
|
+
table: user_communication_methods
|
|
17
|
+
column: user_communication_method_id
|
|
18
|
+
# HMAC-SHA256 of the code under the app's codeSecret, so a database read
|
|
19
|
+
# alone cannot brute-force the million possible codes.
|
|
20
|
+
- name: code_hash
|
|
21
|
+
type: text
|
|
22
|
+
nullable: false
|
|
23
|
+
- name: created_at
|
|
24
|
+
type: timestamptz
|
|
25
|
+
nullable: false
|
|
26
|
+
default: now()
|
|
27
|
+
- name: expires_at
|
|
28
|
+
type: timestamptz
|
|
29
|
+
nullable: false
|
|
30
|
+
- name: failed_attempts
|
|
31
|
+
type: integer
|
|
32
|
+
nullable: false
|
|
33
|
+
default: 0
|
|
34
|
+
- name: used_at
|
|
35
|
+
type: timestamptz
|
|
36
|
+
- name: superseded_at
|
|
37
|
+
type: timestamptz
|
|
38
|
+
indexes:
|
|
39
|
+
- columns: [user_communication_method_id, created_at]
|
|
@@ -68,14 +68,18 @@ indexes:
|
|
|
68
68
|
- columns: [domain]
|
|
69
69
|
where: 'verified_at IS NOT NULL AND deleted_at IS NULL'
|
|
70
70
|
name: tenant_email_domains_verified_domain_idx
|
|
71
|
-
# RLS.
|
|
72
|
-
# maintains the email domains of the tenants they
|
|
73
|
-
#
|
|
71
|
+
# RLS. Part of setting up SSO, like auth_domains: a security or settings admin
|
|
72
|
+
# sees and maintains the email domains (and sso_required) of the tenants they
|
|
73
|
+
# hold either role for. Verifying a domain stays out of their reach through the
|
|
74
|
+
# column grants above. The sign-in checks read this table through the
|
|
75
|
+
# privileged pool, pre-session.
|
|
74
76
|
rls: true
|
|
75
77
|
policies:
|
|
78
|
+
# The policy keeps its original name, from when only settings admins were admitted:
|
|
79
|
+
# renaming it would leave the old policy behind as a blocked destructive drop.
|
|
76
80
|
- name: tenant_email_domains_settings
|
|
77
81
|
for: ALL
|
|
78
82
|
to: app_rls
|
|
79
83
|
permissive: true
|
|
80
|
-
using: auth_has_role('settings', tenant_email_domains.tenant_id)
|
|
81
|
-
check: auth_has_role('settings', tenant_email_domains.tenant_id)
|
|
84
|
+
using: auth_has_role('security', tenant_email_domains.tenant_id) OR auth_has_role('settings', tenant_email_domains.tenant_id)
|
|
85
|
+
check: auth_has_role('security', tenant_email_domains.tenant_id) OR auth_has_role('settings', tenant_email_domains.tenant_id)
|