@opencrvs/toolkit 2.0.0-rc.153df7b → 2.0.0-rc.174a4a0
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/create-countryconfig/index.js +73 -0
- package/create-countryconfig/package.json +11 -0
- package/dist/application-config/index.js +53 -31
- package/dist/cli.js +822 -202
- package/dist/commons/api/router.d.ts +62 -54
- package/dist/commons/application-config/index.d.ts +16 -4
- package/dist/commons/conditionals/conditionals.d.ts +6 -6
- package/dist/commons/events/ActionInput.d.ts +36 -0
- package/dist/commons/events/Draft.d.ts +1 -0
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/locations.d.ts +38 -1
- package/dist/commons/events/mocks.test.utils.d.ts +19 -0
- package/dist/commons/events/scopes.d.ts +24 -1
- package/dist/conditionals/index.js +37 -7
- package/dist/events/index.js +143 -27
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +60 -35
- package/dist/migrations/v2.0/add-resend-invite-notification.d.ts +3 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.d.ts.map +1 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.js +373 -0
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
- package/dist/migrations/v2.0/index.d.ts +5 -3
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +820 -200
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +90 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +54 -30
- package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
- package/dist/notification/index.js +50 -27
- package/dist/scopes/index.d.ts +87 -10
- package/dist/scopes/index.js +43 -8
- package/opencrvs-toolkit-2.0.0-rc.174a4a0.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.153df7b.tgz +0 -0
|
@@ -190,6 +190,8 @@ function ensureImports(sourceFile) {
|
|
|
190
190
|
var DEFINE_CONFIG_NAME2 = "defineConfig";
|
|
191
191
|
var ACTIONS_PROPERTY_NAME2 = "actions";
|
|
192
192
|
var TYPE_PROPERTY_NAME2 = "type";
|
|
193
|
+
var ID_PROPERTY_NAME = "id";
|
|
194
|
+
var FLAGS_PROPERTY_NAME = "flags";
|
|
193
195
|
var CUSTOM_ACTION_TYPE_PROPERTY_NAME = "customActionType";
|
|
194
196
|
var AUDIT_HISTORY_LABEL_PROPERTY_NAME = "auditHistoryLabel";
|
|
195
197
|
var DEDUPLICATION_PROPERTY_NAME = "deduplication";
|
|
@@ -199,9 +201,12 @@ var FORM_PROPERTY_NAME = "form";
|
|
|
199
201
|
var ACTION_TYPE_ENUM_NAME = "ActionType";
|
|
200
202
|
var VALIDATE_MEMBER_NAME = "VALIDATE";
|
|
201
203
|
var CUSTOM_MEMBER_NAME = "CUSTOM";
|
|
204
|
+
var REGISTER_MEMBER_NAME2 = "REGISTER";
|
|
202
205
|
var VALIDATE_STRING_LITERAL = "VALIDATE";
|
|
203
206
|
var CUSTOM_STRING_LITERAL = "CUSTOM";
|
|
207
|
+
var REGISTER_STRING_LITERAL2 = "REGISTER";
|
|
204
208
|
var VALIDATE_DECLARATION_VALUE = "VALIDATE_DECLARATION";
|
|
209
|
+
var VALIDATED_FLAG_VALUE = "validated";
|
|
205
210
|
function isValidateType(typeInitializer) {
|
|
206
211
|
if (typeInitializer.getKind() === import_ts_morph2.SyntaxKind.PropertyAccessExpression) {
|
|
207
212
|
const propAccess = typeInitializer.asKindOrThrow(
|
|
@@ -325,6 +330,50 @@ function transformValidateActionToCustom(obj, eventType) {
|
|
|
325
330
|
}
|
|
326
331
|
return true;
|
|
327
332
|
}
|
|
333
|
+
function isRegisterAction(action) {
|
|
334
|
+
const typeProperty = action.getProperty(TYPE_PROPERTY_NAME2);
|
|
335
|
+
if (!typeProperty || !import_ts_morph2.Node.isPropertyAssignment(typeProperty)) return false;
|
|
336
|
+
const typeInit = typeProperty.getInitializer();
|
|
337
|
+
if (!typeInit) return false;
|
|
338
|
+
if (import_ts_morph2.Node.isPropertyAccessExpression(typeInit)) {
|
|
339
|
+
const enumExpr = typeInit.getExpression();
|
|
340
|
+
return import_ts_morph2.Node.isIdentifier(enumExpr) && enumExpr.getText() === ACTION_TYPE_ENUM_NAME && typeInit.getName() === REGISTER_MEMBER_NAME2;
|
|
341
|
+
}
|
|
342
|
+
if (import_ts_morph2.Node.isStringLiteral(typeInit)) {
|
|
343
|
+
return typeInit.getLiteralValue() === REGISTER_STRING_LITERAL2;
|
|
344
|
+
}
|
|
345
|
+
return false;
|
|
346
|
+
}
|
|
347
|
+
function arrayHasElementWithId(array3, id) {
|
|
348
|
+
for (const el of array3.getElements()) {
|
|
349
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(el)) continue;
|
|
350
|
+
const idProp = el.getProperty(ID_PROPERTY_NAME);
|
|
351
|
+
if (!idProp || !import_ts_morph2.Node.isPropertyAssignment(idProp)) continue;
|
|
352
|
+
const idInit = idProp.getInitializer();
|
|
353
|
+
if (idInit && import_ts_morph2.Node.isStringLiteral(idInit) && idInit.getLiteralValue() === id) {
|
|
354
|
+
return true;
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
return false;
|
|
358
|
+
}
|
|
359
|
+
function ensureRegisterRemovesValidatedFlag(action) {
|
|
360
|
+
const entry = `{ id: '${VALIDATED_FLAG_VALUE}', operation: 'remove' }`;
|
|
361
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME);
|
|
362
|
+
if (flagsProp && import_ts_morph2.Node.isPropertyAssignment(flagsProp)) {
|
|
363
|
+
const flagsInit = flagsProp.getInitializer();
|
|
364
|
+
if (flagsInit && import_ts_morph2.Node.isArrayLiteralExpression(flagsInit)) {
|
|
365
|
+
if (arrayHasElementWithId(flagsInit, VALIDATED_FLAG_VALUE)) return false;
|
|
366
|
+
flagsInit.addElement(entry);
|
|
367
|
+
return true;
|
|
368
|
+
}
|
|
369
|
+
return false;
|
|
370
|
+
}
|
|
371
|
+
action.addPropertyAssignment({
|
|
372
|
+
name: FLAGS_PROPERTY_NAME,
|
|
373
|
+
initializer: `[${entry}]`
|
|
374
|
+
});
|
|
375
|
+
return true;
|
|
376
|
+
}
|
|
328
377
|
function processFile2(filePath, project) {
|
|
329
378
|
const sourceFile = project.getSourceFile(filePath);
|
|
330
379
|
if (!sourceFile) return 0;
|
|
@@ -390,6 +439,18 @@ function processFile2(filePath, project) {
|
|
|
390
439
|
` [${import_path2.default.relative(process.cwd(), filePath)}] Added top-level 'flags' array to defineConfig`
|
|
391
440
|
);
|
|
392
441
|
}
|
|
442
|
+
if (configHadValidateAction) {
|
|
443
|
+
for (const element of actionsInitializer.getElements()) {
|
|
444
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(element)) continue;
|
|
445
|
+
if (!isRegisterAction(element)) continue;
|
|
446
|
+
if (ensureRegisterRemovesValidatedFlag(element)) {
|
|
447
|
+
transformedCount++;
|
|
448
|
+
console.log(
|
|
449
|
+
` [${import_path2.default.relative(process.cwd(), filePath)}] Added '${VALIDATED_FLAG_VALUE}' remove-flag to REGISTER action`
|
|
450
|
+
);
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
}
|
|
393
454
|
if (fileNeedsImports) {
|
|
394
455
|
ensureImports(sourceFile);
|
|
395
456
|
}
|
|
@@ -436,7 +497,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
436
497
|
}
|
|
437
498
|
console.log(
|
|
438
499
|
`
|
|
439
|
-
Done.
|
|
500
|
+
Done. Applied ${totalTransformed} change(s): VALIDATE \u2192 CUSTOM (${VALIDATE_DECLARATION_VALUE}) and '${VALIDATED_FLAG_VALUE}' remove-flag on matching REGISTER actions.`
|
|
440
501
|
);
|
|
441
502
|
}
|
|
442
503
|
|
|
@@ -679,14 +740,14 @@ var QUERY_PROPERTY_NAME = "query";
|
|
|
679
740
|
var TYPE_PROPERTY_NAME5 = "type";
|
|
680
741
|
var CLAUSES_PROPERTY_NAME = "clauses";
|
|
681
742
|
var STATUS_PROPERTY_NAME = "status";
|
|
682
|
-
var
|
|
743
|
+
var FLAGS_PROPERTY_NAME2 = "flags";
|
|
683
744
|
var TERMS_PROPERTY_NAME = "terms";
|
|
684
745
|
var TERM_PROPERTY_NAME = "term";
|
|
685
746
|
var ANY_OF_PROPERTY_NAME = "anyOf";
|
|
686
747
|
var VALIDATED_STATUS_VALUE = "VALIDATED";
|
|
687
|
-
var
|
|
748
|
+
var VALIDATED_FLAG_VALUE2 = "validated";
|
|
688
749
|
function addValidatedFlag(clause) {
|
|
689
|
-
const flagsProperty = clause.getProperty(
|
|
750
|
+
const flagsProperty = clause.getProperty(FLAGS_PROPERTY_NAME2);
|
|
690
751
|
if (flagsProperty && import_ts_morph5.Node.isPropertyAssignment(flagsProperty)) {
|
|
691
752
|
const flagsInit = flagsProperty.getInitializer();
|
|
692
753
|
if (flagsInit && import_ts_morph5.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -694,19 +755,19 @@ function addValidatedFlag(clause) {
|
|
|
694
755
|
if (anyOfProperty && import_ts_morph5.Node.isPropertyAssignment(anyOfProperty)) {
|
|
695
756
|
const anyOfInit = anyOfProperty.getInitializer();
|
|
696
757
|
if (anyOfInit && import_ts_morph5.Node.isArrayLiteralExpression(anyOfInit)) {
|
|
697
|
-
anyOfInit.addElement(`'${
|
|
758
|
+
anyOfInit.addElement(`'${VALIDATED_FLAG_VALUE2}'`);
|
|
698
759
|
}
|
|
699
760
|
} else {
|
|
700
761
|
flagsInit.addPropertyAssignment({
|
|
701
762
|
name: ANY_OF_PROPERTY_NAME,
|
|
702
|
-
initializer: `['${
|
|
763
|
+
initializer: `['${VALIDATED_FLAG_VALUE2}']`
|
|
703
764
|
});
|
|
704
765
|
}
|
|
705
766
|
}
|
|
706
767
|
} else {
|
|
707
768
|
clause.addPropertyAssignment({
|
|
708
|
-
name:
|
|
709
|
-
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${
|
|
769
|
+
name: FLAGS_PROPERTY_NAME2,
|
|
770
|
+
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${VALIDATED_FLAG_VALUE2}'] }`
|
|
710
771
|
});
|
|
711
772
|
}
|
|
712
773
|
}
|
|
@@ -872,23 +933,26 @@ var DEFINE_CONFIG_NAME4 = "defineConfig";
|
|
|
872
933
|
var DEFINE_WORKQUEUES_NAME2 = "defineWorkqueues";
|
|
873
934
|
var ACTIONS_PROPERTY_NAME4 = "actions";
|
|
874
935
|
var ACTION_PROPERTY_NAME = "action";
|
|
875
|
-
var
|
|
936
|
+
var FLAGS_PROPERTY_NAME3 = "flags";
|
|
876
937
|
var QUERY_PROPERTY_NAME2 = "query";
|
|
877
938
|
var TYPE_PROPERTY_NAME6 = "type";
|
|
939
|
+
var ID_PROPERTY_NAME2 = "id";
|
|
878
940
|
var CLAUSES_PROPERTY_NAME2 = "clauses";
|
|
879
941
|
var ANY_OF_PROPERTY_NAME2 = "anyOf";
|
|
880
942
|
var FLAG_ID = "pending-first-certificate-issuance";
|
|
881
943
|
var REGISTER_TYPE = "REGISTER";
|
|
882
944
|
var PRINT_CERTIFICATE_TYPE = "PRINT_CERTIFICATE";
|
|
883
|
-
|
|
945
|
+
function flagDefinitionInitializer(eventType) {
|
|
946
|
+
return `{
|
|
884
947
|
id: '${FLAG_ID}',
|
|
885
948
|
label: {
|
|
886
|
-
id: 'event.
|
|
949
|
+
id: 'event.${eventType}.flag.${FLAG_ID}',
|
|
887
950
|
defaultMessage: 'Pending first certificate issuance',
|
|
888
951
|
description: 'Flag label for first certificate issuance'
|
|
889
952
|
},
|
|
890
953
|
requiresAction: true
|
|
891
954
|
}`;
|
|
955
|
+
}
|
|
892
956
|
function isActionOfType(obj, typeName) {
|
|
893
957
|
const typeProperty = obj.getProperty(TYPE_PROPERTY_NAME6);
|
|
894
958
|
if (!typeProperty || !import_ts_morph6.Node.isPropertyAssignment(typeProperty)) return false;
|
|
@@ -902,18 +966,20 @@ function isActionOfType(obj, typeName) {
|
|
|
902
966
|
}
|
|
903
967
|
return false;
|
|
904
968
|
}
|
|
905
|
-
function
|
|
906
|
-
const
|
|
907
|
-
|
|
908
|
-
|
|
909
|
-
|
|
910
|
-
|
|
911
|
-
|
|
912
|
-
|
|
913
|
-
|
|
914
|
-
|
|
969
|
+
function getEventType(configArg) {
|
|
970
|
+
for (const propName of [TYPE_PROPERTY_NAME6, ID_PROPERTY_NAME2]) {
|
|
971
|
+
const prop = configArg.getProperty(propName);
|
|
972
|
+
if (!prop || !import_ts_morph6.Node.isPropertyAssignment(prop)) continue;
|
|
973
|
+
const initializer = prop.getInitializer();
|
|
974
|
+
if (!initializer) continue;
|
|
975
|
+
if (import_ts_morph6.Node.isStringLiteral(initializer)) {
|
|
976
|
+
return initializer.getLiteralValue().toLowerCase();
|
|
977
|
+
}
|
|
978
|
+
if (import_ts_morph6.Node.isPropertyAccessExpression(initializer)) {
|
|
979
|
+
return initializer.getName().toLowerCase();
|
|
980
|
+
}
|
|
915
981
|
}
|
|
916
|
-
return
|
|
982
|
+
return null;
|
|
917
983
|
}
|
|
918
984
|
function hasElementWithId(array3, id) {
|
|
919
985
|
for (const el of array3.getElements()) {
|
|
@@ -927,27 +993,28 @@ function hasElementWithId(array3, id) {
|
|
|
927
993
|
}
|
|
928
994
|
return false;
|
|
929
995
|
}
|
|
930
|
-
function ensureTopLevelFlagDefinition(configArg) {
|
|
931
|
-
const
|
|
996
|
+
function ensureTopLevelFlagDefinition(configArg, eventType) {
|
|
997
|
+
const initializer = flagDefinitionInitializer(eventType);
|
|
998
|
+
const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME3);
|
|
932
999
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
933
1000
|
const flagsInit = flagsProp.getInitializer();
|
|
934
1001
|
if (flagsInit && import_ts_morph6.Node.isArrayLiteralExpression(flagsInit)) {
|
|
935
1002
|
if (hasElementWithId(flagsInit, FLAG_ID)) return false;
|
|
936
|
-
flagsInit.addElement(
|
|
1003
|
+
flagsInit.addElement(initializer);
|
|
937
1004
|
return true;
|
|
938
1005
|
}
|
|
939
1006
|
return false;
|
|
940
1007
|
}
|
|
941
1008
|
configArg.addPropertyAssignment({
|
|
942
|
-
name:
|
|
1009
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
943
1010
|
initializer: `[
|
|
944
|
-
${
|
|
1011
|
+
${initializer}
|
|
945
1012
|
]`
|
|
946
1013
|
});
|
|
947
1014
|
return true;
|
|
948
1015
|
}
|
|
949
1016
|
function ensureActionOperationFlag(action, operation) {
|
|
950
|
-
const flagsProp = action.getProperty(
|
|
1017
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME3);
|
|
951
1018
|
const entry = `{ id: '${FLAG_ID}', operation: '${operation}' }`;
|
|
952
1019
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
953
1020
|
const flagsInit = flagsProp.getInitializer();
|
|
@@ -959,16 +1026,18 @@ function ensureActionOperationFlag(action, operation) {
|
|
|
959
1026
|
return false;
|
|
960
1027
|
}
|
|
961
1028
|
action.addPropertyAssignment({
|
|
962
|
-
name:
|
|
1029
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
963
1030
|
initializer: `[${entry}]`
|
|
964
1031
|
});
|
|
965
1032
|
return true;
|
|
966
1033
|
}
|
|
967
|
-
function
|
|
1034
|
+
function processConfig(configArg, eventType, relPath) {
|
|
968
1035
|
let changes = 0;
|
|
969
|
-
if (ensureTopLevelFlagDefinition(configArg)) {
|
|
1036
|
+
if (ensureTopLevelFlagDefinition(configArg, eventType)) {
|
|
970
1037
|
changes++;
|
|
971
|
-
console.log(
|
|
1038
|
+
console.log(
|
|
1039
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`
|
|
1040
|
+
);
|
|
972
1041
|
}
|
|
973
1042
|
const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME4);
|
|
974
1043
|
if (!actionsProp || !import_ts_morph6.Node.isPropertyAssignment(actionsProp)) return changes;
|
|
@@ -982,7 +1051,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
982
1051
|
if (ensureActionOperationFlag(element, "add")) {
|
|
983
1052
|
changes++;
|
|
984
1053
|
console.log(
|
|
985
|
-
` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
1054
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
986
1055
|
);
|
|
987
1056
|
}
|
|
988
1057
|
}
|
|
@@ -990,7 +1059,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
990
1059
|
if (ensureActionOperationFlag(element, "remove")) {
|
|
991
1060
|
changes++;
|
|
992
1061
|
console.log(
|
|
993
|
-
` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
1062
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
994
1063
|
);
|
|
995
1064
|
}
|
|
996
1065
|
}
|
|
@@ -1019,7 +1088,7 @@ function hasPrintCertificateAction(workqueue) {
|
|
|
1019
1088
|
return false;
|
|
1020
1089
|
}
|
|
1021
1090
|
function addFlagToQueryClause(clause) {
|
|
1022
|
-
const flagsProp = clause.getProperty(
|
|
1091
|
+
const flagsProp = clause.getProperty(FLAGS_PROPERTY_NAME3);
|
|
1023
1092
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
1024
1093
|
const flagsInit = flagsProp.getInitializer();
|
|
1025
1094
|
if (flagsInit && import_ts_morph6.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -1044,7 +1113,7 @@ function addFlagToQueryClause(clause) {
|
|
|
1044
1113
|
}
|
|
1045
1114
|
} else {
|
|
1046
1115
|
clause.addPropertyAssignment({
|
|
1047
|
-
name:
|
|
1116
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
1048
1117
|
initializer: `{ ${ANY_OF_PROPERTY_NAME2}: ['${FLAG_ID}'] }`
|
|
1049
1118
|
});
|
|
1050
1119
|
return true;
|
|
@@ -1088,8 +1157,9 @@ function processFile6(filePath, project) {
|
|
|
1088
1157
|
if (args.length === 0) continue;
|
|
1089
1158
|
const configArg = args[0];
|
|
1090
1159
|
if (!import_ts_morph6.Node.isObjectLiteralExpression(configArg)) continue;
|
|
1091
|
-
|
|
1092
|
-
|
|
1160
|
+
const eventType = getEventType(configArg);
|
|
1161
|
+
if (!eventType) continue;
|
|
1162
|
+
totalChanges += processConfig(configArg, eventType, relPath);
|
|
1093
1163
|
}
|
|
1094
1164
|
if (calleeName === DEFINE_WORKQUEUES_NAME2) {
|
|
1095
1165
|
const args = call.getArguments();
|
|
@@ -1118,7 +1188,7 @@ function processFile6(filePath, project) {
|
|
|
1118
1188
|
async function main6() {
|
|
1119
1189
|
const srcDir = import_path6.default.join(process.cwd(), "src");
|
|
1120
1190
|
console.log(
|
|
1121
|
-
`Scanning for
|
|
1191
|
+
`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}
|
|
1122
1192
|
`
|
|
1123
1193
|
);
|
|
1124
1194
|
const project = new import_ts_morph6.Project({
|
|
@@ -1143,7 +1213,7 @@ async function main6() {
|
|
|
1143
1213
|
}
|
|
1144
1214
|
if (modifiedFiles.length === 0) {
|
|
1145
1215
|
console.log(
|
|
1146
|
-
"No
|
|
1216
|
+
"No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
|
|
1147
1217
|
);
|
|
1148
1218
|
return;
|
|
1149
1219
|
}
|
|
@@ -1825,9 +1895,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
|
|
|
1825
1895
|
}
|
|
1826
1896
|
return replacedCount;
|
|
1827
1897
|
}
|
|
1828
|
-
function resolveConfigChain(configObj,
|
|
1898
|
+
function resolveConfigChain(configObj, path23) {
|
|
1829
1899
|
let current = configObj;
|
|
1830
|
-
for (const key of
|
|
1900
|
+
for (const key of path23) {
|
|
1831
1901
|
if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
|
|
1832
1902
|
const prop = current.getProperty(key);
|
|
1833
1903
|
if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
|
|
@@ -2062,6 +2132,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
|
|
|
2062
2132
|
var import_ts_morph11 = require("ts-morph");
|
|
2063
2133
|
var import_path11 = __toESM(require("path"));
|
|
2064
2134
|
|
|
2135
|
+
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2136
|
+
var z4 = __toESM(require("zod/v4"));
|
|
2137
|
+
var import_lodash = require("lodash");
|
|
2138
|
+
|
|
2065
2139
|
// ../commons/src/scopes.ts
|
|
2066
2140
|
var z3 = __toESM(require("zod/v4"));
|
|
2067
2141
|
var qs = __toESM(require("qs"));
|
|
@@ -2122,6 +2196,10 @@ var scopeByEvent = z3.preprocess(
|
|
|
2122
2196
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
2123
2197
|
z3.array(z3.string()).optional()
|
|
2124
2198
|
).describe("Event type, e.g. birth, death");
|
|
2199
|
+
var userRole = z3.preprocess(
|
|
2200
|
+
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
2201
|
+
z3.array(z3.string()).optional()
|
|
2202
|
+
).describe("User role, e.g. admin, field agent");
|
|
2125
2203
|
var scopeOptionsPlaceEvent = z3.object({
|
|
2126
2204
|
event: scopeByEvent,
|
|
2127
2205
|
placeOfEvent: JurisdictionFilter.optional()
|
|
@@ -2145,6 +2223,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
|
|
|
2145
2223
|
var AccessLevelOptions = z3.object({
|
|
2146
2224
|
accessLevel: JurisdictionFilter.optional()
|
|
2147
2225
|
});
|
|
2226
|
+
var AllUserScopeOptions = AccessLevelOptions.extend({
|
|
2227
|
+
role: userRole.optional()
|
|
2228
|
+
});
|
|
2148
2229
|
var WorkqueueOrDashboardOptions = z3.object({
|
|
2149
2230
|
ids: z3.preprocess(
|
|
2150
2231
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
@@ -2154,6 +2235,7 @@ var WorkqueueOrDashboardOptions = z3.object({
|
|
|
2154
2235
|
var AllScopeOptions = z3.object({
|
|
2155
2236
|
...AllRecordScopeOptions.shape,
|
|
2156
2237
|
...AccessLevelOptions.shape,
|
|
2238
|
+
...AllUserScopeOptions.shape,
|
|
2157
2239
|
...WorkqueueOrDashboardOptions.shape
|
|
2158
2240
|
});
|
|
2159
2241
|
var ScopeOptionKey = AllScopeOptions.keyof();
|
|
@@ -2226,6 +2308,30 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2226
2308
|
]).describe(
|
|
2227
2309
|
"Scopes used to check user's permission to perform actions on a record."
|
|
2228
2310
|
);
|
|
2311
|
+
var SystemScopeType = z3.enum([
|
|
2312
|
+
"organisation.read-locations",
|
|
2313
|
+
"user.read",
|
|
2314
|
+
"user.create",
|
|
2315
|
+
"user.edit",
|
|
2316
|
+
"user.search"
|
|
2317
|
+
]);
|
|
2318
|
+
var UserScopeType = SystemScopeType.extract([
|
|
2319
|
+
"user.read",
|
|
2320
|
+
"user.create",
|
|
2321
|
+
"user.edit",
|
|
2322
|
+
"user.search"
|
|
2323
|
+
]);
|
|
2324
|
+
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
2325
|
+
var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
2326
|
+
z3.object({
|
|
2327
|
+
type: ScopesWithRoleOption,
|
|
2328
|
+
options: AllUserScopeOptions.optional()
|
|
2329
|
+
}),
|
|
2330
|
+
z3.object({
|
|
2331
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
2332
|
+
options: AccessLevelOptions.optional()
|
|
2333
|
+
})
|
|
2334
|
+
]);
|
|
2229
2335
|
var ResolvedRecordScopeV2 = z3.discriminatedUnion("type", [
|
|
2230
2336
|
z3.object({
|
|
2231
2337
|
type: ScopesWithPlaceEventOptions,
|
|
@@ -2246,16 +2352,14 @@ var ResolvedRecordScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2246
2352
|
}).optional()
|
|
2247
2353
|
})
|
|
2248
2354
|
]).describe("Resolved scope with location/user IDs instead of filters.");
|
|
2249
|
-
var SystemScopeType = z3.enum([
|
|
2250
|
-
"organisation.read-locations",
|
|
2251
|
-
"user.read",
|
|
2252
|
-
"user.create",
|
|
2253
|
-
"user.edit"
|
|
2254
|
-
]);
|
|
2255
2355
|
var Scope2 = z3.discriminatedUnion("type", [
|
|
2256
2356
|
z3.object({ type: PlainScopeType }),
|
|
2257
2357
|
...RecordScopeV2.options,
|
|
2258
|
-
|
|
2358
|
+
...UserScopeV2.options,
|
|
2359
|
+
z3.object({
|
|
2360
|
+
type: z3.literal("organisation.read-locations"),
|
|
2361
|
+
options: AccessLevelOptions.optional()
|
|
2362
|
+
}),
|
|
2259
2363
|
z3.object({
|
|
2260
2364
|
type: z3.literal("workqueue"),
|
|
2261
2365
|
options: WorkqueueOrDashboardOptions
|
|
@@ -2305,7 +2409,6 @@ var DEFAULT_SCOPE_OPTIONS = {
|
|
|
2305
2409
|
};
|
|
2306
2410
|
|
|
2307
2411
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2308
|
-
var z4 = __toESM(require("zod/v4"));
|
|
2309
2412
|
var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
|
|
2310
2413
|
var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
|
|
2311
2414
|
var SearchScope = z4.object({
|
|
@@ -2539,6 +2642,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
|
|
|
2539
2642
|
}
|
|
2540
2643
|
throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
|
|
2541
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
|
+
}
|
|
2542
2713
|
|
|
2543
2714
|
// src/migrations/v2.0/migrate-scopes.ts
|
|
2544
2715
|
var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
|
|
@@ -2576,57 +2747,65 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
2576
2747
|
}
|
|
2577
2748
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
2578
2749
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
2579
|
-
if (!sourceFile)
|
|
2750
|
+
if (!sourceFile) {
|
|
2751
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
2752
|
+
}
|
|
2580
2753
|
let migratedCount = 0;
|
|
2581
2754
|
let removedCount = 0;
|
|
2755
|
+
let mergedCount = 0;
|
|
2582
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);
|
|
2583
2758
|
for (const scopesProp of scopesProperties) {
|
|
2584
2759
|
const initializer = scopesProp.getInitializer();
|
|
2585
2760
|
if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
|
|
2586
|
-
const
|
|
2587
|
-
|
|
2588
|
-
|
|
2589
|
-
|
|
2761
|
+
const rawTexts = [];
|
|
2762
|
+
const legacyStrings = [];
|
|
2763
|
+
let anyChange = false;
|
|
2764
|
+
for (const element of initializer.getElements()) {
|
|
2590
2765
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2591
2766
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2592
2767
|
console.warn(
|
|
2593
|
-
` [${
|
|
2768
|
+
` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2594
2769
|
);
|
|
2595
|
-
initializer.removeElement(index);
|
|
2596
2770
|
removedCount++;
|
|
2771
|
+
anyChange = true;
|
|
2597
2772
|
continue;
|
|
2598
2773
|
}
|
|
2599
2774
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2600
2775
|
if (!legacyScope) {
|
|
2601
2776
|
console.warn(
|
|
2602
|
-
` [${
|
|
2777
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2603
2778
|
);
|
|
2779
|
+
rawTexts.push(element.getText());
|
|
2604
2780
|
continue;
|
|
2605
2781
|
}
|
|
2606
|
-
|
|
2607
|
-
|
|
2608
|
-
const scope = decodeScope(migratedScope);
|
|
2609
|
-
if (!scope) {
|
|
2610
|
-
console.warn(
|
|
2611
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
|
|
2612
|
-
);
|
|
2613
|
-
continue;
|
|
2614
|
-
}
|
|
2615
|
-
element.replaceWithText(JSON.stringify(scope));
|
|
2616
|
-
migratedCount++;
|
|
2617
|
-
} catch (error) {
|
|
2618
|
-
console.warn(
|
|
2619
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2620
|
-
);
|
|
2621
|
-
}
|
|
2782
|
+
legacyStrings.push(legacyScope);
|
|
2783
|
+
anyChange = true;
|
|
2622
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
|
+
);
|
|
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(", ")}]`);
|
|
2623
2802
|
}
|
|
2624
2803
|
if (removedCount > 0) {
|
|
2625
2804
|
console.log(
|
|
2626
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
2805
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
|
|
2627
2806
|
);
|
|
2628
2807
|
}
|
|
2629
|
-
return { migratedCount, removedCount };
|
|
2808
|
+
return { migratedCount, removedCount, mergedCount };
|
|
2630
2809
|
}
|
|
2631
2810
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
2632
2811
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -2761,7 +2940,7 @@ async function main11() {
|
|
|
2761
2940
|
return;
|
|
2762
2941
|
}
|
|
2763
2942
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
2764
|
-
const { migratedCount, removedCount } = migrateScopesArrays(
|
|
2943
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
|
|
2765
2944
|
rolesFilePath,
|
|
2766
2945
|
project
|
|
2767
2946
|
);
|
|
@@ -2780,7 +2959,7 @@ async function main11() {
|
|
|
2780
2959
|
}
|
|
2781
2960
|
await sourceFile.save();
|
|
2782
2961
|
console.log(
|
|
2783
|
-
`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." : "."}`
|
|
2784
2963
|
);
|
|
2785
2964
|
}
|
|
2786
2965
|
|
|
@@ -3586,6 +3765,10 @@ var ACTION_PROPERTY_NAME2 = "action";
|
|
|
3586
3765
|
var CONDITIONALS_PROPERTY_NAME = "conditionals";
|
|
3587
3766
|
var TYPE_PROPERTY_NAME7 = "type";
|
|
3588
3767
|
var SLUG_PROPERTY_NAME = "slug";
|
|
3768
|
+
var READ_ACTION_TYPE = "READ";
|
|
3769
|
+
var ACTION_TYPE_IMPORT_NAME = "ActionType";
|
|
3770
|
+
var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
|
|
3771
|
+
var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
|
|
3589
3772
|
var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
3590
3773
|
"READ",
|
|
3591
3774
|
"DELETE",
|
|
@@ -3633,91 +3816,137 @@ function isUnsupportedActionType(action) {
|
|
|
3633
3816
|
}
|
|
3634
3817
|
return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
|
|
3635
3818
|
}
|
|
3636
|
-
function
|
|
3637
|
-
const
|
|
3638
|
-
|
|
3639
|
-
|
|
3640
|
-
|
|
3641
|
-
|
|
3642
|
-
|
|
3643
|
-
|
|
3819
|
+
function ensureValidAction(workqueue, relPath) {
|
|
3820
|
+
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3821
|
+
const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3822
|
+
if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
|
|
3823
|
+
const initializer = actionProperty.getInitializer();
|
|
3824
|
+
if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
|
|
3825
|
+
if (!isUnsupportedActionType(initializer)) {
|
|
3826
|
+
return { changed: false, usedReadFallback: false };
|
|
3827
|
+
}
|
|
3828
|
+
actionProperty.set({
|
|
3829
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3830
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3831
|
+
});
|
|
3832
|
+
console.log(
|
|
3833
|
+
` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
|
|
3834
|
+
);
|
|
3835
|
+
return { changed: true, usedReadFallback: true };
|
|
3836
|
+
}
|
|
3644
3837
|
}
|
|
3838
|
+
workqueue.addPropertyAssignment({
|
|
3839
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3840
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3841
|
+
});
|
|
3842
|
+
console.log(
|
|
3843
|
+
` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
|
|
3844
|
+
);
|
|
3845
|
+
return { changed: true, usedReadFallback: true };
|
|
3846
|
+
}
|
|
3847
|
+
function migrateWorkqueueActions(workqueue, relPath) {
|
|
3645
3848
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3646
|
-
const
|
|
3647
|
-
|
|
3648
|
-
|
|
3649
|
-
|
|
3650
|
-
|
|
3651
|
-
|
|
3652
|
-
|
|
3849
|
+
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
3850
|
+
let actionsArrayMigrated = false;
|
|
3851
|
+
if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
3852
|
+
const actionsInitializer = actionsProperty.getInitializer();
|
|
3853
|
+
if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
3854
|
+
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3855
|
+
if (existingActionProperty) {
|
|
3856
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
3857
|
+
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
3858
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
3859
|
+
const conditionalsProperty = existingActionInitializer.getProperty(
|
|
3860
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3861
|
+
);
|
|
3862
|
+
if (conditionalsProperty) {
|
|
3863
|
+
conditionalsProperty.remove();
|
|
3864
|
+
console.log(
|
|
3865
|
+
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3866
|
+
);
|
|
3867
|
+
}
|
|
3868
|
+
}
|
|
3869
|
+
}
|
|
3870
|
+
actionsProperty.remove();
|
|
3871
|
+
console.log(
|
|
3872
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3873
|
+
);
|
|
3874
|
+
actionsArrayMigrated = true;
|
|
3875
|
+
} else {
|
|
3876
|
+
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3877
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3653
3878
|
);
|
|
3654
|
-
if (
|
|
3655
|
-
|
|
3879
|
+
if (actionCandidates.length === 0) {
|
|
3880
|
+
actionsProperty.remove();
|
|
3656
3881
|
console.log(
|
|
3657
|
-
` [${relPath}] Removed
|
|
3882
|
+
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3658
3883
|
);
|
|
3659
|
-
|
|
3660
|
-
|
|
3661
|
-
|
|
3662
|
-
|
|
3663
|
-
|
|
3884
|
+
actionsArrayMigrated = true;
|
|
3885
|
+
} else {
|
|
3886
|
+
if (actionCandidates.length > 1) {
|
|
3887
|
+
const droppedCount = actionCandidates.length - 1;
|
|
3888
|
+
console.warn(
|
|
3889
|
+
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3890
|
+
);
|
|
3891
|
+
}
|
|
3892
|
+
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3893
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3664
3894
|
);
|
|
3895
|
+
if (conditionalsProperty) {
|
|
3896
|
+
conditionalsProperty.remove();
|
|
3897
|
+
console.log(
|
|
3898
|
+
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3899
|
+
);
|
|
3900
|
+
}
|
|
3901
|
+
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3902
|
+
actionsProperty.remove();
|
|
3903
|
+
console.log(
|
|
3904
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3905
|
+
);
|
|
3906
|
+
actionsArrayMigrated = true;
|
|
3907
|
+
} else {
|
|
3908
|
+
const firstActionText = actionCandidates[0].getText();
|
|
3909
|
+
workqueue.addPropertyAssignment({
|
|
3910
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3911
|
+
initializer: firstActionText
|
|
3912
|
+
});
|
|
3913
|
+
actionsProperty.remove();
|
|
3914
|
+
console.log(
|
|
3915
|
+
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3916
|
+
);
|
|
3917
|
+
actionsArrayMigrated = true;
|
|
3918
|
+
}
|
|
3665
3919
|
}
|
|
3666
3920
|
}
|
|
3667
3921
|
}
|
|
3668
|
-
actionsProperty.remove();
|
|
3669
|
-
console.log(
|
|
3670
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3671
|
-
);
|
|
3672
|
-
return 1;
|
|
3673
3922
|
}
|
|
3674
|
-
const
|
|
3675
|
-
|
|
3676
|
-
|
|
3677
|
-
|
|
3678
|
-
|
|
3679
|
-
|
|
3680
|
-
|
|
3681
|
-
|
|
3682
|
-
|
|
3683
|
-
}
|
|
3684
|
-
if (actionCandidates.length > 1) {
|
|
3685
|
-
const droppedCount = actionCandidates.length - 1;
|
|
3686
|
-
console.warn(
|
|
3687
|
-
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3688
|
-
);
|
|
3689
|
-
}
|
|
3690
|
-
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3691
|
-
CONDITIONALS_PROPERTY_NAME
|
|
3923
|
+
const fallback = ensureValidAction(workqueue, relPath);
|
|
3924
|
+
return {
|
|
3925
|
+
changed: actionsArrayMigrated || fallback.changed,
|
|
3926
|
+
usedReadFallback: fallback.usedReadFallback
|
|
3927
|
+
};
|
|
3928
|
+
}
|
|
3929
|
+
function ensureActionTypeImport(sourceFile) {
|
|
3930
|
+
const existingImport = sourceFile.getImportDeclaration(
|
|
3931
|
+
(decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
|
|
3692
3932
|
);
|
|
3693
|
-
if (
|
|
3694
|
-
|
|
3695
|
-
|
|
3696
|
-
|
|
3697
|
-
|
|
3698
|
-
|
|
3699
|
-
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3700
|
-
actionsProperty.remove();
|
|
3701
|
-
console.log(
|
|
3702
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3703
|
-
);
|
|
3704
|
-
return 1;
|
|
3933
|
+
if (existingImport) {
|
|
3934
|
+
const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
|
|
3935
|
+
if (!alreadyImported) {
|
|
3936
|
+
existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
|
|
3937
|
+
}
|
|
3938
|
+
return;
|
|
3705
3939
|
}
|
|
3706
|
-
|
|
3707
|
-
|
|
3708
|
-
|
|
3709
|
-
initializer: firstActionText
|
|
3940
|
+
sourceFile.addImportDeclaration({
|
|
3941
|
+
moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
|
|
3942
|
+
namedImports: [ACTION_TYPE_IMPORT_NAME]
|
|
3710
3943
|
});
|
|
3711
|
-
actionsProperty.remove();
|
|
3712
|
-
console.log(
|
|
3713
|
-
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3714
|
-
);
|
|
3715
|
-
return 1;
|
|
3716
3944
|
}
|
|
3717
3945
|
function processFile13(filePath, project) {
|
|
3718
3946
|
const sourceFile = project.getSourceFile(filePath);
|
|
3719
3947
|
if (!sourceFile) return 0;
|
|
3720
3948
|
let migratedWorkqueues = 0;
|
|
3949
|
+
let needsActionTypeImport = false;
|
|
3721
3950
|
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3722
3951
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3723
3952
|
import_ts_morph17.SyntaxKind.CallExpression
|
|
@@ -3733,9 +3962,14 @@ function processFile13(filePath, project) {
|
|
|
3733
3962
|
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3734
3963
|
for (const element of workqueuesArg.getElements()) {
|
|
3735
3964
|
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3736
|
-
|
|
3965
|
+
const result = migrateWorkqueueActions(element, relPath);
|
|
3966
|
+
if (result.changed) migratedWorkqueues++;
|
|
3967
|
+
if (result.usedReadFallback) needsActionTypeImport = true;
|
|
3737
3968
|
}
|
|
3738
3969
|
}
|
|
3970
|
+
if (needsActionTypeImport) {
|
|
3971
|
+
ensureActionTypeImport(sourceFile);
|
|
3972
|
+
}
|
|
3739
3973
|
return migratedWorkqueues;
|
|
3740
3974
|
}
|
|
3741
3975
|
async function main18() {
|
|
@@ -4070,7 +4304,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4070
4304
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4071
4305
|
var import_child_process = require("child_process");
|
|
4072
4306
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4073
|
-
var UPSTREAM_BRANCH = "
|
|
4307
|
+
var UPSTREAM_BRANCH = "release-v2.0.0";
|
|
4074
4308
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4075
4309
|
var FILES_TO_CHECKOUT = [
|
|
4076
4310
|
"src/analytics/analytics.ts",
|
|
@@ -4147,10 +4381,356 @@ async function main22() {
|
|
|
4147
4381
|
}
|
|
4148
4382
|
}
|
|
4149
4383
|
|
|
4150
|
-
// src/migrations/v2.0/
|
|
4151
|
-
var
|
|
4152
|
-
var import_fs3 = __toESM(require("fs"));
|
|
4384
|
+
// src/migrations/v2.0/add-resend-invite-notification.ts
|
|
4385
|
+
var import_fs3 = require("fs");
|
|
4153
4386
|
var import_path22 = __toESM(require("path"));
|
|
4387
|
+
var import_ts_morph20 = require("ts-morph");
|
|
4388
|
+
var TS_MORPH_PROJECT_OPTIONS = {
|
|
4389
|
+
skipAddingFilesFromTsConfig: true,
|
|
4390
|
+
manipulationSettings: {
|
|
4391
|
+
indentationText: import_ts_morph20.IndentationText.TwoSpaces
|
|
4392
|
+
}
|
|
4393
|
+
};
|
|
4394
|
+
var EMAIL_TEMPLATES_INDEX = "src/api/notification/email-templates/index.ts";
|
|
4395
|
+
var NOTIFICATION_HANDLER = "src/api/notification/handler.ts";
|
|
4396
|
+
var USER_NOTIFICATION_ROUTES = "src/config/routes/userNotificationRoutes.ts";
|
|
4397
|
+
var SMS_SERVICE = "src/api/notification/sms-service.ts";
|
|
4398
|
+
var NOTIFICATION_CSV = "src/translations/notification.csv";
|
|
4399
|
+
var RESEND_INVITE_HTML = "src/api/notification/email-templates/other/resend-invite.html";
|
|
4400
|
+
var RESEND_INVITE_HTML_CONTENT = `<!doctype html>
|
|
4401
|
+
<html>
|
|
4402
|
+
<head>
|
|
4403
|
+
<link
|
|
4404
|
+
href="https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400;700&display=swap"
|
|
4405
|
+
rel="stylesheet"
|
|
4406
|
+
/>
|
|
4407
|
+
<style type="text/css">
|
|
4408
|
+
body {
|
|
4409
|
+
font-family: 'Noto Sans', sans-serif;
|
|
4410
|
+
color: #222;
|
|
4411
|
+
padding: 16px 24px;
|
|
4412
|
+
}
|
|
4413
|
+
|
|
4414
|
+
h1 {
|
|
4415
|
+
font-size: 21px;
|
|
4416
|
+
margin-top: 32px;
|
|
4417
|
+
margin-bottom: 36px;
|
|
4418
|
+
font-weight: 700;
|
|
4419
|
+
}
|
|
4420
|
+
|
|
4421
|
+
p {
|
|
4422
|
+
font-weight: 400;
|
|
4423
|
+
font-size: 16px;
|
|
4424
|
+
line-height: 1.8;
|
|
4425
|
+
margin-bottom: 24px;
|
|
4426
|
+
}
|
|
4427
|
+
|
|
4428
|
+
i {
|
|
4429
|
+
color: #666;
|
|
4430
|
+
font-weight: 400;
|
|
4431
|
+
font-size: 16px;
|
|
4432
|
+
}
|
|
4433
|
+
</style>
|
|
4434
|
+
</head>
|
|
4435
|
+
|
|
4436
|
+
<body>
|
|
4437
|
+
<img
|
|
4438
|
+
src="{{countryLogo}}"
|
|
4439
|
+
alt="country_logo"
|
|
4440
|
+
style="max-height: 88px; max-width: 100%"
|
|
4441
|
+
/>
|
|
4442
|
+
<h1>Your {{applicationName}} account invitation</h1>
|
|
4443
|
+
<p>Hello {{firstname}},</p>
|
|
4444
|
+
<p>Your account invitation has been resent. Please use the following credentials to access your account:</p>
|
|
4445
|
+
<p>
|
|
4446
|
+
Username: <strong>{{username}}</strong><br />
|
|
4447
|
+
Password: <strong>{{temporaryPassword}}</strong>
|
|
4448
|
+
</p>
|
|
4449
|
+
<p>
|
|
4450
|
+
Please click the link below to complete your account setup and start using
|
|
4451
|
+
{{applicationName}}.
|
|
4452
|
+
</p>
|
|
4453
|
+
|
|
4454
|
+
<div style="margin-top: 32px; margin-bottom: 32px">
|
|
4455
|
+
<a href="{{loginURL}}">Complete setup</a>
|
|
4456
|
+
</div>
|
|
4457
|
+
<br />
|
|
4458
|
+
<p>
|
|
4459
|
+
Best regards, <br />
|
|
4460
|
+
{{applicationName}} Team
|
|
4461
|
+
</p>
|
|
4462
|
+
</body>
|
|
4463
|
+
</html>
|
|
4464
|
+
`;
|
|
4465
|
+
var CSV_ROW = "resendInviteNotification,The SMS message that is sent when a user invitation is resent,Your OpenCRVS account invitation was resent. Please login with your username: {{username}} and temporary password: {{temporaryPassword}},Votre invitation de compte OpenCRVS a \xE9t\xE9 renvoy\xE9e. Veuillez vous connecter avec votre nom d'utilisateur : {{username}} et votre mot de passe temporaire : {{temporaryPassword}}.\n";
|
|
4466
|
+
function getObjectLiteralFromConst(declaration) {
|
|
4467
|
+
if (!declaration) {
|
|
4468
|
+
return;
|
|
4469
|
+
}
|
|
4470
|
+
const initializer = declaration.getInitializer();
|
|
4471
|
+
if (!initializer) {
|
|
4472
|
+
return;
|
|
4473
|
+
}
|
|
4474
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(initializer)) {
|
|
4475
|
+
return initializer;
|
|
4476
|
+
}
|
|
4477
|
+
if (import_ts_morph20.Node.isAsExpression(initializer)) {
|
|
4478
|
+
const expression = initializer.getExpression();
|
|
4479
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(expression)) {
|
|
4480
|
+
return expression;
|
|
4481
|
+
}
|
|
4482
|
+
}
|
|
4483
|
+
if (import_ts_morph20.Node.isSatisfiesExpression(initializer)) {
|
|
4484
|
+
const expression = initializer.getExpression();
|
|
4485
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(expression)) {
|
|
4486
|
+
return expression;
|
|
4487
|
+
}
|
|
4488
|
+
}
|
|
4489
|
+
}
|
|
4490
|
+
function patchEmailTemplatesIndex() {
|
|
4491
|
+
const full = import_path22.default.join(process.cwd(), EMAIL_TEMPLATES_INDEX);
|
|
4492
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4493
|
+
console.log(` '${EMAIL_TEMPLATES_INDEX}' missing \u2014 skipping.`);
|
|
4494
|
+
return false;
|
|
4495
|
+
}
|
|
4496
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4497
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4498
|
+
let changed = false;
|
|
4499
|
+
const triggerVariableObject = getObjectLiteralFromConst(
|
|
4500
|
+
sourceFile.getVariableDeclaration("TriggerVariable")
|
|
4501
|
+
);
|
|
4502
|
+
if (triggerVariableObject) {
|
|
4503
|
+
const hasResendInviteVariable = triggerVariableObject.getProperties().some((prop) => prop.getText().includes("[TriggerEvent.RESEND_INVITE]"));
|
|
4504
|
+
if (!hasResendInviteVariable) {
|
|
4505
|
+
const properties = triggerVariableObject.getProperties();
|
|
4506
|
+
const lastProperty = properties[properties.length - 1];
|
|
4507
|
+
if (lastProperty) {
|
|
4508
|
+
sourceFile.insertText(
|
|
4509
|
+
lastProperty.getEnd(),
|
|
4510
|
+
`,
|
|
4511
|
+
[TriggerEvent.RESEND_INVITE]: z.object({
|
|
4512
|
+
firstname: z.string(),
|
|
4513
|
+
username: z.string(),
|
|
4514
|
+
temporaryPassword: z.string(),
|
|
4515
|
+
completeSetupUrl: z.string(),
|
|
4516
|
+
loginURL: z.string()
|
|
4517
|
+
})`
|
|
4518
|
+
);
|
|
4519
|
+
changed = true;
|
|
4520
|
+
}
|
|
4521
|
+
}
|
|
4522
|
+
}
|
|
4523
|
+
const templatesObject = getObjectLiteralFromConst(
|
|
4524
|
+
sourceFile.getVariableDeclaration("templates")
|
|
4525
|
+
);
|
|
4526
|
+
if (templatesObject) {
|
|
4527
|
+
const hasResendInviteTemplate = templatesObject.getProperties().some(
|
|
4528
|
+
(prop) => prop.getText().includes("readOtherTemplate<TriggerVariable['resend-invite']>")
|
|
4529
|
+
);
|
|
4530
|
+
if (!hasResendInviteTemplate) {
|
|
4531
|
+
const userCreatedProp = templatesObject.getProperties().find((prop) => prop.getText().includes("[TriggerEvent.USER_CREATED]"));
|
|
4532
|
+
const anchor = userCreatedProp ?? templatesObject.getProperties()[templatesObject.getProperties().length - 1];
|
|
4533
|
+
if (anchor) {
|
|
4534
|
+
sourceFile.insertText(
|
|
4535
|
+
anchor.getEnd(),
|
|
4536
|
+
`,
|
|
4537
|
+
[TriggerEvent.RESEND_INVITE]: {
|
|
4538
|
+
type: 'resend-invite',
|
|
4539
|
+
subject: 'Your OpenCRVS account invitation',
|
|
4540
|
+
template:
|
|
4541
|
+
readOtherTemplate<TriggerVariable['resend-invite']>('resend-invite')
|
|
4542
|
+
}`
|
|
4543
|
+
);
|
|
4544
|
+
changed = true;
|
|
4545
|
+
}
|
|
4546
|
+
}
|
|
4547
|
+
}
|
|
4548
|
+
if (changed) {
|
|
4549
|
+
sourceFile.saveSync();
|
|
4550
|
+
}
|
|
4551
|
+
return changed;
|
|
4552
|
+
}
|
|
4553
|
+
function patchNotificationHandler() {
|
|
4554
|
+
const full = import_path22.default.join(process.cwd(), NOTIFICATION_HANDLER);
|
|
4555
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4556
|
+
return false;
|
|
4557
|
+
}
|
|
4558
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4559
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4560
|
+
const convertFn = sourceFile.getFunction("convertPayloadToVariable");
|
|
4561
|
+
if (!convertFn) {
|
|
4562
|
+
return false;
|
|
4563
|
+
}
|
|
4564
|
+
const switchStmt = convertFn.getFirstDescendantByKind(
|
|
4565
|
+
import_ts_morph20.SyntaxKind.SwitchStatement
|
|
4566
|
+
);
|
|
4567
|
+
if (!switchStmt) {
|
|
4568
|
+
return false;
|
|
4569
|
+
}
|
|
4570
|
+
const clauses = switchStmt.getCaseBlock().getClauses();
|
|
4571
|
+
const hasResendInvite = clauses.some(
|
|
4572
|
+
(clause) => import_ts_morph20.Node.isCaseClause(clause) && clause.getExpression().getText() === "TriggerEvent.RESEND_INVITE"
|
|
4573
|
+
);
|
|
4574
|
+
if (hasResendInvite) {
|
|
4575
|
+
return false;
|
|
4576
|
+
}
|
|
4577
|
+
const userCreatedClauseIndex = clauses.findIndex(
|
|
4578
|
+
(clause) => import_ts_morph20.Node.isCaseClause(clause) && clause.getExpression().getText() === "TriggerEvent.USER_CREATED"
|
|
4579
|
+
);
|
|
4580
|
+
if (userCreatedClauseIndex < 0) {
|
|
4581
|
+
return false;
|
|
4582
|
+
}
|
|
4583
|
+
const userCreatedClause = clauses[userCreatedClauseIndex];
|
|
4584
|
+
sourceFile.insertText(
|
|
4585
|
+
userCreatedClause.getEnd(),
|
|
4586
|
+
`
|
|
4587
|
+
|
|
4588
|
+
case TriggerEvent.RESEND_INVITE:
|
|
4589
|
+
return {
|
|
4590
|
+
firstname,
|
|
4591
|
+
username: payload.username,
|
|
4592
|
+
temporaryPassword: payload.temporaryPassword,
|
|
4593
|
+
completeSetupUrl: LOGIN_URL,
|
|
4594
|
+
loginURL: LOGIN_URL
|
|
4595
|
+
}`
|
|
4596
|
+
);
|
|
4597
|
+
sourceFile.saveSync();
|
|
4598
|
+
return true;
|
|
4599
|
+
}
|
|
4600
|
+
function getReturnedArrayLiteral(functionFilePath, fnName) {
|
|
4601
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4602
|
+
const sourceFile = project.addSourceFileAtPath(functionFilePath);
|
|
4603
|
+
const fn = sourceFile.getFunction(fnName);
|
|
4604
|
+
const returnStmt = fn?.getFirstDescendantByKind(import_ts_morph20.SyntaxKind.ReturnStatement);
|
|
4605
|
+
const expr = returnStmt?.getExpression();
|
|
4606
|
+
if (!expr || !import_ts_morph20.Node.isArrayLiteralExpression(expr)) {
|
|
4607
|
+
return { sourceFile, arrayLiteral: void 0 };
|
|
4608
|
+
}
|
|
4609
|
+
return { sourceFile, arrayLiteral: expr };
|
|
4610
|
+
}
|
|
4611
|
+
function patchUserNotificationRoutes() {
|
|
4612
|
+
const full = import_path22.default.join(process.cwd(), USER_NOTIFICATION_ROUTES);
|
|
4613
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4614
|
+
return false;
|
|
4615
|
+
}
|
|
4616
|
+
const { sourceFile, arrayLiteral } = getReturnedArrayLiteral(
|
|
4617
|
+
full,
|
|
4618
|
+
"getUserNotificationRoutes"
|
|
4619
|
+
);
|
|
4620
|
+
if (!arrayLiteral) {
|
|
4621
|
+
return false;
|
|
4622
|
+
}
|
|
4623
|
+
const elements = arrayLiteral.getElements();
|
|
4624
|
+
const routeExists = elements.some(
|
|
4625
|
+
(element) => element.getText().includes(`path: '/triggers/user/resend-invite'`)
|
|
4626
|
+
);
|
|
4627
|
+
if (routeExists) {
|
|
4628
|
+
return false;
|
|
4629
|
+
}
|
|
4630
|
+
const anchor = elements.find(
|
|
4631
|
+
(element) => element.getText().includes(`path: '/triggers/user/user-created'`)
|
|
4632
|
+
) ?? elements[elements.length - 1];
|
|
4633
|
+
if (!anchor) {
|
|
4634
|
+
return false;
|
|
4635
|
+
}
|
|
4636
|
+
sourceFile.insertText(
|
|
4637
|
+
anchor.getEnd(),
|
|
4638
|
+
`,
|
|
4639
|
+
{
|
|
4640
|
+
method: 'POST',
|
|
4641
|
+
path: '/triggers/user/resend-invite',
|
|
4642
|
+
handler: makeNotificationHandler('resend-invite'),
|
|
4643
|
+
options: {
|
|
4644
|
+
auth: false,
|
|
4645
|
+
tags: ['api'],
|
|
4646
|
+
description: 'Handles notification for resent user invite'
|
|
4647
|
+
}
|
|
4648
|
+
}`
|
|
4649
|
+
);
|
|
4650
|
+
sourceFile.saveSync();
|
|
4651
|
+
return true;
|
|
4652
|
+
}
|
|
4653
|
+
function patchSmsService() {
|
|
4654
|
+
const full = import_path22.default.join(process.cwd(), SMS_SERVICE);
|
|
4655
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4656
|
+
return false;
|
|
4657
|
+
}
|
|
4658
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4659
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4660
|
+
let changed = false;
|
|
4661
|
+
const otherTemplatesObject = getObjectLiteralFromConst(
|
|
4662
|
+
sourceFile.getVariableDeclaration("otherTemplates")
|
|
4663
|
+
);
|
|
4664
|
+
if (otherTemplatesObject) {
|
|
4665
|
+
const hasResendTemplate = otherTemplatesObject.getProperties().some((prop) => prop.getText().includes("resendInviteNotification"));
|
|
4666
|
+
if (!hasResendTemplate) {
|
|
4667
|
+
const userCredentialsIndex = otherTemplatesObject.getProperties().findIndex((prop) => prop.getText().includes("userCredentialsNotification"));
|
|
4668
|
+
otherTemplatesObject.insertPropertyAssignment(
|
|
4669
|
+
userCredentialsIndex >= 0 ? userCredentialsIndex + 1 : otherTemplatesObject.getProperties().length,
|
|
4670
|
+
{
|
|
4671
|
+
name: "resendInviteNotification",
|
|
4672
|
+
initializer: `'resendInviteNotification'`
|
|
4673
|
+
}
|
|
4674
|
+
);
|
|
4675
|
+
changed = true;
|
|
4676
|
+
}
|
|
4677
|
+
}
|
|
4678
|
+
const triggerToSmsTemplateObject = getObjectLiteralFromConst(
|
|
4679
|
+
sourceFile.getVariableDeclaration("TriggerToSMSTemplate")
|
|
4680
|
+
);
|
|
4681
|
+
if (triggerToSmsTemplateObject) {
|
|
4682
|
+
const hasResendInviteMap = triggerToSmsTemplateObject.getProperties().some((prop) => prop.getText().includes(`['resend-invite']`));
|
|
4683
|
+
if (!hasResendInviteMap) {
|
|
4684
|
+
const userCreatedIndex = triggerToSmsTemplateObject.getProperties().findIndex((prop) => prop.getText().includes(`['user-created']`));
|
|
4685
|
+
triggerToSmsTemplateObject.insertPropertyAssignment(
|
|
4686
|
+
userCreatedIndex >= 0 ? userCreatedIndex + 1 : triggerToSmsTemplateObject.getProperties().length,
|
|
4687
|
+
{
|
|
4688
|
+
name: `['resend-invite']`,
|
|
4689
|
+
initializer: `'resendInviteNotification'`
|
|
4690
|
+
}
|
|
4691
|
+
);
|
|
4692
|
+
changed = true;
|
|
4693
|
+
}
|
|
4694
|
+
}
|
|
4695
|
+
if (changed) {
|
|
4696
|
+
sourceFile.saveSync();
|
|
4697
|
+
}
|
|
4698
|
+
return changed;
|
|
4699
|
+
}
|
|
4700
|
+
async function main23() {
|
|
4701
|
+
console.log("Adding RESEND_INVITE notification wiring\u2026");
|
|
4702
|
+
const touched = [];
|
|
4703
|
+
if (patchEmailTemplatesIndex()) touched.push(EMAIL_TEMPLATES_INDEX);
|
|
4704
|
+
if (patchNotificationHandler()) touched.push(NOTIFICATION_HANDLER);
|
|
4705
|
+
if (patchUserNotificationRoutes()) touched.push(USER_NOTIFICATION_ROUTES);
|
|
4706
|
+
if (patchSmsService()) touched.push(SMS_SERVICE);
|
|
4707
|
+
const csvPath = import_path22.default.join(process.cwd(), NOTIFICATION_CSV);
|
|
4708
|
+
if ((0, import_fs3.existsSync)(csvPath)) {
|
|
4709
|
+
let t = (0, import_fs3.readFileSync)(csvPath, "utf8");
|
|
4710
|
+
if (!/^resendInviteNotification,/m.test(t)) {
|
|
4711
|
+
if (!t.endsWith("\n")) t += "\n";
|
|
4712
|
+
(0, import_fs3.writeFileSync)(csvPath, t + CSV_ROW);
|
|
4713
|
+
touched.push(NOTIFICATION_CSV);
|
|
4714
|
+
}
|
|
4715
|
+
}
|
|
4716
|
+
const htmlPath = import_path22.default.join(process.cwd(), RESEND_INVITE_HTML);
|
|
4717
|
+
(0, import_fs3.mkdirSync)(import_path22.default.dirname(htmlPath), { recursive: true });
|
|
4718
|
+
if (!(0, import_fs3.existsSync)(htmlPath)) {
|
|
4719
|
+
(0, import_fs3.writeFileSync)(htmlPath, RESEND_INVITE_HTML_CONTENT);
|
|
4720
|
+
touched.push(RESEND_INVITE_HTML);
|
|
4721
|
+
}
|
|
4722
|
+
if (touched.length === 0) {
|
|
4723
|
+
console.log(" Nothing to update (already present or anchors not found).");
|
|
4724
|
+
return;
|
|
4725
|
+
}
|
|
4726
|
+
console.log(` Updated:
|
|
4727
|
+
${touched.map((f) => ` - ${f}`).join("\n")}`);
|
|
4728
|
+
}
|
|
4729
|
+
|
|
4730
|
+
// src/migrations/v2.0/simplify-analytics-precalculations.ts
|
|
4731
|
+
var import_ts_morph21 = require("ts-morph");
|
|
4732
|
+
var import_fs4 = __toESM(require("fs"));
|
|
4733
|
+
var import_path23 = __toESM(require("path"));
|
|
4154
4734
|
var ANALYTICS_FILE_REL = "src/analytics/analytics.ts";
|
|
4155
4735
|
var FUNCTION_NAME = "precalculateAdditionalAnalytics";
|
|
4156
4736
|
var IMPORT_NAMES_TO_REMOVE = /* @__PURE__ */ new Set(["Event", "precalculateBirthEvent"]);
|
|
@@ -4186,10 +4766,10 @@ function findPrecalculateFunction(sourceFile) {
|
|
|
4186
4766
|
return void 0;
|
|
4187
4767
|
}
|
|
4188
4768
|
function getFunctionBodyBlock(fn) {
|
|
4189
|
-
if (
|
|
4769
|
+
if (import_ts_morph21.Node.isFunctionDeclaration(fn)) return fn.getBody();
|
|
4190
4770
|
const initializer = fn.getInitializer();
|
|
4191
4771
|
if (!initializer) return void 0;
|
|
4192
|
-
if (!
|
|
4772
|
+
if (!import_ts_morph21.Node.isArrowFunction(initializer) && !import_ts_morph21.Node.isFunctionExpression(initializer)) {
|
|
4193
4773
|
return void 0;
|
|
4194
4774
|
}
|
|
4195
4775
|
return initializer.getBody();
|
|
@@ -4199,9 +4779,9 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
4199
4779
|
const fn = findPrecalculateFunction(sourceFile);
|
|
4200
4780
|
if (!fn) return log;
|
|
4201
4781
|
const body = getFunctionBodyBlock(fn);
|
|
4202
|
-
if (!body || !
|
|
4782
|
+
if (!body || !import_ts_morph21.Node.isBlock(body)) return log;
|
|
4203
4783
|
for (const statement of [...body.getStatements()]) {
|
|
4204
|
-
const references = statement.getDescendantsOfKind(
|
|
4784
|
+
const references = statement.getDescendantsOfKind(import_ts_morph21.SyntaxKind.Identifier).some((id) => IMPORT_NAMES_TO_REMOVE.has(id.getText()));
|
|
4205
4785
|
if (references) {
|
|
4206
4786
|
statement.remove();
|
|
4207
4787
|
log.push(`removed statement in ${FUNCTION_NAME} referencing removed imports`);
|
|
@@ -4209,7 +4789,7 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
4209
4789
|
}
|
|
4210
4790
|
const remaining = body.getStatements();
|
|
4211
4791
|
const last = remaining[remaining.length - 1];
|
|
4212
|
-
const alreadyCorrect = last &&
|
|
4792
|
+
const alreadyCorrect = last && import_ts_morph21.Node.isReturnStatement(last) && last.getExpression()?.getText() === RETURN_EXPRESSION_TEXT;
|
|
4213
4793
|
if (!alreadyCorrect) {
|
|
4214
4794
|
body.addStatements(`return ${RETURN_EXPRESSION_TEXT}`);
|
|
4215
4795
|
log.push(
|
|
@@ -4218,17 +4798,17 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
4218
4798
|
}
|
|
4219
4799
|
return log;
|
|
4220
4800
|
}
|
|
4221
|
-
async function
|
|
4801
|
+
async function main24() {
|
|
4222
4802
|
const cwd = process.cwd();
|
|
4223
|
-
const absPath =
|
|
4224
|
-
if (!
|
|
4803
|
+
const absPath = import_path23.default.join(cwd, ANALYTICS_FILE_REL);
|
|
4804
|
+
if (!import_fs4.default.existsSync(absPath)) {
|
|
4225
4805
|
console.log(
|
|
4226
4806
|
`[${ANALYTICS_FILE_REL}] does not exist \u2014 nothing to clean up.`
|
|
4227
4807
|
);
|
|
4228
4808
|
return;
|
|
4229
4809
|
}
|
|
4230
|
-
const project = new
|
|
4231
|
-
tsConfigFilePath:
|
|
4810
|
+
const project = new import_ts_morph21.Project({
|
|
4811
|
+
tsConfigFilePath: import_path23.default.resolve(cwd, "tsconfig.json"),
|
|
4232
4812
|
skipAddingFilesFromTsConfig: false
|
|
4233
4813
|
});
|
|
4234
4814
|
const sourceFile = project.getSourceFile(absPath);
|
|
@@ -4257,15 +4837,15 @@ Saved ${ANALYTICS_FILE_REL}.`);
|
|
|
4257
4837
|
|
|
4258
4838
|
// src/migrations/v2.0/merge-infrastructure-directory.ts
|
|
4259
4839
|
var import_child_process2 = require("child_process");
|
|
4260
|
-
var
|
|
4840
|
+
var import_fs5 = require("fs");
|
|
4261
4841
|
var import_os = require("os");
|
|
4262
|
-
var
|
|
4842
|
+
var import_path24 = require("path");
|
|
4263
4843
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4264
4844
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4265
4845
|
var BASE_BRANCH = "release-v1.9";
|
|
4266
|
-
function gitShowBytes(ref,
|
|
4846
|
+
function gitShowBytes(ref, path23) {
|
|
4267
4847
|
try {
|
|
4268
|
-
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${
|
|
4848
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
|
|
4269
4849
|
cwd: process.cwd(),
|
|
4270
4850
|
stdio: ["ignore", "pipe", "pipe"]
|
|
4271
4851
|
});
|
|
@@ -4274,9 +4854,13 @@ function gitShowBytes(ref, path22) {
|
|
|
4274
4854
|
return null;
|
|
4275
4855
|
}
|
|
4276
4856
|
}
|
|
4277
|
-
async function
|
|
4857
|
+
async function main25({
|
|
4858
|
+
subdirs = []
|
|
4859
|
+
} = {}) {
|
|
4860
|
+
const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
|
|
4861
|
+
const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
|
|
4278
4862
|
console.log(
|
|
4279
|
-
`Merging
|
|
4863
|
+
`Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4280
4864
|
`
|
|
4281
4865
|
);
|
|
4282
4866
|
assertIsGitRepo();
|
|
@@ -4291,32 +4875,24 @@ async function main24() {
|
|
|
4291
4875
|
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4292
4876
|
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4293
4877
|
const upstreamFiles = runGit(
|
|
4294
|
-
[
|
|
4295
|
-
"ls-tree",
|
|
4296
|
-
"-r",
|
|
4297
|
-
"--name-only",
|
|
4298
|
-
"-z",
|
|
4299
|
-
ref,
|
|
4300
|
-
"--",
|
|
4301
|
-
`${INFRASTRUCTURE_DIR}/`
|
|
4302
|
-
],
|
|
4878
|
+
["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
|
|
4303
4879
|
{ silent: true }
|
|
4304
4880
|
).split("\0").filter(Boolean);
|
|
4305
4881
|
if (upstreamFiles.length === 0) {
|
|
4306
4882
|
console.log(
|
|
4307
|
-
` No files found under
|
|
4883
|
+
` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
|
|
4308
4884
|
);
|
|
4309
4885
|
return;
|
|
4310
4886
|
}
|
|
4311
|
-
const tmpDir = (0,
|
|
4312
|
-
const baseTmp = (0,
|
|
4313
|
-
const theirsTmp = (0,
|
|
4887
|
+
const tmpDir = (0, import_fs5.mkdtempSync)((0, import_path24.join)((0, import_os.tmpdir)(), "opencrvs-merge-infra-"));
|
|
4888
|
+
const baseTmp = (0, import_path24.join)(tmpDir, "base");
|
|
4889
|
+
const theirsTmp = (0, import_path24.join)(tmpDir, "theirs");
|
|
4314
4890
|
let added = 0;
|
|
4315
4891
|
let merged = 0;
|
|
4316
4892
|
const conflictedFiles = [];
|
|
4317
4893
|
for (const file of upstreamFiles) {
|
|
4318
|
-
const fullPath = (0,
|
|
4319
|
-
if (!(0,
|
|
4894
|
+
const fullPath = (0, import_path24.join)(process.cwd(), file);
|
|
4895
|
+
if (!(0, import_fs5.existsSync)(fullPath)) {
|
|
4320
4896
|
if (tryGit(["checkout", ref, "--", file])) {
|
|
4321
4897
|
console.log(` + ${file} (new from upstream)`);
|
|
4322
4898
|
added++;
|
|
@@ -4330,9 +4906,9 @@ async function main24() {
|
|
|
4330
4906
|
console.warn(` [warn] could not read ${file} from ${ref} \u2014 skipping.`);
|
|
4331
4907
|
continue;
|
|
4332
4908
|
}
|
|
4333
|
-
(0,
|
|
4909
|
+
(0, import_fs5.writeFileSync)(theirsTmp, theirContents);
|
|
4334
4910
|
const baseContents = gitShowBytes(baseRef, file);
|
|
4335
|
-
(0,
|
|
4911
|
+
(0, import_fs5.writeFileSync)(baseTmp, baseContents ?? new Uint8Array(0));
|
|
4336
4912
|
try {
|
|
4337
4913
|
(0, import_child_process2.execFileSync)("git", ["merge-file", fullPath, baseTmp, theirsTmp], {
|
|
4338
4914
|
cwd: process.cwd(),
|
|
@@ -4376,35 +4952,77 @@ async function main24() {
|
|
|
4376
4952
|
}
|
|
4377
4953
|
|
|
4378
4954
|
// src/migrations/v2.0/delete-infrastructure-directory.ts
|
|
4379
|
-
var
|
|
4380
|
-
var
|
|
4955
|
+
var import_fs6 = require("fs");
|
|
4956
|
+
var import_path25 = require("path");
|
|
4381
4957
|
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4382
|
-
async function
|
|
4383
|
-
|
|
4384
|
-
|
|
4958
|
+
async function main26({
|
|
4959
|
+
keep = []
|
|
4960
|
+
} = {}) {
|
|
4961
|
+
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4962
|
+
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
4385
4963
|
console.log(
|
|
4386
4964
|
`'${INFRASTRUCTURE_DIR2}/' not found in ${process.cwd()} \u2014 nothing to delete.`
|
|
4387
4965
|
);
|
|
4388
4966
|
return;
|
|
4389
4967
|
}
|
|
4390
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4391
|
-
`);
|
|
4392
4968
|
assertIsGitRepo();
|
|
4393
|
-
|
|
4394
|
-
|
|
4395
|
-
|
|
4396
|
-
|
|
4397
|
-
|
|
4398
|
-
|
|
4399
|
-
console.log(
|
|
4969
|
+
if (keep.length === 0) {
|
|
4970
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4971
|
+
`);
|
|
4972
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4973
|
+
silent: true
|
|
4974
|
+
});
|
|
4975
|
+
console.log(
|
|
4976
|
+
` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4977
|
+
);
|
|
4978
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4979
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4980
|
+
console.log(
|
|
4981
|
+
` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4982
|
+
);
|
|
4983
|
+
}
|
|
4984
|
+
console.log(
|
|
4985
|
+
`
|
|
4986
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4987
|
+
);
|
|
4988
|
+
return;
|
|
4989
|
+
}
|
|
4990
|
+
const keepSet = new Set(keep);
|
|
4991
|
+
console.log(
|
|
4992
|
+
`Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
|
|
4993
|
+
`
|
|
4994
|
+
);
|
|
4995
|
+
const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
|
|
4996
|
+
let deleted = 0;
|
|
4997
|
+
for (const entry of topLevelEntries) {
|
|
4998
|
+
if (keepSet.has(entry.name)) {
|
|
4999
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
|
|
5000
|
+
continue;
|
|
5001
|
+
}
|
|
5002
|
+
const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
|
|
5003
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
|
|
5004
|
+
const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
|
|
5005
|
+
if ((0, import_fs6.existsSync)(fullEntryPath)) {
|
|
5006
|
+
(0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
5007
|
+
}
|
|
5008
|
+
console.log(` Deleted '${relPath}'.`);
|
|
5009
|
+
deleted++;
|
|
5010
|
+
}
|
|
5011
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
5012
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
5013
|
+
if (missingKeeps.length > 0) {
|
|
5014
|
+
console.warn(
|
|
5015
|
+
` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
|
|
5016
|
+
);
|
|
4400
5017
|
}
|
|
4401
5018
|
console.log(
|
|
4402
5019
|
`
|
|
4403
|
-
Done. Review the staged
|
|
5020
|
+
Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4404
5021
|
);
|
|
4405
5022
|
}
|
|
4406
5023
|
|
|
4407
5024
|
// src/migrations/v2.0/index.ts
|
|
5025
|
+
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4408
5026
|
async function runUpgrade(dockerSwarm) {
|
|
4409
5027
|
await main18();
|
|
4410
5028
|
await main();
|
|
@@ -4428,10 +5046,12 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4428
5046
|
await main21();
|
|
4429
5047
|
await main22();
|
|
4430
5048
|
await main23();
|
|
5049
|
+
await main24();
|
|
4431
5050
|
await main17();
|
|
4432
5051
|
if (dockerSwarm) {
|
|
4433
|
-
await main24();
|
|
4434
|
-
} else {
|
|
4435
5052
|
await main25();
|
|
5053
|
+
} else {
|
|
5054
|
+
await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
|
|
5055
|
+
await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
|
|
4436
5056
|
}
|
|
4437
5057
|
}
|