fix: update new sys admin scope in events middleware (#8315)

* fix: update new sys admin scope in events middleware * fix: update scopes in events package
opencrvs · Jan 10, 2025 · ab88d0f · ab88d0f
1 parent f68d20d
commit ab88d0f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/packages/events/src/router/locations.get.test.ts b/packages/events/src/router/locations.get.test.ts
@@ -10,11 +10,9 @@
  */
 import { createTestClient } from '@events/tests/utils'
 import { payloadGenerator } from '@events/tests/generators'
-import { userScopes } from '@opencrvs/commons'
+import { SCOPES } from '@opencrvs/commons'
 
-const nationalSystemAdminClient = createTestClient([
-  userScopes.nationalSystemAdmin
-])
+const nationalSystemAdminClient = createTestClient([SCOPES.CONFIG_UPDATE_ALL])
 const generator = payloadGenerator()
 
 test('Returns empty list when no locations are set', async () => {

diff --git a/packages/events/src/router/locations.set.test.ts b/packages/events/src/router/locations.set.test.ts
@@ -10,11 +10,9 @@
  */
 import { createTestClient } from '@events/tests/utils'
 import { payloadGenerator } from '@events/tests/generators'
-import { userScopes } from '@opencrvs/commons'
+import { SCOPES } from '@opencrvs/commons'
 
-const nationalSystemAdminClient = createTestClient([
-  userScopes.nationalSystemAdmin
-])
+const nationalSystemAdminClient = createTestClient([SCOPES.CONFIG_UPDATE_ALL])
 
 const registrarClient = createTestClient()
 

diff --git a/packages/events/src/router/middleware/middleware.ts b/packages/events/src/router/middleware/middleware.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 
-import { inScope, Scope, userScopes } from '@opencrvs/commons'
+import { inScope, Scope, SCOPES } from '@opencrvs/commons'
 import { TRPCError, AnyTRPCMiddlewareFunction } from '@trpc/server'
 
 import { z } from 'zod'
@@ -56,7 +56,7 @@ const createScopeAuthMiddleware =
   }
 
 const isNationalSystemAdminUser = createScopeAuthMiddleware([
-  userScopes.nationalSystemAdmin
+  SCOPES.CONFIG_UPDATE_ALL
 ])
 
 export const middleware = {

diff --git a/packages/events/src/tests/utils.ts b/packages/events/src/tests/utils.ts
@@ -13,7 +13,7 @@ import { appRouter, t } from '@events/router'
 import * as jwt from 'jsonwebtoken'
 import { readFileSync } from 'fs'
 import { join } from 'path'
-import { Scope, userRoleScopes } from '@opencrvs/commons'
+import { Scope, SCOPES } from '@opencrvs/commons'
 
 const { createCallerFactory } = t
 
@@ -30,7 +30,7 @@ export function createTestClient(scopes?: Scope[]) {
 
 const createTestToken = (scopes?: Scope[]) =>
   jwt.sign(
-    { scope: scopes ?? userRoleScopes.REGISTRATION_AGENT },
+    { scope: scopes ?? SCOPES.RECORD_SUBMIT_FOR_APPROVAL },
     readFileSync(join(__dirname, './cert.key')),
     {
       algorithm: 'RS256',