chore: adjust implementation and test suite

dhis2 · Oct 12, 2023 · 69e9e5f · 69e9e5f
1 parent 9c8ff4c
commit 69e9e5f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 24 deletions.
diff --git a/src/components/Interpretations/common/__tests__/getInterpretationAccess.spec.js b/src/components/Interpretations/common/__tests__/getInterpretationAccess.spec.js
@@ -1,4 +1,5 @@
 import {
+    hasAuthority,
     getInterpretationAccess,
     getCommentAccess,
 } from '../getInterpretationAccess.js'
@@ -34,6 +35,18 @@ const userJane = {
 }
 
 describe('interpretation and comment access', () => {
+    describe('hasAuthority', () => {
+        it('throws an error when no authority is provided', () => {
+            expect(() => hasAuthority([], undefined)).toThrow(
+                '"hasAuthority" requires "authority" to be a populated string but received undefined'
+            )
+        })
+        it('throws an error when authority is not a string', () => {
+            expect(() => hasAuthority([], 12)).toThrow(
+                '"hasAuthority" requires "authority" to be a populated string but received 12'
+            )
+        })
+    })
     describe('getInterpretationAccess', () => {
         it('returns true for all accesses for superuser', () => {
             const interpretation = {
@@ -129,7 +142,7 @@ describe('interpretation and comment access', () => {
             })
         })
 
-        it('returns false for all accesses when no currentUser provided', () => {
+        it('throws an error for all accesses when no currentUser provided', () => {
             const interpretation = {
                 access: {
                     write: false,
@@ -138,15 +151,12 @@ describe('interpretation and comment access', () => {
                 createdBy: userJane,
             }
 
-            expect(getInterpretationAccess(interpretation)).toMatchObject({
-                share: false,
-                comment: false,
-                edit: false,
-                delete: false,
-            })
+            expect(() => getInterpretationAccess(interpretation)).toThrow(
+                '"hasAuthority" requires "authorities" to be an array or set of authorities (strings)'
+            )
         })
 
-        it('returns false for all accesses when currentUser missing authorities', () => {
+        it('throws an error when currentUser is missing authorities', () => {
             const interpretation = {
                 access: {
                     write: false,
@@ -155,16 +165,13 @@ describe('interpretation and comment access', () => {
                 createdBy: userJane,
             }
 
-            expect(
+            expect(() =>
                 getInterpretationAccess(interpretation, {
                     id: 'usernoauthorties',
                 })
-            ).toMatchObject({
-                share: false,
-                comment: false,
-                edit: false,
-                delete: false,
-            })
+            ).toThrow(
+                '"hasAuthority" requires "authorities" to be an array or set of authorities (strings)'
+            )
         })
     })
 

diff --git a/src/components/Interpretations/common/getInterpretationAccess.js b/src/components/Interpretations/common/getInterpretationAccess.js
@@ -1,15 +1,20 @@
 // For backwards compatibility
 // accept both Set (from the old d2.currentUser object) and array
-const hasAuthority = (authorities, authority) => {
-    if (!authority || typeof authority !== 'string) {
-        throw new Error(`"hasAuthority" requires "authority" to be a populated string but received ${authority}`)
-    } else if (Array.isArray(authorities)) {
-        return authorities.includes(authority)
-    } else if (typeof authorities.has === 'function') {
-        return authorities.has(authority)
-    } else {
-        throw new Error(`"hasAuthority" requires "authorities" to be an array or set of authorities (strings)`)
+export const hasAuthority = (authorities, authority) => {
+    if (!authority || typeof authority !== 'string') {
+        throw new Error(
+            `"hasAuthority" requires "authority" to be a populated string but received ${authority}`
+        )
     }
+    if (!(Array.isArray(authorities) || authorities instanceof Set)) {
+        throw new Error(
+            `"hasAuthority" requires "authorities" to be an array or set of authorities (strings)`
+        )
+    }
+
+    return Array.isArray(authorities)
+        ? authorities.includes(authority)
+        : authorities.has(authority)
 }
 
 const isSuperuser = (authorities) => hasAuthority(authorities, 'ALL')