@haneinfo/identity-core 4.6.18 → 4.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -26,3 +26,13 @@ controller requests the concrete implementation's optional name sorting.
26
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
27
 
28
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.
29
+
30
+ ## Default roles and CSV `roles` column
31
+
32
+ **Behavior change:** Creating a user without explicit `roleIds` (manual `UsersService.create`, OIDC JIT via `IdentityStoreService.create`, and CSV import with an empty `roles` cell) no longer assigns `USER` (`SYSTEM_USER_ROLE`) by default. Apps that want default roles must declare `defaultRoleNames` in `@haneinfo/rbac` (`configRef: "rbac"`); to keep the previous behavior, set `defaultRoleNames: ["USER"]`.
33
+
34
+ CSV import (`UsersImportService`) supports an optional `roles` column (aliases: `role`, `roles`, `角色`), with multiple role machine names separated by `;`. When creating a new user:
35
+
36
+ - Non-empty values are validated via `RbacPolicyPort.resolveImportRoleIds` (failing closed with `ROLES_UNSUPPORTED` if missing, or `ROLE_NOT_ASSIGNABLE` if any role is `ADMIN` or unknown).
37
+ - Empty cells fall back to the App's declared `defaultRoleIds()`.
38
+ - For existing users (`bind` or `skip`), roles are never modified and non-empty cells are flagged with `ROLES_IGNORED_FOR_EXISTING_USER`.
@@ -1 +1 @@
1
- {"version":3,"file":"import-users-logic.d.ts","sourceRoot":"","sources":["../../src/frontend/import-users-logic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;IAClF,iBAAiB,EAAE,QAAQ;CAC5B,CAAC;AACF,OAAO,EAAc,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEjE,sGAAsG;AACtG,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAE5C;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAM1D;AAED,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,WAAW,CAAC;AAExD,wBAAgB,eAAe,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,iBAAiB,GAAG,IAAI,CAI9F;AAcD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAOvD;AAED,eAAO,MAAM,gBAAgB,4CAA6C,CAAC;AAE3E,wBAAgB,YAAY,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAEzD;AAWD,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,MAAM,CAErF;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,cAAc,GAAG,MAAM,CAEpE;AAED,oFAAoF;AACpF,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,CAwB9E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,mBAAmB;;;;EAG1D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAGjE;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,mBAAmB,GAC1B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAWxC;AAED,0CAA0C;AAC1C,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CASxE"}
1
+ {"version":3,"file":"import-users-logic.d.ts","sourceRoot":"","sources":["../../src/frontend/import-users-logic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;IAClF,iBAAiB,EAAE,QAAQ;CAC5B,CAAC;AACF,OAAO,EAAc,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEjE,sGAAsG;AACtG,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAE5C;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAM1D;AAED,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,WAAW,CAAC;AAExD,wBAAgB,eAAe,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,iBAAiB,GAAG,IAAI,CAI9F;AAcD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAOvD;AAED,eAAO,MAAM,gBAAgB,4CAA6C,CAAC;AAE3E,wBAAgB,YAAY,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAEzD;AAWD,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,MAAM,CAErF;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,cAAc,GAAG,MAAM,CAIpE;AAED,oFAAoF;AACpF,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,CAwB9E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,mBAAmB;;;;EAG1D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAGjE;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,mBAAmB,GAC1B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAWxC;AAED,0CAA0C;AAC1C,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CASxE"}
@@ -68,7 +68,9 @@ function statusLabel(text, status) {
68
68
  return text[STATUS_KEY[status]];
69
69
  }
70
70
  function noteFor(text, row) {
71
- return text[`code.${row.code}`];
71
+ const base = text[`code.${row.code}`];
72
+ const detail = row.detail;
73
+ return detail ? `${base}: ${detail}` : base;
72
74
  }
73
75
  /** Rows that were not applied, in the shape the person can fix and upload again. */
74
76
  function buildReportCsv(rows, text) {
@@ -1 +1 @@
1
- {"version":3,"file":"import-users-logic.js","sourceRoot":"","sources":["../../src/frontend/import-users-logic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"import-users-logic.js","sourceRoot":"","sources":["../../src/frontend/import-users-logic.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@
6
6
  * Locales mirror `@haneinfo/frontend-shell`'s `locales`; anything else falls back to Traditional
7
7
  * Chinese, the default locale.
8
8
  */
9
- export type UsersTextKey = 'actions' | 'employeeNumber' | 'employeeNumberHint' | 'errEmployeeNumberTaken' | 'errEmailTaken' | 'createDesc' | 'importButton' | 'importTitle' | 'importDescription' | 'dropTitle' | 'dropTitleActive' | 'dropHint' | 'chooseFile' | 'downloadTemplate' | 'formatTitle' | 'formatBody' | 'rulesTitle' | 'ruleFillOnly' | 'ruleNoDisable' | 'ruleRole' | 'reading' | 'previewing' | 'importing' | 'fileTooLarge' | 'notCsv' | 'readFailed' | 'requestFailed' | 'previewTitle' | 'previewCount' | 'filterAll' | 'statusCreate' | 'statusBind' | 'statusSkip' | 'statusInactive' | 'statusConflict' | 'statusError' | 'colLine' | 'colEmployeeNumber' | 'colEmail' | 'colName' | 'colStatus' | 'colNote' | 'noRowsMatch' | 'willApply' | 'willSkip' | 'nothingToApply' | 'confirmImport' | 'chooseAnother' | 'cancel' | 'close' | 'downloadReport' | 'doneTitle' | 'doneBody' | 'doneWithProblems' | 'code.CREATED' | 'code.BOUND' | 'code.UNCHANGED' | 'code.INACTIVE' | 'code.MISSING_EMPLOYEE_NUMBER' | 'code.INVALID_EMPLOYEE_NUMBER' | 'code.MISSING_EMAIL' | 'code.INVALID_EMAIL' | 'code.DUPLICATE_IN_FILE' | 'code.WRONG_COLUMN_COUNT' | 'code.EMPLOYEE_NUMBER_HELD_BY_OTHER' | 'code.EMAIL_HAS_OTHER_EMPLOYEE_NUMBER' | 'code.RACE_LOST' | 'code.FAILED';
9
+ export type UsersTextKey = 'actions' | 'employeeNumber' | 'employeeNumberHint' | 'errEmployeeNumberTaken' | 'errEmailTaken' | 'createDesc' | 'importButton' | 'importTitle' | 'importDescription' | 'dropTitle' | 'dropTitleActive' | 'dropHint' | 'chooseFile' | 'downloadTemplate' | 'formatTitle' | 'formatBody' | 'rulesTitle' | 'ruleFillOnly' | 'ruleNoDisable' | 'ruleRole' | 'reading' | 'previewing' | 'importing' | 'fileTooLarge' | 'notCsv' | 'readFailed' | 'requestFailed' | 'previewTitle' | 'previewCount' | 'filterAll' | 'statusCreate' | 'statusBind' | 'statusSkip' | 'statusInactive' | 'statusConflict' | 'statusError' | 'colLine' | 'colEmployeeNumber' | 'colEmail' | 'colName' | 'colStatus' | 'colNote' | 'noRowsMatch' | 'willApply' | 'willSkip' | 'nothingToApply' | 'confirmImport' | 'chooseAnother' | 'cancel' | 'close' | 'downloadReport' | 'doneTitle' | 'doneBody' | 'doneWithProblems' | 'code.CREATED' | 'code.BOUND' | 'code.UNCHANGED' | 'code.INACTIVE' | 'code.MISSING_EMPLOYEE_NUMBER' | 'code.INVALID_EMPLOYEE_NUMBER' | 'code.MISSING_EMAIL' | 'code.INVALID_EMAIL' | 'code.DUPLICATE_IN_FILE' | 'code.WRONG_COLUMN_COUNT' | 'code.EMPLOYEE_NUMBER_HELD_BY_OTHER' | 'code.EMAIL_HAS_OTHER_EMPLOYEE_NUMBER' | 'code.RACE_LOST' | 'code.FAILED' | 'code.ROLES_IGNORED_FOR_EXISTING_USER' | 'code.ROLES_UNSUPPORTED' | 'code.ROLE_NOT_ASSIGNABLE';
10
10
  export type UsersText = Record<UsersTextKey, string>;
11
11
  export declare function usersText(locale: string): UsersText;
12
12
  /** Fills `{name}` placeholders. A placeholder with no value is left visible rather than dropped. */
@@ -1 +1 @@
1
- {"version":3,"file":"users-messages.d.ts","sourceRoot":"","sources":["../../src/frontend/users-messages.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GACpB,SAAS,GACT,gBAAgB,GAChB,oBAAoB,GACpB,wBAAwB,GACxB,eAAe,GACf,YAAY,GACZ,cAAc,GACd,aAAa,GACb,mBAAmB,GACnB,WAAW,GACX,iBAAiB,GACjB,UAAU,GACV,YAAY,GACZ,kBAAkB,GAClB,aAAa,GACb,YAAY,GACZ,YAAY,GACZ,cAAc,GACd,eAAe,GACf,UAAU,GACV,SAAS,GACT,YAAY,GACZ,WAAW,GACX,cAAc,GACd,QAAQ,GACR,YAAY,GACZ,eAAe,GACf,cAAc,GACd,cAAc,GACd,WAAW,GACX,cAAc,GACd,YAAY,GACZ,YAAY,GACZ,gBAAgB,GAChB,gBAAgB,GAChB,aAAa,GACb,SAAS,GACT,mBAAmB,GACnB,UAAU,GACV,SAAS,GACT,WAAW,GACX,SAAS,GACT,aAAa,GACb,WAAW,GACX,UAAU,GACV,gBAAgB,GAChB,eAAe,GACf,eAAe,GACf,QAAQ,GACR,OAAO,GACP,gBAAgB,GAChB,WAAW,GACX,UAAU,GACV,kBAAkB,GAClB,cAAc,GACd,YAAY,GACZ,gBAAgB,GAChB,eAAe,GACf,8BAA8B,GAC9B,8BAA8B,GAC9B,oBAAoB,GACpB,oBAAoB,GACpB,wBAAwB,GACxB,yBAAyB,GACzB,oCAAoC,GACpC,sCAAsC,GACtC,gBAAgB,GAChB,aAAa,CAAC;AAElB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AA0JrD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAEnD;AAED,oGAAoG;AACpG,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM,CAI5F"}
1
+ {"version":3,"file":"users-messages.d.ts","sourceRoot":"","sources":["../../src/frontend/users-messages.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GACpB,SAAS,GACT,gBAAgB,GAChB,oBAAoB,GACpB,wBAAwB,GACxB,eAAe,GACf,YAAY,GACZ,cAAc,GACd,aAAa,GACb,mBAAmB,GACnB,WAAW,GACX,iBAAiB,GACjB,UAAU,GACV,YAAY,GACZ,kBAAkB,GAClB,aAAa,GACb,YAAY,GACZ,YAAY,GACZ,cAAc,GACd,eAAe,GACf,UAAU,GACV,SAAS,GACT,YAAY,GACZ,WAAW,GACX,cAAc,GACd,QAAQ,GACR,YAAY,GACZ,eAAe,GACf,cAAc,GACd,cAAc,GACd,WAAW,GACX,cAAc,GACd,YAAY,GACZ,YAAY,GACZ,gBAAgB,GAChB,gBAAgB,GAChB,aAAa,GACb,SAAS,GACT,mBAAmB,GACnB,UAAU,GACV,SAAS,GACT,WAAW,GACX,SAAS,GACT,aAAa,GACb,WAAW,GACX,UAAU,GACV,gBAAgB,GAChB,eAAe,GACf,eAAe,GACf,QAAQ,GACR,OAAO,GACP,gBAAgB,GAChB,WAAW,GACX,UAAU,GACV,kBAAkB,GAClB,cAAc,GACd,YAAY,GACZ,gBAAgB,GAChB,eAAe,GACf,8BAA8B,GAC9B,8BAA8B,GAC9B,oBAAoB,GACpB,oBAAoB,GACpB,wBAAwB,GACxB,yBAAyB,GACzB,oCAAoC,GACpC,sCAAsC,GACtC,gBAAgB,GAChB,aAAa,GACb,sCAAsC,GACtC,wBAAwB,GACxB,0BAA0B,CAAC;AAE/B,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAmKrD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAEnD;AAED,oGAAoG;AACpG,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM,CAI5F"}
@@ -18,11 +18,11 @@ const zhTW = {
18
18
  chooseFile: '選擇檔案',
19
19
  downloadTemplate: '下載範本',
20
20
  formatTitle: '檔案格式',
21
- formatBody: '第一列為標題,必須包含「工號」與「email」,「姓名」為選填。建議使用 UTF-8;用 Excel 另存的 Big5 CSV 也能辨識。',
21
+ formatBody: '第一列為標題,必須包含「工號」與「email」,「姓名」與「角色」為選填(多角色請以 ; 分隔)。建議使用 UTF-8;用 Excel 另存的 Big5 CSV 也能辨識。',
22
22
  rulesTitle: '匯入規則',
23
23
  ruleFillOnly: '只會新增缺少的人員,或為既有帳號補上工號,不會覆寫已有的工號。',
24
24
  ruleNoDisable: '不會啟用或停用任何帳號,停用狀態以身分提供者為準。',
25
- ruleRole: '新建立的使用者只會取得預設角色,其他權限請另行指派。',
25
+ ruleRole: '僅於建立新帳號時指派角色(留空則套用系統預設角色);既有帳號的角色不會變更。',
26
26
  reading: '讀取檔案中…',
27
27
  previewing: '檢查內容中…',
28
28
  importing: '匯入中,請勿關閉…',
@@ -71,6 +71,9 @@ const zhTW = {
71
71
  'code.EMAIL_HAS_OTHER_EMPLOYEE_NUMBER': '這個 email 的使用者已有不同的工號,不會覆寫',
72
72
  'code.RACE_LOST': '匯入期間資料被同時更動,請重新匯入',
73
73
  'code.FAILED': '處理失敗,請稍後重試',
74
+ 'code.ROLES_IGNORED_FOR_EXISTING_USER': '既有帳號的角色維持不變,已忽略角色欄位',
75
+ 'code.ROLES_UNSUPPORTED': '目前未安裝角色權限模組,無法於匯入時指派角色',
76
+ 'code.ROLE_NOT_ASSIGNABLE': '包含不存在或不可指派的角色',
74
77
  };
75
78
  const en = {
76
79
  actions: 'Actions',
@@ -88,11 +91,11 @@ const en = {
88
91
  chooseFile: 'Choose file',
89
92
  downloadTemplate: 'Download template',
90
93
  formatTitle: 'File format',
91
- formatBody: 'The first row is the header and must include "employeeNumber" and "email"; "name" is optional. UTF-8 is recommended; Big5 CSVs saved from Excel are detected too.',
94
+ formatBody: 'The first row is the header and must include "employeeNumber" and "email"; "name" and "roles" (semicolon-separated) are optional. UTF-8 is recommended; Big5 CSVs saved from Excel are detected too.',
92
95
  rulesTitle: 'Import rules',
93
96
  ruleFillOnly: 'Only adds missing people or fills in a missing employee number. An existing employee number is never overwritten.',
94
97
  ruleNoDisable: 'Never enables or disables an account; the identity provider decides that.',
95
- ruleRole: 'New users get only the default role. Grant anything more separately.',
98
+ ruleRole: 'Roles are only assigned when creating new users (empty cells use the App default roles); existing users keep their current roles.',
96
99
  reading: 'Reading file…',
97
100
  previewing: 'Checking contents…',
98
101
  importing: 'Importing, please keep this open…',
@@ -141,6 +144,9 @@ const en = {
141
144
  'code.EMAIL_HAS_OTHER_EMPLOYEE_NUMBER': 'The user with this email already has a different employee number; it is not overwritten',
142
145
  'code.RACE_LOST': 'Data changed during the import; import again',
143
146
  'code.FAILED': 'Could not be processed; try again later',
147
+ 'code.ROLES_IGNORED_FOR_EXISTING_USER': 'Existing user roles are not modified; the roles column was ignored',
148
+ 'code.ROLES_UNSUPPORTED': 'Role assignment during import is not supported because the RBAC policy plugin is unavailable',
149
+ 'code.ROLE_NOT_ASSIGNABLE': 'Contains an unknown or unassignable role',
144
150
  };
145
151
  const TEXT = { 'zh-TW': zhTW, en };
146
152
  function usersText(locale) {
@@ -1 +1 @@
1
- {"version":3,"file":"users-messages.js","sourceRoot":"","sources":["../../src/frontend/users-messages.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"users-messages.js","sourceRoot":"","sources":["../../src/frontend/users-messages.ts"],"names":[],"mappings":"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"}
package/dist/plugin.js CHANGED
@@ -21,12 +21,12 @@ exports.identityCoreManifest = {
21
21
  cardinality: 'singleton',
22
22
  distribution: 'official',
23
23
  engine: {
24
- haneinfoPluginApi: '^1.12.0',
24
+ haneinfoPluginApi: '^1.29.0',
25
25
  node: '>=22.0.0',
26
26
  frameworks: {
27
- '@nestjs/common': '^11.0.5',
28
- '@nestjs/core': '^11.0.5',
29
- '@prisma/client': '^6.2.0',
27
+ '@nestjs/common': '^11.0.5 || ^12.0.0',
28
+ '@nestjs/core': '^11.0.5 || ^12.0.0',
29
+ '@prisma/client': '^6.2.0 || ^7.10.1',
30
30
  'lucide-react': '^1.22.0',
31
31
  react: '^19.0.0',
32
32
  'react-dom': '^19.0.0',
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AA2FH,oCAEC;AA3FD,qDAAgG;AAChG,iEAA4D;AAE5D,iGAAiG;AACpF,QAAA,2BAA2B,GACtC,yEAAyE,CAAC;AAE5E,qFAAqF;AACxE,QAAA,oBAAoB,GAAqB;IACpD,aAAa,EAAE,oBAAoB;IACnC,EAAE,EAAE,eAAe;IACnB,WAAW,EAAE,eAAe;IAC5B,WAAW,EAAE,WAAW;IACxB,YAAY,EAAE,UAAU;IACxB,MAAM,EAAE;QACN,iBAAiB,EAAE,SAAS;QAC5B,IAAI,EAAE,UAAU;QAChB,UAAU,EAAE;YACV,gBAAgB,EAAE,SAAS;YAC3B,cAAc,EAAE,SAAS;YACzB,gBAAgB,EAAE,QAAQ;YAC1B,cAAc,EAAE,SAAS;YACzB,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,SAAS;SACvB;KACF;IACD,QAAQ,EAAE,CAAC,yBAAyB,CAAC;IACrC,QAAQ,EAAE,CAAC,iBAAiB,EAAE,4BAA4B,CAAC;IAC3D,kFAAkF;IAClF,0BAA0B;IAC1B,EAAE;IACF,sFAAsF;IACtF,6EAA6E;IAC7E,gBAAgB,EAAE,CAAC,qBAAqB,CAAC;IACzC,MAAM,EAAE;QACN,OAAO,EAAE;YACP,UAAU,EAAE,gCAAgC;YAC5C,UAAU,EAAE,oBAAoB;YAChC,gBAAgB,EAAE,CAAC,OAAO,EAAE,uBAAuB,CAAC;YACpD,cAAc,EAAE,CAAC,yBAAyB,CAAC;SAC5C;QACD,QAAQ,EAAE;YACR,UAAU,EAAE;gBACV;oBACE,EAAE,EAAE,OAAO;oBACX,SAAS,EAAE,kBAAkB;oBAC7B,KAAK,EAAE,OAAO;oBACd,eAAe,EAAE,YAAY;oBAC7B,kBAAkB,EAAE,oBAAoB;oBACxC,KAAK,EAAE,EAAE;iBACV;aACF;YACD,eAAe,EAAE;gBACf;oBACE,EAAE,EAAE,OAAO;oBACX,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,kBAAkB;oBACxB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,EAAE;oBACT,OAAO,EAAE,OAAO;oBAChB,kBAAkB,EAAE,oBAAoB;iBACzC;aACF;YACD,aAAa,EAAE,OAAO;YACtB,WAAW,EAAE,oBAAoB;SAClC;QACD,MAAM,EAAE;YACN,IAAI,EAAE,CAAC,MAAM,CAAC;YACd,qFAAqF;YACrF,oEAAoE;YACpE,WAAW,EAAE;gBACX,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE;gBACtC,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,eAAe,EAAE;gBACjD,EAAE,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,eAAe,EAAE;aACnD;YACD,cAAc,EAAE,oBAAoB;YACpC,YAAY,EAAE,mCAA2B;SAC1C;KACF;CACF,CAAC;AAEW,QAAA,kBAAkB,GAAG,IAAA,yBAAY,EAAC;IAC7C,QAAQ,EAAE,4BAAoB;IAC9B,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CACnB,yCAAkB,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAC3C,OAAO,CAAC,YAAY,CAAC,WAAW,CAAiB,sBAAsB,CAAC,CACzE;CACJ,CAAC,CAAC;AAEH,SAAgB,YAAY;IAC1B,OAAO,0BAAkB,CAAC;AAC5B,CAAC;AAGD,mDAAsD;AAA7C,4GAAA,cAAc,OAAA;AACvB,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA"}
1
+ {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AA2FH,oCAEC;AA3FD,qDAAgG;AAChG,iEAA4D;AAE5D,iGAAiG;AACpF,QAAA,2BAA2B,GACtC,yEAAyE,CAAC;AAE5E,qFAAqF;AACxE,QAAA,oBAAoB,GAAqB;IACpD,aAAa,EAAE,oBAAoB;IACnC,EAAE,EAAE,eAAe;IACnB,WAAW,EAAE,eAAe;IAC5B,WAAW,EAAE,WAAW;IACxB,YAAY,EAAE,UAAU;IACxB,MAAM,EAAE;QACN,iBAAiB,EAAE,SAAS;QAC5B,IAAI,EAAE,UAAU;QAChB,UAAU,EAAE;YACV,gBAAgB,EAAE,oBAAoB;YACtC,cAAc,EAAE,oBAAoB;YACpC,gBAAgB,EAAE,mBAAmB;YACrC,cAAc,EAAE,SAAS;YACzB,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,SAAS;SACvB;KACF;IACD,QAAQ,EAAE,CAAC,yBAAyB,CAAC;IACrC,QAAQ,EAAE,CAAC,iBAAiB,EAAE,4BAA4B,CAAC;IAC3D,kFAAkF;IAClF,0BAA0B;IAC1B,EAAE;IACF,sFAAsF;IACtF,6EAA6E;IAC7E,gBAAgB,EAAE,CAAC,qBAAqB,CAAC;IACzC,MAAM,EAAE;QACN,OAAO,EAAE;YACP,UAAU,EAAE,gCAAgC;YAC5C,UAAU,EAAE,oBAAoB;YAChC,gBAAgB,EAAE,CAAC,OAAO,EAAE,uBAAuB,CAAC;YACpD,cAAc,EAAE,CAAC,yBAAyB,CAAC;SAC5C;QACD,QAAQ,EAAE;YACR,UAAU,EAAE;gBACV;oBACE,EAAE,EAAE,OAAO;oBACX,SAAS,EAAE,kBAAkB;oBAC7B,KAAK,EAAE,OAAO;oBACd,eAAe,EAAE,YAAY;oBAC7B,kBAAkB,EAAE,oBAAoB;oBACxC,KAAK,EAAE,EAAE;iBACV;aACF;YACD,eAAe,EAAE;gBACf;oBACE,EAAE,EAAE,OAAO;oBACX,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,kBAAkB;oBACxB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,EAAE;oBACT,OAAO,EAAE,OAAO;oBAChB,kBAAkB,EAAE,oBAAoB;iBACzC;aACF;YACD,aAAa,EAAE,OAAO;YACtB,WAAW,EAAE,oBAAoB;SAClC;QACD,MAAM,EAAE;YACN,IAAI,EAAE,CAAC,MAAM,CAAC;YACd,qFAAqF;YACrF,oEAAoE;YACpE,WAAW,EAAE;gBACX,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE;gBACtC,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,eAAe,EAAE;gBACjD,EAAE,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,eAAe,EAAE;aACnD;YACD,cAAc,EAAE,oBAAoB;YACpC,YAAY,EAAE,mCAA2B;SAC1C;KACF;CACF,CAAC;AAEW,QAAA,kBAAkB,GAAG,IAAA,yBAAY,EAAC;IAC7C,QAAQ,EAAE,4BAAoB;IAC9B,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CACnB,yCAAkB,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAC3C,OAAO,CAAC,YAAY,CAAC,WAAW,CAAiB,sBAAsB,CAAC,CACzE;CACJ,CAAC,CAAC;AAEH,SAAgB,YAAY;IAC1B,OAAO,0BAAkB,CAAC;AAC5B,CAAC;AAGD,mDAAsD;AAA7C,4GAAA,cAAc,OAAA;AACvB,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA"}
@@ -1,5 +1,5 @@
1
1
  import { PrismaService } from '@haneinfo/common';
2
- import { type AuditSinkPort } from '@haneinfo/plugin-api';
2
+ import { type AuditSinkPort, type RbacPolicyPort } from '@haneinfo/plugin-api';
3
3
  import { IdentityStoreService } from '../identity-store.service';
4
4
  import { UsersService } from './users.service';
5
5
  /** What an import would do, or did, with one CSV row. */
@@ -8,7 +8,7 @@ export type ImportRowStatus = 'create' | 'bind' | 'skip' | 'inactive' | 'conflic
8
8
  * Machine-readable reason behind a row's status. The UI translates these; the API never returns
9
9
  * prose the front end has to parse.
10
10
  */
11
- export type ImportRowCode = 'CREATED' | 'BOUND' | 'UNCHANGED' | 'INACTIVE' | 'MISSING_EMPLOYEE_NUMBER' | 'INVALID_EMPLOYEE_NUMBER' | 'MISSING_EMAIL' | 'INVALID_EMAIL' | 'DUPLICATE_IN_FILE' | 'WRONG_COLUMN_COUNT' | 'EMPLOYEE_NUMBER_HELD_BY_OTHER' | 'EMAIL_HAS_OTHER_EMPLOYEE_NUMBER' | 'RACE_LOST' | 'FAILED';
11
+ export type ImportRowCode = 'CREATED' | 'BOUND' | 'UNCHANGED' | 'INACTIVE' | 'MISSING_EMPLOYEE_NUMBER' | 'INVALID_EMPLOYEE_NUMBER' | 'MISSING_EMAIL' | 'INVALID_EMAIL' | 'DUPLICATE_IN_FILE' | 'WRONG_COLUMN_COUNT' | 'EMPLOYEE_NUMBER_HELD_BY_OTHER' | 'EMAIL_HAS_OTHER_EMPLOYEE_NUMBER' | 'RACE_LOST' | 'FAILED' | 'ROLES_IGNORED_FOR_EXISTING_USER' | 'ROLES_UNSUPPORTED' | 'ROLE_NOT_ASSIGNABLE';
12
12
  export interface ImportRowResult {
13
13
  line: number;
14
14
  employeeNumber: string;
@@ -16,6 +16,7 @@ export interface ImportRowResult {
16
16
  name: string | null;
17
17
  status: ImportRowStatus;
18
18
  code: ImportRowCode;
19
+ detail?: string;
19
20
  }
20
21
  export interface ImportUsersResult {
21
22
  dryRun: boolean;
@@ -33,8 +34,11 @@ type Actor = {
33
34
  * notifications, org linking) before they first sign in. Decision 202609-7dcf.
34
35
  *
35
36
  * It only fills in: it creates missing users and binds an employee number to an existing user that
36
- * has none. It never overwrites an employee number, never changes `isActive`, and never grants a
37
- * role beyond the default one `UsersService.create` already assigns.
37
+ * has none. It never overwrites an employee number and never changes `isActive`. When creating a
38
+ * new user, an optional `roles` column (semicolon-separated role machine names) assigns those
39
+ * RBAC-approved roles instead of the App's declared default roles; leaving it empty applies the
40
+ * App's default roles (which may be empty). For existing users, roles are never modified and any
41
+ * non-empty `roles` cell is flagged as `ROLES_IGNORED_FOR_EXISTING_USER`.
38
42
  *
39
43
  * Each row is its own write, so one conflict cannot abort the rest (a unique-key error aborts a
40
44
  * PostgreSQL transaction). A re-run is safe: rows already applied come back as `UNCHANGED`.
@@ -44,8 +48,9 @@ export declare class UsersImportService {
44
48
  private readonly users;
45
49
  private readonly identityStore;
46
50
  private readonly auditSink?;
51
+ private readonly rbacPolicy?;
47
52
  private readonly logger;
48
- constructor(prisma: PrismaService, users: UsersService, identityStore: IdentityStoreService, auditSink?: AuditSinkPort | undefined);
53
+ constructor(prisma: PrismaService, users: UsersService, identityStore: IdentityStoreService, auditSink?: AuditSinkPort | undefined, rbacPolicy?: RbacPolicyPort | undefined);
49
54
  import(csv: string, dryRun: boolean, actor: Actor): Promise<ImportUsersResult>;
50
55
  private parse;
51
56
  private toResult;
@@ -1 +1 @@
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"}
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,EAEL,KAAK,aAAa,EAGlB,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAC;AAW9B,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,GACR,iCAAiC,GACjC,mBAAmB,GACnB,qBAAqB,CAAC;AAE1B,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;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;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;AAgBD,KAAK,KAAK,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAW7C;;;;;;;;;;;;;GAaG;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;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAP/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;gBAGpB,MAAM,EAAE,aAAa,EACtB,KAAK,EAAE,YAAY,EACX,aAAa,EAAE,oBAAoB,EACjC,SAAS,CAAC,EAAE,aAAa,YAAA,EACxB,UAAU,CAAC,EAAE,cAAc,YAAA;IAGzE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAwBpF,OAAO,CAAC,KAAK;IA+Db,OAAO,CAAC,QAAQ;YAiBF,KAAK;IAkFnB,0FAA0F;YAC5E,QAAQ;IAItB,OAAO,CAAC,eAAe;IAIvB,iGAAiG;IACjG,OAAO,CAAC,kBAAkB;YAIZ,MAAM;CAqBrB"}
@@ -28,6 +28,7 @@ const HEADER_ALIASES = {
28
28
  employeeNumber: ['employeenumber', 'employee_number', 'employeeno', '工號', '員工編號'],
29
29
  email: ['email', 'e-mail', 'mail', '電子郵件', '信箱'],
30
30
  name: ['name', 'displayname', '姓名', '名稱'],
31
+ roles: ['role', 'roles', '角色'],
31
32
  };
32
33
  const emailSchema = zod_1.z.string().email();
33
34
  function columnIndex(header, key) {
@@ -39,18 +40,22 @@ function columnIndex(header, key) {
39
40
  * notifications, org linking) before they first sign in. Decision 202609-7dcf.
40
41
  *
41
42
  * It only fills in: it creates missing users and binds an employee number to an existing user that
42
- * has none. It never overwrites an employee number, never changes `isActive`, and never grants a
43
- * role beyond the default one `UsersService.create` already assigns.
43
+ * has none. It never overwrites an employee number and never changes `isActive`. When creating a
44
+ * new user, an optional `roles` column (semicolon-separated role machine names) assigns those
45
+ * RBAC-approved roles instead of the App's declared default roles; leaving it empty applies the
46
+ * App's default roles (which may be empty). For existing users, roles are never modified and any
47
+ * non-empty `roles` cell is flagged as `ROLES_IGNORED_FOR_EXISTING_USER`.
44
48
  *
45
49
  * Each row is its own write, so one conflict cannot abort the rest (a unique-key error aborts a
46
50
  * PostgreSQL transaction). A re-run is safe: rows already applied come back as `UNCHANGED`.
47
51
  */
48
52
  let UsersImportService = UsersImportService_1 = class UsersImportService {
49
- constructor(prisma, users, identityStore, auditSink) {
53
+ constructor(prisma, users, identityStore, auditSink, rbacPolicy) {
50
54
  this.prisma = prisma;
51
55
  this.users = users;
52
56
  this.identityStore = identityStore;
53
57
  this.auditSink = auditSink;
58
+ this.rbacPolicy = rbacPolicy;
54
59
  this.logger = new common_2.Logger(UsersImportService_1.name);
55
60
  }
56
61
  async import(csv, dryRun, actor) {
@@ -81,6 +86,7 @@ let UsersImportService = UsersImportService_1 = class UsersImportService {
81
86
  const employeeNumberAt = columnIndex(header.cells, 'employeeNumber');
82
87
  const emailAt = columnIndex(header.cells, 'email');
83
88
  const nameAt = columnIndex(header.cells, 'name');
89
+ const rolesAt = columnIndex(header.cells, 'roles');
84
90
  if (employeeNumberAt < 0 || emailAt < 0) {
85
91
  throw new common_2.BadRequestException('CSV header must contain employeeNumber (工號) and email columns');
86
92
  }
@@ -91,11 +97,16 @@ let UsersImportService = UsersImportService_1 = class UsersImportService {
91
97
  }
92
98
  const rows = body.map((record) => {
93
99
  const cell = (at) => (at >= 0 ? (record.cells[at] ?? '').trim() : '');
100
+ const roles = cell(rolesAt)
101
+ .split(';')
102
+ .map((role) => role.trim())
103
+ .filter((role) => role.length > 0);
94
104
  const row = {
95
105
  line: record.line,
96
106
  employeeNumber: cell(employeeNumberAt),
97
107
  email: cell(emailAt),
98
108
  name: cell(nameAt) || null,
109
+ roles,
99
110
  };
100
111
  if (record.cells.length > header.cells.length)
101
112
  row.error = 'WRONG_COLUMN_COUNT';
@@ -133,7 +144,7 @@ let UsersImportService = UsersImportService_1 = class UsersImportService {
133
144
  }
134
145
  return rows;
135
146
  }
136
- toResult(row, status, code) {
147
+ toResult(row, status, code, detail) {
137
148
  return {
138
149
  line: row.line,
139
150
  employeeNumber: row.employeeNumber,
@@ -141,10 +152,11 @@ let UsersImportService = UsersImportService_1 = class UsersImportService {
141
152
  name: row.name,
142
153
  status,
143
154
  code,
155
+ ...(detail ? { detail } : {}),
144
156
  };
145
157
  }
146
158
  async apply(row, dryRun, actor) {
147
- const result = (status, code) => this.toResult(row, status, code);
159
+ const result = (status, code, detail) => this.toResult(row, status, code, detail);
148
160
  try {
149
161
  const [byNumber, emailMatches] = await Promise.all([
150
162
  this.prisma.user.findFirst({
@@ -165,12 +177,25 @@ let UsersImportService = UsersImportService_1 = class UsersImportService {
165
177
  return result('conflict', 'EMPLOYEE_NUMBER_HELD_BY_OTHER');
166
178
  }
167
179
  if (!byEmail) {
180
+ let roleIds;
181
+ if (row.roles.length > 0) {
182
+ if (!this.rbacPolicy?.resolveImportRoleIds) {
183
+ return result('error', 'ROLES_UNSUPPORTED');
184
+ }
185
+ const resolved = await this.rbacPolicy.resolveImportRoleIds(row.roles);
186
+ if ('rejected' in resolved) {
187
+ const detail = resolved.rejected.map((r) => `${r.name} (${r.reason})`).join(', ');
188
+ return result('error', 'ROLE_NOT_ASSIGNABLE', detail);
189
+ }
190
+ roleIds = resolved.roleIds;
191
+ }
168
192
  if (dryRun)
169
193
  return result('create', 'CREATED');
170
194
  const created = await this.users.create({
171
195
  email: row.email,
172
196
  name: row.name ?? undefined,
173
197
  employeeNumber: row.employeeNumber,
198
+ ...(roleIds !== undefined ? { roleIds } : {}),
174
199
  });
175
200
  this.recordUserAudit(created.id, common_1.AuditAction.CREATE, actor);
176
201
  return result('create', 'CREATED');
@@ -185,17 +210,18 @@ let UsersImportService = UsersImportService_1 = class UsersImportService {
185
210
  if (byEmail.employeeNumber === row.employeeNumber) {
186
211
  if (!dryRun && fillName)
187
212
  await this.fillName(byEmail.id, row.name);
188
- return result('skip', 'UNCHANGED');
213
+ return result('skip', row.roles.length > 0 ? 'ROLES_IGNORED_FOR_EXISTING_USER' : 'UNCHANGED');
214
+ }
215
+ if (dryRun) {
216
+ return result('bind', row.roles.length > 0 ? 'ROLES_IGNORED_FOR_EXISTING_USER' : 'BOUND');
189
217
  }
190
- if (dryRun)
191
- return result('bind', 'BOUND');
192
218
  const outcome = await this.identityStore.bindEmployeeNumber(byEmail.id, row.employeeNumber);
193
219
  if (outcome !== 'bound')
194
220
  return result('conflict', outcome === 'held-by-other' ? 'RACE_LOST' : 'FAILED');
195
221
  if (fillName)
196
222
  await this.fillName(byEmail.id, row.name);
197
223
  this.recordUserAudit(byEmail.id, common_1.AuditAction.UPDATE, actor);
198
- return result('bind', 'BOUND');
224
+ return result('bind', row.roles.length > 0 ? 'ROLES_IGNORED_FOR_EXISTING_USER' : 'BOUND');
199
225
  }
200
226
  catch (error) {
201
227
  if (error instanceof common_2.ConflictException || (0, users_service_1.isPrismaErrorWithCode)(error, 'P2002')) {
@@ -242,8 +268,10 @@ exports.UsersImportService = UsersImportService = UsersImportService_1 = __decor
242
268
  __param(2, (0, common_2.Inject)(identity_store_service_1.IdentityStoreService)),
243
269
  __param(3, (0, common_2.Optional)()),
244
270
  __param(3, (0, common_2.Inject)(plugin_api_1.AUDIT_SINK)),
271
+ __param(4, (0, common_2.Optional)()),
272
+ __param(4, (0, common_2.Inject)(plugin_api_1.RBAC_POLICY)),
245
273
  __metadata("design:paramtypes", [common_1.PrismaService,
246
274
  users_service_1.UsersService,
247
- identity_store_service_1.IdentityStoreService, Object])
275
+ identity_store_service_1.IdentityStoreService, Object, Object])
248
276
  ], UsersImportService);
249
277
  //# sourceMappingURL=users-import.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"users-import.service.js","sourceRoot":"","sources":["../../src/users/users-import.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"users-import.service.js","sourceRoot":"","sources":["../../src/users/users-import.service.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
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"}
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;;IAyJT,OAAO,CAAC,KAAK,EAAE,eAAe;IAqBpC;;;;OAIG;IACG,mBAAmB,CAAC,KAAK,EAAE,mBAAmB;IA0B9C,QAAQ,CAAC,EAAE,EAAE,MAAM;;;;;;;YAnNrB,MAAM;eACH,MAAM;cACP,MAAM,GAAG,IAAI;kBACT,OAAO;0BACC,OAAO;wBACT,MAAM,GAAG,IAAI;mBAClB,IAAI;;IAmNT,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa;;;;;;;YAzNvC,MAAM;eACH,MAAM;cACP,MAAM,GAAG,IAAI;kBACT,OAAO;0BACC,OAAO;wBACT,MAAM,GAAG,IAAI;mBAClB,IAAI;;IAyNT,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;;;;;;;YA/N3C,MAAM;eACH,MAAM;cACP,MAAM,GAAG,IAAI;kBACT,OAAO;0BACC,OAAO;wBACT,MAAM,GAAG,IAAI;mBAClB,IAAI;;IA+NT,MAAM,CAAC,EAAE,EAAE,MAAM;CAcxB"}
@@ -134,10 +134,13 @@ let UsersService = class UsersService {
134
134
  // this create() — the loser hits the DB's unique constraint on email instead of
135
135
  // the pre-check. Normalize both paths to the same exception so callers only need
136
136
  // to handle one case.
137
- const target = error.meta?.target;
137
+ const meta = error.meta;
138
+ // Prisma 7's pg adapter reports fields or an index instead of meta.target.
139
+ const constraint = meta?.driverAdapterError?.cause?.constraint;
140
+ const target = meta?.target ?? constraint?.fields ?? constraint?.index;
138
141
  const onEmployeeNumber = Array.isArray(target)
139
- ? target.some((column) => String(column).includes('employee_number'))
140
- : String(target ?? '').includes('employee_number');
142
+ ? target.some((column) => /employee_number|employeeNumber/u.test(String(column)))
143
+ : /employee_number|employeeNumber/u.test(String(target ?? ''));
141
144
  throw new common_2.ConflictException(onEmployeeNumber ? 'Employee number already registered' : 'Email already registered');
142
145
  }
143
146
  throw error;
@@ -1 +1 @@
1
- {"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../src/users/users.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../src/users/users.service.ts"],"names":[],"mappings":"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"}
@@ -5,12 +5,12 @@
5
5
  "cardinality": "singleton",
6
6
  "distribution": "official",
7
7
  "engine": {
8
- "haneinfoPluginApi": "^1.12.0",
8
+ "haneinfoPluginApi": "^1.29.0",
9
9
  "node": ">=22.0.0",
10
10
  "frameworks": {
11
- "@nestjs/common": "^11.0.5",
12
- "@nestjs/core": "^11.0.5",
13
- "@prisma/client": "^6.2.0",
11
+ "@nestjs/common": "^11.0.5 || ^12.0.0",
12
+ "@nestjs/core": "^11.0.5 || ^12.0.0",
13
+ "@prisma/client": "^6.2.0 || ^7.10.1",
14
14
  "lucide-react": "^1.22.0",
15
15
  "react": "^19.0.0",
16
16
  "react-dom": "^19.0.0"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haneinfo/identity-core",
3
- "version": "4.6.18",
3
+ "version": "4.7.0",
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": [
@@ -37,15 +37,15 @@
37
37
  },
38
38
  "dependencies": {
39
39
  "@haneinfo/frontend-shell": "1.7.1",
40
- "@haneinfo/plugin-api": "1.28.0"
40
+ "@haneinfo/plugin-api": "1.29.0"
41
41
  },
42
42
  "peerDependencies": {
43
- "@haneinfo/common": "^0.6.1",
43
+ "@haneinfo/common": "^0.6.1 || ^0.7.0",
44
44
  "@haneinfo/frontend-shell": "^1.1.0",
45
45
  "@haneinfo/plugin-host-nest": "^2.0.0",
46
- "@nestjs/common": "^11.0.0",
47
- "@nestjs/core": "^11.0.0",
48
- "@prisma/client": "^6.19.0",
46
+ "@nestjs/common": "^11.0.0 || ^12.0.0",
47
+ "@nestjs/core": "^11.0.0 || ^12.0.0",
48
+ "@prisma/client": "^6.19.0 || ^7.10.1",
49
49
  "lucide-react": "^1.22.0",
50
50
  "react": "^19.0.0",
51
51
  "react-dom": "^19.0.0",
@@ -66,22 +66,22 @@
66
66
  }
67
67
  },
68
68
  "devDependencies": {
69
- "@nestjs/common": "^11.0.0",
70
- "@nestjs/core": "^11.0.0",
69
+ "@nestjs/common": "^12.3.2",
70
+ "@nestjs/core": "^12.3.2",
71
71
  "@types/node": "^24.13.0",
72
72
  "@types/react": "^19.2.17",
73
73
  "@types/react-dom": "^19.2.3",
74
- "@prisma/client": "^6.19.0",
74
+ "@prisma/client": "^7.10.1",
75
75
  "lucide-react": "^1.22.0",
76
76
  "react": "^19.2.7",
77
77
  "react-dom": "^19.2.7",
78
78
  "typescript": "^5.9.3",
79
79
  "vitest": "^4.1.11",
80
80
  "zod": "^4.4.0",
81
- "@haneinfo/plugin-host-nest": "2.1.1",
82
- "@haneinfo/plugin-testkit": "2.3.1",
83
- "@haneinfo/common": "0.6.1",
84
- "@haneinfo/frontend-shell": "1.7.1"
81
+ "@haneinfo/common": "0.7.0",
82
+ "@haneinfo/frontend-shell": "1.7.1",
83
+ "@haneinfo/plugin-host-nest": "2.2.0",
84
+ "@haneinfo/plugin-testkit": "2.3.1"
85
85
  },
86
86
  "license": "UNLICENSED",
87
87
  "publishConfig": {