@opencrvs/toolkit 2.0.0-rc.c7f111d → 2.0.0-rc.ca1536b

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.
@@ -306,7 +306,6 @@ __export(events_exports, {
306
306
  getAllUniqueFields: () => getAllUniqueFields,
307
307
  getAnnotationFromDrafts: () => getAnnotationFromDrafts,
308
308
  getAssignedUserFromActions: () => getAssignedUserFromActions,
309
- getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
310
309
  getAssignmentStatus: () => getAssignmentStatus,
311
310
  getAvailableActionsForEvent: () => getAvailableActionsForEvent,
312
311
  getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
@@ -1765,8 +1764,7 @@ var ActionCreationMetadata = z16.object({
1765
1764
  ),
1766
1765
  createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
1767
1766
  acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
1768
- createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation."),
1769
- createdBySignature: z16.string().nullish().describe("Signature of the user who created the action request.")
1767
+ createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
1770
1768
  });
1771
1769
  var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1772
1770
  registrationNumber: z16.string().describe(
@@ -1794,9 +1792,6 @@ var EventMetadata = z16.object({
1794
1792
  createdAtLocation: UUID.nullish().describe(
1795
1793
  "Location of the user who created the event."
1796
1794
  ),
1797
- createdBySignature: DocumentPath.nullish().describe(
1798
- "Signature of the user who created the event."
1799
- ),
1800
1795
  updatedAtLocation: UUID.nullish().describe(
1801
1796
  "Location of the user who last changed the status."
1802
1797
  ),
@@ -1804,9 +1799,6 @@ var EventMetadata = z16.object({
1804
1799
  "Timestamp of the most recent *accepted* status change. Possibly 3rd party update, if action is validation asynchronously."
1805
1800
  ),
1806
1801
  assignedTo: z16.string().nullish().describe("ID of the user currently assigned to the event."),
1807
- assignedToSignature: DocumentPath.nullish().describe(
1808
- "Signature of the user who is currently assigned to the event."
1809
- ),
1810
1802
  updatedBy: z16.string().nullish().describe("ID of the user who last changed the status."),
1811
1803
  trackingId: z16.string().describe(
1812
1804
  "System-generated tracking ID used by informants or registrars to look up the event."
@@ -3799,6 +3791,9 @@ function precompileActionSchemas(eventConfigurations) {
3799
3791
  function isAgeValue(value) {
3800
3792
  return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
3801
3793
  }
3794
+ function mergeWithBaseFormState(values, context) {
3795
+ return { ...context.baseFormState, ...values };
3796
+ }
3802
3797
  function validate(schema, data) {
3803
3798
  const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
3804
3799
  if ("$form" in data) {
@@ -3837,7 +3832,7 @@ function isOnline() {
3837
3832
  }
3838
3833
  function isConditionMet(conditional, values, context, eventIndex) {
3839
3834
  return validate(conditional, {
3840
- $form: values,
3835
+ $form: mergeWithBaseFormState(values, context),
3841
3836
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3842
3837
  $online: isOnline(),
3843
3838
  $user: context.user,
@@ -3866,7 +3861,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
3866
3861
  return true;
3867
3862
  }
3868
3863
  const validConditionals = getConditionalActionsForField(field3, {
3869
- $form: form,
3864
+ $form: mergeWithBaseFormState(form, context),
3870
3865
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3871
3866
  $online: isOnline(),
3872
3867
  $user: context.user,
@@ -4058,7 +4053,7 @@ function runFieldValidations({
4058
4053
  return [];
4059
4054
  }
4060
4055
  const conditionalParameters = {
4061
- $form: form,
4056
+ $form: mergeWithBaseFormState(form, context),
4062
4057
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
4063
4058
  /**
4064
4059
  * In real use cases, there can be hundreds of thousands of locations.
@@ -4302,17 +4297,16 @@ function isPageVisible(page, formValues, context) {
4302
4297
  }
4303
4298
  return isConditionMet(page.conditional, formValues, context);
4304
4299
  }
4305
- function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false, declarationContext) {
4300
+ function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
4306
4301
  const base = (0, import_lodash.cloneDeep)(formValues);
4307
4302
  function fn(prevVisibilityContext) {
4308
- const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
4309
4303
  const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
4310
4304
  const fieldConfig = fields.filter((f) => f.id === fieldId);
4311
4305
  if (!fieldConfig.length) {
4312
4306
  return false;
4313
4307
  }
4314
4308
  const isHidden = fieldConfig.every(
4315
- (f) => !isFieldVisible(f, visibilityForm, validatorContext)
4309
+ (f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
4316
4310
  );
4317
4311
  if (!isHidden) {
4318
4312
  return false;
@@ -4330,7 +4324,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
4330
4324
  const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4331
4325
  const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4332
4326
  const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
4333
- return hiddenFields.some((f) => f.id === fieldId);
4327
+ return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
4334
4328
  });
4335
4329
  return omitHiddenFields(
4336
4330
  visibleFields,
@@ -4377,13 +4371,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
4377
4371
  }
4378
4372
  function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
4379
4373
  const annotationFields = getActionAnnotationFields(actionConfig);
4380
- return omitHiddenFields(
4381
- annotationFields,
4382
- annotation,
4383
- context,
4384
- false,
4385
- declaration
4386
- );
4374
+ return omitHiddenFields(annotationFields, annotation, {
4375
+ ...context,
4376
+ baseFormState: declaration
4377
+ });
4387
4378
  }
4388
4379
  function deepMerge(currentDocument, actionDocument) {
4389
4380
  const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
@@ -5895,6 +5886,8 @@ var BaseActionInput = z38.object({
5895
5886
  originalActionId: UUID.optional(),
5896
5887
  // should not be part of base action.
5897
5888
  keepAssignment: z38.boolean().optional(),
5889
+ keepAssignmentIfAccepted: z38.boolean().optional(),
5890
+ keepAssignmentIfRejected: z38.boolean().optional(),
5898
5891
  waitFor: z38.boolean().optional(),
5899
5892
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
5900
5893
  // @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
@@ -6149,7 +6142,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
6149
6142
  createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
6150
6143
  acceptedAt: acceptAction.createdAt,
6151
6144
  createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
6152
- createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
6153
6145
  registrationNumber
6154
6146
  };
6155
6147
  }
@@ -6363,17 +6355,6 @@ function getAssignedUserFromActions(actions) {
6363
6355
  return user2;
6364
6356
  }, null);
6365
6357
  }
6366
- function getAssignedUserSignatureFromActions(actions) {
6367
- return actions.reduce((signature, action) => {
6368
- if (action.type === ActionType.ASSIGN) {
6369
- return action.createdBySignature || null;
6370
- }
6371
- if (action.type === ActionType.UNASSIGN) {
6372
- return null;
6373
- }
6374
- return signature;
6375
- }, null);
6376
- }
6377
6358
  function deepDropNulls(obj) {
6378
6359
  if (Array.isArray(obj)) {
6379
6360
  return obj.map(deepDropNulls);
@@ -6469,10 +6450,8 @@ function getCurrentEventState(event2, config) {
6469
6450
  createdBy: creationAction.createdBy,
6470
6451
  createdByUserType: creationAction.createdByUserType,
6471
6452
  createdAtLocation: creationAction.createdAtLocation,
6472
- createdBySignature: creationAction.createdBySignature,
6473
6453
  updatedAt: acceptedActionMetadata.createdAt,
6474
6454
  assignedTo: getAssignedUserFromActions(acceptedActions),
6475
- assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
6476
6455
  updatedBy: requestActionMetadata.createdBy,
6477
6456
  updatedAtLocation: requestActionMetadata.createdAtLocation,
6478
6457
  declaration,
@@ -9731,7 +9710,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
9731
9710
  createdBy: overrides.createdBy ?? generateUuid(rng),
9732
9711
  createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
9733
9712
  updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
9734
- createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
9735
9713
  updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
9736
9714
  assignedTo: overrides.assignedTo ?? null,
9737
9715
  updatedBy: overrides.updatedBy ?? generateUuid(rng),
@@ -2132,6 +2132,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
2132
2132
  var import_ts_morph11 = require("ts-morph");
2133
2133
  var import_path11 = __toESM(require("path"));
2134
2134
 
2135
+ // ../commons/src/scopes.deprecated.do-not-use.ts
2136
+ var z4 = __toESM(require("zod/v4"));
2137
+ var import_lodash = require("lodash");
2138
+
2135
2139
  // ../commons/src/scopes.ts
2136
2140
  var z3 = __toESM(require("zod/v4"));
2137
2141
  var qs = __toESM(require("qs"));
@@ -2405,7 +2409,6 @@ var DEFAULT_SCOPE_OPTIONS = {
2405
2409
  };
2406
2410
 
2407
2411
  // ../commons/src/scopes.deprecated.do-not-use.ts
2408
- var z4 = __toESM(require("zod/v4"));
2409
2412
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2410
2413
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2411
2414
  var SearchScope = z4.object({
@@ -2639,6 +2642,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2639
2642
  }
2640
2643
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2641
2644
  };
2645
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2646
+ function isMergeableUserScopeType(type) {
2647
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2648
+ }
2649
+ function decodeLegacyScope(legacy) {
2650
+ const encoded = legacyScopeToV2Scope(legacy);
2651
+ const scope = decodeScope(encoded);
2652
+ if (!scope) {
2653
+ throw new Error(
2654
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2655
+ );
2656
+ }
2657
+ return { legacy, scope };
2658
+ }
2659
+ function groupByType(entries) {
2660
+ return entries.reduce(
2661
+ (groups, entry) => ({
2662
+ ...groups,
2663
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2664
+ }),
2665
+ {}
2666
+ );
2667
+ }
2668
+ function deduplicateEntries(entries) {
2669
+ return entries.filter(
2670
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2671
+ );
2672
+ }
2673
+ function mergeEntries(type, entries) {
2674
+ const optionsList = entries.map(
2675
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2676
+ );
2677
+ const allKeys = optionsList.flatMap(
2678
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2679
+ );
2680
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2681
+ if (conflictKey) {
2682
+ const conflicting = entries.filter(
2683
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2684
+ ).map((e) => JSON.stringify(e.legacy));
2685
+ throw new Error(
2686
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2687
+ );
2688
+ }
2689
+ const mergedOptions = Object.assign({}, ...optionsList);
2690
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2691
+ const parsed = Scope2.safeParse(merged);
2692
+ if (!parsed.success) {
2693
+ throw new Error(
2694
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2695
+ );
2696
+ }
2697
+ return parsed.data;
2698
+ }
2699
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2700
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2701
+ return Object.entries(groups).flatMap(([type, entries]) => {
2702
+ const deduped = deduplicateEntries(entries);
2703
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2704
+ if (!isMergeableUserScopeType(type)) {
2705
+ console.warn(
2706
+ `Multiple non-mergeable '${type}' scopes detected after dedup \u2014 kept all as-is. Legacy scopes: [${deduped.map((e) => JSON.stringify(e.legacy)).join(", ")}]. Review whether the duplication is intentional.`
2707
+ );
2708
+ return deduped.map((e) => e.scope);
2709
+ }
2710
+ return [mergeEntries(type, deduped)];
2711
+ });
2712
+ }
2642
2713
 
2643
2714
  // src/migrations/v2.0/migrate-scopes.ts
2644
2715
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2676,57 +2747,65 @@ function resolveLegacyScopeFromElement(element) {
2676
2747
  }
2677
2748
  function migrateScopesArrays(rolesFilePath, project) {
2678
2749
  const sourceFile = project.getSourceFile(rolesFilePath);
2679
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2750
+ if (!sourceFile) {
2751
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2752
+ }
2680
2753
  let migratedCount = 0;
2681
2754
  let removedCount = 0;
2755
+ let mergedCount = 0;
2682
2756
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2757
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2683
2758
  for (const scopesProp of scopesProperties) {
2684
2759
  const initializer = scopesProp.getInitializer();
2685
2760
  if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
2686
- const elements = initializer.getElements();
2687
- for (let index = elements.length - 1; index >= 0; index--) {
2688
- const element = elements[index];
2689
- if (!import_ts_morph11.Node.isExpression(element)) continue;
2761
+ const rawTexts = [];
2762
+ const legacyStrings = [];
2763
+ let anyChange = false;
2764
+ for (const element of initializer.getElements()) {
2690
2765
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2691
2766
  if (scopeKey && !(scopeKey in SCOPES)) {
2692
2767
  console.warn(
2693
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2768
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2694
2769
  );
2695
- initializer.removeElement(index);
2696
2770
  removedCount++;
2771
+ anyChange = true;
2697
2772
  continue;
2698
2773
  }
2699
2774
  const legacyScope = resolveLegacyScopeFromElement(element);
2700
2775
  if (!legacyScope) {
2701
2776
  console.warn(
2702
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2777
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2703
2778
  );
2779
+ rawTexts.push(element.getText());
2704
2780
  continue;
2705
2781
  }
2706
- try {
2707
- const migratedScope = legacyScopeToV2Scope(legacyScope);
2708
- const scope = decodeScope(migratedScope);
2709
- if (!scope) {
2710
- console.warn(
2711
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
2712
- );
2713
- continue;
2714
- }
2715
- element.replaceWithText(JSON.stringify(scope));
2716
- migratedCount++;
2717
- } catch (error) {
2718
- console.warn(
2719
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
2720
- );
2721
- }
2782
+ legacyStrings.push(legacyScope);
2783
+ anyChange = true;
2784
+ }
2785
+ if (!anyChange) continue;
2786
+ let mergedScopes;
2787
+ try {
2788
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2789
+ } catch (error) {
2790
+ throw new Error(
2791
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2792
+ { cause: error }
2793
+ );
2722
2794
  }
2795
+ migratedCount += legacyStrings.length;
2796
+ mergedCount += legacyStrings.length - mergedScopes.length;
2797
+ const outputElements = [
2798
+ ...rawTexts,
2799
+ ...mergedScopes.map((s) => JSON.stringify(s))
2800
+ ];
2801
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2723
2802
  }
2724
2803
  if (removedCount > 0) {
2725
2804
  console.log(
2726
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2805
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2727
2806
  );
2728
2807
  }
2729
- return { migratedCount, removedCount };
2808
+ return { migratedCount, removedCount, mergedCount };
2730
2809
  }
2731
2810
  function ensureScopesHelpersImport(rolesFilePath, project) {
2732
2811
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2861,7 +2940,7 @@ async function main11() {
2861
2940
  return;
2862
2941
  }
2863
2942
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2864
- const { migratedCount, removedCount } = migrateScopesArrays(
2943
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2865
2944
  rolesFilePath,
2866
2945
  project
2867
2946
  );
@@ -2880,7 +2959,7 @@ async function main11() {
2880
2959
  }
2881
2960
  await sourceFile.save();
2882
2961
  console.log(
2883
- `Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2962
+ `Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2884
2963
  );
2885
2964
  }
2886
2965
 
@@ -1 +1 @@
1
- {"version":3,"file":"migrate-scopes.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-scopes.ts"],"names":[],"mappings":"AAyVA,iBAAe,IAAI,kBAmDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
1
+ {"version":3,"file":"migrate-scopes.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-scopes.ts"],"names":[],"mappings":"AAoXA,iBAAe,IAAI,kBAmDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
@@ -25,7 +25,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
25
25
  exports.main = main;
26
26
  const ts_morph_1 = require("ts-morph");
27
27
  const path_1 = __importDefault(require("path"));
28
- const scopes_1 = require("../commons/scopes");
29
28
  const scopes_deprecated_do_not_use_1 = require("../commons/scopes.deprecated.do-not-use");
30
29
  const ROLES_FILE_RELATIVE_PATH = 'src/data-seeding/roles/roles.ts';
31
30
  const SCOPES_PROPERTY_NAME = 'scopes';
@@ -65,60 +64,85 @@ function resolveLegacyScopeFromElement(element) {
65
64
  }
66
65
  return null;
67
66
  }
67
+ /**
68
+ * Walks each `scopes: [...]` array in the roles file, classifies elements,
69
+ * and rewrites the whole array using `migrateLegacyScopesArrayToV2Scopes`
70
+ * (which preserves v1.9 AND semantics by merging pairs of legacy scopes
71
+ * that targeted the same v2 type). See issue #12489.
72
+ *
73
+ * Elements are partitioned into three kinds:
74
+ * - drop: `SCOPES.X` references where X is not in the SCOPES map (warned
75
+ * and removed, matching pre-refactor behavior).
76
+ * - raw: non-literal expressions we cannot statically resolve (e.g.
77
+ * `...sharedScopes` spreads). Preserved verbatim in output so authoring
78
+ * intent isn't lost.
79
+ * - legacy: literal strings or resolvable `SCOPES.X` references.
80
+ * Collected and passed as a batch to the merge function.
81
+ *
82
+ * The output array text is `[...rawTexts, ...mergedScopesAsJson]`. Order of
83
+ * legacy entries relative to raw expressions is not preserved — scopes in a
84
+ * v2 array compose with OR, so position is semantically irrelevant.
85
+ */
68
86
  function migrateScopesArrays(rolesFilePath, project) {
69
87
  const sourceFile = project.getSourceFile(rolesFilePath);
70
- if (!sourceFile)
71
- return { migratedCount: 0, removedCount: 0 };
88
+ if (!sourceFile) {
89
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
90
+ }
72
91
  let migratedCount = 0;
73
92
  let removedCount = 0;
93
+ let mergedCount = 0;
74
94
  const scopesProperties = sourceFile
75
95
  .getDescendantsOfKind(ts_morph_1.SyntaxKind.PropertyAssignment)
76
96
  .filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
97
+ const relPath = path_1.default.relative(process.cwd(), rolesFilePath);
77
98
  for (const scopesProp of scopesProperties) {
78
99
  const initializer = scopesProp.getInitializer();
79
100
  if (!initializer || !ts_morph_1.Node.isArrayLiteralExpression(initializer))
80
101
  continue;
81
- const elements = initializer.getElements();
82
- for (let index = elements.length - 1; index >= 0; index--) {
83
- const element = elements[index];
84
- if (!ts_morph_1.Node.isExpression(element))
85
- continue;
102
+ const rawTexts = [];
103
+ const legacyStrings = [];
104
+ let anyChange = false;
105
+ for (const element of initializer.getElements()) {
86
106
  const scopeKey = resolveScopeKeyFromElementAccess(element);
87
107
  if (scopeKey && !(scopeKey in scopes_deprecated_do_not_use_1.SCOPES)) {
88
108
  // eslint-disable-next-line no-console
89
- console.warn(` [${path_1.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`);
90
- initializer.removeElement(index);
109
+ console.warn(` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`);
91
110
  removedCount++;
111
+ anyChange = true;
92
112
  continue;
93
113
  }
94
114
  const legacyScope = resolveLegacyScopeFromElement(element);
95
115
  if (!legacyScope) {
96
116
  // eslint-disable-next-line no-console
97
- console.warn(` [${path_1.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`);
117
+ console.warn(` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`);
118
+ rawTexts.push(element.getText());
98
119
  continue;
99
120
  }
100
- try {
101
- const migratedScope = (0, scopes_deprecated_do_not_use_1.legacyScopeToV2Scope)(legacyScope);
102
- const scope = (0, scopes_1.decodeScope)(migratedScope);
103
- if (!scope) {
104
- // eslint-disable-next-line no-console
105
- console.warn(` [${path_1.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`);
106
- continue;
107
- }
108
- element.replaceWithText(JSON.stringify(scope));
109
- migratedCount++;
110
- }
111
- catch (error) {
112
- // eslint-disable-next-line no-console
113
- console.warn(` [${path_1.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`);
114
- }
121
+ legacyStrings.push(legacyScope);
122
+ anyChange = true;
123
+ }
124
+ if (!anyChange)
125
+ continue;
126
+ let mergedScopes;
127
+ try {
128
+ mergedScopes = (0, scopes_deprecated_do_not_use_1.migrateLegacyScopesArrayToV2Scopes)(legacyStrings);
129
+ }
130
+ catch (error) {
131
+ throw new Error(`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
115
132
  }
133
+ migratedCount += legacyStrings.length;
134
+ mergedCount += legacyStrings.length - mergedScopes.length;
135
+ const outputElements = [
136
+ ...rawTexts,
137
+ ...mergedScopes.map((s) => JSON.stringify(s))
138
+ ];
139
+ scopesProp.setInitializer(`[${outputElements.join(', ')}]`);
116
140
  }
117
141
  if (removedCount > 0) {
118
142
  // eslint-disable-next-line no-console
119
- console.log(` Removed ${removedCount} unknown SCOPES reference(s) from '${path_1.default.relative(process.cwd(), rolesFilePath)}'.`);
143
+ console.log(` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`);
120
144
  }
121
- return { migratedCount, removedCount };
145
+ return { migratedCount, removedCount, mergedCount };
122
146
  }
123
147
  function ensureScopesHelpersImport(rolesFilePath, project) {
124
148
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -262,7 +286,7 @@ function main() {
262
286
  return;
263
287
  }
264
288
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
265
- const { migratedCount, removedCount } = migrateScopesArrays(rolesFilePath, project);
289
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(rolesFilePath, project);
266
290
  const wrappedScopesCount = wrapScopesArraysWithDefineScopes(rolesFilePath, project);
267
291
  const wrappedRoles = wrapRolesWithDefineRoles(rolesFilePath, project);
268
292
  const removedRoleType = removeRoleTypeDefinitionAndUnusedImports(rolesFilePath, project);
@@ -276,6 +300,6 @@ function main() {
276
300
  return;
277
301
  }
278
302
  yield sourceFile.save();
279
- console.log(`Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ', wrapped roles with defineRoles()' : ''}${removedRoleType ? ', and removed Role type definition' : ''}${importChanged ? '. Updated toolkit/scopes imports.' : '.'}`);
303
+ console.log(`Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ', wrapped roles with defineRoles()' : ''}${removedRoleType ? ', and removed Role type definition' : ''}${importChanged ? '. Updated toolkit/scopes imports.' : '.'}`);
280
304
  });
281
305
  }
@@ -1331,8 +1331,7 @@ var ActionCreationMetadata = z16.object({
1331
1331
  ),
1332
1332
  createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
1333
1333
  acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
1334
- createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation."),
1335
- createdBySignature: z16.string().nullish().describe("Signature of the user who created the action request.")
1334
+ createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
1336
1335
  });
1337
1336
  var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1338
1337
  registrationNumber: z16.string().describe(
@@ -1360,9 +1359,6 @@ var EventMetadata = z16.object({
1360
1359
  createdAtLocation: UUID.nullish().describe(
1361
1360
  "Location of the user who created the event."
1362
1361
  ),
1363
- createdBySignature: DocumentPath.nullish().describe(
1364
- "Signature of the user who created the event."
1365
- ),
1366
1362
  updatedAtLocation: UUID.nullish().describe(
1367
1363
  "Location of the user who last changed the status."
1368
1364
  ),
@@ -1370,9 +1366,6 @@ var EventMetadata = z16.object({
1370
1366
  "Timestamp of the most recent *accepted* status change. Possibly 3rd party update, if action is validation asynchronously."
1371
1367
  ),
1372
1368
  assignedTo: z16.string().nullish().describe("ID of the user currently assigned to the event."),
1373
- assignedToSignature: DocumentPath.nullish().describe(
1374
- "Signature of the user who is currently assigned to the event."
1375
- ),
1376
1369
  updatedBy: z16.string().nullish().describe("ID of the user who last changed the status."),
1377
1370
  trackingId: z16.string().describe(
1378
1371
  "System-generated tracking ID used by informants or registrars to look up the event."
@@ -4175,6 +4168,8 @@ var BaseActionInput = z38.object({
4175
4168
  originalActionId: UUID.optional(),
4176
4169
  // should not be part of base action.
4177
4170
  keepAssignment: z38.boolean().optional(),
4171
+ keepAssignmentIfAccepted: z38.boolean().optional(),
4172
+ keepAssignmentIfRejected: z38.boolean().optional(),
4178
4173
  waitFor: z38.boolean().optional(),
4179
4174
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
4180
4175
  // @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opencrvs/toolkit",
3
- "version": "2.0.0-rc.c7f111d",
3
+ "version": "2.0.0-rc.ca1536b",
4
4
  "description": "OpenCRVS toolkit for building country configurations",
5
5
  "license": "MPL-2.0",
6
6
  "bin": {