@zlooks.cn/password-auth-server 1.0.9 → 1.1.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/.hile-rsc/{build-mu2ebvjj-b7c71e74/client-browser/src-plugin-password-form-3bd63d69e5-4TOGMUOJ.js → build-mu41ll5m-02df9102/client-browser/src-plugin-password-form-3bd63d69e5-MO3JJSBS.js} +92 -86
- package/.hile-rsc/{build-mu2ebvjj-b7c71e74/client-ssr/src-plugin-password-form-3bd63d69e5-S65T2FFP.js → build-mu41ll5m-02df9102/client-ssr/src-plugin-password-form-3bd63d69e5-MWQ7H3E5.js} +92 -86
- package/.hile-rsc/{build-mu2ebvjj-b7c71e74 → build-mu41ll5m-02df9102}/plugin.json +9 -9
- package/.hile-rsc/{build-mu2ebvjj-b7c71e74 → build-mu41ll5m-02df9102}/server-rsc/index.js +94 -88
- package/dist/password/password-authenticator.d.ts +4 -1
- package/dist/password/password-authenticator.d.ts.map +1 -1
- package/dist/password/password-authenticator.js +62 -9
- package/dist/password/password-authenticator.js.map +1 -1
- package/dist/password/typeorm-credential-repository.d.ts.map +1 -1
- package/dist/password/typeorm-credential-repository.js +11 -46
- package/dist/password/typeorm-credential-repository.js.map +1 -1
- package/dist/persistence/entities.d.ts +1 -12
- package/dist/persistence/entities.d.ts.map +1 -1
- package/dist/persistence/entities.js +0 -16
- package/dist/persistence/entities.js.map +1 -1
- package/dist/services/application.service.d.ts.map +1 -1
- package/dist/services/application.service.js +2 -1
- package/dist/services/application.service.js.map +1 -1
- package/dist/services/password-runtime.service.d.ts.map +1 -1
- package/dist/services/password-runtime.service.js +7 -17
- package/dist/services/password-runtime.service.js.map +1 -1
- package/package.json +8 -6
- package/dist/password/credential-lifecycle-outbox.d.ts +0 -42
- package/dist/password/credential-lifecycle-outbox.d.ts.map +0 -1
- package/dist/password/credential-lifecycle-outbox.js +0 -120
- package/dist/password/credential-lifecycle-outbox.js.map +0 -1
- /package/.hile-rsc/{build-mu2ebvjj-b7c71e74 → build-mu41ll5m-02df9102}/client-browser/chunks/chunk-ZV6MPT36.js +0 -0
- /package/.hile-rsc/{build-mu2ebvjj-b7c71e74 → build-mu41ll5m-02df9102}/client-browser/src-plugin-page-frame-07c4de56a6-24L24OGL.js +0 -0
- /package/.hile-rsc/{build-mu2ebvjj-b7c71e74 → build-mu41ll5m-02df9102}/client-browser/src-plugin-page-frame-07c4de56a6-3F24AYCH.css +0 -0
- /package/.hile-rsc/{build-mu2ebvjj-b7c71e74 → build-mu41ll5m-02df9102}/client-browser/src-plugin-password-form-3bd63d69e5-TRYMJX4F.css +0 -0
- /package/.hile-rsc/{build-mu2ebvjj-b7c71e74 → build-mu41ll5m-02df9102}/client-ssr/chunks/chunk-EWBYMJX4.js +0 -0
- /package/.hile-rsc/{build-mu2ebvjj-b7c71e74 → build-mu41ll5m-02df9102}/client-ssr/src-plugin-page-frame-07c4de56a6-LN2W67ZP.js +0 -0
- /package/.hile-rsc/{build-mu2ebvjj-b7c71e74 → build-mu41ll5m-02df9102}/styles/4b3193c4f2b317ffed425ccf401342a4bdd6ccfd5f9c42def3315e776f166975.css +0 -0
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { DomainEventPublisher } from '@zlooks.cn/event-client';
|
|
1
2
|
import type { PasswordAuthConfig } from '../config/schema.js';
|
|
2
3
|
import type { PasswordCredentialRepository } from './credential-repository.js';
|
|
3
4
|
import type { PasswordAttemptCoordinator } from './attempt-coordinator.js';
|
|
@@ -25,8 +26,9 @@ export declare class PasswordAuthenticator {
|
|
|
25
26
|
private readonly unknownCredentialHash;
|
|
26
27
|
private readonly clock;
|
|
27
28
|
private readonly attemptCoordinator?;
|
|
29
|
+
private readonly lifecycleEvents?;
|
|
28
30
|
private constructor();
|
|
29
|
-
static create(repository: PasswordCredentialRepository, policy: PasswordPolicy, clock?: () => Date, attemptCoordinator?: PasswordAttemptCoordinator): Promise<PasswordAuthenticator>;
|
|
31
|
+
static create(repository: PasswordCredentialRepository, policy: PasswordPolicy, clock?: () => Date, attemptCoordinator?: PasswordAttemptCoordinator, lifecycleEvents?: DomainEventPublisher): Promise<PasswordAuthenticator>;
|
|
30
32
|
register(input: {
|
|
31
33
|
readonly identifier: string;
|
|
32
34
|
readonly password: string;
|
|
@@ -53,6 +55,7 @@ export declare class PasswordAuthenticator {
|
|
|
53
55
|
readonly identifier: string;
|
|
54
56
|
readonly password: string;
|
|
55
57
|
}): Promise<VerificationResult>;
|
|
58
|
+
private publishLifecycleEvent;
|
|
56
59
|
}
|
|
57
60
|
export declare function normalizeEmailIdentifier(value: string): string | undefined;
|
|
58
61
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-authenticator.d.ts","sourceRoot":"","sources":["../../src/password/password-authenticator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"password-authenticator.d.ts","sourceRoot":"","sources":["../../src/password/password-authenticator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,26 @@
|
|
|
1
1
|
import { randomBytes, randomUUID } from 'node:crypto';
|
|
2
2
|
import { hash, verify } from '@node-rs/argon2';
|
|
3
|
+
import { createUserCredentialLifecycleDomainEvent, USER_CREDENTIAL_LIFECYCLE_PROTOCOL, } from '@zlooks.cn/user-shared';
|
|
3
4
|
import { z } from 'zod';
|
|
5
|
+
import { PASSWORD_AUTH_EXTENSION_ID, PASSWORD_AUTH_METHOD_ID, } from '../service-identity.js';
|
|
4
6
|
export class PasswordAuthenticator {
|
|
5
7
|
repository;
|
|
6
8
|
policy;
|
|
7
9
|
unknownCredentialHash;
|
|
8
10
|
clock;
|
|
9
11
|
attemptCoordinator;
|
|
10
|
-
|
|
12
|
+
lifecycleEvents;
|
|
13
|
+
constructor(repository, policy, unknownCredentialHash, clock, attemptCoordinator, lifecycleEvents) {
|
|
11
14
|
this.repository = repository;
|
|
12
15
|
this.policy = policy;
|
|
13
16
|
this.unknownCredentialHash = unknownCredentialHash;
|
|
14
17
|
this.clock = clock;
|
|
15
18
|
this.attemptCoordinator = attemptCoordinator;
|
|
19
|
+
this.lifecycleEvents = lifecycleEvents;
|
|
16
20
|
}
|
|
17
|
-
static async create(repository, policy, clock = () => new Date(), attemptCoordinator) {
|
|
21
|
+
static async create(repository, policy, clock = () => new Date(), attemptCoordinator, lifecycleEvents) {
|
|
18
22
|
const unknownCredentialHash = await hash(randomBytes(32), argonOptions(policy));
|
|
19
|
-
return new PasswordAuthenticator(repository, policy, unknownCredentialHash, clock, attemptCoordinator);
|
|
23
|
+
return new PasswordAuthenticator(repository, policy, unknownCredentialHash, clock, attemptCoordinator, lifecycleEvents);
|
|
20
24
|
}
|
|
21
25
|
async register(input) {
|
|
22
26
|
const identifier = normalizeEmailIdentifier(input.identifier);
|
|
@@ -98,9 +102,17 @@ export class PasswordAuthenticator {
|
|
|
98
102
|
const operation = async () => {
|
|
99
103
|
const existing = await this.repository.findByIdentifier(identifier);
|
|
100
104
|
if (existing?.registrationTransactionId === input.transactionId) {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
105
|
+
if (!await verify(existing.passwordHash, input.password).catch(() => false)) {
|
|
106
|
+
return { ok: false, code: 'registration-rejected' };
|
|
107
|
+
}
|
|
108
|
+
await this.publishLifecycleEvent({
|
|
109
|
+
transactionId: input.transactionId,
|
|
110
|
+
kind: 'registration',
|
|
111
|
+
subject: existing.subject,
|
|
112
|
+
identifier,
|
|
113
|
+
occurredAt: requiredLifecycleTime(existing.emailVerifiedAt, 'registration'),
|
|
114
|
+
});
|
|
115
|
+
return { ok: true, subject: existing.subject, identifier };
|
|
104
116
|
}
|
|
105
117
|
if (existing) {
|
|
106
118
|
return { ok: false, code: 'registration-rejected' };
|
|
@@ -125,6 +137,13 @@ export class PasswordAuthenticator {
|
|
|
125
137
|
const credential = await this.repository.findByIdentifier(identifier);
|
|
126
138
|
if (!credential)
|
|
127
139
|
throw new Error('Created password credential is unavailable');
|
|
140
|
+
await this.publishLifecycleEvent({
|
|
141
|
+
transactionId: input.transactionId,
|
|
142
|
+
kind: 'registration',
|
|
143
|
+
subject: credential.subject,
|
|
144
|
+
identifier,
|
|
145
|
+
occurredAt: now,
|
|
146
|
+
});
|
|
128
147
|
return { ok: true, subject: credential.subject, identifier };
|
|
129
148
|
};
|
|
130
149
|
return this.attemptCoordinator ? this.attemptCoordinator.run(identifier, operation) : operation();
|
|
@@ -147,9 +166,17 @@ export class PasswordAuthenticator {
|
|
|
147
166
|
if (!credential)
|
|
148
167
|
return { ok: false, code: 'invalid-credentials' };
|
|
149
168
|
if (credential.passwordChangedTransactionId === input.transactionId) {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
169
|
+
if (!await verify(credential.passwordHash, input.password).catch(() => false)) {
|
|
170
|
+
return { ok: false, code: 'invalid-credentials' };
|
|
171
|
+
}
|
|
172
|
+
await this.publishLifecycleEvent({
|
|
173
|
+
transactionId: input.transactionId,
|
|
174
|
+
kind: 'recovery',
|
|
175
|
+
subject: credential.subject,
|
|
176
|
+
identifier,
|
|
177
|
+
occurredAt: requiredLifecycleTime(credential.passwordChangedAt, 'recovery'),
|
|
178
|
+
});
|
|
179
|
+
return { ok: true, subject: credential.subject, identifier, emailVerified: true };
|
|
153
180
|
}
|
|
154
181
|
const changedAt = this.clock();
|
|
155
182
|
await this.repository.updatePasswordWithLifecycleEvent(identifier, await hash(input.password, argonOptions(this.policy)), changedAt, {
|
|
@@ -159,10 +186,36 @@ export class PasswordAuthenticator {
|
|
|
159
186
|
identifier,
|
|
160
187
|
occurredAt: changedAt,
|
|
161
188
|
});
|
|
189
|
+
await this.publishLifecycleEvent({
|
|
190
|
+
transactionId: input.transactionId,
|
|
191
|
+
kind: 'recovery',
|
|
192
|
+
subject: credential.subject,
|
|
193
|
+
identifier,
|
|
194
|
+
occurredAt: changedAt,
|
|
195
|
+
});
|
|
162
196
|
return { ok: true, subject: credential.subject, identifier, emailVerified: true };
|
|
163
197
|
};
|
|
164
198
|
return this.attemptCoordinator ? this.attemptCoordinator.run(identifier, operation) : operation();
|
|
165
199
|
}
|
|
200
|
+
async publishLifecycleEvent(event) {
|
|
201
|
+
if (!this.lifecycleEvents)
|
|
202
|
+
return;
|
|
203
|
+
await this.lifecycleEvents.publish(createUserCredentialLifecycleDomainEvent({
|
|
204
|
+
protocol: USER_CREDENTIAL_LIFECYCLE_PROTOCOL,
|
|
205
|
+
kind: event.kind,
|
|
206
|
+
authenticationTransactionId: event.transactionId,
|
|
207
|
+
extensionId: PASSWORD_AUTH_EXTENSION_ID,
|
|
208
|
+
methodId: PASSWORD_AUTH_METHOD_ID,
|
|
209
|
+
subject: event.subject,
|
|
210
|
+
email: event.identifier,
|
|
211
|
+
occurredAt: event.occurredAt.toISOString(),
|
|
212
|
+
}));
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
function requiredLifecycleTime(value, kind) {
|
|
216
|
+
if (!value)
|
|
217
|
+
throw new Error(`Password ${kind} lifecycle time is unavailable`);
|
|
218
|
+
return value;
|
|
166
219
|
}
|
|
167
220
|
function argonOptions(policy) {
|
|
168
221
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-authenticator.js","sourceRoot":"","sources":["../../src/password/password-authenticator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"password-authenticator.js","sourceRoot":"","sources":["../../src/password/password-authenticator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-credential-repository.d.ts","sourceRoot":"","sources":["../../src/password/typeorm-credential-repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"typeorm-credential-repository.d.ts","sourceRoot":"","sources":["../../src/password/typeorm-credential-repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAElD,OAAO,KAAK,EACV,kBAAkB,EAClB,gCAAgC,EAChC,4BAA4B,EAC7B,MAAM,4BAA4B,CAAC;AAEpC,qBAAa,mCAAoC,YAAW,4BAA4B;IACnE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAA9C,YAAoC,UAAU,EAAE,UAAU,EAAI;IAEjD,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAiBzF;IAEY,MAAM,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBpE;IAEY,wBAAwB,CACnC,UAAU,EAAE,kBAAkB,EAC9B,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,OAAO,CAAC,CAElB;IAEY,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAMhF;IAEY,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5D;IAEY,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAKlF;IAEY,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAYpG;IAEY,gCAAgC,CAC3C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,IAAI,EACf,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,IAAI,CAAC,CAaf;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IsNull } from 'typeorm';
|
|
2
|
-
import { PasswordCredentialEntity
|
|
2
|
+
import { PasswordCredentialEntity } from '../persistence/entities.js';
|
|
3
3
|
export class TypeOrmPasswordCredentialRepository {
|
|
4
4
|
dataSource;
|
|
5
5
|
constructor(dataSource) {
|
|
@@ -45,28 +45,7 @@ export class TypeOrmPasswordCredentialRepository {
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
async createWithLifecycleEvent(credential, event) {
|
|
48
|
-
|
|
49
|
-
await this.dataSource.transaction(async (manager) => {
|
|
50
|
-
await manager.getRepository(PasswordCredentialEntity).insert({
|
|
51
|
-
subject: credential.subject,
|
|
52
|
-
identifier: credential.identifier,
|
|
53
|
-
passwordHash: credential.passwordHash,
|
|
54
|
-
failedAttempts: 0,
|
|
55
|
-
lockedUntil: null,
|
|
56
|
-
emailVerifiedAt: credential.emailVerifiedAt ?? null,
|
|
57
|
-
passwordChangedAt: credential.passwordChangedAt ?? null,
|
|
58
|
-
registrationTransactionId: event.transactionId,
|
|
59
|
-
passwordChangedTransactionId: credential.passwordChangedTransactionId ?? null,
|
|
60
|
-
});
|
|
61
|
-
await manager.getRepository(PasswordCredentialLifecycleOutboxEntity).insert(toOutboxRow(event));
|
|
62
|
-
});
|
|
63
|
-
return true;
|
|
64
|
-
}
|
|
65
|
-
catch (error) {
|
|
66
|
-
if (isUniqueViolation(error))
|
|
67
|
-
return false;
|
|
68
|
-
throw error;
|
|
69
|
-
}
|
|
48
|
+
return this.create({ ...credential, registrationTransactionId: event.transactionId });
|
|
70
49
|
}
|
|
71
50
|
async recordFailure(identifier, lockedUntil) {
|
|
72
51
|
await this.dataSource.transaction(async (manager) => {
|
|
@@ -93,32 +72,18 @@ export class TypeOrmPasswordCredentialRepository {
|
|
|
93
72
|
});
|
|
94
73
|
}
|
|
95
74
|
async updatePasswordWithLifecycleEvent(identifier, passwordHash, changedAt, event) {
|
|
96
|
-
await this.dataSource.
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
passwordChangedTransactionId: event.transactionId,
|
|
104
|
-
});
|
|
105
|
-
if (updated.affected !== 1)
|
|
106
|
-
throw new Error('Password credential is unavailable');
|
|
107
|
-
await manager.getRepository(PasswordCredentialLifecycleOutboxEntity).insert(toOutboxRow(event));
|
|
75
|
+
const updated = await this.dataSource.getRepository(PasswordCredentialEntity).update({ identifier }, {
|
|
76
|
+
passwordHash,
|
|
77
|
+
passwordChangedAt: changedAt,
|
|
78
|
+
emailVerifiedAt: changedAt,
|
|
79
|
+
failedAttempts: 0,
|
|
80
|
+
lockedUntil: null,
|
|
81
|
+
passwordChangedTransactionId: event.transactionId,
|
|
108
82
|
});
|
|
83
|
+
if (updated.affected !== 1)
|
|
84
|
+
throw new Error('Password credential is unavailable');
|
|
109
85
|
}
|
|
110
86
|
}
|
|
111
|
-
function toOutboxRow(event) {
|
|
112
|
-
return {
|
|
113
|
-
transactionId: event.transactionId,
|
|
114
|
-
kind: event.kind,
|
|
115
|
-
subject: event.subject,
|
|
116
|
-
identifier: event.identifier,
|
|
117
|
-
occurredAt: event.occurredAt,
|
|
118
|
-
attempts: 0,
|
|
119
|
-
nextAttemptAt: event.occurredAt,
|
|
120
|
-
};
|
|
121
|
-
}
|
|
122
87
|
function isUniqueViolation(error) {
|
|
123
88
|
return typeof error === 'object' && error !== null && 'code' in error && error.code === '23505';
|
|
124
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-credential-repository.js","sourceRoot":"","sources":["../../src/password/typeorm-credential-repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmB,MAAM,SAAS,CAAC;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"typeorm-credential-repository.js","sourceRoot":"","sources":["../../src/password/typeorm-credential-repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmB,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAOtE,MAAM,OAAO,mCAAmC;IACV,UAAU;IAA9C,YAAoC,UAAsB;0BAAtB,UAAU;IAAe,CAAC;IAEvD,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QAC9C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QACpG,OAAO,GAAG,CAAC,CAAC,CAAC;YACX,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxE,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9E,GAAG,CAAC,GAAG,CAAC,yBAAyB;gBAC/B,CAAC,CAAC,EAAE,yBAAyB,EAAE,GAAG,CAAC,yBAAyB,EAAE;gBAC9D,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,GAAG,CAAC,4BAA4B;gBAClC,CAAC,CAAC,EAAE,4BAA4B,EAAE,GAAG,CAAC,4BAA4B,EAAE;gBACpE,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,UAA8B;QAChD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC,MAAM,CAAC;gBACnE,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,YAAY,EAAE,UAAU,CAAC,YAAY;gBACrC,cAAc,EAAE,CAAC;gBACjB,WAAW,EAAE,IAAI;gBACjB,eAAe,EAAE,UAAU,CAAC,eAAe,IAAI,IAAI;gBACnD,iBAAiB,EAAE,UAAU,CAAC,iBAAiB,IAAI,IAAI;gBACvD,yBAAyB,EAAE,UAAU,CAAC,yBAAyB,IAAI,IAAI;gBACvE,4BAA4B,EAAE,UAAU,CAAC,4BAA4B,IAAI,IAAI;aAC9E,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,iBAAiB,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YAC3C,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,wBAAwB,CACnC,UAA8B,EAC9B,KAAuC;QAEvC,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,UAAU,EAAE,yBAAyB,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC;IACxF,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,UAAkB,EAAE,WAAkB;QAC/D,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAClD,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC;YACnE,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;YAChE,IAAI,WAAW;gBAAE,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,UAAkB;QAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC,MAAM,CAClE,EAAE,UAAU,EAAE,EACd,EAAE,cAAc,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CACzC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,UAAkB,EAAE,UAAgB;QACjE,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC,MAAM,CAClE,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,EACzC,EAAE,eAAe,EAAE,UAAU,EAAE,CAChC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,UAAkB,EAAE,YAAoB,EAAE,SAAe;QACnF,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC,MAAM,CAClE,EAAE,UAAU,EAAE,EACd;YACE,YAAY;YACZ,iBAAiB,EAAE,SAAS;YAC5B,eAAe,EAAE,SAAS;YAC1B,4BAA4B,EAAE,IAAI;YAClC,cAAc,EAAE,CAAC;YACjB,WAAW,EAAE,IAAI;SAClB,CACF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,gCAAgC,CAC3C,UAAkB,EAClB,YAAoB,EACpB,SAAe,EACf,KAAuC;QAEvC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC,MAAM,CAClF,EAAE,UAAU,EAAE,EACd;YACE,YAAY;YACZ,iBAAiB,EAAE,SAAS;YAC5B,eAAe,EAAE,SAAS;YAC1B,cAAc,EAAE,CAAC;YACjB,WAAW,EAAE,IAAI;YACjB,4BAA4B,EAAE,KAAK,CAAC,aAAa;SAClD,CACF,CAAC;QACF,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACpF,CAAC;CACF;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC;AAClG,CAAC"}
|
|
@@ -13,17 +13,6 @@ export interface PasswordCredentialRow {
|
|
|
13
13
|
updatedAt: Date;
|
|
14
14
|
version: number;
|
|
15
15
|
}
|
|
16
|
-
export interface PasswordCredentialLifecycleOutboxRow {
|
|
17
|
-
transactionId: string;
|
|
18
|
-
kind: 'registration' | 'recovery';
|
|
19
|
-
subject: string;
|
|
20
|
-
identifier: string;
|
|
21
|
-
occurredAt: Date;
|
|
22
|
-
attempts: number;
|
|
23
|
-
nextAttemptAt: Date;
|
|
24
|
-
createdAt: Date;
|
|
25
|
-
}
|
|
26
16
|
export declare const PasswordCredentialEntity: EntitySchema<PasswordCredentialRow>;
|
|
27
|
-
export declare const
|
|
28
|
-
export declare const passwordAuthEntities: readonly [EntitySchema<PasswordCredentialRow>, EntitySchema<PasswordCredentialLifecycleOutboxRow>];
|
|
17
|
+
export declare const passwordAuthEntities: readonly [EntitySchema<PasswordCredentialRow>];
|
|
29
18
|
//# sourceMappingURL=entities.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entities.d.ts","sourceRoot":"","sources":["../../src/persistence/entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,IAAI,GAAG,IAAI,CAAC;IAC7B,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAC;IAC/B,yBAAyB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,4BAA4B,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,
|
|
1
|
+
{"version":3,"file":"entities.d.ts","sourceRoot":"","sources":["../../src/persistence/entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,IAAI,GAAG,IAAI,CAAC;IAC7B,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAC;IAC/B,yBAAyB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,4BAA4B,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,wBAAwB,qCA2BnC,CAAC;AAEH,eAAO,MAAM,oBAAoB,gDAEvB,CAAC"}
|
|
@@ -27,23 +27,7 @@ export const PasswordCredentialEntity = new EntitySchema({
|
|
|
27
27
|
version: { type: 'integer', version: true },
|
|
28
28
|
},
|
|
29
29
|
});
|
|
30
|
-
export const PasswordCredentialLifecycleOutboxEntity = new EntitySchema({
|
|
31
|
-
name: 'PasswordCredentialLifecycleOutbox',
|
|
32
|
-
tableName: 'password_credential_lifecycle_outbox',
|
|
33
|
-
columns: {
|
|
34
|
-
transactionId: { name: 'transaction_id', type: 'uuid', primary: true },
|
|
35
|
-
kind: { type: 'varchar', length: 16 },
|
|
36
|
-
subject: { type: 'uuid' },
|
|
37
|
-
identifier: { type: 'varchar', length: 320 },
|
|
38
|
-
occurredAt: { name: 'occurred_at', type: 'timestamptz' },
|
|
39
|
-
attempts: { type: 'integer', default: 0 },
|
|
40
|
-
nextAttemptAt: { name: 'next_attempt_at', type: 'timestamptz' },
|
|
41
|
-
createdAt: { name: 'created_at', type: 'timestamptz', createDate: true },
|
|
42
|
-
},
|
|
43
|
-
indices: [{ name: 'idx_password_credential_lifecycle_due', columns: ['nextAttemptAt'] }],
|
|
44
|
-
});
|
|
45
30
|
export const passwordAuthEntities = [
|
|
46
31
|
PasswordCredentialEntity,
|
|
47
|
-
PasswordCredentialLifecycleOutboxEntity,
|
|
48
32
|
];
|
|
49
33
|
//# sourceMappingURL=entities.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/persistence/entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/persistence/entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAiBvC,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,YAAY,CAAwB;IAC9E,IAAI,EAAE,oBAAoB;IAC1B,SAAS,EAAE,sBAAsB;IACjC,OAAO,EAAE;QACP,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QACxC,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE;QAC1D,YAAY,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE;QACrD,cAAc,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE;QACxE,WAAW,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC1E,eAAe,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE;QACnF,iBAAiB,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvF,yBAAyB,EAAE;YACzB,IAAI,EAAE,6BAA6B;YACnC,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,IAAI;SACf;QACD,4BAA4B,EAAE;YAC5B,IAAI,EAAE,iCAAiC;YACvC,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE;QACxE,SAAS,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE;QACxE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;KAC5C;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,wBAAwB;CAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.service.d.ts","sourceRoot":"","sources":["../../src/services/application.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"application.service.d.ts","sourceRoot":"","sources":["../../src/services/application.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { fileURLToPath } from 'node:url';
|
|
1
2
|
import { defineService } from '@hile/core';
|
|
2
3
|
import { Application } from '@hile/micro';
|
|
3
4
|
import { parseAdvertiseHost, parseRegistryBootstrap, } from '@zlooks.cn/registry-config';
|
|
@@ -14,7 +15,7 @@ export default defineService('zlooks.password-auth.application', async (shutdown
|
|
|
14
15
|
registry,
|
|
15
16
|
...(advertiseHost ? { advertiseHost } : {}),
|
|
16
17
|
});
|
|
17
|
-
await application.load(new URL('../messages', import.meta.url)
|
|
18
|
+
await application.load(fileURLToPath(new URL('../messages', import.meta.url)));
|
|
18
19
|
const microPort = await detect();
|
|
19
20
|
shutdown(await application.listen(microPort));
|
|
20
21
|
return { application, registry, advertiseHost };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../src/services/application.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,+BAA+B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,eAAe,aAAa,CAAC,kCAAkC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IAClF,MAAM,QAAQ,GAAG,sBAAsB,CAAC;QACtC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;QACxC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;KACzC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;QAClC,SAAS,EAAE,+BAA+B;QAC1C,QAAQ;QACR,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5C,CAAC,CAAC;IACH,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../src/services/application.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,+BAA+B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,eAAe,aAAa,CAAC,kCAAkC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IAClF,MAAM,QAAQ,GAAG,sBAAsB,CAAC;QACtC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;QACxC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;KACzC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;QAClC,SAAS,EAAE,+BAA+B;QAC1C,QAAQ;QACR,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5C,CAAC,CAAC;IACH,MAAM,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/E,MAAM,SAAS,GAAG,MAAM,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,MAAM,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAW,CAAC;AAC3D,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-runtime.service.d.ts","sourceRoot":"","sources":["../../src/services/password-runtime.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"password-runtime.service.d.ts","sourceRoot":"","sources":["../../src/services/password-runtime.service.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { randomBytes } from 'node:crypto';
|
|
2
2
|
import { fileURLToPath } from 'node:url';
|
|
3
|
+
import { createExecutionContext } from '@hile/context';
|
|
3
4
|
import { defineService, loadService } from '@hile/core';
|
|
4
5
|
import { Application } from '@hile/micro';
|
|
5
6
|
import { HILE_RSC_RUNTIME } from '@hile/rsc/protocol';
|
|
@@ -7,11 +8,11 @@ import { RscArtifactServerFunctionRuntime, RscPluginService, createOfficialRscRe
|
|
|
7
8
|
import { resolveVerifiedRscPluginArtifact } from '@hile/rsc/artifact';
|
|
8
9
|
import { HileRscPluginRuntime, resolveHileRscPluginIdentity, } from '@hile/rsc-discovery-hile';
|
|
9
10
|
import { detect } from 'detect-port';
|
|
11
|
+
import { ContextualEventPublisher, EventClient } from '@zlooks.cn/event-client';
|
|
10
12
|
import { PasswordAuthenticator } from '../password/password-authenticator.js';
|
|
11
13
|
import { RedisPasswordAttemptCoordinator } from '../password/attempt-coordinator.js';
|
|
12
14
|
import { RedisVerificationCodeRateLimiter } from '../email/verification-code-rate-limiter.js';
|
|
13
15
|
import { TypeOrmPasswordCredentialRepository } from '../password/typeorm-credential-repository.js';
|
|
14
|
-
import { PasswordCredentialLifecyclePublisher, TypeOrmPasswordCredentialLifecycleOutboxStore, } from '../password/credential-lifecycle-outbox.js';
|
|
15
16
|
import { AuthAnnouncementPublisher } from '../runtime/auth-announcement-publisher.js';
|
|
16
17
|
import { PasswordAuthRuntime } from '../runtime/password-auth-runtime.js';
|
|
17
18
|
import { RedisPasswordTransactionStateStore } from '../runtime/password-state-store.js';
|
|
@@ -21,7 +22,7 @@ import databaseService from './database.service.js';
|
|
|
21
22
|
import emailService from './email.service.js';
|
|
22
23
|
import loggerService from './logger.service.js';
|
|
23
24
|
import redisService from './redis.service.js';
|
|
24
|
-
import { PASSWORD_AUTH_PLUGIN_ID } from '../service-identity.js';
|
|
25
|
+
import { PASSWORD_AUTH_PLUGIN_ID, PASSWORD_AUTH_SERVICE_NAMESPACE, } from '../service-identity.js';
|
|
25
26
|
export default defineService('zlooks.password-auth.runtime', async (shutdown) => {
|
|
26
27
|
const [applicationRuntime, configSubscriber, database, redis, logger, email] = await Promise.all([
|
|
27
28
|
loadService(applicationService),
|
|
@@ -34,7 +35,8 @@ export default defineService('zlooks.password-auth.runtime', async (shutdown) =>
|
|
|
34
35
|
const { application } = applicationRuntime;
|
|
35
36
|
const config = configSubscriber.snapshot();
|
|
36
37
|
const runtimeInstanceId = `${config.discovery.instanceId.slice(0, 110)}-${randomBytes(8).toString('hex')}`;
|
|
37
|
-
const
|
|
38
|
+
const events = new EventClient(application);
|
|
39
|
+
const authenticator = await PasswordAuthenticator.create(new TypeOrmPasswordCredentialRepository(database), config.password, () => new Date(), new RedisPasswordAttemptCoordinator(redis, config.verification.hmacKey), new ContextualEventPublisher(events, () => createExecutionContext({ source: PASSWORD_AUTH_SERVICE_NAMESPACE })));
|
|
38
40
|
const authentication = new PasswordAuthRuntime(authenticator, new RedisPasswordTransactionStateStore(redis), () => new Date(), {
|
|
39
41
|
config: config.verification,
|
|
40
42
|
sender: email,
|
|
@@ -46,17 +48,6 @@ export default defineService('zlooks.password-auth.runtime', async (shutdown) =>
|
|
|
46
48
|
}, 'Password verification email delivery failed'),
|
|
47
49
|
rateLimiter: new RedisVerificationCodeRateLimiter(redis, config.verification.maxSendsPerEmailPerHour, config.verification.hmacKey),
|
|
48
50
|
});
|
|
49
|
-
const credentialLifecyclePublisher = new PasswordCredentialLifecyclePublisher({
|
|
50
|
-
application,
|
|
51
|
-
redis,
|
|
52
|
-
store: new TypeOrmPasswordCredentialLifecycleOutboxStore(database),
|
|
53
|
-
onError: (error, event) => logger.error({
|
|
54
|
-
err: error,
|
|
55
|
-
event: 'password-auth.credential-lifecycle.publish-failed',
|
|
56
|
-
authenticationTransactionId: event?.transactionId,
|
|
57
|
-
lifecycleKind: event?.kind,
|
|
58
|
-
}, 'Password credential lifecycle publication failed'),
|
|
59
|
-
});
|
|
60
51
|
const artifactBuildRoot = fileURLToPath(new URL('../../.hile-rsc', import.meta.url));
|
|
61
52
|
const { artifactRoot, manifest } = await resolveVerifiedRscPluginArtifact(artifactBuildRoot, HILE_RSC_RUNTIME);
|
|
62
53
|
if (manifest.pluginId !== PASSWORD_AUTH_PLUGIN_ID) {
|
|
@@ -113,15 +104,14 @@ export default defineService('zlooks.password-auth.runtime', async (shutdown) =>
|
|
|
113
104
|
try {
|
|
114
105
|
await announcement.start();
|
|
115
106
|
await rsc.start();
|
|
116
|
-
credentialLifecyclePublisher.start();
|
|
117
107
|
}
|
|
118
108
|
catch (error) {
|
|
119
|
-
await Promise.allSettled([
|
|
109
|
+
await Promise.allSettled([events.close(), announcement.close(), rsc.close()]);
|
|
120
110
|
throw error;
|
|
121
111
|
}
|
|
122
112
|
shutdown(async () => {
|
|
123
113
|
const results = await Promise.allSettled([
|
|
124
|
-
|
|
114
|
+
events.close(),
|
|
125
115
|
rsc.close(),
|
|
126
116
|
announcement.close(),
|
|
127
117
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-runtime.service.js","sourceRoot":"","sources":["../../src/services/password-runtime.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,gCAAgC,EAChC,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EACL,oBAAoB,EACpB,4BAA4B,GAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,gCAAgC,EAAE,MAAM,4CAA4C,CAAC;AAC9F,OAAO,EAAE,mCAAmC,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,
|
|
1
|
+
{"version":3,"file":"password-runtime.service.js","sourceRoot":"","sources":["../../src/services/password-runtime.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zlooks.cn/password-auth-server",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -16,7 +16,9 @@
|
|
|
16
16
|
"zlooks": {
|
|
17
17
|
"kind": "service",
|
|
18
18
|
"description": "密码认证扩展服务",
|
|
19
|
-
"dependsOn": [
|
|
19
|
+
"dependsOn": [
|
|
20
|
+
"@zlooks.cn/event-server"
|
|
21
|
+
],
|
|
20
22
|
"nodeConditions": [
|
|
21
23
|
"react-server"
|
|
22
24
|
],
|
|
@@ -52,17 +54,17 @@
|
|
|
52
54
|
"@hile/reloader": "3.0.4",
|
|
53
55
|
"@hile/rsc": "1.0.24",
|
|
54
56
|
"@hile/rsc-discovery-hile": "1.0.21",
|
|
55
|
-
"@hile/schedule": "4.0.5",
|
|
56
57
|
"@hile/typeorm": "4.0.3",
|
|
57
58
|
"@node-rs/argon2": "2.1.0",
|
|
58
59
|
"@zlooks.cn/auth-extension-contract": "1.0.2",
|
|
59
60
|
"@zlooks.cn/database-command": "1.0.5",
|
|
61
|
+
"@zlooks.cn/event-client": "1.1.0",
|
|
60
62
|
"@zlooks.cn/global-config-shared": "1.0.2",
|
|
61
63
|
"@zlooks.cn/infrastructure": "1.0.0",
|
|
62
64
|
"@zlooks.cn/registry-config": "1.0.1",
|
|
63
65
|
"@zlooks.cn/service-command": "1.0.3",
|
|
64
|
-
"@zlooks.cn/ui": "1.0
|
|
65
|
-
"@zlooks.cn/user-shared": "1.0
|
|
66
|
+
"@zlooks.cn/ui": "1.1.0",
|
|
67
|
+
"@zlooks.cn/user-shared": "1.1.0",
|
|
66
68
|
"@zlooks.cn/utils": "1.0.0",
|
|
67
69
|
"antd": "6.6.1",
|
|
68
70
|
"detect-port": "2.1.0",
|
|
@@ -87,5 +89,5 @@
|
|
|
87
89
|
"typescript": "7.0.2",
|
|
88
90
|
"vitest": "4.1.11"
|
|
89
91
|
},
|
|
90
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "0bc8e75106dc91dc532581e4d6ca2a93bcecac04"
|
|
91
93
|
}
|
|
@@ -1,42 +0,0 @@
|
|
|
1
|
-
import { type ExecutionContext } from '@hile/context';
|
|
2
|
-
import type { Redis } from 'ioredis';
|
|
3
|
-
import { type DataSource } from 'typeorm';
|
|
4
|
-
import { type PasswordCredentialLifecycleOutboxRow } from '../persistence/entities.js';
|
|
5
|
-
export type PendingCredentialLifecycleEvent = Readonly<Pick<PasswordCredentialLifecycleOutboxRow, 'transactionId' | 'kind' | 'subject' | 'identifier' | 'occurredAt' | 'attempts'>>;
|
|
6
|
-
export interface PasswordCredentialLifecycleOutboxStore {
|
|
7
|
-
readDue(now: Date, limit: number): Promise<readonly PendingCredentialLifecycleEvent[]>;
|
|
8
|
-
acknowledge(transactionId: string): Promise<void>;
|
|
9
|
-
recordFailure(transactionId: string, attempts: number, nextAttemptAt: Date): Promise<void>;
|
|
10
|
-
}
|
|
11
|
-
export interface CredentialLifecycleMicroCaller {
|
|
12
|
-
call(namespace: string, operation: string, data: unknown, options: Readonly<{
|
|
13
|
-
context: ExecutionContext;
|
|
14
|
-
timeout: number;
|
|
15
|
-
retries: number;
|
|
16
|
-
signal: AbortSignal;
|
|
17
|
-
}>): Promise<unknown>;
|
|
18
|
-
}
|
|
19
|
-
export declare class TypeOrmPasswordCredentialLifecycleOutboxStore implements PasswordCredentialLifecycleOutboxStore {
|
|
20
|
-
private readonly dataSource;
|
|
21
|
-
constructor(dataSource: DataSource);
|
|
22
|
-
readDue(now: Date, limit: number): Promise<readonly PendingCredentialLifecycleEvent[]>;
|
|
23
|
-
acknowledge(transactionId: string): Promise<void>;
|
|
24
|
-
recordFailure(transactionId: string, attempts: number, nextAttemptAt: Date): Promise<void>;
|
|
25
|
-
}
|
|
26
|
-
export declare class PasswordCredentialLifecyclePublisher {
|
|
27
|
-
#private;
|
|
28
|
-
private readonly options;
|
|
29
|
-
constructor(options: {
|
|
30
|
-
readonly application: CredentialLifecycleMicroCaller;
|
|
31
|
-
readonly redis: Redis;
|
|
32
|
-
readonly store: PasswordCredentialLifecycleOutboxStore;
|
|
33
|
-
readonly clock?: () => Date;
|
|
34
|
-
readonly onError?: (error: unknown, event?: PendingCredentialLifecycleEvent) => void;
|
|
35
|
-
});
|
|
36
|
-
start(): void;
|
|
37
|
-
close(): Promise<void>;
|
|
38
|
-
flush(): Promise<void>;
|
|
39
|
-
private runFlush;
|
|
40
|
-
private publish;
|
|
41
|
-
}
|
|
42
|
-
//# sourceMappingURL=credential-lifecycle-outbox.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"credential-lifecycle-outbox.d.ts","sourceRoot":"","sources":["../../src/password/credential-lifecycle-outbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAS9E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAEL,KAAK,oCAAoC,EAC1C,MAAM,4BAA4B,CAAC;AAMpC,MAAM,MAAM,+BAA+B,GAAG,QAAQ,CAAC,IAAI,CACzD,oCAAoC,EACpC,eAAe,GAAG,MAAM,GAAG,SAAS,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAChF,CAAC,CAAC;AAEH,MAAM,WAAW,sCAAsC;IACrD,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,+BAA+B,EAAE,CAAC,CAAC;IACvF,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5F;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,CACF,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,CAAC;QAChB,OAAO,EAAE,gBAAgB,CAAC;QAC1B,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,WAAW,CAAC;KACrB,CAAC,GACD,OAAO,CAAC,OAAO,CAAC,CAAC;CACrB;AAED,qBAAa,6CACb,YAAW,sCAAsC;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAA9C,YAAoC,UAAU,EAAE,UAAU,EAAI;IAEjD,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,+BAA+B,EAAE,CAAC,CAclG;IAEY,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7D;IAEY,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAKtG;CACF;AAED,qBAAa,oCAAoC;;IAO5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAA3C,YAAoC,OAAO,EAAE;QAC3C,QAAQ,CAAC,WAAW,EAAE,8BAA8B,CAAC;QACrD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QACtB,QAAQ,CAAC,KAAK,EAAE,sCAAsC,CAAC;QACvD,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;QAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,+BAA+B,KAAK,IAAI,CAAC;KACtF,EAEA;IAEM,KAAK,IAAI,IAAI,CAanB;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAKlC;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CASlC;YAEa,QAAQ;YAeR,OAAO;CAmCtB"}
|