@opencrvs/toolkit 2.0.0-rc.801cc8b → 2.0.0-rc.85c0047
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/dist/application-config/index.js +23 -26
- package/dist/cli.js +203 -35
- package/dist/commons/api/router.d.ts +3301 -247
- package/dist/commons/conditionals/validate.d.ts +1 -0
- package/dist/commons/events/ActionInput.d.ts +108 -0
- package/dist/commons/events/Draft.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +0 -3
- package/dist/commons/events/EventMetadata.d.ts +0 -7
- package/dist/commons/events/state/index.d.ts +0 -4
- package/dist/commons/events/state/utils.d.ts +0 -2
- package/dist/commons/events/utils.d.ts +1 -1
- package/dist/events/index.js +43 -60
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +201 -33
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +54 -30
- package/dist/notification/index.js +30 -30
- package/opencrvs-toolkit-2.0.0-rc.85c0047.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.801cc8b.tgz +0 -0
|
@@ -1895,9 +1895,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
|
|
|
1895
1895
|
}
|
|
1896
1896
|
return replacedCount;
|
|
1897
1897
|
}
|
|
1898
|
-
function resolveConfigChain(configObj,
|
|
1898
|
+
function resolveConfigChain(configObj, path24) {
|
|
1899
1899
|
let current = configObj;
|
|
1900
|
-
for (const key of
|
|
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"));
|
|
@@ -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)
|
|
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
|
|
2687
|
-
|
|
2688
|
-
|
|
2689
|
-
|
|
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
|
-
` [${
|
|
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
|
-
` [${
|
|
2777
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2703
2778
|
);
|
|
2779
|
+
rawTexts.push(element.getText());
|
|
2704
2780
|
continue;
|
|
2705
2781
|
}
|
|
2706
|
-
|
|
2707
|
-
|
|
2708
|
-
|
|
2709
|
-
|
|
2710
|
-
|
|
2711
|
-
|
|
2712
|
-
|
|
2713
|
-
|
|
2714
|
-
|
|
2715
|
-
|
|
2716
|
-
|
|
2717
|
-
|
|
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 '${
|
|
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
|
|
|
@@ -4764,9 +4843,9 @@ var import_path24 = require("path");
|
|
|
4764
4843
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4765
4844
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4766
4845
|
var BASE_BRANCH = "release-v1.9";
|
|
4767
|
-
function gitShowBytes(ref,
|
|
4846
|
+
function gitShowBytes(ref, path24) {
|
|
4768
4847
|
try {
|
|
4769
|
-
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${
|
|
4848
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
|
|
4770
4849
|
cwd: process.cwd(),
|
|
4771
4850
|
stdio: ["ignore", "pipe", "pipe"]
|
|
4772
4851
|
});
|
|
@@ -4942,6 +5021,94 @@ async function main26({
|
|
|
4942
5021
|
);
|
|
4943
5022
|
}
|
|
4944
5023
|
|
|
5024
|
+
// src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
|
|
5025
|
+
var import_ts_morph22 = require("ts-morph");
|
|
5026
|
+
var import_path26 = __toESM(require("path"));
|
|
5027
|
+
var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
|
|
5028
|
+
var ACTION_PARAMETER_NAME = "action";
|
|
5029
|
+
var OLD_TYPE = "ActionInput";
|
|
5030
|
+
var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
|
|
5031
|
+
function isAcceptRequestedRegistrationParameter(parameter) {
|
|
5032
|
+
const functionDeclaration = parameter.getFirstAncestorByKind(
|
|
5033
|
+
import_ts_morph22.SyntaxKind.FunctionDeclaration
|
|
5034
|
+
);
|
|
5035
|
+
if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
|
|
5036
|
+
return true;
|
|
5037
|
+
}
|
|
5038
|
+
const arrowFunction = parameter.getFirstAncestorByKind(
|
|
5039
|
+
import_ts_morph22.SyntaxKind.ArrowFunction
|
|
5040
|
+
);
|
|
5041
|
+
const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
|
|
5042
|
+
import_ts_morph22.SyntaxKind.VariableDeclaration
|
|
5043
|
+
);
|
|
5044
|
+
return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
|
|
5045
|
+
}
|
|
5046
|
+
function processFile14(filePath, project) {
|
|
5047
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
5048
|
+
if (!sourceFile) return 0;
|
|
5049
|
+
let updatedCount = 0;
|
|
5050
|
+
for (const parameter of sourceFile.getDescendantsOfKind(
|
|
5051
|
+
import_ts_morph22.SyntaxKind.Parameter
|
|
5052
|
+
)) {
|
|
5053
|
+
if (parameter.getName() !== ACTION_PARAMETER_NAME) {
|
|
5054
|
+
continue;
|
|
5055
|
+
}
|
|
5056
|
+
if (!isAcceptRequestedRegistrationParameter(parameter)) {
|
|
5057
|
+
continue;
|
|
5058
|
+
}
|
|
5059
|
+
const typeNode = parameter.getTypeNode();
|
|
5060
|
+
if (!typeNode || typeNode.getText() !== OLD_TYPE) {
|
|
5061
|
+
continue;
|
|
5062
|
+
}
|
|
5063
|
+
parameter.setType(NEW_TYPE);
|
|
5064
|
+
updatedCount++;
|
|
5065
|
+
console.log(
|
|
5066
|
+
` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
|
|
5067
|
+
);
|
|
5068
|
+
}
|
|
5069
|
+
return updatedCount;
|
|
5070
|
+
}
|
|
5071
|
+
async function main27() {
|
|
5072
|
+
const srcDir = import_path26.default.join(process.cwd(), "src");
|
|
5073
|
+
console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
|
|
5074
|
+
`);
|
|
5075
|
+
const project = new import_ts_morph22.Project({
|
|
5076
|
+
tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
|
|
5077
|
+
skipAddingFilesFromTsConfig: false
|
|
5078
|
+
});
|
|
5079
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
5080
|
+
const filePath = sf.getFilePath();
|
|
5081
|
+
return filePath.includes("/src/") && !filePath.includes("/node_modules/");
|
|
5082
|
+
});
|
|
5083
|
+
let totalUpdated = 0;
|
|
5084
|
+
const modifiedFiles = [];
|
|
5085
|
+
for (const sourceFile of sourceFiles) {
|
|
5086
|
+
const filePath = sourceFile.getFilePath();
|
|
5087
|
+
const updated = processFile14(filePath, project);
|
|
5088
|
+
if (updated > 0) {
|
|
5089
|
+
totalUpdated += updated;
|
|
5090
|
+
modifiedFiles.push(filePath);
|
|
5091
|
+
}
|
|
5092
|
+
}
|
|
5093
|
+
if (modifiedFiles.length === 0) {
|
|
5094
|
+
console.log(
|
|
5095
|
+
`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
|
|
5096
|
+
);
|
|
5097
|
+
return;
|
|
5098
|
+
}
|
|
5099
|
+
console.log(`
|
|
5100
|
+
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
5101
|
+
for (const filePath of modifiedFiles) {
|
|
5102
|
+
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
5103
|
+
await sourceFile.save();
|
|
5104
|
+
console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
|
|
5105
|
+
}
|
|
5106
|
+
console.log(
|
|
5107
|
+
`
|
|
5108
|
+
Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
|
|
5109
|
+
);
|
|
5110
|
+
}
|
|
5111
|
+
|
|
4945
5112
|
// src/migrations/v2.0/index.ts
|
|
4946
5113
|
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4947
5114
|
async function runUpgrade(dockerSwarm) {
|
|
@@ -4968,6 +5135,7 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4968
5135
|
await main22();
|
|
4969
5136
|
await main23();
|
|
4970
5137
|
await main24();
|
|
5138
|
+
await main27();
|
|
4971
5139
|
await main17();
|
|
4972
5140
|
if (dockerSwarm) {
|
|
4973
5141
|
await main25();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-scopes.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-scopes.ts"],"names":[],"mappings":"
|
|
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
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
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(` [${
|
|
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(` [${
|
|
117
|
+
console.warn(` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`);
|
|
118
|
+
rawTexts.push(element.getText());
|
|
98
119
|
continue;
|
|
99
120
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
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 '${
|
|
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
|
}
|
|
@@ -652,7 +652,10 @@ var ActionConditional = z7.discriminatedUnion("type", [
|
|
|
652
652
|
ShowConditional,
|
|
653
653
|
// Action can be shown to the user in the list but as disabled
|
|
654
654
|
EnableConditional
|
|
655
|
-
])
|
|
655
|
+
]).meta({
|
|
656
|
+
description: "Action conditional configuration",
|
|
657
|
+
id: "ActionConditional"
|
|
658
|
+
});
|
|
656
659
|
var DisplayOnReviewConditional = z7.object({
|
|
657
660
|
type: z7.literal(ConditionalType.DISPLAY_ON_REVIEW),
|
|
658
661
|
conditional: Conditional
|
|
@@ -980,28 +983,20 @@ function schemaPriority(schema) {
|
|
|
980
983
|
return idx === -1 ? 9999 : idx;
|
|
981
984
|
}
|
|
982
985
|
function safeUnion(schemas) {
|
|
986
|
+
const sortedSchemas = [...schemas].sort(
|
|
987
|
+
(a, b) => schemaPriority(a) - schemaPriority(b)
|
|
988
|
+
);
|
|
983
989
|
return z12.any().superRefine((val, ctx) => {
|
|
984
|
-
const
|
|
985
|
-
|
|
986
|
-
|
|
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
|
-
});
|
|
990
|
+
for (const schema of sortedSchemas) {
|
|
991
|
+
if (schema.safeParse(val).success) {
|
|
992
|
+
return;
|
|
993
|
+
}
|
|
1004
994
|
}
|
|
995
|
+
ctx.addIssue({
|
|
996
|
+
code: "invalid_type",
|
|
997
|
+
expected: "custom",
|
|
998
|
+
message: "Value does not match any schema"
|
|
999
|
+
});
|
|
1005
1000
|
}).meta({
|
|
1006
1001
|
description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
|
|
1007
1002
|
});
|
|
@@ -1311,6 +1306,9 @@ var FlagConfig = z15.object({
|
|
|
1311
1306
|
"Indicates if this flag expects an action to be performed to be cleared."
|
|
1312
1307
|
),
|
|
1313
1308
|
label: TranslationConfig.describe("Human readable label of the flag.")
|
|
1309
|
+
}).meta({
|
|
1310
|
+
description: "Flag configuration",
|
|
1311
|
+
id: "FlagConfig"
|
|
1314
1312
|
});
|
|
1315
1313
|
var ActionFlagConfig = z15.object({
|
|
1316
1314
|
id: Flag,
|
|
@@ -1318,6 +1316,9 @@ var ActionFlagConfig = z15.object({
|
|
|
1318
1316
|
conditional: Conditional.optional().describe(
|
|
1319
1317
|
"When conditional is met, the operation is performed on the flag. If not provided, the operation is performed unconditionally."
|
|
1320
1318
|
)
|
|
1319
|
+
}).meta({
|
|
1320
|
+
description: "Action flag configuration",
|
|
1321
|
+
id: "ActionFlagConfig"
|
|
1321
1322
|
});
|
|
1322
1323
|
|
|
1323
1324
|
// ../commons/src/events/EventMetadata.ts
|
|
@@ -1339,8 +1340,7 @@ var ActionCreationMetadata = z16.object({
|
|
|
1339
1340
|
),
|
|
1340
1341
|
createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
|
|
1341
1342
|
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.")
|
|
1343
|
+
createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
|
|
1344
1344
|
});
|
|
1345
1345
|
var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
1346
1346
|
registrationNumber: z16.string().describe(
|
|
@@ -1368,9 +1368,6 @@ var EventMetadata = z16.object({
|
|
|
1368
1368
|
createdAtLocation: UUID.nullish().describe(
|
|
1369
1369
|
"Location of the user who created the event."
|
|
1370
1370
|
),
|
|
1371
|
-
createdBySignature: DocumentPath.nullish().describe(
|
|
1372
|
-
"Signature of the user who created the event."
|
|
1373
|
-
),
|
|
1374
1371
|
updatedAtLocation: UUID.nullish().describe(
|
|
1375
1372
|
"Location of the user who last changed the status."
|
|
1376
1373
|
),
|
|
@@ -2376,10 +2373,10 @@ var VerificationPageConfig = FormPageConfig.extend({
|
|
|
2376
2373
|
type: z21.literal(PageTypes.enum.VERIFICATION),
|
|
2377
2374
|
actions: VerificationActionConfig
|
|
2378
2375
|
});
|
|
2379
|
-
var PageConfig = z21.discriminatedUnion("type", [
|
|
2380
|
-
|
|
2381
|
-
|
|
2382
|
-
|
|
2376
|
+
var PageConfig = z21.discriminatedUnion("type", [FormPageConfig, VerificationPageConfig]).meta({
|
|
2377
|
+
description: "Page configuration",
|
|
2378
|
+
id: "PageConfig"
|
|
2379
|
+
});
|
|
2383
2380
|
|
|
2384
2381
|
// ../commons/src/events/FormConfig.ts
|
|
2385
2382
|
var DeclarationFormConfig = z22.object({
|
|
@@ -4180,6 +4177,9 @@ var BaseActionInput = z38.object({
|
|
|
4180
4177
|
originalActionId: UUID.optional(),
|
|
4181
4178
|
// should not be part of base action.
|
|
4182
4179
|
keepAssignment: z38.boolean().optional(),
|
|
4180
|
+
keepAssignmentIfAccepted: z38.boolean().optional(),
|
|
4181
|
+
keepAssignmentIfRejected: z38.boolean().optional(),
|
|
4182
|
+
waitFor: z38.boolean().optional(),
|
|
4183
4183
|
// For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
|
|
4184
4184
|
// @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
4185
|
createdAtLocation: UUID.nullish().describe(
|
|
Binary file
|
package/package.json
CHANGED
package/tsconfig.tsbuildinfo
CHANGED
|
@@ -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"}
|
|
Binary file
|