@opencrvs/toolkit 2.1.0 → 2.2.0-rc.9042a13

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.
Files changed (59) hide show
  1. package/build.sh +2 -2
  2. package/create-countryconfig/package.json +1 -1
  3. package/dist/application-config/index.js +29 -2
  4. package/dist/authentication/index.js +14 -1
  5. package/dist/cli.js +294 -1967
  6. package/dist/commons/api/router.d.ts +1370 -73
  7. package/dist/commons/conditionals/conditionals.d.ts +3 -3
  8. package/dist/commons/events/ActionConfig.d.ts +133 -0
  9. package/dist/commons/events/ActionDocument.d.ts +88 -0
  10. package/dist/commons/events/ActionInput.d.ts +52 -0
  11. package/dist/commons/events/ActionType.d.ts +11 -1
  12. package/dist/commons/events/AdvancedSearchConfig.d.ts +12 -0
  13. package/dist/commons/events/AuditLog.d.ts +4 -0
  14. package/dist/commons/events/CountryConfigQueryInput.d.ts +132 -0
  15. package/dist/commons/events/Draft.d.ts +2 -0
  16. package/dist/commons/events/EventConfig.d.ts +26 -6
  17. package/dist/commons/events/EventDocument.d.ts +88 -0
  18. package/dist/commons/events/EventIndex.d.ts +20 -0
  19. package/dist/commons/events/EventMetadata.d.ts +23 -0
  20. package/dist/commons/events/EventStatus.d.ts +1 -0
  21. package/dist/commons/events/FieldConfig.d.ts +10 -0
  22. package/dist/commons/events/WorkqueueConfig.d.ts +154 -10
  23. package/dist/commons/events/eventConfigValidation.d.ts +17 -1
  24. package/dist/commons/events/scopes.d.ts +2 -0
  25. package/dist/commons/events/state/index.d.ts +10 -2
  26. package/dist/commons/events/state/utils.d.ts +11 -1
  27. package/dist/commons/events/test.utils.d.ts +28 -1
  28. package/dist/commons/events/utils.d.ts +43 -15
  29. package/dist/conditionals/index.js +14 -1
  30. package/dist/environment/derived-variables.d.ts +18 -0
  31. package/dist/environment/derived-variables.d.ts.map +1 -1
  32. package/dist/environment/derived-variables.js +22 -1
  33. package/dist/environment/setup-environment.d.ts.map +1 -1
  34. package/dist/environment/setup-environment.js +29 -10
  35. package/dist/events/index.js +293 -66
  36. package/dist/migrations/add-translations.d.ts +15 -0
  37. package/dist/migrations/add-translations.d.ts.map +1 -0
  38. package/dist/migrations/{v2.1/add-translations.js → add-translations.js} +16 -14
  39. package/dist/migrations/v2.1/index.js +35 -2155
  40. package/dist/migrations/v2.1/migrate-infrastructure-to-assets.d.ts +3 -0
  41. package/dist/migrations/v2.1/migrate-infrastructure-to-assets.d.ts.map +1 -1
  42. package/dist/migrations/v2.1/upgrade-tilt.d.ts +3 -0
  43. package/dist/migrations/v2.1/upgrade-tilt.d.ts.map +1 -1
  44. package/dist/migrations/v2.2/index.d.ts +6 -0
  45. package/dist/migrations/v2.2/index.d.ts.map +1 -0
  46. package/dist/migrations/v2.2/index.js +456 -0
  47. package/dist/migrations/v2.2/read-declaration-through-helper.d.ts +39 -0
  48. package/dist/migrations/v2.2/read-declaration-through-helper.d.ts.map +1 -0
  49. package/dist/migrations/v2.2/read-declaration-through-helper.js +257 -0
  50. package/dist/notification/index.js +271 -86
  51. package/dist/scopes/index.d.ts +29 -6
  52. package/dist/scopes/index.js +14 -1
  53. package/dist/templates/charts-values/traefik/values.yaml +2 -3
  54. package/opencrvs-toolkit-2.2.0-rc.9042a13.tgz +0 -0
  55. package/package.json +1 -1
  56. package/tsconfig.build.tsbuildinfo +1 -1
  57. package/dist/migrations/v2.1/add-translations.d.ts +0 -9
  58. package/dist/migrations/v2.1/add-translations.d.ts.map +0 -1
  59. package/opencrvs-toolkit-2.1.0.tgz +0 -0
@@ -162,6 +162,8 @@ var ActionType = {
162
162
  REQUEST_CORRECTION: "REQUEST_CORRECTION",
163
163
  REJECT_CORRECTION: "REJECT_CORRECTION",
164
164
  APPROVE_CORRECTION: "APPROVE_CORRECTION",
165
+ REVOKE_REGISTRATION: "REVOKE_REGISTRATION",
166
+ REINSTATE_REGISTRATION: "REINSTATE_REGISTRATION",
165
167
  // General actions
166
168
  READ: "READ",
167
169
  ASSIGN: "ASSIGN",
@@ -181,6 +183,8 @@ var ConfirmableActions = [
181
183
  ActionType.REQUEST_CORRECTION,
182
184
  ActionType.APPROVE_CORRECTION,
183
185
  ActionType.REJECT_CORRECTION,
186
+ ActionType.REVOKE_REGISTRATION,
187
+ ActionType.REINSTATE_REGISTRATION,
184
188
  ActionType.CUSTOM
185
189
  ];
186
190
  var ActionTypes = z6.enum([
@@ -200,6 +204,8 @@ var ActionTypes = z6.enum([
200
204
  "REQUEST_CORRECTION",
201
205
  "REJECT_CORRECTION",
202
206
  "APPROVE_CORRECTION",
207
+ "REVOKE_REGISTRATION",
208
+ "REINSTATE_REGISTRATION",
203
209
  "READ",
204
210
  "ASSIGN",
205
211
  "UNASSIGN",
@@ -238,7 +244,9 @@ var WorkqueueActionType = ActionTypes.extract([
238
244
  ActionType.ARCHIVE,
239
245
  ActionType.UNARCHIVE,
240
246
  ActionType.PRINT_CERTIFICATE,
241
- ActionType.REQUEST_CORRECTION
247
+ ActionType.REQUEST_CORRECTION,
248
+ ActionType.REVOKE_REGISTRATION,
249
+ ActionType.REINSTATE_REGISTRATION
242
250
  ]);
243
251
  var META_ACTIONS = [
244
252
  ActionType.ASSIGN,
@@ -390,6 +398,7 @@ var EventStatus = z10.enum([
390
398
  "NOTIFIED",
391
399
  "DECLARED",
392
400
  "REGISTERED",
401
+ "REVOKED",
393
402
  "ARCHIVED"
394
403
  ]);
395
404
 
@@ -413,6 +422,8 @@ var RecordScopeTypeV2 = z11.enum([
413
422
  "record.print-certified-copies",
414
423
  "record.request-correction",
415
424
  "record.correct",
425
+ "record.revoke-registration",
426
+ "record.reinstate-registration",
416
427
  "record.unassign-others",
417
428
  "record.custom-action",
418
429
  "record.action.accept",
@@ -539,6 +550,8 @@ var ScopesWithFullOptions = RecordScopeTypeV2.extract([
539
550
  "record.read",
540
551
  "record.request-correction",
541
552
  "record.correct",
553
+ "record.revoke-registration",
554
+ "record.reinstate-registration",
542
555
  "record.unassign-others",
543
556
  "record.review-duplicates"
544
557
  ]);
@@ -112,11 +112,29 @@ export declare const derivedVariables: readonly [{
112
112
  readonly valueType: 'VARIABLE';
113
113
  readonly type: 'disabled';
114
114
  readonly scope: 'ENVIRONMENT';
115
+ }, {
116
+ readonly name: 'RESTORE_ENVIRONMENT_MODE';
117
+ readonly valueLabel: 'RESTORE_ENVIRONMENT_MODE';
118
+ readonly valueType: 'VARIABLE';
119
+ readonly type: 'disabled';
120
+ readonly scope: 'ENVIRONMENT';
121
+ }, {
122
+ readonly name: 'RESTORE_HOST';
123
+ readonly valueLabel: 'RESTORE_HOST';
124
+ readonly valueType: 'VARIABLE';
125
+ readonly type: 'disabled';
126
+ readonly scope: 'ENVIRONMENT';
115
127
  }, {
116
128
  readonly name: 'NOTIFICATION_TRANSPORT';
117
129
  readonly valueLabel: 'NOTIFICATION_TRANSPORT';
118
130
  readonly valueType: 'VARIABLE';
119
131
  readonly type: 'disabled';
120
132
  readonly scope: 'ENVIRONMENT';
133
+ }, {
134
+ readonly name: 'TWO_FA_ENABLED';
135
+ readonly valueLabel: 'TWO_FA_ENABLED';
136
+ readonly valueType: 'VARIABLE';
137
+ readonly type: 'disabled';
138
+ readonly scope: 'ENVIRONMENT';
121
139
  }];
122
140
  //# sourceMappingURL=derived-variables.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"derived-variables.d.ts","sourceRoot":"","sources":["../../src/environment/derived-variables.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"derived-variables.d.ts","sourceRoot":"","sources":["../../src/environment/derived-variables.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,gBAAgB;aAEzB,IAAI,EAAE,gBAAgB;aACtB,UAAU,EAAE,gBAAgB;aAC5B,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,qBAAqB;aAC3B,UAAU,EAAE,qBAAqB;aACjC,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,cAAc;aACpB,UAAU,EAAE,cAAc;aAC1B,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,kCAAkC;aACxC,UAAU,EAAE,kCAAkC;aAC9C,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,gBAAgB;aACtB,UAAU,EAAE,gBAAgB;aAC5B,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,WAAW;aACjB,UAAU,EAAE,WAAW;aACvB,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,kCAAkC;aACxC,UAAU,EAAE,kCAAkC;aAC9C,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,wBAAwB;aAC9B,UAAU,EAAE,wBAAwB;aACpC,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,iBAAiB;aACvB,UAAU,EAAE,iBAAiB;aAC7B,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,qBAAqB;aAC3B,UAAU,EAAE,qBAAqB;aACjC,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,eAAe;aACrB,UAAU,EAAE,eAAe;aAC3B,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,mBAAmB;aACzB,UAAU,EAAE,mBAAmB;aAC/B,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,qBAAqB;aAC3B,UAAU,EAAE,qBAAqB;aACjC,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,gBAAgB;aACtB,UAAU,EAAE,gBAAgB;aAC5B,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,wBAAwB;aAC9B,UAAU,EAAE,wBAAwB;aACpC,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,YAAY;;aAGnB,IAAI,EAAE,8BAA8B;aACpC,UAAU,EAAE,8BAA8B;aAC1C,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,yBAAyB;aAC/B,UAAU,EAAE,yBAAyB;aACrC,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,wBAAwB;aAC9B,UAAU,EAAE,wBAAwB;aACpC,SAAS,EAAE,QAAQ;aACnB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,0BAA0B;aAChC,UAAU,EAAE,0BAA0B;aACtC,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,0BAA0B;aAChC,UAAU,EAAE,0BAA0B;aACtC,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,cAAc;aACpB,UAAU,EAAE,cAAc;aAC1B,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,wBAAwB;aAC9B,UAAU,EAAE,wBAAwB;aACpC,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;;aAGpB,IAAI,EAAE,gBAAgB;aACtB,UAAU,EAAE,gBAAgB;aAC5B,SAAS,EAAE,UAAU;aACrB,IAAI,EAAE,UAAU;aAChB,KAAK,EAAE,aAAa;EAEd,CAAA"}
@@ -145,11 +145,32 @@ exports.derivedVariables = [
145
145
  type: 'disabled',
146
146
  scope: 'ENVIRONMENT'
147
147
  },
148
+ {
149
+ name: 'RESTORE_ENVIRONMENT_MODE',
150
+ valueLabel: 'RESTORE_ENVIRONMENT_MODE',
151
+ valueType: 'VARIABLE',
152
+ type: 'disabled',
153
+ scope: 'ENVIRONMENT'
154
+ },
155
+ {
156
+ name: 'RESTORE_HOST',
157
+ valueLabel: 'RESTORE_HOST',
158
+ valueType: 'VARIABLE',
159
+ type: 'disabled',
160
+ scope: 'ENVIRONMENT'
161
+ },
148
162
  {
149
163
  name: 'NOTIFICATION_TRANSPORT',
150
164
  valueLabel: 'NOTIFICATION_TRANSPORT',
151
165
  valueType: 'VARIABLE',
152
166
  type: 'disabled',
153
167
  scope: 'ENVIRONMENT'
154
- }
168
+ },
169
+ {
170
+ name: 'TWO_FA_ENABLED',
171
+ valueLabel: 'TWO_FA_ENABLED',
172
+ valueType: 'VARIABLE',
173
+ type: 'disabled',
174
+ scope: 'ENVIRONMENT'
175
+ },
155
176
  ];
@@ -1 +1 @@
1
- {"version":3,"file":"setup-environment.d.ts","sourceRoot":"","sources":["../../src/environment/setup-environment.ts"],"names":[],"mappings":"AAwSA,wBAAsB,mBAAmB,kBAkmCxC"}
1
+ {"version":3,"file":"setup-environment.d.ts","sourceRoot":"","sources":["../../src/environment/setup-environment.ts"],"names":[],"mappings":"AAwSA,wBAAsB,mBAAmB,kBA+nCxC"}
@@ -239,16 +239,6 @@ function runSetupEnvironment() {
239
239
  ]
240
240
  });
241
241
  }
242
- (0, logger_1.log)('\n', kleur_1.default.bold().underline('Two-factor authentication (2FA)'));
243
- const two_fa_enabled = yield confirm({
244
- message: 'Enable two-factor authentication (2FA)? This should be enabled for any environment that hosts PII data.',
245
- default: process.env.TWO_FA_ENABLED
246
- ? process.env.TWO_FA_ENABLED === 'true'
247
- : environment_type === 'production'
248
- });
249
- if (!two_fa_enabled && ['production', 'staging'].includes(environment_type)) {
250
- (0, logger_1.warn)('2FA is disabled on a production-like environment. Logins will accept the fixed test code 000000, exposing real citizen data. Only do this if you know what you are doing.');
251
- }
252
242
  const environment_exists = existingEnvironments
253
243
  .map((e) => e.trim())
254
244
  .includes(environment);
@@ -277,6 +267,18 @@ function runSetupEnvironment() {
277
267
  .bold('WARNING! You are setting up a production environment.\n Make sure you have read the deployment guide carefully before proceeding.\n'));
278
268
  yield promptAndStoreAnswer(questions_1.githubOtherQuestions, existingValues);
279
269
  }
270
+ (0, logger_1.log)('\n', kleur_1.default.bold().underline('Two-factor authentication (2FA)'));
271
+ const existingTwoFaEnabled = (0, utils_1.findExistingValue)('TWO_FA_ENABLED', 'VARIABLE', 'ENVIRONMENT', existingValues);
272
+ const twoFaDefault = process.env.TWO_FA_ENABLED || (existingTwoFaEnabled === null || existingTwoFaEnabled === void 0 ? void 0 : existingTwoFaEnabled.value);
273
+ const two_fa_enabled = yield confirm({
274
+ message: 'Enable two-factor authentication (2FA)? This should be enabled for any environment that hosts PII data.',
275
+ default: twoFaDefault
276
+ ? twoFaDefault === 'true'
277
+ : environment_type === 'production'
278
+ });
279
+ if (!two_fa_enabled && ['production', 'staging'].includes(environment_type)) {
280
+ (0, logger_1.warn)('2FA is disabled on a production-like environment. Logins will accept the fixed test code 000000, exposing real citizen data. Only do this if you know what you are doing.');
281
+ }
280
282
  (0, logger_1.log)('\n', kleur_1.default.bold().underline('Docker Hub'));
281
283
  yield promptAndStoreAnswer(questions_1.dockerhubQuestions, existingValues);
282
284
  (0, logger_1.log)('\n', kleur_1.default.bold().underline('Kubernetes & Runtime'));
@@ -396,6 +398,7 @@ function runSetupEnvironment() {
396
398
  });
397
399
  restoreType = yield select({
398
400
  message: `Select ${kleur_1.default.yellow().bold(restoreEnvironmentName)} environment backup mode`,
401
+ default: restoreType,
399
402
  choices: [
400
403
  {
401
404
  name: 'Full dump (daily full database backup)',
@@ -467,6 +470,14 @@ function runSetupEnvironment() {
467
470
  value: findExistingOrDefine('NOTIFICATION_TRANSPORT', 'VARIABLE', 'ENVIRONMENT', 'email'),
468
471
  scope: 'ENVIRONMENT'
469
472
  });
473
+ derivedUpdates.push({
474
+ name: 'TWO_FA_ENABLED',
475
+ type: 'VARIABLE',
476
+ didExist: existingTwoFaEnabled,
477
+ // Always stored, so the next run defaults to the current answer
478
+ value: two_fa_enabled ? 'true' : 'false',
479
+ scope: 'ENVIRONMENT'
480
+ });
470
481
  derivedUpdates.push(...ssl_answers);
471
482
  if (configureBackup) {
472
483
  derivedUpdates.push({
@@ -582,6 +593,14 @@ function runSetupEnvironment() {
582
593
  value: answerOrExisting(restoreHost, (0, utils_1.findExistingValue)('RESTORE_HOST', 'VARIABLE', 'ENVIRONMENT', existingValues), (val) => val || ''),
583
594
  didExist: (0, utils_1.findExistingValue)('RESTORE_HOST', 'VARIABLE', 'ENVIRONMENT', existingValues),
584
595
  scope: 'ENVIRONMENT'
596
+ },
597
+ {
598
+ type: 'VARIABLE',
599
+ name: 'RESTORE_ENVIRONMENT_MODE',
600
+ // Only persist the mode when restore is configured
601
+ value: restoreEnvironmentName ? restoreType : '',
602
+ didExist: (0, utils_1.findExistingValue)('RESTORE_ENVIRONMENT_MODE', 'VARIABLE', 'ENVIRONMENT', existingValues),
603
+ scope: 'ENVIRONMENT'
585
604
  }
586
605
  ];
587
606
  if (enableEncryption) {