@openforis/arena-server 2.8.1 → 2.8.3
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/dist/server/middleware/authentication.js +5 -0
- package/dist/server/middleware/authentication.js.map +1 -1
- package/dist/service/userAuthToken/index.d.ts +1 -0
- package/dist/service/userAuthToken/index.js +3 -1
- package/dist/service/userAuthToken/index.js.map +1 -1
- package/dist/webSocket/server.js +3 -0
- package/dist/webSocket/server.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"}
|
|
@@ -9,6 +9,7 @@ const passport_jwt_1 = require("passport-jwt");
|
|
|
9
9
|
const passport_local_1 = require("passport-local");
|
|
10
10
|
const arena_core_1 = require("@openforis/arena-core");
|
|
11
11
|
const processEnv_1 = require("../../processEnv");
|
|
12
|
+
const userAuthToken_1 = require("../../service/userAuthToken");
|
|
12
13
|
const userAuthTokenServiceConstants_1 = require("../../service/userAuthToken/userAuthTokenServiceConstants");
|
|
13
14
|
const pathsAllowedWithoutAuthentication = [
|
|
14
15
|
/^\/$/,
|
|
@@ -63,6 +64,10 @@ const jwtStrategy = new passport_jwt_1.Strategy({
|
|
|
63
64
|
passReqToCallback: true,
|
|
64
65
|
algorithms: userAuthTokenServiceConstants_1.jwtAlgorithms,
|
|
65
66
|
}, (req, jwtPayload, done) => {
|
|
67
|
+
if (!(0, userAuthToken_1.isAccessTokenPayload)(jwtPayload)) {
|
|
68
|
+
done(null, false);
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
66
71
|
const { userUuid } = jwtPayload;
|
|
67
72
|
const service = arena_core_1.ServiceRegistry.getInstance().getService(arena_core_1.ServiceType.user);
|
|
68
73
|
service
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../../src/server/middleware/authentication.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../../src/server/middleware/authentication.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { UserAuthTokenService } from '@openforis/arena-core';
|
|
2
|
+
export declare const isAccessTokenPayload: (payload: object) => boolean;
|
|
2
3
|
export declare const UserAuthTokenServiceServer: UserAuthTokenService;
|
|
3
4
|
export { jwtExpiresMs, jwtRefreshTokenExpireMs, jwtRefreshTokenMobileExpireMs } from './userAuthTokenServiceConstants';
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.jwtRefreshTokenMobileExpireMs = exports.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = exports.UserAuthTokenServiceServer = void 0;
|
|
6
|
+
exports.jwtRefreshTokenMobileExpireMs = exports.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = exports.UserAuthTokenServiceServer = exports.isAccessTokenPayload = void 0;
|
|
7
7
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
8
8
|
const arena_core_1 = require("@openforis/arena-core");
|
|
9
9
|
const db_1 = require("../../db");
|
|
@@ -13,6 +13,8 @@ const repository_1 = require("../../repository");
|
|
|
13
13
|
const userAuthTokenServiceConstants_1 = require("./userAuthTokenServiceConstants");
|
|
14
14
|
const logger = new log_1.Logger('UserAuthTokenService');
|
|
15
15
|
const signToken = (payload, expiresInSeconds) => jsonwebtoken_1.default.sign(payload, processEnv_1.ProcessEnv.userAuthTokenSecret, { expiresIn: expiresInSeconds, algorithm: userAuthTokenServiceConstants_1.jwtAlgorithm });
|
|
16
|
+
const isAccessTokenPayload = (payload) => !('uuid' in payload) && !('fileName' in payload);
|
|
17
|
+
exports.isAccessTokenPayload = isAccessTokenPayload;
|
|
16
18
|
const createUserAuthTokenPayload = ({ userUuid }) => ({ userUuid });
|
|
17
19
|
const createDownloadAuthTokenPayload = ({ userUuid, fileName, }) => ({
|
|
18
20
|
userUuid,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/index.ts"],"names":[],"mappings":";;;;;;AAAA,gEAA8B;AAG9B,sDAU8B;AAE9B,iCAA6B;AAE7B,mCAAkC;AAClC,iDAA6C;AAC7C,iDAA6D;AAC7D,mFAQwC;AAExC,MAAM,MAAM,GAAG,IAAI,YAAM,CAAC,sBAAsB,CAAC,CAAA;AASjD,MAAM,SAAS,GAAG,CAAC,OAAyB,EAAE,gBAAwB,EAAU,EAAE,CAChF,sBAAG,CAAC,IAAI,CAAC,OAAO,EAAE,uBAAU,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,4CAAY,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/index.ts"],"names":[],"mappings":"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"}
|
package/dist/webSocket/server.js
CHANGED
|
@@ -5,6 +5,7 @@ const socket_io_1 = require("socket.io");
|
|
|
5
5
|
const arena_core_1 = require("@openforis/arena-core");
|
|
6
6
|
const clusterBus_1 = require("../clusterBus");
|
|
7
7
|
const repository_1 = require("../repository");
|
|
8
|
+
const userAuthToken_1 = require("../service/userAuthToken");
|
|
8
9
|
const log_1 = require("../log");
|
|
9
10
|
const event_1 = require("./event");
|
|
10
11
|
var ClusterEventTargetType;
|
|
@@ -32,6 +33,8 @@ class WebSocketServer {
|
|
|
32
33
|
try {
|
|
33
34
|
const service = arena_core_1.ServiceRegistry.getInstance().getService(arena_core_1.ServiceType.userAuthToken);
|
|
34
35
|
const jwtPayload = service.verifyAuthToken(token);
|
|
36
|
+
if (!(0, userAuthToken_1.isAccessTokenPayload)(jwtPayload))
|
|
37
|
+
throw new Error('not an access token');
|
|
35
38
|
const { userUuid } = jwtPayload;
|
|
36
39
|
return userUuid;
|
|
37
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/webSocket/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/webSocket/server.ts"],"names":[],"mappings":"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"}
|