#31 - Support non admin roles

Author: callmekatootie

src/common/es-helper.js

@@ -1042,7 +1042,11 @@ async function searchElasticSearch (resource, ...args) {
   }
 
   // for non-admin, only return entities that the user created
-  if (authUser.roles && !checkIfExists(authUser.roles, [appConst.UserRoles.admin, appConst.UserRoles.administrator])) {
+  if (
+    authUser.roles &&
+    !checkIfExists(authUser.roles, appConst.AdminUser) &&
+    !checkIfExists(authUser.roles, [appConst.UserRoles.ubahn])
+  ) {
     setFilterValueToEsQuery(esQuery, 'createdBy', getAuthUser(authUser), 'createdBy')
   }
 
@@ -1197,7 +1201,11 @@ async function searchUsers (authUser, filter, params) {
   }
 
   // for non-admin, only return entities that the user created
-  if (authUser.roles && !checkIfExists(authUser.roles, [appConst.UserRoles.admin, appConst.UserRoles.administrator])) {
+  if (
+    authUser.roles &&
+    !checkIfExists(authUser.roles, appConst.AdminUser) &&
+    !checkIfExists(authUser.roles, [appConst.UserRoles.ubahn])
+  ) {
     setFilterValueToEsQuery(esQuery, 'createdBy', getAuthUser(authUser), 'createdBy')
   }
 

src/common/service-helper.js

@@ -267,7 +267,11 @@ function getServiceMethods (Model, createSchema, patchSchema, searchSchema, buil
 
     // user token
     // for non-admin users, this endpoint will only return entities that the user has created.
-    if (auth.roles && !checkIfExists(auth.roles, [appConst.UserRoles.admin, appConst.UserRoles.administrator])) {
+    if (
+      auth.roles &&
+      !checkIfExists(auth.roles, appConst.AdminUser) &&
+      !checkIfExists(auth.roles, [appConst.UserRoles.ubahn])
+    ) {
       dbQueries.push(`${Model.tableName}.createdBy = '${getAuthUser(auth)}'`)
     }
     const items = await models.DBHelper.find(Model, dbQueries)