@haneinfo/identity-core 4.6.12 → 4.6.13
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 +6 -0
- package/agent-guide.md +1 -1
- package/dist/email-match.d.ts +3 -0
- package/dist/email-match.d.ts.map +1 -0
- package/dist/email-match.js +8 -0
- package/dist/email-match.js.map +1 -0
- package/dist/frontend/import-users-logic.js +1 -1
- package/dist/frontend/import-users-logic.js.map +1 -1
- package/dist/identity-store.service.d.ts.map +1 -1
- package/dist/identity-store.service.js +10 -2
- package/dist/identity-store.service.js.map +1 -1
- package/dist/users/users-import.service.d.ts.map +1 -1
- package/dist/users/users-import.service.js +9 -6
- package/dist/users/users-import.service.js.map +1 -1
- package/dist/users/users.service.d.ts +1 -0
- package/dist/users/users.service.d.ts.map +1 -1
- package/dist/users/users.service.js +12 -6
- package/dist/users/users.service.js.map +1 -1
- package/package.json +7 -6
- package/scripts/check-email-duplicates.sql +7 -0
package/README.md
CHANGED
|
@@ -20,3 +20,9 @@ each exactly { id, name }, with nullable name, ordered by name then id. Percent,
|
|
|
20
20
|
backslash are literal search characters. There is no email/role disclosure, cursor or bulk export,
|
|
21
21
|
and no new MCP tool. The existing identity-store keyset search keeps its id ordering; only this
|
|
22
22
|
controller requests the concrete implementation's optional name sorting.
|
|
23
|
+
|
|
24
|
+
## Email matching preflight
|
|
25
|
+
|
|
26
|
+
Before enabling this version, run `psql -X -v ON_ERROR_STOP=1 -f node_modules/@haneinfo/identity-core/scripts/check-email-duplicates.sql` against the target database with a read-only account. Configure the connection with standard PostgreSQL client settings. The SELECT prints existing case-insensitive duplicate emails to standard output; it does not write files, merge accounts, or modify data. Resolve duplicates manually before enabling authentication. Protect the output as personal data and do not redirect it to logs or files.
|
|
27
|
+
|
|
28
|
+
New users are stored with lowercase email. Lookup ignores case and rejects ambiguous matches, including during import. Existing rows are not rewritten. The existing case-sensitive unique constraint cannot prevent an external writer from concurrently inserting mixed-case duplicates; all writers must follow this policy and operators should repeat the preflight as needed.
|
package/agent-guide.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# identity-core
|
|
2
2
|
|
|
3
|
-
## Human picker lookup (
|
|
3
|
+
## Human picker lookup (decision 202610-e2a9)
|
|
4
4
|
|
|
5
5
|
GET /identity/users/lookup?q= is available to every interactively authenticated person. A trimmed
|
|
6
6
|
2–200 character query matches literal active names, returns at most twenty { id, name } entries
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"email-match.d.ts","sourceRoot":"","sources":["../src/email-match.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEzD"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.literalEmailPattern = literalEmailPattern;
|
|
4
|
+
/** Escape PostgreSQL LIKE wildcards in a case-insensitive Prisma email comparison. */
|
|
5
|
+
function literalEmailPattern(email) {
|
|
6
|
+
return email.replace(/[\\%_]/g, '\\$&');
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=email-match.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"email-match.js","sourceRoot":"","sources":["../src/email-match.ts"],"names":[],"mappings":";;AACA,kDAEC;AAHD,sFAAsF;AACtF,SAAgB,mBAAmB,CAAC,KAAa;IAC/C,OAAO,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -40,7 +40,7 @@ function checkImportFile(file) {
|
|
|
40
40
|
* text from the uploaded file back out, so those cells are neutralised (OWASP "CSV injection").
|
|
41
41
|
*/
|
|
42
42
|
function csvCell(value) {
|
|
43
|
-
const safe = /^[=+\-@\t\r]/.test(value) ? `'${value}` : value;
|
|
43
|
+
const safe = /^[=+\-@\t\r\n]/.test(value) ? `'${value}` : value;
|
|
44
44
|
return /[",\r\n]/.test(safe) ? `"${safe.replace(/"/g, '""')}"` : safe;
|
|
45
45
|
}
|
|
46
46
|
/** The BOM makes Excel open a UTF-8 file as UTF-8 instead of guessing the local code page. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-users-logic.js","sourceRoot":"","sources":["../../src/frontend/import-users-logic.ts"],"names":[],"mappings":";;;AAaA,wCAMC;AAID,0CAIC;AAcD,4CAOC;AAID,oCAEC;AAWD,kCAEC;AAED,0BAEC;AAGD,wCAwBC;AAED,0CAGC;AAED,sCAGC;AAED,kCAcC;AAGD,4CASC;AArID,2DAAiE;AAEjE,sGAAsG;AACzF,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAE5C;;;;GAIG;AACH,SAAgB,cAAc,CAAC,MAAmB;IAChD,IAAI,CAAC;QACH,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAID,SAAgB,eAAe,CAAC,IAAoC;IAClE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACjD,IAAI,IAAI,CAAC,IAAI,GAAG,6BAAqB;QAAE,OAAO,WAAW,CAAC;IAC1D,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAS,OAAO,CAAC,KAAa;IAC5B,MAAM,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"import-users-logic.js","sourceRoot":"","sources":["../../src/frontend/import-users-logic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-store.service.d.ts","sourceRoot":"","sources":["../src/identity-store.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EACV,wBAAwB,EACxB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"identity-store.service.d.ts","sourceRoot":"","sources":["../src/identity-store.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EACV,wBAAwB,EACxB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAIxE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAWrD;;;;;;;;;;;;;GAaG;AACH,qBACa,oBAAqB,YAAW,iBAAiB;IAEnC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACX,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;IAGrE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBALM,MAAM,EAAE,aAAa,EACtB,KAAK,EAAE,YAAY,EACR,kBAAkB,CAAC,EAAE,cAAc,YAAA,EAGpE,gBAAgB,CAAC,GAAE,MAAM,cAAc,GAAG,SAAS,aAAA;IAGtE,OAAO,KAAK,UAAU,GAErB;IAED,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAI9C,oBAAoB,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,OAAO;IASxE,kBAAkB,CAChB,KAAK,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,EAC9F,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE,CAAC;IAgB3C,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAUhE,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAItE,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAKhE,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAK5E;;;;OAIG;IACG,MAAM,CAAC,KAAK,EAAE,mBAAmB,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;IAoBxF;;;;;OAKG;IACG,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;YAwBtB,SAAS;CAMxB"}
|
|
@@ -16,6 +16,7 @@ exports.IdentityStoreService = void 0;
|
|
|
16
16
|
const common_1 = require("@haneinfo/common");
|
|
17
17
|
const plugin_api_1 = require("@haneinfo/plugin-api");
|
|
18
18
|
const common_2 = require("@nestjs/common");
|
|
19
|
+
const email_match_1 = require("./email-match");
|
|
19
20
|
const role_policy_lookup_1 = require("./role-policy-lookup");
|
|
20
21
|
const users_service_1 = require("./users/users.service");
|
|
21
22
|
const IDENTITY_FIELDS = {
|
|
@@ -77,8 +78,15 @@ let IdentityStoreService = class IdentityStoreService {
|
|
|
77
78
|
select: { id: true, name: true },
|
|
78
79
|
});
|
|
79
80
|
}
|
|
80
|
-
findByEmail(email) {
|
|
81
|
-
|
|
81
|
+
async findByEmail(email) {
|
|
82
|
+
const matches = await this.prisma.user.findMany({
|
|
83
|
+
where: { email: { equals: (0, email_match_1.literalEmailPattern)(email), mode: 'insensitive' } },
|
|
84
|
+
select: IDENTITY_FIELDS,
|
|
85
|
+
take: 2,
|
|
86
|
+
});
|
|
87
|
+
if (matches.length > 1)
|
|
88
|
+
throw new common_2.ConflictException('Ambiguous email identity');
|
|
89
|
+
return matches[0] ?? null;
|
|
82
90
|
}
|
|
83
91
|
findByEmployeeNumber(employeeNumber) {
|
|
84
92
|
return this.prisma.user.findUnique({ where: { employeeNumber }, select: IDENTITY_FIELDS });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-store.service.js","sourceRoot":"","sources":["../src/identity-store.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiD;AAQjD,qDAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"identity-store.service.js","sourceRoot":"","sources":["../src/identity-store.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-import.service.d.ts","sourceRoot":"","sources":["../../src/users/users-import.service.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"users-import.service.d.ts","sourceRoot":"","sources":["../../src/users/users-import.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAc,KAAK,aAAa,EAAuB,MAAM,sBAAsB,CAAC;AAW3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE,OAAO,EAAyB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEtE,yDAAyD;AACzD,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC;AAE7F;;;GAGG;AACH,MAAM,MAAM,aAAa,GACrB,SAAS,GACT,OAAO,GACP,WAAW,GACX,UAAU,GACV,yBAAyB,GACzB,yBAAyB,GACzB,eAAe,GACf,eAAe,GACf,mBAAmB,GACnB,oBAAoB,GACpB,+BAA+B,GAC/B,iCAAiC,GACjC,WAAW,GACX,QAAQ,CAAC;AAEb,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7D,IAAI,EAAE,eAAe,EAAE,CAAC;CACzB;AAeD,KAAK,KAAK,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAU7C;;;;;;;;;;GAUG;AACH,qBACa,kBAAkB;IAIJ,OAAO,CAAC,QAAQ,CAAC,MAAM;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACd,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAN7D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;gBAGpB,MAAM,EAAE,aAAa,EACtB,KAAK,EAAE,YAAY,EACX,aAAa,EAAE,oBAAoB,EACjC,SAAS,CAAC,EAAE,aAAa,YAAA;IAGtE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAwBpF,OAAO,CAAC,KAAK;IAyDb,OAAO,CAAC,QAAQ;YAWF,KAAK;IAgEnB,0FAA0F;YAC5E,QAAQ;IAItB,OAAO,CAAC,eAAe;IAIvB,iGAAiG;IACjG,OAAO,CAAC,kBAAkB;YAIZ,MAAM;CAqBrB"}
|
|
@@ -19,6 +19,7 @@ const common_1 = require("@haneinfo/common");
|
|
|
19
19
|
const plugin_api_1 = require("@haneinfo/plugin-api");
|
|
20
20
|
const common_2 = require("@nestjs/common");
|
|
21
21
|
const zod_1 = require("zod");
|
|
22
|
+
const email_match_1 = require("../email-match");
|
|
22
23
|
const identity_store_service_1 = require("../identity-store.service");
|
|
23
24
|
const csv_1 = require("./csv");
|
|
24
25
|
const user_dto_1 = require("./dto/user.dto");
|
|
@@ -145,16 +146,20 @@ let UsersImportService = UsersImportService_1 = class UsersImportService {
|
|
|
145
146
|
async apply(row, dryRun, actor) {
|
|
146
147
|
const result = (status, code) => this.toResult(row, status, code);
|
|
147
148
|
try {
|
|
148
|
-
const [byNumber,
|
|
149
|
+
const [byNumber, emailMatches] = await Promise.all([
|
|
149
150
|
this.prisma.user.findFirst({
|
|
150
151
|
where: { employeeNumber: row.employeeNumber },
|
|
151
152
|
select: { id: true },
|
|
152
153
|
}),
|
|
153
|
-
this.prisma.user.
|
|
154
|
-
|
|
154
|
+
this.prisma.user.findMany({
|
|
155
|
+
take: 2,
|
|
156
|
+
where: { email: { equals: (0, email_match_1.literalEmailPattern)(row.email), mode: 'insensitive' } },
|
|
155
157
|
select: { id: true, isActive: true, name: true, employeeNumber: true },
|
|
156
158
|
}),
|
|
157
159
|
]);
|
|
160
|
+
if (emailMatches.length > 1)
|
|
161
|
+
return result('conflict', 'RACE_LOST');
|
|
162
|
+
const byEmail = emailMatches[0];
|
|
158
163
|
// The number belongs to someone the row's email does not point at.
|
|
159
164
|
if (byNumber && byNumber.id !== byEmail?.id) {
|
|
160
165
|
return result('conflict', 'EMPLOYEE_NUMBER_HELD_BY_OTHER');
|
|
@@ -193,9 +198,7 @@ let UsersImportService = UsersImportService_1 = class UsersImportService {
|
|
|
193
198
|
return result('bind', 'BOUND');
|
|
194
199
|
}
|
|
195
200
|
catch (error) {
|
|
196
|
-
if (error instanceof common_2.ConflictException ||
|
|
197
|
-
(error instanceof common_1.Prisma.PrismaClientKnownRequestError &&
|
|
198
|
-
error.code === 'P2002')) {
|
|
201
|
+
if (error instanceof common_2.ConflictException || (0, users_service_1.isPrismaErrorWithCode)(error, 'P2002')) {
|
|
199
202
|
return result('conflict', 'RACE_LOST');
|
|
200
203
|
}
|
|
201
204
|
this.logger.warn(`Import row ${row.line} failed: ${String(error)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-import.service.js","sourceRoot":"","sources":["../../src/users/users-import.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"users-import.service.js","sourceRoot":"","sources":["../../src/users/users-import.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type PaginationQuery, PrismaService } from '@haneinfo/common';
|
|
2
2
|
import { type RbacPolicyPort } from '@haneinfo/plugin-api';
|
|
3
3
|
import type { ServiceAccountQuery, UpdateUserDto } from './dto/user.dto';
|
|
4
|
+
export declare function isPrismaErrorWithCode(error: unknown, code: string): boolean;
|
|
4
5
|
/**
|
|
5
6
|
* Users CRUD, owned by `identity-core` (PL0-04 section 2).
|
|
6
7
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.service.d.ts","sourceRoot":"","sources":["../../src/users/users.service.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"users.service.d.ts","sourceRoot":"","sources":["../../src/users/users.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,aAAa,EAId,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAe,KAAK,cAAc,EAAkB,MAAM,sBAAsB,CAAC;AAWxF,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAiCzE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE3E;AAED;;;;;;;;;;;;;;;GAeG;AACH,qBACa,YAAY;IAEE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACb,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;IAGrE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAJM,MAAM,EAAE,aAAa,EACX,kBAAkB,CAAC,EAAE,cAAc,YAAA,EAGpE,gBAAgB,CAAC,GAAE,MAAM,cAAc,GAAG,SAAS,aAAA;IAGtE,OAAO,KAAK,UAAU,GAErB;IAED,OAAO,CAAC,WAAW;YASL,SAAS;IAKvB;;;;;;OAMG;IACG,MAAM,CACV,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;KACpB,EACD,WAAW,CAAC,EAAE,aAAa;;;;;;;YAjFzB,MAAM;eACH,MAAM;cACP,MAAM,GAAG,IAAI;kBACT,OAAO;0BACC,OAAO;wBACT,MAAM,GAAG,IAAI;mBAClB,IAAI;;;YANX,MAAM;eACH,MAAM;cACP,MAAM,GAAG,IAAI;kBACT,OAAO;0BACC,OAAO;wBACT,MAAM,GAAG,IAAI;mBAClB,IAAI;;IA6IT,OAAO,CAAC,KAAK,EAAE,eAAe;IAqBpC;;;;OAIG;IACG,mBAAmB,CAAC,KAAK,EAAE,mBAAmB;IA0B9C,QAAQ,CAAC,EAAE,EAAE,MAAM;;;;;;;YAvMrB,MAAM;eACH,MAAM;cACP,MAAM,GAAG,IAAI;kBACT,OAAO;0BACC,OAAO;wBACT,MAAM,GAAG,IAAI;mBAClB,IAAI;;IAuMT,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa;;;;;;;YA7MvC,MAAM;eACH,MAAM;cACP,MAAM,GAAG,IAAI;kBACT,OAAO;0BACC,OAAO;wBACT,MAAM,GAAG,IAAI;mBAClB,IAAI;;IA6MT,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;;;;;;;YAnN3C,MAAM;eACH,MAAM;cACP,MAAM,GAAG,IAAI;kBACT,OAAO;0BACC,OAAO;wBACT,MAAM,GAAG,IAAI;mBAClB,IAAI;;IAmNT,MAAM,CAAC,EAAE,EAAE,MAAM;CAcxB"}
|
|
@@ -13,9 +13,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.UsersService = void 0;
|
|
16
|
+
exports.isPrismaErrorWithCode = isPrismaErrorWithCode;
|
|
16
17
|
const common_1 = require("@haneinfo/common");
|
|
17
18
|
const plugin_api_1 = require("@haneinfo/plugin-api");
|
|
18
19
|
const common_2 = require("@nestjs/common");
|
|
20
|
+
const email_match_1 = require("../email-match");
|
|
19
21
|
const role_policy_lookup_1 = require("../role-policy-lookup");
|
|
20
22
|
const SORTABLE = ['name', 'email', 'createdAt'];
|
|
21
23
|
const PUBLIC_FIELDS = {
|
|
@@ -35,6 +37,9 @@ function publicRole(role) {
|
|
|
35
37
|
permissionPolicy: role.permissionPolicy,
|
|
36
38
|
};
|
|
37
39
|
}
|
|
40
|
+
function isPrismaErrorWithCode(error, code) {
|
|
41
|
+
return (0, common_1.isPrismaErrorCode)(error, code);
|
|
42
|
+
}
|
|
38
43
|
/**
|
|
39
44
|
* Users CRUD, owned by `identity-core` (PL0-04 section 2).
|
|
40
45
|
*
|
|
@@ -79,7 +84,10 @@ let UsersService = class UsersService {
|
|
|
79
84
|
*/
|
|
80
85
|
async create(data, transaction) {
|
|
81
86
|
const client = transaction ?? this.prisma;
|
|
82
|
-
const
|
|
87
|
+
const email = data.email.toLowerCase();
|
|
88
|
+
const existing = await client.user.findFirst({
|
|
89
|
+
where: { email: { equals: (0, email_match_1.literalEmailPattern)(email), mode: 'insensitive' } },
|
|
90
|
+
});
|
|
83
91
|
if (existing)
|
|
84
92
|
throw new common_2.ConflictException('Email already registered');
|
|
85
93
|
if (data.employeeNumber) {
|
|
@@ -93,7 +101,7 @@ let UsersService = class UsersService {
|
|
|
93
101
|
const roleIds = data.roleIds && data.roleIds.length > 0
|
|
94
102
|
? data.roleIds
|
|
95
103
|
: await (this.rbacPolicy?.defaultRoleIds() ?? Promise.resolve([]));
|
|
96
|
-
const {
|
|
104
|
+
const { name, employeeNumber, isServiceAccount } = data;
|
|
97
105
|
try {
|
|
98
106
|
const createUser = (client) => client.user.create({
|
|
99
107
|
data: { email, name, employeeNumber, isServiceAccount },
|
|
@@ -120,8 +128,7 @@ let UsersService = class UsersService {
|
|
|
120
128
|
return transaction ? { ...user, roles: [] } : this.withRoles(user);
|
|
121
129
|
}
|
|
122
130
|
catch (error) {
|
|
123
|
-
if (error
|
|
124
|
-
error.code === 'P2002') {
|
|
131
|
+
if (isPrismaErrorWithCode(error, 'P2002')) {
|
|
125
132
|
// Two concurrent callers (e.g. JIT provisioning racing on the same OIDC
|
|
126
133
|
// identity's first login) both pass the findUnique pre-check above and reach
|
|
127
134
|
// this create() — the loser hits the DB's unique constraint on email instead of
|
|
@@ -206,8 +213,7 @@ let UsersService = class UsersService {
|
|
|
206
213
|
await this.prisma.user.delete({ where: { id } });
|
|
207
214
|
}
|
|
208
215
|
catch (error) {
|
|
209
|
-
if (error
|
|
210
|
-
error.code === 'P2003') {
|
|
216
|
+
if (isPrismaErrorWithCode(error, 'P2003')) {
|
|
211
217
|
throw new common_2.ConflictException('This user still has records referencing them elsewhere in the system and cannot be permanently deleted. Deactivate the account instead.');
|
|
212
218
|
}
|
|
213
219
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../src/users/users.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../src/users/users.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@haneinfo/identity-core",
|
|
3
|
-
"version": "4.6.
|
|
3
|
+
"version": "4.6.13",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Provider-neutral user and service-account identity for Haneinfo apps: the User model, Users CRUD and the haneinfo.identity-store capability.",
|
|
6
6
|
"files": [
|
|
7
7
|
"dist",
|
|
8
8
|
"prisma",
|
|
9
|
+
"scripts/check-email-duplicates.sql",
|
|
9
10
|
"haneinfo.plugin.json",
|
|
10
11
|
"plugin.js",
|
|
11
12
|
"plugin.d.ts",
|
|
@@ -36,10 +37,10 @@
|
|
|
36
37
|
},
|
|
37
38
|
"dependencies": {
|
|
38
39
|
"@haneinfo/frontend-shell": "1.6.0",
|
|
39
|
-
"@haneinfo/plugin-api": "1.
|
|
40
|
+
"@haneinfo/plugin-api": "1.27.0"
|
|
40
41
|
},
|
|
41
42
|
"peerDependencies": {
|
|
42
|
-
"@haneinfo/common": "^0.
|
|
43
|
+
"@haneinfo/common": "^0.6.1",
|
|
43
44
|
"@haneinfo/frontend-shell": "^1.1.0",
|
|
44
45
|
"@haneinfo/plugin-host-nest": "^2.0.0",
|
|
45
46
|
"@nestjs/common": "^11.0.0",
|
|
@@ -77,10 +78,10 @@
|
|
|
77
78
|
"typescript": "^5.9.3",
|
|
78
79
|
"vitest": "^4.1.11",
|
|
79
80
|
"zod": "^4.4.0",
|
|
80
|
-
"@haneinfo/common": "0.5.0",
|
|
81
|
-
"@haneinfo/plugin-host-nest": "2.1.0",
|
|
82
81
|
"@haneinfo/frontend-shell": "1.6.0",
|
|
83
|
-
"@haneinfo/
|
|
82
|
+
"@haneinfo/common": "0.6.1",
|
|
83
|
+
"@haneinfo/plugin-host-nest": "2.1.1",
|
|
84
|
+
"@haneinfo/plugin-testkit": "2.3.1"
|
|
84
85
|
},
|
|
85
86
|
"license": "UNLICENSED",
|
|
86
87
|
"publishConfig": {
|