@openora/core 0.4.1-canary.113 → 0.4.1-canary.115
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/dist/.tsbuildinfo +1 -1
- package/dist/admin-console/plugin.d.ts +11 -0
- package/dist/admin-console/plugin.d.ts.map +1 -1
- package/dist/analytics/plugin.d.ts +11 -0
- package/dist/analytics/plugin.d.ts.map +1 -1
- package/dist/audit/__tests__/map-event.test.js +34 -0
- package/dist/audit/__tests__/map-event.test.js.map +1 -1
- package/dist/audit/plugin.d.ts +11 -0
- package/dist/audit/plugin.d.ts.map +1 -1
- package/dist/audit/plugin.js +63 -7
- package/dist/audit/plugin.js.map +1 -1
- package/dist/casino/gaming/plugin.d.ts +11 -0
- package/dist/casino/gaming/plugin.d.ts.map +1 -1
- package/dist/casino/lobby/plugin.d.ts +11 -0
- package/dist/casino/lobby/plugin.d.ts.map +1 -1
- package/dist/cms/plugin.d.ts +11 -0
- package/dist/cms/plugin.d.ts.map +1 -1
- package/dist/compliance/plugin.d.ts +11 -0
- package/dist/compliance/plugin.d.ts.map +1 -1
- package/dist/contracts/adapters/admin-security.d.ts +27 -0
- package/dist/contracts/adapters/admin-security.d.ts.map +1 -0
- package/dist/contracts/adapters/admin-security.js +9 -0
- package/dist/contracts/adapters/admin-security.js.map +1 -0
- package/dist/contracts/adapters/index.d.ts +3 -1
- package/dist/contracts/adapters/index.d.ts.map +1 -1
- package/dist/contracts/adapters/index.js +1 -0
- package/dist/contracts/adapters/index.js.map +1 -1
- package/dist/contracts/adapters/realtime.d.ts +36 -3
- package/dist/contracts/adapters/realtime.d.ts.map +1 -1
- package/dist/contracts/adapters/realtime.js.map +1 -1
- package/dist/contracts/schemas/common.d.ts +3 -1
- package/dist/contracts/schemas/common.d.ts.map +1 -1
- package/dist/contracts/schemas/common.js +2 -0
- package/dist/contracts/schemas/common.js.map +1 -1
- package/dist/contracts/schemas/events.d.ts +114 -0
- package/dist/contracts/schemas/events.d.ts.map +1 -1
- package/dist/contracts/schemas/events.js +77 -0
- package/dist/contracts/schemas/events.js.map +1 -1
- package/dist/contracts/schemas/identity.d.ts +26 -0
- package/dist/contracts/schemas/identity.d.ts.map +1 -1
- package/dist/contracts/schemas/identity.js +32 -1
- package/dist/contracts/schemas/identity.js.map +1 -1
- package/dist/contracts/schemas/platform-config.d.ts +39 -0
- package/dist/contracts/schemas/platform-config.d.ts.map +1 -1
- package/dist/contracts/schemas/platform-config.js +43 -0
- package/dist/contracts/schemas/platform-config.js.map +1 -1
- package/dist/engagement/chat/__tests__/chat.router.test.d.ts +2 -0
- package/dist/engagement/chat/__tests__/chat.router.test.d.ts.map +1 -0
- package/dist/engagement/chat/__tests__/chat.router.test.js +44 -0
- package/dist/engagement/chat/__tests__/chat.router.test.js.map +1 -0
- package/dist/engagement/chat/__tests__/chat.service.int.test.js +590 -6
- package/dist/engagement/chat/__tests__/chat.service.int.test.js.map +1 -1
- package/dist/engagement/chat/contract/constants.d.ts +2 -0
- package/dist/engagement/chat/contract/constants.d.ts.map +1 -1
- package/dist/engagement/chat/contract/constants.js +7 -0
- package/dist/engagement/chat/contract/constants.js.map +1 -1
- package/dist/engagement/chat/contract/index.d.ts +39 -0
- package/dist/engagement/chat/contract/index.d.ts.map +1 -1
- package/dist/engagement/chat/contract/index.js +25 -1
- package/dist/engagement/chat/contract/index.js.map +1 -1
- package/dist/engagement/chat/drizzle/migrations/0009_massive_bill_hollister.sql +1 -0
- package/dist/engagement/chat/drizzle/migrations/0010_backfill_role_assigned_at.sql +9 -0
- package/dist/engagement/chat/drizzle/migrations/meta/0009_snapshot.json +1468 -0
- package/dist/engagement/chat/drizzle/migrations/meta/0010_snapshot.json +1468 -0
- package/dist/engagement/chat/drizzle/migrations/meta/_journal.json +14 -0
- package/dist/engagement/chat/plugin.d.ts +11 -0
- package/dist/engagement/chat/plugin.d.ts.map +1 -1
- package/dist/engagement/chat/router/index.d.ts +19 -0
- package/dist/engagement/chat/router/index.d.ts.map +1 -1
- package/dist/engagement/chat/router/index.js +31 -2
- package/dist/engagement/chat/router/index.js.map +1 -1
- package/dist/engagement/chat/schema/index.d.ts +17 -0
- package/dist/engagement/chat/schema/index.d.ts.map +1 -1
- package/dist/engagement/chat/schema/index.js +3 -0
- package/dist/engagement/chat/schema/index.js.map +1 -1
- package/dist/engagement/chat/service/chat-ban.service.d.ts.map +1 -1
- package/dist/engagement/chat/service/chat-ban.service.js +6 -6
- package/dist/engagement/chat/service/chat-ban.service.js.map +1 -1
- package/dist/engagement/chat/service/chat-room-ban.service.js +1 -1
- package/dist/engagement/chat/service/chat-room-ban.service.js.map +1 -1
- package/dist/engagement/chat/service/chat-room-membership.service.d.ts +15 -0
- package/dist/engagement/chat/service/chat-room-membership.service.d.ts.map +1 -1
- package/dist/engagement/chat/service/chat-room-membership.service.js +96 -4
- package/dist/engagement/chat/service/chat-room-membership.service.js.map +1 -1
- package/dist/engagement/chat/service/chat.service.d.ts +3 -2
- package/dist/engagement/chat/service/chat.service.d.ts.map +1 -1
- package/dist/engagement/chat/service/chat.service.js +73 -24
- package/dist/engagement/chat/service/chat.service.js.map +1 -1
- package/dist/engagement/chat/service/errors/chat-moderation.errors.d.ts +1 -0
- package/dist/engagement/chat/service/errors/chat-moderation.errors.d.ts.map +1 -1
- package/dist/engagement/chat/service/errors/chat-moderation.errors.js +1 -0
- package/dist/engagement/chat/service/errors/chat-moderation.errors.js.map +1 -1
- package/dist/engagement/chat-commands/plugin.d.ts +11 -0
- package/dist/engagement/chat-commands/plugin.d.ts.map +1 -1
- package/dist/engagement/notifications/plugin.d.ts +11 -0
- package/dist/engagement/notifications/plugin.d.ts.map +1 -1
- package/dist/engagement/social/plugin.d.ts +11 -0
- package/dist/engagement/social/plugin.d.ts.map +1 -1
- package/dist/iam/plugin.d.ts +11 -0
- package/dist/iam/plugin.d.ts.map +1 -1
- package/dist/pam/identity/__tests__/admin-security.int.test.d.ts +2 -0
- package/dist/pam/identity/__tests__/admin-security.int.test.d.ts.map +1 -0
- package/dist/pam/identity/__tests__/admin-security.int.test.js +137 -0
- package/dist/pam/identity/__tests__/admin-security.int.test.js.map +1 -0
- package/dist/pam/identity/__tests__/device-fingerprint.test.d.ts +2 -0
- package/dist/pam/identity/__tests__/device-fingerprint.test.d.ts.map +1 -0
- package/dist/pam/identity/__tests__/device-fingerprint.test.js +105 -0
- package/dist/pam/identity/__tests__/device-fingerprint.test.js.map +1 -0
- package/dist/pam/identity/__tests__/identity.rate-limit.int.test.js +3 -3
- package/dist/pam/identity/__tests__/identity.rate-limit.int.test.js.map +1 -1
- package/dist/pam/identity/__tests__/identity.service.int.test.js +221 -1
- package/dist/pam/identity/__tests__/identity.service.int.test.js.map +1 -1
- package/dist/pam/identity/contract/index.d.ts +144 -0
- package/dist/pam/identity/contract/index.d.ts.map +1 -1
- package/dist/pam/identity/contract/index.js +84 -1
- package/dist/pam/identity/contract/index.js.map +1 -1
- package/dist/pam/identity/drizzle/migrations/0008_pink_bucky.sql +23 -0
- package/dist/pam/identity/drizzle/migrations/0009_hard_sauron.sql +2 -0
- package/dist/pam/identity/drizzle/migrations/meta/0008_snapshot.json +913 -0
- package/dist/pam/identity/drizzle/migrations/meta/0009_snapshot.json +926 -0
- package/dist/pam/identity/drizzle/migrations/meta/_journal.json +14 -0
- package/dist/pam/identity/plugin.d.ts +11 -0
- package/dist/pam/identity/plugin.d.ts.map +1 -1
- package/dist/pam/identity/plugin.js +81 -26
- package/dist/pam/identity/plugin.js.map +1 -1
- package/dist/pam/identity/react/account.d.ts +5 -0
- package/dist/pam/identity/react/account.d.ts.map +1 -1
- package/dist/pam/identity/react/auth.d.ts +2 -0
- package/dist/pam/identity/react/auth.d.ts.map +1 -1
- package/dist/pam/identity/router/index.d.ts +105 -1
- package/dist/pam/identity/router/index.d.ts.map +1 -1
- package/dist/pam/identity/router/index.js +44 -3
- package/dist/pam/identity/router/index.js.map +1 -1
- package/dist/pam/identity/schema/index.d.ts +314 -0
- package/dist/pam/identity/schema/index.d.ts.map +1 -1
- package/dist/pam/identity/schema/index.js +38 -0
- package/dist/pam/identity/schema/index.js.map +1 -1
- package/dist/pam/identity/service/admin-security.service.d.ts +82 -0
- package/dist/pam/identity/service/admin-security.service.d.ts.map +1 -0
- package/dist/pam/identity/service/admin-security.service.js +277 -0
- package/dist/pam/identity/service/admin-security.service.js.map +1 -0
- package/dist/pam/identity/service/device-fingerprint.service.d.ts +32 -0
- package/dist/pam/identity/service/device-fingerprint.service.d.ts.map +1 -0
- package/dist/pam/identity/service/device-fingerprint.service.js +79 -0
- package/dist/pam/identity/service/device-fingerprint.service.js.map +1 -0
- package/dist/pam/identity/service/identity.service.d.ts +37 -2
- package/dist/pam/identity/service/identity.service.d.ts.map +1 -1
- package/dist/pam/identity/service/identity.service.js +233 -19
- package/dist/pam/identity/service/identity.service.js.map +1 -1
- package/dist/pam/identity/service/phone-login.service.d.ts +1 -0
- package/dist/pam/identity/service/phone-login.service.d.ts.map +1 -1
- package/dist/pam/identity/service/phone-login.service.js +2 -0
- package/dist/pam/identity/service/phone-login.service.js.map +1 -1
- package/dist/pam/identity/service/session.service.d.ts +45 -1
- package/dist/pam/identity/service/session.service.d.ts.map +1 -1
- package/dist/pam/identity/service/session.service.js +81 -12
- package/dist/pam/identity/service/session.service.js.map +1 -1
- package/dist/pam/identity/service/trusted-device.service.d.ts +54 -0
- package/dist/pam/identity/service/trusted-device.service.d.ts.map +1 -0
- package/dist/pam/identity/service/trusted-device.service.js +157 -0
- package/dist/pam/identity/service/trusted-device.service.js.map +1 -0
- package/dist/pam/identity/service/two-factor-lockout.service.d.ts +25 -0
- package/dist/pam/identity/service/two-factor-lockout.service.d.ts.map +1 -0
- package/dist/pam/identity/service/two-factor-lockout.service.js +121 -0
- package/dist/pam/identity/service/two-factor-lockout.service.js.map +1 -0
- package/dist/pam/player-management/plugin.d.ts +11 -0
- package/dist/pam/player-management/plugin.d.ts.map +1 -1
- package/dist/pam/player-note/plugin.d.ts +11 -0
- package/dist/pam/player-note/plugin.d.ts.map +1 -1
- package/dist/pam/profile/plugin.d.ts +11 -0
- package/dist/pam/profile/plugin.d.ts.map +1 -1
- package/dist/pam/tag/plugin.d.ts +11 -0
- package/dist/pam/tag/plugin.d.ts.map +1 -1
- package/dist/react/context/__tests__/realtime-client.test.d.ts +2 -0
- package/dist/react/context/__tests__/realtime-client.test.d.ts.map +1 -0
- package/dist/react/context/__tests__/realtime-client.test.js +75 -0
- package/dist/react/context/__tests__/realtime-client.test.js.map +1 -0
- package/dist/react/context/realtime-client.d.ts +14 -0
- package/dist/react/context/realtime-client.d.ts.map +1 -1
- package/dist/react/context/realtime-client.js.map +1 -1
- package/dist/server/auth/__tests__/admin-guard.int.test.js +3 -1
- package/dist/server/auth/__tests__/admin-guard.int.test.js.map +1 -1
- package/dist/server/auth/admin-guard.d.ts +3 -2
- package/dist/server/auth/admin-guard.d.ts.map +1 -1
- package/dist/server/auth/admin-guard.js +18 -2
- package/dist/server/auth/admin-guard.js.map +1 -1
- package/dist/server/auth/auth.d.ts +14 -0
- package/dist/server/auth/auth.d.ts.map +1 -1
- package/dist/server/auth/auth.js +18 -1
- package/dist/server/auth/auth.js.map +1 -1
- package/dist/server/kernel/realtime-transport.d.ts +11 -3
- package/dist/server/kernel/realtime-transport.d.ts.map +1 -1
- package/dist/server/kernel/realtime-transport.js +53 -10
- package/dist/server/kernel/realtime-transport.js.map +1 -1
- package/dist/server/runtime/core-token-catalog.d.ts +11 -0
- package/dist/server/runtime/core-token-catalog.d.ts.map +1 -1
- package/dist/server/runtime/core-token-catalog.js +2 -1
- package/dist/server/runtime/core-token-catalog.js.map +1 -1
- package/dist/server/runtime/create-app.d.ts.map +1 -1
- package/dist/server/runtime/create-app.js +2 -2
- package/dist/server/runtime/create-app.js.map +1 -1
- package/dist/testing/seed-player.d.ts +10 -2
- package/dist/testing/seed-player.d.ts.map +1 -1
- package/dist/wallet/plugin.d.ts +11 -0
- package/dist/wallet/plugin.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { type EventBus, DrizzleService } from '@openora/core/server';
|
|
2
2
|
import type { ClientMeta, IdentityReader, User, PaginationOptions } from '@openora/core/contracts';
|
|
3
|
+
import { type Session } from '../schema/index.js';
|
|
3
4
|
import { type SessionSortBy } from '../contract/index.js';
|
|
4
5
|
export declare const SessionNotFoundError: new (id: string) => Error;
|
|
6
|
+
export declare const CurrentSessionRevokeError: new () => Error;
|
|
5
7
|
export type SessionServiceDeps = {
|
|
6
8
|
drizzle: DrizzleService;
|
|
7
9
|
events: EventBus;
|
|
@@ -14,7 +16,7 @@ export declare class SessionService {
|
|
|
14
16
|
constructor({ drizzle, events, identityReader }: SessionServiceDeps);
|
|
15
17
|
listSessions({ userId, currentSessionId, activeOnly, page, limit, sortBy, sortOrder, }: PaginationOptions<{
|
|
16
18
|
userId: User['id'];
|
|
17
|
-
currentSessionId?:
|
|
19
|
+
currentSessionId?: Session['id'];
|
|
18
20
|
activeOnly?: boolean;
|
|
19
21
|
}, SessionSortBy>): Promise<{
|
|
20
22
|
items: {
|
|
@@ -22,7 +24,41 @@ export declare class SessionService {
|
|
|
22
24
|
expiresAt: string;
|
|
23
25
|
createdAt: string;
|
|
24
26
|
updatedAt: string;
|
|
27
|
+
lastSeenAt: string | null;
|
|
28
|
+
deviceLabel: string;
|
|
29
|
+
browser: string | null;
|
|
30
|
+
os: string | null;
|
|
31
|
+
current: boolean;
|
|
32
|
+
ipAddress?: string | null | undefined;
|
|
33
|
+
userAgent?: string | null | undefined;
|
|
34
|
+
}[];
|
|
35
|
+
total: number;
|
|
36
|
+
page: number;
|
|
37
|
+
limit: number;
|
|
38
|
+
}>;
|
|
39
|
+
/**
|
|
40
|
+
* Every active session on the platform, newest first, with the account each belongs
|
|
41
|
+
* to. `listSessions` needs a userId and so cannot answer "who is logged in right now",
|
|
42
|
+
* which is what a Super Admin needs before revoking someone else's session.
|
|
43
|
+
*/
|
|
44
|
+
listAllActiveSessions({ role, query, currentSessionId, page, limit, sortBy, sortOrder, }: PaginationOptions<{
|
|
45
|
+
role?: string | undefined;
|
|
46
|
+
query?: string | undefined;
|
|
47
|
+
currentSessionId?: string;
|
|
48
|
+
}, SessionSortBy>): Promise<{
|
|
49
|
+
items: {
|
|
50
|
+
id: string;
|
|
51
|
+
expiresAt: string;
|
|
52
|
+
createdAt: string;
|
|
53
|
+
updatedAt: string;
|
|
54
|
+
lastSeenAt: string | null;
|
|
55
|
+
deviceLabel: string;
|
|
56
|
+
browser: string | null;
|
|
57
|
+
os: string | null;
|
|
25
58
|
current: boolean;
|
|
59
|
+
userId: string;
|
|
60
|
+
email: string;
|
|
61
|
+
role: string;
|
|
26
62
|
ipAddress?: string | null | undefined;
|
|
27
63
|
userAgent?: string | null | undefined;
|
|
28
64
|
}[];
|
|
@@ -30,6 +66,14 @@ export declare class SessionService {
|
|
|
30
66
|
page: number;
|
|
31
67
|
limit: number;
|
|
32
68
|
}>;
|
|
69
|
+
/**
|
|
70
|
+
* Self-service revoke. Refuses the caller's own session: ending it here would look
|
|
71
|
+
* like a silent logout rather than the deliberate "sign out" action, and the session
|
|
72
|
+
* list marks it as current precisely so it is not the one you cut off.
|
|
73
|
+
*/
|
|
74
|
+
revokeOwnSession(userId: User['id'], id: Session['id'], currentSessionId: Session['id'] | undefined, meta?: ClientMeta): Promise<{
|
|
75
|
+
success: true;
|
|
76
|
+
}>;
|
|
33
77
|
revokeSession(userId: User['id'], id: string, actorId?: User['id'], meta?: ClientMeta): Promise<{
|
|
34
78
|
success: true;
|
|
35
79
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.service.d.ts","sourceRoot":"","sources":["../../../../src/pam/identity/service/session.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,cAAc,
|
|
1
|
+
{"version":3,"file":"session.service.d.ts","sourceRoot":"","sources":["../../../../src/pam/identity/service/session.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,cAAc,EAIf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnG,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAA4C,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIpG,eAAO,MAAM,oBAAoB,2BAA+B,CAAC;AACjE,eAAO,MAAM,yBAAyB,iBAGrC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,QAAQ,CAAC;IACjB,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAmBF,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAEpC,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,kBAAkB;IAM7D,YAAY,CAAC,EACjB,MAAM,EACN,gBAAgB,EAChB,UAAU,EACV,IAAI,EACJ,KAAK,EACL,MAAM,EACN,SAAS,GACV,EAAE,iBAAiB,CAClB;QAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,EAC9E,aAAa,CACd;;;;;;;;;;;;;;;;;;IAgCD;;;;OAIG;IACG,qBAAqB,CAAC,EAC1B,IAAI,EACJ,KAAK,EACL,gBAAgB,EAChB,IAAI,EACJ,KAAK,EACL,MAAM,EACN,SAAS,GACV,EAAE,iBAAiB,CAClB;QAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,EACpF,aAAa,CACd;;;;;;;;;;;;;;;;;;;;;IAiDD;;;;OAIG;IACG,gBAAgB,CACpB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAClB,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EACjB,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,EAC3C,IAAI,CAAC,EAAE,UAAU;;;IAQb,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,UAAU;;;IAwBrF,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,UAAU;;;CAepF"}
|
|
@@ -1,7 +1,25 @@
|
|
|
1
|
-
import { pageToOffset, makeNotFoundError, } from '@openora/core/server';
|
|
2
|
-
import { eq, asc, desc, and, gt, count, sql } from 'drizzle-orm';
|
|
3
|
-
import { session } from '../schema/index.js';
|
|
1
|
+
import { pageToOffset, makeNotFoundError, makeConflictError, } from '@openora/core/server';
|
|
2
|
+
import { eq, asc, desc, and, gt, count, ilike, sql } from 'drizzle-orm';
|
|
3
|
+
import { session, user } from '../schema/index.js';
|
|
4
|
+
import { describeDevice } from './device-fingerprint.service.js';
|
|
4
5
|
export const SessionNotFoundError = makeNotFoundError('Session');
|
|
6
|
+
export const CurrentSessionRevokeError = makeConflictError('CurrentSessionRevokeError', 'The current session cannot be revoked - sign out instead');
|
|
7
|
+
function toSessionItem(row, currentSessionId) {
|
|
8
|
+
const { label, browser, os } = describeDevice(row.userAgent);
|
|
9
|
+
return {
|
|
10
|
+
id: row.id,
|
|
11
|
+
expiresAt: row.expiresAt.toISOString(),
|
|
12
|
+
createdAt: row.createdAt.toISOString(),
|
|
13
|
+
updatedAt: row.updatedAt.toISOString(),
|
|
14
|
+
lastSeenAt: row.lastSeenAt?.toISOString() ?? null,
|
|
15
|
+
ipAddress: row.ipAddress,
|
|
16
|
+
userAgent: row.userAgent,
|
|
17
|
+
deviceLabel: label,
|
|
18
|
+
browser,
|
|
19
|
+
os,
|
|
20
|
+
current: row.id === currentSessionId,
|
|
21
|
+
};
|
|
22
|
+
}
|
|
5
23
|
export class SessionService {
|
|
6
24
|
drizzle;
|
|
7
25
|
events;
|
|
@@ -35,20 +53,71 @@ export class SessionService {
|
|
|
35
53
|
db.select({ n: count() }).from(session).where(where),
|
|
36
54
|
]);
|
|
37
55
|
return {
|
|
38
|
-
items: rows.map((s) => (
|
|
39
|
-
id: s.id,
|
|
40
|
-
expiresAt: s.expiresAt.toISOString(),
|
|
41
|
-
createdAt: s.createdAt.toISOString(),
|
|
42
|
-
updatedAt: s.updatedAt.toISOString(),
|
|
43
|
-
ipAddress: s.ipAddress,
|
|
44
|
-
userAgent: s.userAgent,
|
|
45
|
-
current: s.id === currentSessionId,
|
|
46
|
-
})),
|
|
56
|
+
items: rows.map((s) => toSessionItem(s, currentSessionId)),
|
|
47
57
|
total: Number(n),
|
|
48
58
|
page,
|
|
49
59
|
limit,
|
|
50
60
|
};
|
|
51
61
|
}
|
|
62
|
+
/**
|
|
63
|
+
* Every active session on the platform, newest first, with the account each belongs
|
|
64
|
+
* to. `listSessions` needs a userId and so cannot answer "who is logged in right now",
|
|
65
|
+
* which is what a Super Admin needs before revoking someone else's session.
|
|
66
|
+
*/
|
|
67
|
+
async listAllActiveSessions({ role, query, currentSessionId, page, limit, sortBy, sortOrder, }) {
|
|
68
|
+
const db = this.drizzle.db;
|
|
69
|
+
const filters = [gt(session.expiresAt, sql `now()`)];
|
|
70
|
+
if (role) {
|
|
71
|
+
filters.push(eq(user.role, role));
|
|
72
|
+
}
|
|
73
|
+
if (query) {
|
|
74
|
+
filters.push(ilike(user.email, `%${query}%`));
|
|
75
|
+
}
|
|
76
|
+
const where = and(...filters);
|
|
77
|
+
const dir = (sortOrder ?? 'desc') === 'asc' ? asc : desc;
|
|
78
|
+
const col = sortBy === 'expiresAt'
|
|
79
|
+
? session.expiresAt
|
|
80
|
+
: sortBy === 'updatedAt'
|
|
81
|
+
? session.updatedAt
|
|
82
|
+
: session.createdAt;
|
|
83
|
+
const [rows, [countRow]] = await Promise.all([
|
|
84
|
+
db
|
|
85
|
+
.select({ session, email: user.email, role: user.role })
|
|
86
|
+
.from(session)
|
|
87
|
+
.innerJoin(user, eq(session.userId, user.id))
|
|
88
|
+
.where(where)
|
|
89
|
+
.orderBy(dir(col))
|
|
90
|
+
.limit(limit)
|
|
91
|
+
.offset(pageToOffset(page, limit)),
|
|
92
|
+
db
|
|
93
|
+
.select({ n: count() })
|
|
94
|
+
.from(session)
|
|
95
|
+
.innerJoin(user, eq(session.userId, user.id))
|
|
96
|
+
.where(where),
|
|
97
|
+
]);
|
|
98
|
+
return {
|
|
99
|
+
items: rows.map((row) => ({
|
|
100
|
+
...toSessionItem(row.session, currentSessionId),
|
|
101
|
+
userId: row.session.userId,
|
|
102
|
+
email: row.email,
|
|
103
|
+
role: row.role,
|
|
104
|
+
})),
|
|
105
|
+
total: Number(countRow?.n ?? 0),
|
|
106
|
+
page,
|
|
107
|
+
limit,
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* Self-service revoke. Refuses the caller's own session: ending it here would look
|
|
112
|
+
* like a silent logout rather than the deliberate "sign out" action, and the session
|
|
113
|
+
* list marks it as current precisely so it is not the one you cut off.
|
|
114
|
+
*/
|
|
115
|
+
async revokeOwnSession(userId, id, currentSessionId, meta) {
|
|
116
|
+
if (currentSessionId && id === currentSessionId) {
|
|
117
|
+
throw new CurrentSessionRevokeError();
|
|
118
|
+
}
|
|
119
|
+
return this.revokeSession(userId, id, userId, meta);
|
|
120
|
+
}
|
|
52
121
|
async revokeSession(userId, id, actorId, meta) {
|
|
53
122
|
const updated = await this.drizzle.db
|
|
54
123
|
.update(session)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../../src/pam/identity/service/session.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACZ,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../../src/pam/identity/service/session.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { type EventBus, DrizzleService } from '@openora/core/server';
|
|
2
|
+
import type { ClientMeta, User } from '@openora/core/contracts';
|
|
3
|
+
import { type AdminTrustedDevice } from '../schema/index.js';
|
|
4
|
+
export declare const TrustedDeviceNotFoundError: new (id: string) => Error;
|
|
5
|
+
export type TrustedDeviceItem = {
|
|
6
|
+
id: string;
|
|
7
|
+
label: string;
|
|
8
|
+
ipAddress: string | null;
|
|
9
|
+
browser: string | null;
|
|
10
|
+
os: string | null;
|
|
11
|
+
lastUsedAt: string;
|
|
12
|
+
expiresAt: string;
|
|
13
|
+
isCurrent: boolean;
|
|
14
|
+
};
|
|
15
|
+
export type TrustedDeviceServiceDeps = {
|
|
16
|
+
drizzle: DrizzleService;
|
|
17
|
+
events: EventBus;
|
|
18
|
+
trustedDeviceDays: number;
|
|
19
|
+
};
|
|
20
|
+
/**
|
|
21
|
+
* Server-side half of "trusted device". better-auth issues an opaque trust cookie that
|
|
22
|
+
* nothing can enumerate or revoke; a device skips the second factor only when that
|
|
23
|
+
* cookie AND an unrevoked row here are both present, which is what makes the 30-day
|
|
24
|
+
* window listable, auditable, and revocable by the user or a Super Admin.
|
|
25
|
+
*/
|
|
26
|
+
export declare class TrustedDeviceService {
|
|
27
|
+
private readonly drizzle;
|
|
28
|
+
private readonly events;
|
|
29
|
+
private readonly trustedDeviceDays;
|
|
30
|
+
constructor({ drizzle, events, trustedDeviceDays }: TrustedDeviceServiceDeps);
|
|
31
|
+
trust(userId: User['id'], meta: ClientMeta): Promise<{
|
|
32
|
+
id: string;
|
|
33
|
+
expiresAt: Date;
|
|
34
|
+
} | null>;
|
|
35
|
+
isTrusted(userId: User['id'], userAgent: string | null): Promise<boolean>;
|
|
36
|
+
list(userId: User['id'], currentUserAgent: string | null): Promise<TrustedDeviceItem[]>;
|
|
37
|
+
revoke(userId: User['id'], deviceId: AdminTrustedDevice['id'], actorId: User['id'], meta?: ClientMeta): Promise<{
|
|
38
|
+
success: true;
|
|
39
|
+
userAgent: string | null;
|
|
40
|
+
}>;
|
|
41
|
+
/**
|
|
42
|
+
* Drops the trust granted to the device a compromised session was riding on, so the
|
|
43
|
+
* forced logout is followed by a full re-authentication instead of a silent skip.
|
|
44
|
+
*/
|
|
45
|
+
/**
|
|
46
|
+
* `actorId` is absent when `AdminGuard` forces this itself (a fingerprint mismatch,
|
|
47
|
+
* not an admin or the device owner acting) - the audit trail attributes that case to
|
|
48
|
+
* the system rather than mislabeling it as a self-revoke.
|
|
49
|
+
*/
|
|
50
|
+
revokeForDevice(userId: User['id'], userAgent: string | null, actorId?: User['id']): Promise<void>;
|
|
51
|
+
revokeAllForUser(userId: User['id'], actorId: User['id']): Promise<void>;
|
|
52
|
+
private activeDeviceWhere;
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=trusted-device.service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"trusted-device.service.d.ts","sourceRoot":"","sources":["../../../../src/pam/identity/service/trusted-device.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AAExF,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAsB,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGjF,eAAO,MAAM,0BAA0B,2BAAsC,CAAC;AAE9E,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,QAAQ,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;gBAE/B,EAAE,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,EAAE,wBAAwB;IAMtE,KAAK,CACT,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAClB,IAAI,EAAE,UAAU,GACf,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IA6C5C,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IASzE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAuBvF,MAAM,CACV,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAClB,QAAQ,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAClC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EACnB,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC;QAAE,OAAO,EAAE,IAAI,CAAC;QAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IA4BvD;;;OAGG;IACH;;;;OAIG;IACG,eAAe,CACnB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,GACnB,OAAO,CAAC,IAAI,CAAC;IAkBV,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB9E,OAAO,CAAC,iBAAiB;CAQ1B"}
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import { makeNotFoundError } from '@openora/core/server';
|
|
2
|
+
import { and, desc, eq, gt, isNull, sql } from 'drizzle-orm';
|
|
3
|
+
import { adminTrustedDevice } from '../schema/index.js';
|
|
4
|
+
import { deviceHash, describeDevice, trustedDeviceExpiry } from './device-fingerprint.service.js';
|
|
5
|
+
export const TrustedDeviceNotFoundError = makeNotFoundError('Trusted device');
|
|
6
|
+
/**
|
|
7
|
+
* Server-side half of "trusted device". better-auth issues an opaque trust cookie that
|
|
8
|
+
* nothing can enumerate or revoke; a device skips the second factor only when that
|
|
9
|
+
* cookie AND an unrevoked row here are both present, which is what makes the 30-day
|
|
10
|
+
* window listable, auditable, and revocable by the user or a Super Admin.
|
|
11
|
+
*/
|
|
12
|
+
export class TrustedDeviceService {
|
|
13
|
+
drizzle;
|
|
14
|
+
events;
|
|
15
|
+
trustedDeviceDays;
|
|
16
|
+
constructor({ drizzle, events, trustedDeviceDays }) {
|
|
17
|
+
this.drizzle = drizzle;
|
|
18
|
+
this.events = events;
|
|
19
|
+
this.trustedDeviceDays = trustedDeviceDays;
|
|
20
|
+
}
|
|
21
|
+
async trust(userId, meta) {
|
|
22
|
+
if (this.trustedDeviceDays <= 0) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
const hash = deviceHash(meta.userAgent);
|
|
26
|
+
const { label } = describeDevice(meta.userAgent);
|
|
27
|
+
const expiresAt = trustedDeviceExpiry(this.trustedDeviceDays);
|
|
28
|
+
const [row] = await this.drizzle.db
|
|
29
|
+
.insert(adminTrustedDevice)
|
|
30
|
+
.values({
|
|
31
|
+
userId,
|
|
32
|
+
deviceHash: hash,
|
|
33
|
+
label,
|
|
34
|
+
ipAddress: meta.ip ?? null,
|
|
35
|
+
userAgent: meta.userAgent ?? null,
|
|
36
|
+
expiresAt,
|
|
37
|
+
})
|
|
38
|
+
.onConflictDoUpdate({
|
|
39
|
+
target: [adminTrustedDevice.userId, adminTrustedDevice.deviceHash],
|
|
40
|
+
set: {
|
|
41
|
+
label,
|
|
42
|
+
ipAddress: meta.ip ?? null,
|
|
43
|
+
userAgent: meta.userAgent ?? null,
|
|
44
|
+
expiresAt,
|
|
45
|
+
lastUsedAt: sql `now()`,
|
|
46
|
+
revokedAt: null,
|
|
47
|
+
revokedBy: null,
|
|
48
|
+
},
|
|
49
|
+
})
|
|
50
|
+
.returning({ id: adminTrustedDevice.id, expiresAt: adminTrustedDevice.expiresAt });
|
|
51
|
+
if (!row) {
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
this.events.emit('identity.trusted_device.added', {
|
|
55
|
+
userId,
|
|
56
|
+
deviceId: row.id,
|
|
57
|
+
label,
|
|
58
|
+
expiresAt: row.expiresAt.toISOString(),
|
|
59
|
+
ip: meta.ip ?? null,
|
|
60
|
+
userAgent: meta.userAgent ?? null,
|
|
61
|
+
});
|
|
62
|
+
return row;
|
|
63
|
+
}
|
|
64
|
+
async isTrusted(userId, userAgent) {
|
|
65
|
+
const [row] = await this.drizzle.db
|
|
66
|
+
.select({ id: adminTrustedDevice.id })
|
|
67
|
+
.from(adminTrustedDevice)
|
|
68
|
+
.where(this.activeDeviceWhere(userId, deviceHash(userAgent)))
|
|
69
|
+
.limit(1);
|
|
70
|
+
return row !== undefined;
|
|
71
|
+
}
|
|
72
|
+
async list(userId, currentUserAgent) {
|
|
73
|
+
const currentHash = deviceHash(currentUserAgent);
|
|
74
|
+
const rows = await this.drizzle.db
|
|
75
|
+
.select()
|
|
76
|
+
.from(adminTrustedDevice)
|
|
77
|
+
.where(and(eq(adminTrustedDevice.userId, userId), isNull(adminTrustedDevice.revokedAt)))
|
|
78
|
+
.orderBy(desc(adminTrustedDevice.lastUsedAt));
|
|
79
|
+
return rows.map((row) => {
|
|
80
|
+
const { browser, os } = describeDevice(row.userAgent);
|
|
81
|
+
return {
|
|
82
|
+
id: row.id,
|
|
83
|
+
label: row.label,
|
|
84
|
+
ipAddress: row.ipAddress,
|
|
85
|
+
browser,
|
|
86
|
+
os,
|
|
87
|
+
lastUsedAt: row.lastUsedAt.toISOString(),
|
|
88
|
+
expiresAt: row.expiresAt.toISOString(),
|
|
89
|
+
isCurrent: row.deviceHash === currentHash,
|
|
90
|
+
};
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
async revoke(userId, deviceId, actorId, meta) {
|
|
94
|
+
const revoked = await this.drizzle.db
|
|
95
|
+
.update(adminTrustedDevice)
|
|
96
|
+
.set({ revokedAt: sql `now()`, revokedBy: actorId })
|
|
97
|
+
.where(and(eq(adminTrustedDevice.id, deviceId), eq(adminTrustedDevice.userId, userId), isNull(adminTrustedDevice.revokedAt)))
|
|
98
|
+
.returning({ id: adminTrustedDevice.id, userAgent: adminTrustedDevice.userAgent });
|
|
99
|
+
const [row] = revoked;
|
|
100
|
+
if (!row) {
|
|
101
|
+
throw new TrustedDeviceNotFoundError(deviceId);
|
|
102
|
+
}
|
|
103
|
+
this.events.emit('identity.trusted_device.revoked', {
|
|
104
|
+
userId,
|
|
105
|
+
deviceId,
|
|
106
|
+
actorId,
|
|
107
|
+
ip: meta?.ip ?? null,
|
|
108
|
+
userAgent: meta?.userAgent ?? null,
|
|
109
|
+
});
|
|
110
|
+
return { success: true, userAgent: row.userAgent };
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* Drops the trust granted to the device a compromised session was riding on, so the
|
|
114
|
+
* forced logout is followed by a full re-authentication instead of a silent skip.
|
|
115
|
+
*/
|
|
116
|
+
/**
|
|
117
|
+
* `actorId` is absent when `AdminGuard` forces this itself (a fingerprint mismatch,
|
|
118
|
+
* not an admin or the device owner acting) - the audit trail attributes that case to
|
|
119
|
+
* the system rather than mislabeling it as a self-revoke.
|
|
120
|
+
*/
|
|
121
|
+
async revokeForDevice(userId, userAgent, actorId) {
|
|
122
|
+
const revoked = await this.drizzle.db
|
|
123
|
+
.update(adminTrustedDevice)
|
|
124
|
+
.set({ revokedAt: sql `now()`, revokedBy: actorId ?? null })
|
|
125
|
+
.where(this.activeDeviceWhere(userId, deviceHash(userAgent)))
|
|
126
|
+
.returning({ id: adminTrustedDevice.id });
|
|
127
|
+
for (const row of revoked) {
|
|
128
|
+
this.events.emit('identity.trusted_device.revoked', {
|
|
129
|
+
userId,
|
|
130
|
+
deviceId: row.id,
|
|
131
|
+
actorId,
|
|
132
|
+
ip: null,
|
|
133
|
+
userAgent,
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
async revokeAllForUser(userId, actorId) {
|
|
138
|
+
const revoked = await this.drizzle.db
|
|
139
|
+
.update(adminTrustedDevice)
|
|
140
|
+
.set({ revokedAt: sql `now()`, revokedBy: actorId })
|
|
141
|
+
.where(and(eq(adminTrustedDevice.userId, userId), isNull(adminTrustedDevice.revokedAt), gt(adminTrustedDevice.expiresAt, sql `now()`)))
|
|
142
|
+
.returning({ id: adminTrustedDevice.id, userAgent: adminTrustedDevice.userAgent });
|
|
143
|
+
for (const row of revoked) {
|
|
144
|
+
this.events.emit('identity.trusted_device.revoked', {
|
|
145
|
+
userId,
|
|
146
|
+
deviceId: row.id,
|
|
147
|
+
actorId,
|
|
148
|
+
ip: null,
|
|
149
|
+
userAgent: row.userAgent,
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
activeDeviceWhere(userId, hash) {
|
|
154
|
+
return and(eq(adminTrustedDevice.userId, userId), eq(adminTrustedDevice.deviceHash, hash), isNull(adminTrustedDevice.revokedAt), gt(adminTrustedDevice.expiresAt, sql `now()`));
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
//# sourceMappingURL=trusted-device.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"trusted-device.service.js","sourceRoot":"","sources":["../../../../src/pam/identity/service/trusted-device.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { type EventBus, DrizzleService } from '@openora/core/server';
|
|
2
|
+
import type { AdminSecurityConfig, ClientMeta, IdentityReader, User } from '@openora/core/contracts';
|
|
3
|
+
export type TwoFactorLockoutServiceDeps = {
|
|
4
|
+
drizzle: DrizzleService;
|
|
5
|
+
events: EventBus;
|
|
6
|
+
identityReader: IdentityReader;
|
|
7
|
+
config: AdminSecurityConfig['twoFactorLockout'];
|
|
8
|
+
};
|
|
9
|
+
/**
|
|
10
|
+
* Consecutive-failure lockout for the second factor, counted per account and kept in
|
|
11
|
+
* columns of its own: a second-factor lockout must not consume the password-login
|
|
12
|
+
* budget, and the two thresholds are configured independently.
|
|
13
|
+
*/
|
|
14
|
+
export declare class TwoFactorLockoutService {
|
|
15
|
+
private readonly drizzle;
|
|
16
|
+
private readonly events;
|
|
17
|
+
private readonly identityReader;
|
|
18
|
+
private readonly config;
|
|
19
|
+
constructor({ drizzle, events, identityReader, config }: TwoFactorLockoutServiceDeps);
|
|
20
|
+
resolvePendingUserId(cookieValue: string | undefined): Promise<User['id'] | undefined>;
|
|
21
|
+
assertNotLocked(userId: User['id']): Promise<void>;
|
|
22
|
+
recordFailure(userId: User['id'], meta: ClientMeta): Promise<void>;
|
|
23
|
+
reset(userId: User['id']): Promise<void>;
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=two-factor-lockout.service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"two-factor-lockout.service.d.ts","sourceRoot":"","sources":["../../../../src/pam/identity/service/two-factor-lockout.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAErE,OAAO,KAAK,EACV,mBAAmB,EACnB,UAAU,EACV,cAAc,EACd,IAAI,EACL,MAAM,yBAAyB,CAAC;AAuBjC,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,QAAQ,CAAC;IACjB,cAAc,EAAE,cAAc,CAAC;IAC/B,MAAM,EAAE,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;CACjD,CAAC;AAEF;;;;GAIG;AACH,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;gBAErD,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,2BAA2B;IAO9E,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAatF,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA6DlE,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAU/C"}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import { eq, sql } from 'drizzle-orm';
|
|
2
|
+
import { user, verification } from '../schema/index.js';
|
|
3
|
+
import { computeLockoutTier, createAccountLockedError, isActiveLockout, } from './lockout-policy.service.js';
|
|
4
|
+
// better-auth withholds the session until the second factor clears, so a failing
|
|
5
|
+
// attempt has no session to identify. It does store the pending user id in a
|
|
6
|
+
// verification row keyed by the identifier it puts in the signed two-factor cookie
|
|
7
|
+
// (`2fa-<random>`), which is what lets the lockout follow the account rather than
|
|
8
|
+
// only the browser. Cookie value is `<identifier>.<signature>`.
|
|
9
|
+
const PENDING_2FA_IDENTIFIER_PREFIX = '2fa-';
|
|
10
|
+
function pendingIdentifier(cookieValue) {
|
|
11
|
+
if (!cookieValue) {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
const [identifier = ''] = cookieValue.split('.');
|
|
15
|
+
return identifier.startsWith(PENDING_2FA_IDENTIFIER_PREFIX) ? identifier : undefined;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Consecutive-failure lockout for the second factor, counted per account and kept in
|
|
19
|
+
* columns of its own: a second-factor lockout must not consume the password-login
|
|
20
|
+
* budget, and the two thresholds are configured independently.
|
|
21
|
+
*/
|
|
22
|
+
export class TwoFactorLockoutService {
|
|
23
|
+
drizzle;
|
|
24
|
+
events;
|
|
25
|
+
identityReader;
|
|
26
|
+
config;
|
|
27
|
+
constructor({ drizzle, events, identityReader, config }) {
|
|
28
|
+
this.drizzle = drizzle;
|
|
29
|
+
this.events = events;
|
|
30
|
+
this.identityReader = identityReader;
|
|
31
|
+
this.config = config;
|
|
32
|
+
}
|
|
33
|
+
async resolvePendingUserId(cookieValue) {
|
|
34
|
+
const identifier = pendingIdentifier(cookieValue);
|
|
35
|
+
if (!identifier) {
|
|
36
|
+
return undefined;
|
|
37
|
+
}
|
|
38
|
+
const [row] = await this.drizzle.db
|
|
39
|
+
.select({ value: verification.value })
|
|
40
|
+
.from(verification)
|
|
41
|
+
.where(eq(verification.identifier, identifier))
|
|
42
|
+
.limit(1);
|
|
43
|
+
return row?.value;
|
|
44
|
+
}
|
|
45
|
+
async assertNotLocked(userId) {
|
|
46
|
+
const [row] = await this.drizzle.db
|
|
47
|
+
.select({ lockoutUntil: user.twoFactorLockoutUntil })
|
|
48
|
+
.from(user)
|
|
49
|
+
.where(eq(user.id, userId))
|
|
50
|
+
.limit(1);
|
|
51
|
+
if (isActiveLockout(row?.lockoutUntil)) {
|
|
52
|
+
throw createAccountLockedError(row?.lockoutUntil ?? new Date());
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
async recordFailure(userId, meta) {
|
|
56
|
+
const [row] = await this.drizzle.db
|
|
57
|
+
.select({
|
|
58
|
+
failedAttempts: user.failedTwoFactorAttempts,
|
|
59
|
+
lockoutCount: user.twoFactorLockoutCount,
|
|
60
|
+
lastFailedAt: user.lastFailedTwoFactorAt,
|
|
61
|
+
})
|
|
62
|
+
.from(user)
|
|
63
|
+
.where(eq(user.id, userId))
|
|
64
|
+
.limit(1);
|
|
65
|
+
if (!row) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
const attempts = row.failedAttempts + 1;
|
|
69
|
+
const isLocking = attempts >= this.config.maxAttempts;
|
|
70
|
+
const { durationMs } = computeLockoutTier({
|
|
71
|
+
lockoutCount: row.lockoutCount,
|
|
72
|
+
lastFailedLoginAt: row.lastFailedAt,
|
|
73
|
+
nowMs: Date.now(),
|
|
74
|
+
fallbackDurationMs: this.config.durationMs,
|
|
75
|
+
});
|
|
76
|
+
const lockoutUntil = isLocking ? new Date(Date.now() + durationMs) : null;
|
|
77
|
+
await this.drizzle.db
|
|
78
|
+
.update(user)
|
|
79
|
+
.set({
|
|
80
|
+
failedTwoFactorAttempts: isLocking ? 0 : attempts,
|
|
81
|
+
lastFailedTwoFactorAt: sql `now()`,
|
|
82
|
+
...(isLocking
|
|
83
|
+
? {
|
|
84
|
+
twoFactorLockoutUntil: lockoutUntil,
|
|
85
|
+
twoFactorLockoutCount: row.lockoutCount + 1,
|
|
86
|
+
}
|
|
87
|
+
: {}),
|
|
88
|
+
})
|
|
89
|
+
.where(eq(user.id, userId));
|
|
90
|
+
const playerId = await this.identityReader.getPlayerIdByUserIdSafe(userId);
|
|
91
|
+
this.events.emit('identity.2fa.failed', {
|
|
92
|
+
userId,
|
|
93
|
+
playerId,
|
|
94
|
+
method: 'totp',
|
|
95
|
+
attemptsRemaining: isLocking ? 0 : Math.max(this.config.maxAttempts - attempts, 0),
|
|
96
|
+
ip: meta.ip ?? null,
|
|
97
|
+
userAgent: meta.userAgent ?? null,
|
|
98
|
+
});
|
|
99
|
+
if (lockoutUntil) {
|
|
100
|
+
this.events.emit('identity.2fa.lockout.triggered', {
|
|
101
|
+
userId,
|
|
102
|
+
playerId,
|
|
103
|
+
lockoutUntil: lockoutUntil.toISOString(),
|
|
104
|
+
ip: meta.ip ?? null,
|
|
105
|
+
userAgent: meta.userAgent ?? null,
|
|
106
|
+
});
|
|
107
|
+
throw createAccountLockedError(lockoutUntil);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
async reset(userId) {
|
|
111
|
+
await this.drizzle.db
|
|
112
|
+
.update(user)
|
|
113
|
+
.set({
|
|
114
|
+
failedTwoFactorAttempts: 0,
|
|
115
|
+
twoFactorLockoutUntil: null,
|
|
116
|
+
lastFailedTwoFactorAt: null,
|
|
117
|
+
})
|
|
118
|
+
.where(eq(user.id, userId));
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
//# sourceMappingURL=two-factor-lockout.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"two-factor-lockout.service.js","sourceRoot":"","sources":["../../../../src/pam/identity/service/two-factor-lockout.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ declare const _default: {
|
|
|
7
7
|
ADMIN_PERMISSION_RESOLVER: import("@openora/core/contracts").Token<import("@openora/core/contracts").AdminPermissionResolver>;
|
|
8
8
|
ADMIN_PLAYER_ACTIVITY: import("@openora/core/contracts").Token<import("@openora/core/contracts").AdminPlayerActivity>;
|
|
9
9
|
ADMIN_ROLE_ASSIGNMENT_DIRECTORY: import("@openora/core/contracts").Token<import("@openora/core/contracts").AdminRoleAssignmentDirectory>;
|
|
10
|
+
ADMIN_SECURITY_POLICY: import("@openora/core/contracts").Token<import("@openora/core/contracts").AdminSecurityPolicy>;
|
|
10
11
|
ADMIN_USER_DIRECTORY: import("@openora/core/contracts").Token<import("@openora/core/contracts").AdminUserDirectory>;
|
|
11
12
|
ADMIN_WALLET_REPORTING: import("@openora/core/contracts").Token<import("@openora/core/contracts").AdminWalletReporting>;
|
|
12
13
|
AUDIT_WRITER: import("@openora/core/contracts").SealedToken<import("@openora/core/contracts").AuditWritePort>;
|
|
@@ -81,6 +82,16 @@ declare const _default: {
|
|
|
81
82
|
chat: {
|
|
82
83
|
allowedAttachmentHosts: string[];
|
|
83
84
|
};
|
|
85
|
+
adminSecurity: {
|
|
86
|
+
requireTwoFactor: boolean;
|
|
87
|
+
bindSessionToDevice: boolean;
|
|
88
|
+
trustedDeviceDays: number;
|
|
89
|
+
ipChangePolicy: "any" | "country" | "off";
|
|
90
|
+
twoFactorLockout: {
|
|
91
|
+
maxAttempts: number;
|
|
92
|
+
durationMs: number;
|
|
93
|
+
};
|
|
94
|
+
};
|
|
84
95
|
activeBrand?: string | undefined;
|
|
85
96
|
kyc?: {
|
|
86
97
|
gateWithdrawals: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/pam/player-management/plugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/pam/player-management/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,wBAa8C"}
|