@openforis/arena-server 2.6.8 → 2.6.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -91,16 +91,6 @@ const requireUserPermission = (permissionFn) => async (req, _res, next) => {
|
|
|
91
91
|
next(error);
|
|
92
92
|
}
|
|
93
93
|
};
|
|
94
|
-
const canManageUserGroups = (user, surveyInfo) => {
|
|
95
|
-
if (!user)
|
|
96
|
-
return false;
|
|
97
|
-
if (arena_core_1.Users.isSystemAdmin(user))
|
|
98
|
-
return true;
|
|
99
|
-
if (!surveyInfo)
|
|
100
|
-
return false;
|
|
101
|
-
const authGroup = arena_core_1.Users.getAuthGroupBySurveyUuid(surveyInfo.uuid)(user);
|
|
102
|
-
return authGroup?.name === arena_core_1.AuthGroupName.surveyAdmin;
|
|
103
|
-
};
|
|
104
94
|
const requireLoggedInUser = (req, _res, next) => {
|
|
105
95
|
try {
|
|
106
96
|
const user = utils_1.Requests.getUser(req);
|
|
@@ -163,7 +153,7 @@ exports.ApiAuthMiddleware = {
|
|
|
163
153
|
requireUserRemovePermission: requireUserPermission(arena_core_1.Authorizer.canRemoveUser),
|
|
164
154
|
requireCanViewAccessRequestsPermission: requirePermission(arena_core_1.Authorizer.canViewUsersAccessRequests),
|
|
165
155
|
requireCanEditAccessRequestsPermission: requirePermission(arena_core_1.Authorizer.canEditUsersAccessRequests),
|
|
166
|
-
requireUserGroupManagePermission: requireSurveyPermission(canManageUserGroups),
|
|
156
|
+
requireUserGroupManagePermission: requireSurveyPermission(arena_core_1.Authorizer.canManageUserGroups),
|
|
167
157
|
requireDownloadToken,
|
|
168
158
|
};
|
|
169
159
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/api/middleware/auth.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/api/middleware/auth.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"name": "OpenForis",
|
|
5
5
|
"email": "openforis.arena@gmail.com"
|
|
6
6
|
},
|
|
7
|
-
"version": "2.6.
|
|
7
|
+
"version": "2.6.9",
|
|
8
8
|
"description": "",
|
|
9
9
|
"main": "dist/index.js",
|
|
10
10
|
"types": "dist/index.d.ts",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@aws-sdk/client-s3": "^3.1145.0",
|
|
48
48
|
"@godaddy/terminus": "^4.12.1",
|
|
49
|
-
"@openforis/arena-core": "^2.
|
|
49
|
+
"@openforis/arena-core": "^2.5.0",
|
|
50
50
|
"bcryptjs": "^3.0.3",
|
|
51
51
|
"compression": "^1.8.2",
|
|
52
52
|
"cookie-parser": "^1.4.7",
|