fixed error accepting user access request (#1793)

Co-authored-by: Stefano Ricci <[email protected]>
openforis · Sep 16, 2021 · 4d1372b · 4d1372b
1 parent 3bc9f0e
commit 4d1372b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/server/modules/auth/manager/authManager.js b/server/modules/auth/manager/authManager.js
@@ -1 +1,6 @@
-export { fetchGroupByUuid, updateUserGroup, fetchSurveyGroups } from '../repository/authGroupRepository'
+export {
+  fetchGroupByName,
+  fetchGroupByUuid,
+  updateUserGroup,
+  fetchSurveyGroups,
+} from '../repository/authGroupRepository'
diff --git a/server/modules/auth/repository/authGroupRepository.js b/server/modules/auth/repository/authGroupRepository.js
@@ -39,6 +39,17 @@ export const insertUserGroup = async (groupUuid, userUuid, client = db) =>
 
 // ==== READ
 
+export const fetchGroupByName = async ({ name }, client = db) =>
+  client.one(
+    `
+      SELECT auth_group.*
+      FROM auth_group
+      WHERE auth_group.name = $1
+        AND auth_group.survey_uuid IS NULL`,
+    [name],
+    dbTransformCallback
+  )
+
 export const fetchGroupByUuid = async (groupUuid, client = db) =>
   client.one(
     `

diff --git a/server/modules/user/service/userService.js b/server/modules/user/service/userService.js
@@ -275,7 +275,7 @@ export const acceptUserAccessRequest = async ({ user, serverUrl, accessRequestAc
     // 3) find group to associate to the user
     let group = null
     if ([AuthGroup.groupNames.systemAdmin, AuthGroup.groupNames.surveyManager].includes(role)) {
-      group = User.getAuthGroupByName(role)(user)
+      group = await AuthManager.fetchGroupByName({ name: role }, t)
     } else {
       const surveyGroups = await AuthManager.fetchSurveyGroups(Survey.getId(survey), t)
       group = surveyGroups.find((surveyGroup) => AuthGroup.getName(surveyGroup) === role)