@openforis/arena-server 2.8.0 → 2.8.2
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.
- package/dist/api/dataQuery/create.js +3 -1
- package/dist/api/dataQuery/create.js.map +1 -1
- package/dist/api/dataQuery/delete.js +3 -1
- package/dist/api/dataQuery/delete.js.map +1 -1
- package/dist/api/dataQuery/read.js +5 -3
- package/dist/api/dataQuery/read.js.map +1 -1
- package/dist/api/dataQuery/update.js +3 -1
- package/dist/api/dataQuery/update.js.map +1 -1
- package/dist/db/schemata/index.js +5 -1
- package/dist/db/schemata/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,10 +5,12 @@ const arena_core_1 = require("@openforis/arena-core");
|
|
|
5
5
|
const serverServiceType_1 = require("../../server/arenaServer/serverServiceType");
|
|
6
6
|
const utils_1 = require("../../utils");
|
|
7
7
|
const endpoint_1 = require("../endpoint");
|
|
8
|
+
const middleware_1 = require("../middleware");
|
|
9
|
+
const { requireSurveyViewPermission } = middleware_1.ApiAuthMiddleware;
|
|
8
10
|
const getDataQueryService = () => arena_core_1.ServiceRegistry.getInstance().getService(serverServiceType_1.ServerServiceType.dataQuery);
|
|
9
11
|
exports.DataQueryCreate = {
|
|
10
12
|
init: (express) => {
|
|
11
|
-
express.post(endpoint_1.ApiEndpoint.dataQuery.dataQuery(':surveyId', ':queryUuid'), async (req, res, next) => {
|
|
13
|
+
express.post(endpoint_1.ApiEndpoint.dataQuery.dataQuery(':surveyId', ':queryUuid'), requireSurveyViewPermission, async (req, res, next) => {
|
|
12
14
|
try {
|
|
13
15
|
const { surveyId } = utils_1.Requests.getParams(req);
|
|
14
16
|
const querySummary = req.body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/api/dataQuery/create.ts"],"names":[],"mappings":";;;AAEA,sDAAuD;AAGvD,kFAA8E;AAE9E,uCAAsC;AAEtC,0CAAyC;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/api/dataQuery/create.ts"],"names":[],"mappings":";;;AAEA,sDAAuD;AAGvD,kFAA8E;AAE9E,uCAAsC;AAEtC,0CAAyC;AACzC,8CAAiD;AAEjD,MAAM,EAAE,2BAA2B,EAAE,GAAG,8BAAiB,CAAA;AAEzD,MAAM,mBAAmB,GAAG,GAAqB,EAAE,CACjD,4BAAe,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,qCAAiB,CAAC,SAAS,CAAC,CAAA;AAE1D,QAAA,eAAe,GAAuB;IACjD,IAAI,EAAE,CAAC,OAAgB,EAAQ,EAAE;QAC/B,OAAO,CAAC,IAAI,CACV,sBAAW,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,EAC1D,2BAA2B,EAC3B,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAA;gBAE7B,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAA;gBAErC,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;gBAEnF,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;YAChC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;IACH,CAAC;CACF,CAAA"}
|
|
@@ -5,10 +5,12 @@ const arena_core_1 = require("@openforis/arena-core");
|
|
|
5
5
|
const serverServiceType_1 = require("../../server/arenaServer/serverServiceType");
|
|
6
6
|
const utils_1 = require("../../utils");
|
|
7
7
|
const endpoint_1 = require("../endpoint");
|
|
8
|
+
const middleware_1 = require("../middleware");
|
|
9
|
+
const { requireSurveyViewPermission } = middleware_1.ApiAuthMiddleware;
|
|
8
10
|
const getDataQueryService = () => arena_core_1.ServiceRegistry.getInstance().getService(serverServiceType_1.ServerServiceType.dataQuery);
|
|
9
11
|
exports.DataQueryDelete = {
|
|
10
12
|
init: (express) => {
|
|
11
|
-
express.delete(endpoint_1.ApiEndpoint.dataQuery.dataQuery(':surveyId', ':queryUuid'), async (req, res, next) => {
|
|
13
|
+
express.delete(endpoint_1.ApiEndpoint.dataQuery.dataQuery(':surveyId', ':queryUuid'), requireSurveyViewPermission, async (req, res, next) => {
|
|
12
14
|
try {
|
|
13
15
|
const { surveyId, queryUuid } = utils_1.Requests.getParams(req);
|
|
14
16
|
const service = getDataQueryService();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/api/dataQuery/delete.ts"],"names":[],"mappings":";;;AAEA,sDAAuD;AAGvD,kFAA8E;AAE9E,uCAAsC;AAEtC,0CAAyC;
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/api/dataQuery/delete.ts"],"names":[],"mappings":";;;AAEA,sDAAuD;AAGvD,kFAA8E;AAE9E,uCAAsC;AAEtC,0CAAyC;AACzC,8CAAiD;AAEjD,MAAM,EAAE,2BAA2B,EAAE,GAAG,8BAAiB,CAAA;AAEzD,MAAM,mBAAmB,GAAG,GAAqB,EAAE,CACjD,4BAAe,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,qCAAiB,CAAC,SAAS,CAAC,CAAA;AAE1D,QAAA,eAAe,GAAuB;IACjD,IAAI,EAAE,CAAC,OAAgB,EAAQ,EAAE;QAC/B,OAAO,CAAC,MAAM,CACZ,sBAAW,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,EAC1D,2BAA2B,EAC3B,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAEvD,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAA;gBAErC,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;gBAEnF,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;YAC/B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;IACH,CAAC;CACF,CAAA"}
|
|
@@ -5,10 +5,12 @@ const arena_core_1 = require("@openforis/arena-core");
|
|
|
5
5
|
const serverServiceType_1 = require("../../server/arenaServer/serverServiceType");
|
|
6
6
|
const utils_1 = require("../../utils");
|
|
7
7
|
const endpoint_1 = require("../endpoint");
|
|
8
|
+
const middleware_1 = require("../middleware");
|
|
9
|
+
const { requireSurveyViewPermission } = middleware_1.ApiAuthMiddleware;
|
|
8
10
|
const getDataQueryService = () => arena_core_1.ServiceRegistry.getInstance().getService(serverServiceType_1.ServerServiceType.dataQuery);
|
|
9
11
|
exports.DataQueryRead = {
|
|
10
12
|
init: (express) => {
|
|
11
|
-
express.get(endpoint_1.ApiEndpoint.dataQuery.dataQueriesCount(':surveyId'), async (req, res, next) => {
|
|
13
|
+
express.get(endpoint_1.ApiEndpoint.dataQuery.dataQueriesCount(':surveyId'), requireSurveyViewPermission, async (req, res, next) => {
|
|
12
14
|
try {
|
|
13
15
|
const { surveyId } = utils_1.Requests.getParams(req);
|
|
14
16
|
const service = getDataQueryService();
|
|
@@ -19,7 +21,7 @@ exports.DataQueryRead = {
|
|
|
19
21
|
next(error);
|
|
20
22
|
}
|
|
21
23
|
});
|
|
22
|
-
express.get(endpoint_1.ApiEndpoint.dataQuery.dataQueries(':surveyId'), async (req, res, next) => {
|
|
24
|
+
express.get(endpoint_1.ApiEndpoint.dataQuery.dataQueries(':surveyId'), requireSurveyViewPermission, async (req, res, next) => {
|
|
23
25
|
try {
|
|
24
26
|
const { surveyId } = utils_1.Requests.getParams(req);
|
|
25
27
|
const service = getDataQueryService();
|
|
@@ -30,7 +32,7 @@ exports.DataQueryRead = {
|
|
|
30
32
|
next(error);
|
|
31
33
|
}
|
|
32
34
|
});
|
|
33
|
-
express.get(endpoint_1.ApiEndpoint.dataQuery.dataQuery(':surveyId', ':querySummaryUuid'), async (req, res, next) => {
|
|
35
|
+
express.get(endpoint_1.ApiEndpoint.dataQuery.dataQuery(':surveyId', ':querySummaryUuid'), requireSurveyViewPermission, async (req, res, next) => {
|
|
34
36
|
try {
|
|
35
37
|
const { surveyId, querySummaryUuid } = utils_1.Requests.getParams(req);
|
|
36
38
|
const service = getDataQueryService();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../src/api/dataQuery/read.ts"],"names":[],"mappings":";;;AAEA,sDAAuD;AAGvD,kFAA8E;AAE9E,uCAAsC;AAEtC,0CAAyC;
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../src/api/dataQuery/read.ts"],"names":[],"mappings":";;;AAEA,sDAAuD;AAGvD,kFAA8E;AAE9E,uCAAsC;AAEtC,0CAAyC;AACzC,8CAAiD;AAEjD,MAAM,EAAE,2BAA2B,EAAE,GAAG,8BAAiB,CAAA;AAEzD,MAAM,mBAAmB,GAAG,GAAqB,EAAE,CACjD,4BAAe,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,qCAAiB,CAAC,SAAS,CAAqB,CAAA;AAE9E,QAAA,aAAa,GAAuB;IAC/C,IAAI,EAAE,CAAC,OAAgB,EAAQ,EAAE;QAC/B,OAAO,CAAC,GAAG,CACT,sBAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC,WAAW,CAAC,EACnD,2BAA2B,EAC3B,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAE5C,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAA;gBAErC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;gBAE/C,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;YACrB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;QAED,OAAO,CAAC,GAAG,CAAC,sBAAW,CAAC,SAAS,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,2BAA2B,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChH,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAE5C,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAA;gBAErC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;gBAE/C,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YACpB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CACT,sBAAW,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,mBAAmB,CAAC,EACjE,2BAA2B,EAC3B,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAE9D,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAA;gBAErC,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAA;gBAEtF,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;IACH,CAAC;CACF,CAAA"}
|
|
@@ -5,10 +5,12 @@ const arena_core_1 = require("@openforis/arena-core");
|
|
|
5
5
|
const serverServiceType_1 = require("../../server/arenaServer/serverServiceType");
|
|
6
6
|
const utils_1 = require("../../utils");
|
|
7
7
|
const endpoint_1 = require("../endpoint");
|
|
8
|
+
const middleware_1 = require("../middleware");
|
|
9
|
+
const { requireSurveyViewPermission } = middleware_1.ApiAuthMiddleware;
|
|
8
10
|
const getDataQueryService = () => arena_core_1.ServiceRegistry.getInstance().getService(serverServiceType_1.ServerServiceType.dataQuery);
|
|
9
11
|
exports.DataQueryUpdate = {
|
|
10
12
|
init: (express) => {
|
|
11
|
-
express.put(endpoint_1.ApiEndpoint.dataQuery.dataQuery(':surveyId', ':queryUuid'), async (req, res, next) => {
|
|
13
|
+
express.put(endpoint_1.ApiEndpoint.dataQuery.dataQuery(':surveyId', ':queryUuid'), requireSurveyViewPermission, async (req, res, next) => {
|
|
12
14
|
try {
|
|
13
15
|
const { surveyId } = utils_1.Requests.getParams(req);
|
|
14
16
|
const querySummary = req.body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/api/dataQuery/update.ts"],"names":[],"mappings":";;;AAEA,sDAAuD;AAGvD,kFAA8E;AAE9E,uCAAsC;AAEtC,0CAAyC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/api/dataQuery/update.ts"],"names":[],"mappings":";;;AAEA,sDAAuD;AAGvD,kFAA8E;AAE9E,uCAAsC;AAEtC,0CAAyC;AACzC,8CAAiD;AAEjD,MAAM,EAAE,2BAA2B,EAAE,GAAG,8BAAiB,CAAA;AAEzD,MAAM,mBAAmB,GAAG,GAAqB,EAAE,CACjD,4BAAe,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,qCAAiB,CAAC,SAAS,CAAC,CAAA;AAE1D,QAAA,eAAe,GAAuB;IACjD,IAAI,EAAE,CAAC,OAAgB,EAAQ,EAAE;QAC/B,OAAO,CAAC,GAAG,CACT,sBAAW,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,EAC1D,2BAA2B,EAC3B,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAA;gBAE7B,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAA;gBAErC,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;gBAElF,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;YAC/B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;IACH,CAAC;CACF,CAAA"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Schemata = void 0;
|
|
4
|
-
const getSchemaSurvey = (surveyId) =>
|
|
4
|
+
const getSchemaSurvey = (surveyId) => {
|
|
5
|
+
if (!/^\d+$/.test(String(surveyId)))
|
|
6
|
+
throw new Error(`invalid survey id: ${surveyId}`);
|
|
7
|
+
return `survey_${surveyId}`;
|
|
8
|
+
};
|
|
5
9
|
const getSchemaSurveyRdb = (surveyId) => `${getSchemaSurvey(surveyId)}_data`;
|
|
6
10
|
exports.Schemata = {
|
|
7
11
|
PUBLIC: 'public',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/db/schemata/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,eAAe,GAAG,CAAC,QAAgB,EAAU,EAAE,CAAC,UAAU,QAAQ,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/db/schemata/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,eAAe,GAAG,CAAC,QAAgB,EAAU,EAAE;IAEnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,QAAQ,EAAE,CAAC,CAAA;IACtF,OAAO,UAAU,QAAQ,EAAE,CAAA;AAC7B,CAAC,CAAA;AACD,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAU,EAAE,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAA;AAE/E,QAAA,QAAQ,GAAG;IACtB,MAAM,EAAE,QAAQ;IAChB,eAAe;IACf,kBAAkB;CACnB,CAAA"}
|