Merge branch 'main' into feature/forms-779-devcontainer

usingtechnology · Jan 18, 2024 · 4ac665d · 4ac665d
2 parents 192f335 + 50cd70a
commit 4ac665d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/src/forms/rbac/routes.js b/app/src/forms/rbac/routes.js
@@ -5,9 +5,9 @@ const controller = require('./controller');
 const keycloak = require('../../components/keycloak');
 const P = require('../common/constants').Permissions;
 const R = require('../common/constants').Roles;
-const { currentUser, hasFormPermissions, hasSubmissionPermissions, hasFormRoles, hasRolePermissions } = require('../auth/middleware/userAccess');
+const { currentUserTemp, hasFormPermissions, hasSubmissionPermissions, hasFormRoles, hasRolePermissions } = require('../auth/middleware/userAccess');
 
-routes.use(currentUser);
+routes.use(currentUserTemp);
 
 routes.get('/current', keycloak.protect(), async (req, res, next) => {
   await controller.getCurrentUser(req, res, next);

diff --git a/app/src/forms/rbac/service.js b/app/src/forms/rbac/service.js
@@ -74,8 +74,11 @@ const service = {
       if (params.idp) accessLevels.push('idp');
       if (params.team) accessLevels.push('team');
     }
-    const filteredForms = authService.filterForms(user, user.forms, accessLevels);
+
+    const forms = await authService.getUserForms(user, { ...params, active: true });
+    const filteredForms = authService.filterForms(user, forms, accessLevels);
     user.forms = filteredForms;
+
     return user;
   },