@opencrvs/toolkit 2.0.0-rc.ba25240 → 2.0.0-rc.bb26ec5

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.
@@ -1895,9 +1895,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
1895
1895
  }
1896
1896
  return replacedCount;
1897
1897
  }
1898
- function resolveConfigChain(configObj, path23) {
1898
+ function resolveConfigChain(configObj, path24) {
1899
1899
  let current = configObj;
1900
- for (const key of path23) {
1900
+ for (const key of path24) {
1901
1901
  if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
1902
1902
  const prop = current.getProperty(key);
1903
1903
  if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
@@ -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"));
@@ -2401,11 +2405,12 @@ var decodeScope = (query) => {
2401
2405
  };
2402
2406
  var DEFAULT_SCOPE_OPTIONS = {
2403
2407
  placeOfEvent: JurisdictionFilter.enum.all,
2404
- accessLevel: JurisdictionFilter.enum.all
2408
+ accessLevel: JurisdictionFilter.enum.all,
2409
+ registeredIn: JurisdictionFilter.enum.all,
2410
+ declaredIn: JurisdictionFilter.enum.all
2405
2411
  };
2406
2412
 
2407
2413
  // ../commons/src/scopes.deprecated.do-not-use.ts
2408
- var z4 = __toESM(require("zod/v4"));
2409
2414
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2410
2415
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2411
2416
  var SearchScope = z4.object({
@@ -2639,6 +2644,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2639
2644
  }
2640
2645
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2641
2646
  };
2647
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2648
+ function isMergeableUserScopeType(type) {
2649
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2650
+ }
2651
+ function decodeLegacyScope(legacy) {
2652
+ const encoded = legacyScopeToV2Scope(legacy);
2653
+ const scope = decodeScope(encoded);
2654
+ if (!scope) {
2655
+ throw new Error(
2656
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2657
+ );
2658
+ }
2659
+ return { legacy, scope };
2660
+ }
2661
+ function groupByType(entries) {
2662
+ return entries.reduce(
2663
+ (groups, entry) => ({
2664
+ ...groups,
2665
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2666
+ }),
2667
+ {}
2668
+ );
2669
+ }
2670
+ function deduplicateEntries(entries) {
2671
+ return entries.filter(
2672
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2673
+ );
2674
+ }
2675
+ function mergeEntries(type, entries) {
2676
+ const optionsList = entries.map(
2677
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2678
+ );
2679
+ const allKeys = optionsList.flatMap(
2680
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2681
+ );
2682
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2683
+ if (conflictKey) {
2684
+ const conflicting = entries.filter(
2685
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2686
+ ).map((e) => JSON.stringify(e.legacy));
2687
+ throw new Error(
2688
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2689
+ );
2690
+ }
2691
+ const mergedOptions = Object.assign({}, ...optionsList);
2692
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2693
+ const parsed = Scope2.safeParse(merged);
2694
+ if (!parsed.success) {
2695
+ throw new Error(
2696
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2697
+ );
2698
+ }
2699
+ return parsed.data;
2700
+ }
2701
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2702
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2703
+ return Object.entries(groups).flatMap(([type, entries]) => {
2704
+ const deduped = deduplicateEntries(entries);
2705
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2706
+ if (!isMergeableUserScopeType(type)) {
2707
+ console.warn(
2708
+ `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.`
2709
+ );
2710
+ return deduped.map((e) => e.scope);
2711
+ }
2712
+ return [mergeEntries(type, deduped)];
2713
+ });
2714
+ }
2642
2715
 
2643
2716
  // src/migrations/v2.0/migrate-scopes.ts
2644
2717
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2676,57 +2749,65 @@ function resolveLegacyScopeFromElement(element) {
2676
2749
  }
2677
2750
  function migrateScopesArrays(rolesFilePath, project) {
2678
2751
  const sourceFile = project.getSourceFile(rolesFilePath);
2679
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2752
+ if (!sourceFile) {
2753
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2754
+ }
2680
2755
  let migratedCount = 0;
2681
2756
  let removedCount = 0;
2757
+ let mergedCount = 0;
2682
2758
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2759
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2683
2760
  for (const scopesProp of scopesProperties) {
2684
2761
  const initializer = scopesProp.getInitializer();
2685
2762
  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;
2763
+ const rawTexts = [];
2764
+ const legacyStrings = [];
2765
+ let anyChange = false;
2766
+ for (const element of initializer.getElements()) {
2690
2767
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2691
2768
  if (scopeKey && !(scopeKey in SCOPES)) {
2692
2769
  console.warn(
2693
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2770
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2694
2771
  );
2695
- initializer.removeElement(index);
2696
2772
  removedCount++;
2773
+ anyChange = true;
2697
2774
  continue;
2698
2775
  }
2699
2776
  const legacyScope = resolveLegacyScopeFromElement(element);
2700
2777
  if (!legacyScope) {
2701
2778
  console.warn(
2702
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2779
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2703
2780
  );
2781
+ rawTexts.push(element.getText());
2704
2782
  continue;
2705
2783
  }
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
- }
2784
+ legacyStrings.push(legacyScope);
2785
+ anyChange = true;
2786
+ }
2787
+ if (!anyChange) continue;
2788
+ let mergedScopes;
2789
+ try {
2790
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2791
+ } catch (error) {
2792
+ throw new Error(
2793
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2794
+ { cause: error }
2795
+ );
2722
2796
  }
2797
+ migratedCount += legacyStrings.length;
2798
+ mergedCount += legacyStrings.length - mergedScopes.length;
2799
+ const outputElements = [
2800
+ ...rawTexts,
2801
+ ...mergedScopes.map((s) => JSON.stringify(s))
2802
+ ];
2803
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2723
2804
  }
2724
2805
  if (removedCount > 0) {
2725
2806
  console.log(
2726
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2807
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2727
2808
  );
2728
2809
  }
2729
- return { migratedCount, removedCount };
2810
+ return { migratedCount, removedCount, mergedCount };
2730
2811
  }
2731
2812
  function ensureScopesHelpersImport(rolesFilePath, project) {
2732
2813
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2861,7 +2942,7 @@ async function main11() {
2861
2942
  return;
2862
2943
  }
2863
2944
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2864
- const { migratedCount, removedCount } = migrateScopesArrays(
2945
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2865
2946
  rolesFilePath,
2866
2947
  project
2867
2948
  );
@@ -2880,7 +2961,7 @@ async function main11() {
2880
2961
  }
2881
2962
  await sourceFile.save();
2882
2963
  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." : "."}`
2964
+ `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
2965
  );
2885
2966
  }
2886
2967
 
@@ -4764,9 +4845,9 @@ var import_path24 = require("path");
4764
4845
  var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
4765
4846
  var INFRASTRUCTURE_DIR = "infrastructure";
4766
4847
  var BASE_BRANCH = "release-v1.9";
4767
- function gitShowBytes(ref, path23) {
4848
+ function gitShowBytes(ref, path24) {
4768
4849
  try {
4769
- const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
4850
+ const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
4770
4851
  cwd: process.cwd(),
4771
4852
  stdio: ["ignore", "pipe", "pipe"]
4772
4853
  });
@@ -4942,6 +5023,94 @@ async function main26({
4942
5023
  );
4943
5024
  }
4944
5025
 
5026
+ // src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
5027
+ var import_ts_morph22 = require("ts-morph");
5028
+ var import_path26 = __toESM(require("path"));
5029
+ var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
5030
+ var ACTION_PARAMETER_NAME = "action";
5031
+ var OLD_TYPE = "ActionInput";
5032
+ var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
5033
+ function isAcceptRequestedRegistrationParameter(parameter) {
5034
+ const functionDeclaration = parameter.getFirstAncestorByKind(
5035
+ import_ts_morph22.SyntaxKind.FunctionDeclaration
5036
+ );
5037
+ if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
5038
+ return true;
5039
+ }
5040
+ const arrowFunction = parameter.getFirstAncestorByKind(
5041
+ import_ts_morph22.SyntaxKind.ArrowFunction
5042
+ );
5043
+ const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
5044
+ import_ts_morph22.SyntaxKind.VariableDeclaration
5045
+ );
5046
+ return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
5047
+ }
5048
+ function processFile14(filePath, project) {
5049
+ const sourceFile = project.getSourceFile(filePath);
5050
+ if (!sourceFile) return 0;
5051
+ let updatedCount = 0;
5052
+ for (const parameter of sourceFile.getDescendantsOfKind(
5053
+ import_ts_morph22.SyntaxKind.Parameter
5054
+ )) {
5055
+ if (parameter.getName() !== ACTION_PARAMETER_NAME) {
5056
+ continue;
5057
+ }
5058
+ if (!isAcceptRequestedRegistrationParameter(parameter)) {
5059
+ continue;
5060
+ }
5061
+ const typeNode = parameter.getTypeNode();
5062
+ if (!typeNode || typeNode.getText() !== OLD_TYPE) {
5063
+ continue;
5064
+ }
5065
+ parameter.setType(NEW_TYPE);
5066
+ updatedCount++;
5067
+ console.log(
5068
+ ` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
5069
+ );
5070
+ }
5071
+ return updatedCount;
5072
+ }
5073
+ async function main27() {
5074
+ const srcDir = import_path26.default.join(process.cwd(), "src");
5075
+ console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
5076
+ `);
5077
+ const project = new import_ts_morph22.Project({
5078
+ tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
5079
+ skipAddingFilesFromTsConfig: false
5080
+ });
5081
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
5082
+ const filePath = sf.getFilePath();
5083
+ return filePath.includes("/src/") && !filePath.includes("/node_modules/");
5084
+ });
5085
+ let totalUpdated = 0;
5086
+ const modifiedFiles = [];
5087
+ for (const sourceFile of sourceFiles) {
5088
+ const filePath = sourceFile.getFilePath();
5089
+ const updated = processFile14(filePath, project);
5090
+ if (updated > 0) {
5091
+ totalUpdated += updated;
5092
+ modifiedFiles.push(filePath);
5093
+ }
5094
+ }
5095
+ if (modifiedFiles.length === 0) {
5096
+ console.log(
5097
+ `No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
5098
+ );
5099
+ return;
5100
+ }
5101
+ console.log(`
5102
+ Saving ${modifiedFiles.length} modified file(s)...`);
5103
+ for (const filePath of modifiedFiles) {
5104
+ const sourceFile = project.getSourceFileOrThrow(filePath);
5105
+ await sourceFile.save();
5106
+ console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
5107
+ }
5108
+ console.log(
5109
+ `
5110
+ Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
5111
+ );
5112
+ }
5113
+
4945
5114
  // src/migrations/v2.0/index.ts
4946
5115
  var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4947
5116
  async function runUpgrade(dockerSwarm) {
@@ -4968,6 +5137,7 @@ async function runUpgrade(dockerSwarm) {
4968
5137
  await main22();
4969
5138
  await main23();
4970
5139
  await main24();
5140
+ await main27();
4971
5141
  await main17();
4972
5142
  if (dockerSwarm) {
4973
5143
  await main25();
@@ -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
  }
@@ -293,7 +293,9 @@ var ScopeType = z2.enum([
293
293
  var EncodedScope = z2.string().brand("EncodedScope");
294
294
  var DEFAULT_SCOPE_OPTIONS = {
295
295
  placeOfEvent: JurisdictionFilter.enum.all,
296
- accessLevel: JurisdictionFilter.enum.all
296
+ accessLevel: JurisdictionFilter.enum.all,
297
+ registeredIn: JurisdictionFilter.enum.all,
298
+ declaredIn: JurisdictionFilter.enum.all
297
299
  };
298
300
 
299
301
  // ../commons/src/authentication.ts
@@ -652,7 +654,10 @@ var ActionConditional = z7.discriminatedUnion("type", [
652
654
  ShowConditional,
653
655
  // Action can be shown to the user in the list but as disabled
654
656
  EnableConditional
655
- ]);
657
+ ]).meta({
658
+ description: "Action conditional configuration",
659
+ id: "ActionConditional"
660
+ });
656
661
  var DisplayOnReviewConditional = z7.object({
657
662
  type: z7.literal(ConditionalType.DISPLAY_ON_REVIEW),
658
663
  conditional: Conditional
@@ -980,28 +985,20 @@ function schemaPriority(schema) {
980
985
  return idx === -1 ? 9999 : idx;
981
986
  }
982
987
  function safeUnion(schemas) {
988
+ const sortedSchemas = [...schemas].sort(
989
+ (a, b) => schemaPriority(a) - schemaPriority(b)
990
+ );
983
991
  return z12.any().superRefine((val, ctx) => {
984
- const successful = schemas.filter((s) => s.safeParse(val).success);
985
- if (successful.length === 1) {
986
- return;
987
- }
988
- if (successful.length === 0) {
989
- ctx.addIssue({
990
- code: "invalid_type",
991
- expected: "custom",
992
- message: "Value does not match any schema"
993
- });
994
- return;
995
- }
996
- successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
997
- const best = successful[0];
998
- if (!best.safeParse(val).success) {
999
- ctx.addIssue({
1000
- expected: "custom",
1001
- code: "invalid_type",
1002
- message: "Value did not match the best schema"
1003
- });
992
+ for (const schema of sortedSchemas) {
993
+ if (schema.safeParse(val).success) {
994
+ return;
995
+ }
1004
996
  }
997
+ ctx.addIssue({
998
+ code: "invalid_type",
999
+ expected: "custom",
1000
+ message: "Value does not match any schema"
1001
+ });
1005
1002
  }).meta({
1006
1003
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
1007
1004
  });
@@ -1311,6 +1308,9 @@ var FlagConfig = z15.object({
1311
1308
  "Indicates if this flag expects an action to be performed to be cleared."
1312
1309
  ),
1313
1310
  label: TranslationConfig.describe("Human readable label of the flag.")
1311
+ }).meta({
1312
+ description: "Flag configuration",
1313
+ id: "FlagConfig"
1314
1314
  });
1315
1315
  var ActionFlagConfig = z15.object({
1316
1316
  id: Flag,
@@ -1318,6 +1318,9 @@ var ActionFlagConfig = z15.object({
1318
1318
  conditional: Conditional.optional().describe(
1319
1319
  "When conditional is met, the operation is performed on the flag. If not provided, the operation is performed unconditionally."
1320
1320
  )
1321
+ }).meta({
1322
+ description: "Action flag configuration",
1323
+ id: "ActionFlagConfig"
1321
1324
  });
1322
1325
 
1323
1326
  // ../commons/src/events/EventMetadata.ts
@@ -1339,8 +1342,7 @@ var ActionCreationMetadata = z16.object({
1339
1342
  ),
1340
1343
  createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
1341
1344
  acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
1342
- createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation."),
1343
- createdBySignature: z16.string().nullish().describe("Signature of the user who created the action request.")
1345
+ createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
1344
1346
  });
1345
1347
  var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1346
1348
  registrationNumber: z16.string().describe(
@@ -1368,9 +1370,6 @@ var EventMetadata = z16.object({
1368
1370
  createdAtLocation: UUID.nullish().describe(
1369
1371
  "Location of the user who created the event."
1370
1372
  ),
1371
- createdBySignature: DocumentPath.nullish().describe(
1372
- "Signature of the user who created the event."
1373
- ),
1374
1373
  updatedAtLocation: UUID.nullish().describe(
1375
1374
  "Location of the user who last changed the status."
1376
1375
  ),
@@ -2376,10 +2375,10 @@ var VerificationPageConfig = FormPageConfig.extend({
2376
2375
  type: z21.literal(PageTypes.enum.VERIFICATION),
2377
2376
  actions: VerificationActionConfig
2378
2377
  });
2379
- var PageConfig = z21.discriminatedUnion("type", [
2380
- FormPageConfig,
2381
- VerificationPageConfig
2382
- ]);
2378
+ var PageConfig = z21.discriminatedUnion("type", [FormPageConfig, VerificationPageConfig]).meta({
2379
+ description: "Page configuration",
2380
+ id: "PageConfig"
2381
+ });
2383
2382
 
2384
2383
  // ../commons/src/events/FormConfig.ts
2385
2384
  var DeclarationFormConfig = z22.object({
@@ -4180,6 +4179,9 @@ var BaseActionInput = z38.object({
4180
4179
  originalActionId: UUID.optional(),
4181
4180
  // should not be part of base action.
4182
4181
  keepAssignment: z38.boolean().optional(),
4182
+ keepAssignmentIfAccepted: z38.boolean().optional(),
4183
+ keepAssignmentIfRejected: z38.boolean().optional(),
4184
+ waitFor: z38.boolean().optional(),
4183
4185
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
4184
4186
  // @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
4185
4187
  createdAtLocation: UUID.nullish().describe(
@@ -365,7 +365,9 @@ var decodeScope = (query) => {
365
365
  };
366
366
  var DEFAULT_SCOPE_OPTIONS = {
367
367
  placeOfEvent: JurisdictionFilter.enum.all,
368
- accessLevel: JurisdictionFilter.enum.all
368
+ accessLevel: JurisdictionFilter.enum.all,
369
+ registeredIn: JurisdictionFilter.enum.all,
370
+ declaredIn: JurisdictionFilter.enum.all
369
371
  };
370
372
  function getScopeOptionValue(scope, option) {
371
373
  const options = "options" in scope ? scope.options : void 0;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opencrvs/toolkit",
3
- "version": "2.0.0-rc.ba25240",
3
+ "version": "2.0.0-rc.bb26ec5",
4
4
  "description": "OpenCRVS toolkit for building country configurations",
5
5
  "license": "MPL-2.0",
6
6
  "bin": {
@@ -1 +1 @@
1
- {"root":["./src/cli.ts","./src/api/index.ts","./src/application-config/index.ts","./src/conditionals/index.ts","./src/events/deduplication.ts","./src/events/index.ts","./src/migrations/v2.0/add-birth-certificate-issuance-flag.ts","./src/migrations/v2.0/add-resend-invite-notification.ts","./src/migrations/v2.0/checkout-upstream-files.ts","./src/migrations/v2.0/convert-config-files-to-ts.ts","./src/migrations/v2.0/convert-paragraph-to-heading.ts","./src/migrations/v2.0/create-events-index.ts","./src/migrations/v2.0/delete-infrastructure-directory.ts","./src/migrations/v2.0/index.ts","./src/migrations/v2.0/make-built-in-validate-actions-custom.ts","./src/migrations/v2.0/merge-infrastructure-directory.ts","./src/migrations/v2.0/migrate-application-config-url.ts","./src/migrations/v2.0/migrate-scopes.ts","./src/migrations/v2.0/migrate-validated-workqueue-status-to-flag.ts","./src/migrations/v2.0/migrate-workqueue-configs.ts","./src/migrations/v2.0/remove-delete-actions.ts","./src/migrations/v2.0/remove-demo-scope.ts","./src/migrations/v2.0/remove-deprecated-imports.ts","./src/migrations/v2.0/remove-fhir-url-helpers.ts","./src/migrations/v2.0/remove-hearth-migrations.ts","./src/migrations/v2.0/remove-old-statistics-service.ts","./src/migrations/v2.0/remove-pending-certification-flag.ts","./src/migrations/v2.0/remove-review-from-register-action.ts","./src/migrations/v2.0/remove-unused-environment-variables.ts","./src/migrations/v2.0/rename-api-paths.ts","./src/migrations/v2.0/rename-location-parent-id.ts","./src/migrations/v2.0/simplify-analytics-precalculations.ts","./src/migrations/v2.0/update-package-json.ts","./src/notification/index.ts","./src/scopes/index.ts"],"version":"5.6.3"}
1
+ {"root":["./src/cli.ts","./src/api/index.ts","./src/application-config/index.ts","./src/conditionals/index.ts","./src/events/deduplication.ts","./src/events/index.ts","./src/migrations/v2.0/add-birth-certificate-issuance-flag.ts","./src/migrations/v2.0/add-resend-invite-notification.ts","./src/migrations/v2.0/checkout-upstream-files.ts","./src/migrations/v2.0/convert-config-files-to-ts.ts","./src/migrations/v2.0/convert-paragraph-to-heading.ts","./src/migrations/v2.0/create-events-index.ts","./src/migrations/v2.0/delete-infrastructure-directory.ts","./src/migrations/v2.0/fix-accept-requested-registration-function-type.ts","./src/migrations/v2.0/index.ts","./src/migrations/v2.0/make-built-in-validate-actions-custom.ts","./src/migrations/v2.0/merge-infrastructure-directory.ts","./src/migrations/v2.0/migrate-application-config-url.ts","./src/migrations/v2.0/migrate-scopes.ts","./src/migrations/v2.0/migrate-validated-workqueue-status-to-flag.ts","./src/migrations/v2.0/migrate-workqueue-configs.ts","./src/migrations/v2.0/remove-delete-actions.ts","./src/migrations/v2.0/remove-demo-scope.ts","./src/migrations/v2.0/remove-deprecated-imports.ts","./src/migrations/v2.0/remove-fhir-url-helpers.ts","./src/migrations/v2.0/remove-hearth-migrations.ts","./src/migrations/v2.0/remove-old-statistics-service.ts","./src/migrations/v2.0/remove-pending-certification-flag.ts","./src/migrations/v2.0/remove-review-from-register-action.ts","./src/migrations/v2.0/remove-unused-environment-variables.ts","./src/migrations/v2.0/rename-api-paths.ts","./src/migrations/v2.0/rename-location-parent-id.ts","./src/migrations/v2.0/simplify-analytics-precalculations.ts","./src/migrations/v2.0/update-package-json.ts","./src/notification/index.ts","./src/scopes/index.ts"],"version":"5.6.3"}