@opencrvs/toolkit 2.0.0-rc.185cc97 → 2.0.0-rc.1d9a00b

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 (79) hide show
  1. package/dist/application-config/index.js +35 -7
  2. package/dist/cli.js +1657 -318
  3. package/dist/commons/api/router.d.ts +34 -32
  4. package/dist/commons/conditionals/conditionals.d.ts +3 -3
  5. package/dist/commons/events/FieldConfig.d.ts +5 -0
  6. package/dist/commons/events/locations.d.ts +17 -1
  7. package/dist/conditionals/index.js +35 -7
  8. package/dist/events/index.js +73 -7
  9. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
  10. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +63 -39
  11. package/dist/migrations/v2.0/add-resend-invite-notification.d.ts +3 -0
  12. package/dist/migrations/v2.0/add-resend-invite-notification.d.ts.map +1 -0
  13. package/dist/migrations/v2.0/add-resend-invite-notification.js +373 -0
  14. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +19 -0
  15. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  16. package/dist/migrations/v2.0/checkout-upstream-files.js +17 -13
  17. package/dist/migrations/v2.0/convert-config-files-to-ts.d.ts.map +1 -1
  18. package/dist/migrations/v2.0/convert-config-files-to-ts.js +4 -5
  19. package/dist/migrations/v2.0/convert-paragraph-to-heading.d.ts.map +1 -1
  20. package/dist/migrations/v2.0/convert-paragraph-to-heading.js +4 -5
  21. package/dist/migrations/v2.0/create-events-index.d.ts.map +1 -1
  22. package/dist/migrations/v2.0/create-events-index.js +1 -2
  23. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +3 -0
  24. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -0
  25. package/dist/migrations/v2.0/delete-infrastructure-directory.js +77 -0
  26. package/dist/migrations/v2.0/index.d.ts +8 -4
  27. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  28. package/dist/migrations/v2.0/index.js +1625 -315
  29. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
  30. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +95 -7
  31. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +3 -0
  32. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -0
  33. package/dist/migrations/v2.0/merge-infrastructure-directory.js +221 -0
  34. package/dist/migrations/v2.0/migrate-application-config-url.d.ts +3 -0
  35. package/dist/migrations/v2.0/migrate-application-config-url.d.ts.map +1 -0
  36. package/dist/migrations/v2.0/migrate-application-config-url.js +342 -0
  37. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  38. package/dist/migrations/v2.0/migrate-scopes.js +6 -7
  39. package/dist/migrations/v2.0/migrate-validated-workqueue-status-to-flag.d.ts.map +1 -1
  40. package/dist/migrations/v2.0/migrate-validated-workqueue-status-to-flag.js +3 -4
  41. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  42. package/dist/migrations/v2.0/migrate-workqueue-configs.js +3 -4
  43. package/dist/migrations/v2.0/remove-delete-actions.d.ts.map +1 -1
  44. package/dist/migrations/v2.0/remove-delete-actions.js +3 -4
  45. package/dist/migrations/v2.0/remove-demo-scope.d.ts.map +1 -1
  46. package/dist/migrations/v2.0/remove-demo-scope.js +2 -3
  47. package/dist/migrations/v2.0/remove-deprecated-imports.d.ts.map +1 -1
  48. package/dist/migrations/v2.0/remove-deprecated-imports.js +3 -4
  49. package/dist/migrations/v2.0/remove-fhir-url-helpers.d.ts +3 -0
  50. package/dist/migrations/v2.0/remove-fhir-url-helpers.d.ts.map +1 -0
  51. package/dist/migrations/v2.0/remove-fhir-url-helpers.js +163 -0
  52. package/dist/migrations/v2.0/remove-hearth-migrations.d.ts.map +1 -1
  53. package/dist/migrations/v2.0/remove-hearth-migrations.js +1 -2
  54. package/dist/migrations/v2.0/remove-old-statistics-service.d.ts +3 -0
  55. package/dist/migrations/v2.0/remove-old-statistics-service.d.ts.map +1 -0
  56. package/dist/migrations/v2.0/remove-old-statistics-service.js +356 -0
  57. package/dist/migrations/v2.0/remove-pending-certification-flag.d.ts.map +1 -1
  58. package/dist/migrations/v2.0/remove-pending-certification-flag.js +3 -4
  59. package/dist/migrations/v2.0/remove-review-from-register-action.d.ts.map +1 -1
  60. package/dist/migrations/v2.0/remove-review-from-register-action.js +3 -4
  61. package/dist/migrations/v2.0/remove-unused-environment-variables.d.ts +3 -0
  62. package/dist/migrations/v2.0/remove-unused-environment-variables.d.ts.map +1 -0
  63. package/dist/migrations/v2.0/remove-unused-environment-variables.js +186 -0
  64. package/dist/migrations/v2.0/rename-api-paths.d.ts.map +1 -1
  65. package/dist/migrations/v2.0/rename-api-paths.js +3 -4
  66. package/dist/migrations/v2.0/rename-location-parent-id.d.ts.map +1 -1
  67. package/dist/migrations/v2.0/rename-location-parent-id.js +3 -4
  68. package/dist/migrations/v2.0/simplify-analytics-precalculations.d.ts.map +1 -1
  69. package/dist/migrations/v2.0/simplify-analytics-precalculations.js +1 -2
  70. package/dist/migrations/v2.0/update-package-json.d.ts +3 -0
  71. package/dist/migrations/v2.0/update-package-json.d.ts.map +1 -0
  72. package/dist/migrations/v2.0/update-package-json.js +105 -0
  73. package/dist/notification/index.js +35 -7
  74. package/dist/scopes/index.d.ts +82 -10
  75. package/dist/scopes/index.js +41 -8
  76. package/opencrvs-toolkit-2.0.0-rc.1d9a00b.tgz +0 -0
  77. package/package.json +1 -1
  78. package/tsconfig.tsbuildinfo +1 -1
  79. package/opencrvs-toolkit-2.0.0-rc.185cc97.tgz +0 -0
@@ -3975,10 +3975,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
3975
3975
  output: {
3976
3976
  id: string & import("zod").$brand<"UUID">;
3977
3977
  name: {
3978
- use: string;
3979
- given: string[];
3980
- family: string;
3981
- }[];
3978
+ firstname: string;
3979
+ surname: string;
3980
+ };
3982
3981
  role: string;
3983
3982
  primaryOfficeId: string & import("zod").$brand<"UUID">;
3984
3983
  type: "user";
@@ -4008,10 +4007,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
4008
4007
  create: import("@trpc/server").TRPCMutationProcedure<{
4009
4008
  input: {
4010
4009
  name: {
4011
- use: string;
4012
- given: string[];
4013
- family: string;
4014
- }[];
4010
+ firstname: string;
4011
+ surname: string;
4012
+ };
4015
4013
  role: string;
4016
4014
  primaryOfficeId: string;
4017
4015
  data?: Record<string, unknown> | undefined;
@@ -4030,10 +4028,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
4030
4028
  output: {
4031
4029
  id: string & import("zod").$brand<"UUID">;
4032
4030
  name: {
4033
- use: string;
4034
- given: string[];
4035
- family: string;
4036
- }[];
4031
+ firstname: string;
4032
+ surname: string;
4033
+ };
4037
4034
  role: string;
4038
4035
  primaryOfficeId: string & import("zod").$brand<"UUID">;
4039
4036
  type: "user";
@@ -4054,10 +4051,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
4054
4051
  id: string;
4055
4052
  data?: Record<string, unknown> | undefined;
4056
4053
  name?: {
4057
- use: string;
4058
- given: string[];
4059
- family: string;
4060
- }[] | undefined;
4054
+ firstname: string;
4055
+ surname: string;
4056
+ } | undefined;
4061
4057
  role?: string | undefined;
4062
4058
  fullHonorificName?: string | undefined;
4063
4059
  device?: string | undefined;
@@ -4074,10 +4070,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
4074
4070
  output: {
4075
4071
  id: string & import("zod").$brand<"UUID">;
4076
4072
  name: {
4077
- use: string;
4078
- given: string[];
4079
- family: string;
4080
- }[];
4073
+ firstname: string;
4074
+ surname: string;
4075
+ };
4081
4076
  role: string;
4082
4077
  primaryOfficeId: string & import("zod").$brand<"UUID">;
4083
4078
  type: "user";
@@ -4098,10 +4093,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
4098
4093
  output: ({
4099
4094
  id: string & import("zod").$brand<"UUID">;
4100
4095
  name: {
4101
- use: string;
4102
- given: string[];
4103
- family: string;
4104
- }[];
4096
+ firstname: string;
4097
+ surname: string;
4098
+ };
4105
4099
  role: string;
4106
4100
  primaryOfficeId: string & import("zod").$brand<"UUID">;
4107
4101
  type: "user";
@@ -4143,10 +4137,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
4143
4137
  output: ({
4144
4138
  id: string & import("zod").$brand<"UUID">;
4145
4139
  name: {
4146
- use: string;
4147
- given: string[];
4148
- family: string;
4149
- }[];
4140
+ firstname: string;
4141
+ surname: string;
4142
+ };
4150
4143
  role: string;
4151
4144
  primaryOfficeId: string & import("zod").$brand<"UUID">;
4152
4145
  type: "user";
@@ -4282,10 +4275,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
4282
4275
  changeAvatar: import("@trpc/server").TRPCMutationProcedure<{
4283
4276
  input: {
4284
4277
  userId: string;
4285
- avatar: {
4286
- type: string;
4287
- data: string;
4288
- };
4278
+ avatar: string;
4289
4279
  };
4290
4280
  output: void;
4291
4281
  meta: import("trpc-to-openapi").OpenApiMeta;
@@ -4317,6 +4307,18 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
4317
4307
  output: void;
4318
4308
  meta: import("trpc-to-openapi").OpenApiMeta;
4319
4309
  }>;
4310
+ verifyLoggedInUserPassword: import("@trpc/server").TRPCMutationProcedure<{
4311
+ input: {
4312
+ password: string;
4313
+ };
4314
+ output: {
4315
+ status: string;
4316
+ username: string;
4317
+ id: string;
4318
+ mobile?: string | undefined;
4319
+ };
4320
+ meta: import("trpc-to-openapi").OpenApiMeta;
4321
+ }>;
4320
4322
  audit: import("@trpc/server").TRPCBuiltRouter<{
4321
4323
  ctx: Partial<{
4322
4324
  token: `Bearer ${string}`;
@@ -87,16 +87,16 @@ export declare const user: typeof userSerializer & {
87
87
  scope: (scope: import("../scopes").ScopeType) => {
88
88
  attribute: (option: import("../scopes").ScopeOptionKey) => {
89
89
  $scope: "record.search" | "record.create" | "record.read" | "record.declare" | "record.notify" | "record.edit" | "record.reject" | "record.archive" | "record.review-duplicates" | "record.register" | "record.print-certified-copies" | "record.request-correction" | "record.correct" | "record.unassign-others" | "record.custom-action" | "bypassratelimit" | "record.reindex" | "user.data-seeding" | "integration.create" | "record.import" | "config.update-all" | "attachment.upload" | "profile.electronic-signature" | "user.read-only-my-audit" | "performance.read" | "performance.read-dashboards" | "performance.vital-statistics-export" | "record.confirm-registration" | "record.reject-registration" | "organisation.read-locations" | "user.read" | "user.create" | "user.edit" | "workqueue" | "dashboard.view";
90
- $option: "event" | "placeOfEvent" | "declaredIn" | "declaredBy" | "registeredIn" | "registeredBy" | "accessLevel" | "ids";
90
+ $option: "role" | "event" | "placeOfEvent" | "declaredIn" | "declaredBy" | "registeredIn" | "registeredBy" | "accessLevel" | "ids";
91
91
  };
92
92
  };
93
93
  jurisdiction: (jurisdiction: import("../scopes").JurisdictionFilter | {
94
94
  $scope: "record.search" | "record.create" | "record.read" | "record.declare" | "record.notify" | "record.edit" | "record.reject" | "record.archive" | "record.review-duplicates" | "record.register" | "record.print-certified-copies" | "record.request-correction" | "record.correct" | "record.unassign-others" | "record.custom-action" | "bypassratelimit" | "record.reindex" | "user.data-seeding" | "integration.create" | "record.import" | "config.update-all" | "attachment.upload" | "profile.electronic-signature" | "user.read-only-my-audit" | "performance.read" | "performance.read-dashboards" | "performance.vital-statistics-export" | "record.confirm-registration" | "record.reject-registration" | "organisation.read-locations" | "user.read" | "user.create" | "user.edit" | "workqueue" | "dashboard.view";
95
- $option: "event" | "placeOfEvent" | "declaredIn" | "declaredBy" | "registeredIn" | "registeredBy" | "accessLevel" | "ids";
95
+ $option: "role" | "event" | "placeOfEvent" | "declaredIn" | "declaredBy" | "registeredIn" | "registeredBy" | "accessLevel" | "ids";
96
96
  }) => {
97
97
  $jurisdiction: "administrativeArea" | "location" | "all" | {
98
98
  $scope: "record.search" | "record.create" | "record.read" | "record.declare" | "record.notify" | "record.edit" | "record.reject" | "record.archive" | "record.review-duplicates" | "record.register" | "record.print-certified-copies" | "record.request-correction" | "record.correct" | "record.unassign-others" | "record.custom-action" | "bypassratelimit" | "record.reindex" | "user.data-seeding" | "integration.create" | "record.import" | "config.update-all" | "attachment.upload" | "profile.electronic-signature" | "user.read-only-my-audit" | "performance.read" | "performance.read-dashboards" | "performance.vital-statistics-export" | "record.confirm-registration" | "record.reject-registration" | "organisation.read-locations" | "user.read" | "user.create" | "user.edit" | "workqueue" | "dashboard.view";
99
- $option: "event" | "placeOfEvent" | "declaredIn" | "declaredBy" | "registeredIn" | "registeredBy" | "accessLevel" | "ids";
99
+ $option: "role" | "event" | "placeOfEvent" | "declaredIn" | "declaredBy" | "registeredIn" | "registeredBy" | "accessLevel" | "ids";
100
100
  };
101
101
  };
102
102
  };
@@ -1727,6 +1727,7 @@ declare const AdministrativeAreaField: z.ZodObject<{
1727
1727
  "dashboard.view": "dashboard.view";
1728
1728
  }>;
1729
1729
  $option: z.ZodEnum<{
1730
+ role: "role";
1730
1731
  event: "event";
1731
1732
  placeOfEvent: "placeOfEvent";
1732
1733
  declaredIn: "declaredIn";
@@ -1845,6 +1846,7 @@ declare const LocationInput: z.ZodObject<{
1845
1846
  "dashboard.view": "dashboard.view";
1846
1847
  }>;
1847
1848
  $option: z.ZodEnum<{
1849
+ role: "role";
1848
1850
  event: "event";
1849
1851
  placeOfEvent: "placeOfEvent";
1850
1852
  declaredIn: "declaredIn";
@@ -2028,6 +2030,7 @@ declare const Facility: z.ZodObject<{
2028
2030
  "dashboard.view": "dashboard.view";
2029
2031
  }>;
2030
2032
  $option: z.ZodEnum<{
2033
+ role: "role";
2031
2034
  event: "event";
2032
2035
  placeOfEvent: "placeOfEvent";
2033
2036
  declaredIn: "declaredIn";
@@ -2132,6 +2135,7 @@ declare const Office: z.ZodObject<{
2132
2135
  "dashboard.view": "dashboard.view";
2133
2136
  }>;
2134
2137
  $option: z.ZodEnum<{
2138
+ role: "role";
2135
2139
  event: "event";
2136
2140
  placeOfEvent: "placeOfEvent";
2137
2141
  declaredIn: "declaredIn";
@@ -2323,6 +2327,7 @@ declare const Address: z.ZodObject<{
2323
2327
  "dashboard.view": "dashboard.view";
2324
2328
  }>;
2325
2329
  $option: z.ZodEnum<{
2330
+ role: "role";
2326
2331
  event: "event";
2327
2332
  placeOfEvent: "placeOfEvent";
2328
2333
  declaredIn: "declaredIn";
@@ -1,7 +1,8 @@
1
+ import { UUID } from '../uuid';
1
2
  import * as z from 'zod/v4';
2
3
  import { EventIndex } from './EventIndex';
3
4
  import { ActionCreationMetadata, RegistrationCreationMetadata } from './EventMetadata';
4
- import { RecordScopeV2 } from '../scopes';
5
+ import { RecordScopeV2, UserScopeV2 } from '../scopes';
5
6
  import { SystemContext, UserContext } from '../users/User';
6
7
  /** @deprecated Moving on, location types are arbitrary and defined by the country config. */
7
8
  export declare const LocationTypeV1: z.ZodEnum<{
@@ -51,6 +52,21 @@ export type EventIndexWithAdministrativeHierarchy = Omit<ToArrayFields<EventInde
51
52
  *
52
53
  */
53
54
  export declare function canAccessEventWithScope(event: Partial<EventIndexWithAdministrativeHierarchy>, scope: RecordScopeV2, user: UserContext | SystemContext, customActionType?: string): boolean;
55
+ export type UserWithResolvedHierarchy = {
56
+ role: string;
57
+ administrativeHierarchy: UUID[];
58
+ primaryOfficeId: UUID;
59
+ };
60
+ export declare function canAccessUserWithScope({ userToAccess, scope, user }: {
61
+ userToAccess: UserWithResolvedHierarchy;
62
+ scope: UserScopeV2;
63
+ user: UserContext | SystemContext;
64
+ }): boolean;
65
+ export declare function canAccessOtherUserWithScopes({ scopes, userToAccess, user }: {
66
+ scopes: UserScopeV2[];
67
+ userToAccess: UserWithResolvedHierarchy;
68
+ user: UserContext | SystemContext;
69
+ }): boolean;
54
70
  /**
55
71
  * Given indexed event and list of resolved scopes, determine if any of the scopes allow access to the event.
56
72
  *
@@ -182,6 +182,10 @@ var scopeByEvent = z6.preprocess(
182
182
  (val) => val === void 0 ? void 0 : [val].flat(),
183
183
  z6.array(z6.string()).optional()
184
184
  ).describe("Event type, e.g. birth, death");
185
+ var userRole = z6.preprocess(
186
+ (val) => val === void 0 ? void 0 : [val].flat(),
187
+ z6.array(z6.string()).optional()
188
+ ).describe("User role, e.g. admin, field agent");
185
189
  var scopeOptionsPlaceEvent = z6.object({
186
190
  event: scopeByEvent,
187
191
  placeOfEvent: JurisdictionFilter.optional()
@@ -205,6 +209,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
205
209
  var AccessLevelOptions = z6.object({
206
210
  accessLevel: JurisdictionFilter.optional()
207
211
  });
212
+ var AllUserScopeOptions = AccessLevelOptions.extend({
213
+ role: userRole.optional()
214
+ });
208
215
  var WorkqueueOrDashboardOptions = z6.object({
209
216
  ids: z6.preprocess(
210
217
  (val) => val === void 0 ? void 0 : [val].flat(),
@@ -214,6 +221,7 @@ var WorkqueueOrDashboardOptions = z6.object({
214
221
  var AllScopeOptions = z6.object({
215
222
  ...AllRecordScopeOptions.shape,
216
223
  ...AccessLevelOptions.shape,
224
+ ...AllUserScopeOptions.shape,
217
225
  ...WorkqueueOrDashboardOptions.shape
218
226
  });
219
227
  var ScopeOptionKey = AllScopeOptions.keyof();
@@ -286,6 +294,28 @@ var RecordScopeV2 = z6.discriminatedUnion("type", [
286
294
  ]).describe(
287
295
  "Scopes used to check user's permission to perform actions on a record."
288
296
  );
297
+ var SystemScopeType = z6.enum([
298
+ "organisation.read-locations",
299
+ "user.read",
300
+ "user.create",
301
+ "user.edit"
302
+ ]);
303
+ var UserScopeType = SystemScopeType.extract([
304
+ "user.read",
305
+ "user.create",
306
+ "user.edit"
307
+ ]);
308
+ var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
309
+ var UserScopeV2 = z6.discriminatedUnion("type", [
310
+ z6.object({
311
+ type: ScopesWithRoleOption,
312
+ options: AllUserScopeOptions.optional()
313
+ }),
314
+ z6.object({
315
+ type: UserScopeType.extract(["user.read"]),
316
+ options: AccessLevelOptions.optional()
317
+ })
318
+ ]);
289
319
  var ResolvedRecordScopeV2 = z6.discriminatedUnion("type", [
290
320
  z6.object({
291
321
  type: ScopesWithPlaceEventOptions,
@@ -306,16 +336,14 @@ var ResolvedRecordScopeV2 = z6.discriminatedUnion("type", [
306
336
  }).optional()
307
337
  })
308
338
  ]).describe("Resolved scope with location/user IDs instead of filters.");
309
- var SystemScopeType = z6.enum([
310
- "organisation.read-locations",
311
- "user.read",
312
- "user.create",
313
- "user.edit"
314
- ]);
315
339
  var Scope2 = z6.discriminatedUnion("type", [
316
340
  z6.object({ type: PlainScopeType }),
317
341
  ...RecordScopeV2.options,
318
- z6.object({ type: SystemScopeType, options: AccessLevelOptions.optional() }),
342
+ ...UserScopeV2.options,
343
+ z6.object({
344
+ type: z6.literal("organisation.read-locations"),
345
+ options: AccessLevelOptions.optional()
346
+ }),
319
347
  z6.object({
320
348
  type: z6.literal("workqueue"),
321
349
  options: WorkqueueOrDashboardOptions
@@ -243,6 +243,8 @@ __export(events_exports, {
243
243
  areConditionsMet: () => areConditionsMet,
244
244
  buildFormState: () => buildFormState,
245
245
  canAccessEventWithScope: () => canAccessEventWithScope,
246
+ canAccessOtherUserWithScopes: () => canAccessOtherUserWithScopes,
247
+ canAccessUserWithScope: () => canAccessUserWithScope,
246
248
  compositeFieldTypes: () => compositeFieldTypes,
247
249
  createEmptyDraft: () => createEmptyDraft,
248
250
  createFieldConditionals: () => createFieldConditionals,
@@ -489,6 +491,10 @@ var scopeByEvent = z2.preprocess(
489
491
  (val) => val === void 0 ? void 0 : [val].flat(),
490
492
  z2.array(z2.string()).optional()
491
493
  ).describe("Event type, e.g. birth, death");
494
+ var userRole = z2.preprocess(
495
+ (val) => val === void 0 ? void 0 : [val].flat(),
496
+ z2.array(z2.string()).optional()
497
+ ).describe("User role, e.g. admin, field agent");
492
498
  var scopeOptionsPlaceEvent = z2.object({
493
499
  event: scopeByEvent,
494
500
  placeOfEvent: JurisdictionFilter.optional()
@@ -512,6 +518,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
512
518
  var AccessLevelOptions = z2.object({
513
519
  accessLevel: JurisdictionFilter.optional()
514
520
  });
521
+ var AllUserScopeOptions = AccessLevelOptions.extend({
522
+ role: userRole.optional()
523
+ });
515
524
  var WorkqueueOrDashboardOptions = z2.object({
516
525
  ids: z2.preprocess(
517
526
  (val) => val === void 0 ? void 0 : [val].flat(),
@@ -521,6 +530,7 @@ var WorkqueueOrDashboardOptions = z2.object({
521
530
  var AllScopeOptions = z2.object({
522
531
  ...AllRecordScopeOptions.shape,
523
532
  ...AccessLevelOptions.shape,
533
+ ...AllUserScopeOptions.shape,
524
534
  ...WorkqueueOrDashboardOptions.shape
525
535
  });
526
536
  var ScopeOptionKey = AllScopeOptions.keyof();
@@ -593,6 +603,31 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
593
603
  ]).describe(
594
604
  "Scopes used to check user's permission to perform actions on a record."
595
605
  );
606
+ var SystemScopeType = z2.enum([
607
+ "organisation.read-locations",
608
+ "user.read",
609
+ "user.create",
610
+ "user.edit"
611
+ ]);
612
+ var UserScopeType = SystemScopeType.extract([
613
+ "user.read",
614
+ "user.create",
615
+ "user.edit"
616
+ ]);
617
+ var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
618
+ var UserScopeV2 = z2.discriminatedUnion("type", [
619
+ z2.object({
620
+ type: ScopesWithRoleOption,
621
+ options: AllUserScopeOptions.optional()
622
+ }),
623
+ z2.object({
624
+ type: UserScopeType.extract(["user.read"]),
625
+ options: AccessLevelOptions.optional()
626
+ })
627
+ ]);
628
+ function scopeUsesRoleOptions(scope) {
629
+ return ScopesWithRoleOption?.options.some((opt) => opt === scope.type);
630
+ }
596
631
  function scopeUsesDeclaredOptions(scope) {
597
632
  return !ScopesWithPlaceEventOptions.options.some((opt) => opt === scope.type);
598
633
  }
@@ -625,16 +660,14 @@ var ResolvedRecordScopeV2 = z2.discriminatedUnion("type", [
625
660
  }).optional()
626
661
  })
627
662
  ]).describe("Resolved scope with location/user IDs instead of filters.");
628
- var SystemScopeType = z2.enum([
629
- "organisation.read-locations",
630
- "user.read",
631
- "user.create",
632
- "user.edit"
633
- ]);
634
663
  var Scope = z2.discriminatedUnion("type", [
635
664
  z2.object({ type: PlainScopeType }),
636
665
  ...RecordScopeV2.options,
637
- z2.object({ type: SystemScopeType, options: AccessLevelOptions.optional() }),
666
+ ...UserScopeV2.options,
667
+ z2.object({
668
+ type: z2.literal("organisation.read-locations"),
669
+ options: AccessLevelOptions.optional()
670
+ }),
638
671
  z2.object({
639
672
  type: z2.literal("workqueue"),
640
673
  options: WorkqueueOrDashboardOptions
@@ -9930,6 +9963,39 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
9930
9963
  }
9931
9964
  return true;
9932
9965
  }
9966
+ function canAccessUserWithScope({
9967
+ userToAccess,
9968
+ scope,
9969
+ user: user2
9970
+ }) {
9971
+ const opts = scope.options;
9972
+ const hasSameOffice = user2.primaryOfficeId === userToAccess.primaryOfficeId;
9973
+ if (opts?.accessLevel === JurisdictionFilter.enum.location && !hasSameOffice) {
9974
+ return false;
9975
+ }
9976
+ const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
9977
+ (id) => user2.administrativeAreaId === id
9978
+ ) || user2.administrativeAreaId === null;
9979
+ if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
9980
+ return false;
9981
+ }
9982
+ if (scopeUsesRoleOptions(scope)) {
9983
+ const { options } = scope;
9984
+ if (options?.role && !options.role.includes(userToAccess.role)) {
9985
+ return false;
9986
+ }
9987
+ }
9988
+ return true;
9989
+ }
9990
+ function canAccessOtherUserWithScopes({
9991
+ scopes,
9992
+ userToAccess,
9993
+ user: user2
9994
+ }) {
9995
+ return scopes.some(
9996
+ (scope) => canAccessUserWithScope({ userToAccess, scope, user: user2 })
9997
+ );
9998
+ }
9933
9999
  function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
9934
10000
  return scopes.some(
9935
10001
  (scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
@@ -1 +1 @@
1
- {"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"AA6aA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
1
+ {"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"AAycA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
@@ -24,15 +24,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
25
  exports.main = main;
26
26
  /**
27
- * Codemod: Add `pending-first-certificate-issuance` flag to birth event configs and workqueues.
27
+ * Codemod: Add `pending-first-certificate-issuance` flag to event configs and workqueues.
28
28
  *
29
29
  * Usage:
30
30
  * ts-node -r tsconfig-paths/register src/migrations/v2.0/add-birth-certificate-issuance-flag.ts
31
31
  *
32
32
  * What it does:
33
- * defineConfig (birth type only):
33
+ * defineConfig (every event type — birth, death, marriage, custom, etc.):
34
34
  * - Ensures the top-level `flags` array contains the `pending-first-certificate-issuance`
35
- * flag definition
35
+ * flag definition. The flag's i18n `label.id` is event-specific, e.g.
36
+ * `event.birth.flag.pending-first-certificate-issuance`,
37
+ * `event.death.flag.pending-first-certificate-issuance`.
36
38
  * - Ensures every `REGISTER` action has
37
39
  * `flags: [{ id: 'pending-first-certificate-issuance', operation: 'add' }]`
38
40
  * - Ensures every `PRINT_CERTIFICATE` action has
@@ -48,7 +50,6 @@ exports.main = main;
48
50
  */
49
51
  const ts_morph_1 = require("ts-morph");
50
52
  const path_1 = __importDefault(require("path"));
51
- const _1 = require(".");
52
53
  const DEFINE_CONFIG_NAME = 'defineConfig';
53
54
  const DEFINE_WORKQUEUES_NAME = 'defineWorkqueues';
54
55
  const ACTIONS_PROPERTY_NAME = 'actions';
@@ -56,20 +57,27 @@ const ACTION_PROPERTY_NAME = 'action';
56
57
  const FLAGS_PROPERTY_NAME = 'flags';
57
58
  const QUERY_PROPERTY_NAME = 'query';
58
59
  const TYPE_PROPERTY_NAME = 'type';
60
+ const ID_PROPERTY_NAME = 'id';
59
61
  const CLAUSES_PROPERTY_NAME = 'clauses';
60
62
  const ANY_OF_PROPERTY_NAME = 'anyOf';
61
63
  const FLAG_ID = 'pending-first-certificate-issuance';
62
64
  const REGISTER_TYPE = 'REGISTER';
63
65
  const PRINT_CERTIFICATE_TYPE = 'PRINT_CERTIFICATE';
64
- const FLAG_DEFINITION_INITIALIZER = `{
66
+ /**
67
+ * Builds the flag-definition object literal for a given event type so the i18n
68
+ * `label.id` is namespaced per event (e.g. `event.death.flag.…`).
69
+ */
70
+ function flagDefinitionInitializer(eventType) {
71
+ return `{
65
72
  id: '${FLAG_ID}',
66
73
  label: {
67
- id: 'event.birth.flag.${FLAG_ID}',
74
+ id: 'event.${eventType}.flag.${FLAG_ID}',
68
75
  defaultMessage: 'Pending first certificate issuance',
69
76
  description: 'Flag label for first certificate issuance'
70
77
  },
71
78
  requiresAction: true
72
79
  }`;
80
+ }
73
81
  // ─── Generic helpers ──────────────────────────────────────────────────────────
74
82
  /**
75
83
  * Returns true if the object's `type` property matches the given type name.
@@ -91,23 +99,36 @@ function isActionOfType(obj, typeName) {
91
99
  return false;
92
100
  }
93
101
  /**
94
- * Returns true when the `defineConfig` root config object describes a birth event.
95
- * Handles both `'birth'` string literal and `EventType.BIRTH` enum access.
102
+ * Extracts the event type from a `defineConfig` root config object, using the
103
+ * (lower-cased) value of either the `type` or `id` property. Property name has
104
+ * shifted across core/country-config versions, so both are tried.
105
+ *
106
+ * Handles all known shapes:
107
+ * - `type: 'birth'` / `id: 'birth'`
108
+ * - `type: EventType.BIRTH` / `id: Event.Birth`
109
+ *
110
+ * For `PropertyAccessExpression` (enum access), the *member name* is returned
111
+ * lower-cased — this works for the conventional `EventType.BIRTH = 'birth'` and
112
+ * `Event.Birth = 'birth'` mappings used in core and country configs.
113
+ *
114
+ * Returns null when no event type can be determined.
96
115
  */
97
- function isBirthConfig(configArg) {
98
- const typeProperty = configArg.getProperty(TYPE_PROPERTY_NAME);
99
- if (!typeProperty || !ts_morph_1.Node.isPropertyAssignment(typeProperty))
100
- return false;
101
- const initializer = typeProperty.getInitializer();
102
- if (!initializer)
103
- return false;
104
- if (ts_morph_1.Node.isStringLiteral(initializer)) {
105
- return initializer.getLiteralValue().toLowerCase() === 'birth';
106
- }
107
- if (ts_morph_1.Node.isPropertyAccessExpression(initializer)) {
108
- return initializer.getName().toLowerCase() === 'birth';
116
+ function getEventType(configArg) {
117
+ for (const propName of [TYPE_PROPERTY_NAME, ID_PROPERTY_NAME]) {
118
+ const prop = configArg.getProperty(propName);
119
+ if (!prop || !ts_morph_1.Node.isPropertyAssignment(prop))
120
+ continue;
121
+ const initializer = prop.getInitializer();
122
+ if (!initializer)
123
+ continue;
124
+ if (ts_morph_1.Node.isStringLiteral(initializer)) {
125
+ return initializer.getLiteralValue().toLowerCase();
126
+ }
127
+ if (ts_morph_1.Node.isPropertyAccessExpression(initializer)) {
128
+ return initializer.getName().toLowerCase();
129
+ }
109
130
  }
110
- return false;
131
+ return null;
111
132
  }
112
133
  /**
113
134
  * Returns true if an array literal contains an object literal with `id: <id>`.
@@ -130,17 +151,19 @@ function hasElementWithId(array, id) {
130
151
  }
131
152
  // ─── defineConfig helpers ─────────────────────────────────────────────────────
132
153
  /**
133
- * Ensures the top-level `flags` array in a birth `defineConfig` contains the
134
- * `pending-first-certificate-issuance` flag definition.
154
+ * Ensures the top-level `flags` array in a `defineConfig` contains the
155
+ * `pending-first-certificate-issuance` flag definition. The flag's i18n
156
+ * `label.id` is namespaced per event type (e.g. `event.death.flag.…`).
135
157
  */
136
- function ensureTopLevelFlagDefinition(configArg) {
158
+ function ensureTopLevelFlagDefinition(configArg, eventType) {
159
+ const initializer = flagDefinitionInitializer(eventType);
137
160
  const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME);
138
161
  if (flagsProp && ts_morph_1.Node.isPropertyAssignment(flagsProp)) {
139
162
  const flagsInit = flagsProp.getInitializer();
140
163
  if (flagsInit && ts_morph_1.Node.isArrayLiteralExpression(flagsInit)) {
141
164
  if (hasElementWithId(flagsInit, FLAG_ID))
142
165
  return false;
143
- flagsInit.addElement(FLAG_DEFINITION_INITIALIZER);
166
+ flagsInit.addElement(initializer);
144
167
  return true;
145
168
  }
146
169
  return false;
@@ -148,7 +171,7 @@ function ensureTopLevelFlagDefinition(configArg) {
148
171
  // No `flags` property at all — create it
149
172
  configArg.addPropertyAssignment({
150
173
  name: FLAGS_PROPERTY_NAME,
151
- initializer: `[\n ${FLAG_DEFINITION_INITIALIZER}\n]`
174
+ initializer: `[\n ${initializer}\n]`
152
175
  });
153
176
  return true;
154
177
  }
@@ -175,15 +198,15 @@ function ensureActionOperationFlag(action, operation) {
175
198
  return true;
176
199
  }
177
200
  /**
178
- * Processes a birth defineConfig object: ensures top-level flag definition,
201
+ * Processes a `defineConfig` object: ensures top-level flag definition,
179
202
  * REGISTER action flags, and PRINT_CERTIFICATE action flags.
180
203
  * Returns the number of changes made.
181
204
  */
182
- function processBirthConfig(configArg, relPath) {
205
+ function processConfig(configArg, eventType, relPath) {
183
206
  let changes = 0;
184
- if (ensureTopLevelFlagDefinition(configArg)) {
207
+ if (ensureTopLevelFlagDefinition(configArg, eventType)) {
185
208
  changes++;
186
- console.log(` [${relPath}] Added '${FLAG_ID}' to top-level flags`);
209
+ console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`);
187
210
  }
188
211
  const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME);
189
212
  if (!actionsProp || !ts_morph_1.Node.isPropertyAssignment(actionsProp))
@@ -198,13 +221,13 @@ function processBirthConfig(configArg, relPath) {
198
221
  if (isActionOfType(element, REGISTER_TYPE)) {
199
222
  if (ensureActionOperationFlag(element, 'add')) {
200
223
  changes++;
201
- console.log(` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`);
224
+ console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`);
202
225
  }
203
226
  }
204
227
  if (isActionOfType(element, PRINT_CERTIFICATE_TYPE)) {
205
228
  if (ensureActionOperationFlag(element, 'remove')) {
206
229
  changes++;
207
- console.log(` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
230
+ console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
208
231
  }
209
232
  }
210
233
  }
@@ -318,7 +341,7 @@ function processFile(filePath, project) {
318
341
  if (!sourceFile)
319
342
  return 0;
320
343
  let totalChanges = 0;
321
- const relPath = path_1.default.relative((0, _1.getCwd)(), filePath);
344
+ const relPath = path_1.default.relative(process.cwd(), filePath);
322
345
  const callExpressions = sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression);
323
346
  for (const call of callExpressions) {
324
347
  const expression = call.getExpression();
@@ -333,9 +356,10 @@ function processFile(filePath, project) {
333
356
  const configArg = args[0];
334
357
  if (!ts_morph_1.Node.isObjectLiteralExpression(configArg))
335
358
  continue;
336
- if (!isBirthConfig(configArg))
359
+ const eventType = getEventType(configArg);
360
+ if (!eventType)
337
361
  continue;
338
- totalChanges += processBirthConfig(configArg, relPath);
362
+ totalChanges += processConfig(configArg, eventType, relPath);
339
363
  }
340
364
  // ── defineWorkqueues ──────────────────────────────────────────────────────
341
365
  if (calleeName === DEFINE_WORKQUEUES_NAME) {
@@ -369,8 +393,8 @@ function processFile(filePath, project) {
369
393
  // ─── Entry point ─────────────────────────────────────────────────────────────
370
394
  function main() {
371
395
  return __awaiter(this, void 0, void 0, function* () {
372
- const srcDir = path_1.default.join((0, _1.getCwd)(), 'src');
373
- console.log(`Scanning for birth defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}\n`);
396
+ const srcDir = path_1.default.join(process.cwd(), 'src');
397
+ console.log(`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}\n`);
374
398
  const project = new ts_morph_1.Project({
375
399
  tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
376
400
  skipAddingFilesFromTsConfig: false
@@ -391,14 +415,14 @@ function main() {
391
415
  }
392
416
  }
393
417
  if (modifiedFiles.length === 0) {
394
- console.log('No birth configs or PRINT_CERTIFICATE workqueues found. Nothing to do.');
418
+ console.log('No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do.');
395
419
  return;
396
420
  }
397
421
  console.log(`\nSaving ${modifiedFiles.length} modified file(s)...`);
398
422
  for (const filePath of modifiedFiles) {
399
423
  const sourceFile = project.getSourceFileOrThrow(filePath);
400
424
  yield sourceFile.save();
401
- console.log(` Saved: ${path_1.default.relative((0, _1.getCwd)(), filePath)}`);
425
+ console.log(` Saved: ${path_1.default.relative(process.cwd(), filePath)}`);
402
426
  }
403
427
  console.log(`\nDone. Applied ${totalChanges} change(s) across ${modifiedFiles.length} file(s).`);
404
428
  });