fixed runtime error when user has not access to a survey (#1847)

* fixed runtime error when user has not access to a survey * code cleanup * code cleanup Co-authored-by: Stefano Ricci <[email protected]>
openforis · Oct 12, 2021 · a0ac1b2 · a0ac1b2
1 parent da373cb
commit a0ac1b2
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/core/auth/authorizer.js b/core/auth/authorizer.js
@@ -1,5 +1,3 @@
-import * as R from 'ramda'
-
 import * as Survey from '@core/survey/survey'
 import * as Record from '@core/record/record'
 import * as User from '@core/user/user'
@@ -18,10 +16,18 @@ const _getSurveyUserGroup = (user, surveyInfo, defaultToMainGroup = true) => {
   return User.getAuthGroupBySurveyUuid({ surveyUuid, defaultToMainGroup })(user)
 }
 
-const _hasSurveyPermission = (permission) => (user, surveyInfo) =>
-  user &&
-  (User.isSystemAdmin(user) ||
-    (surveyInfo && R.includes(permission, R.pipe(_getSurveyUserGroup, AuthGroup.getPermissions)(user, surveyInfo))))
+const _hasSurveyPermission = (permission) => (user, surveyInfo) => {
+  if (!user) return false
+
+  if (User.isSystemAdmin(user)) return true
+
+  if (!surveyInfo) return false
+
+  const authGroup = _getSurveyUserGroup(user, surveyInfo)
+  if (!authGroup) return false
+
+  return AuthGroup.getPermissions(authGroup).includes(permission)
+}
 
 const _hasPermissionInSomeGroup = (permission) => (user) => {
   if (User.isSystemAdmin(user)) return true