@openforis/arena-server 2.7.0 → 2.7.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/service/userAuthToken/index.d.ts +1 -1
- package/dist/service/userAuthToken/index.js +6 -3
- package/dist/service/userAuthToken/index.js.map +1 -1
- package/dist/service/userAuthToken/userAuthTokenServiceConstants.d.ts +2 -0
- package/dist/service/userAuthToken/userAuthTokenServiceConstants.js +3 -1
- package/dist/service/userAuthToken/userAuthTokenServiceConstants.js.map +1 -1
- package/package.json +9 -9
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { UserAuthTokenService } from '@openforis/arena-core';
|
|
2
2
|
export declare const UserAuthTokenServiceServer: UserAuthTokenService;
|
|
3
|
-
export { jwtExpiresMs, jwtRefreshTokenExpireMs } from './userAuthTokenServiceConstants';
|
|
3
|
+
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.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = exports.UserAuthTokenServiceServer = void 0;
|
|
6
|
+
exports.jwtRefreshTokenMobileExpireMs = exports.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = exports.UserAuthTokenServiceServer = 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");
|
|
@@ -28,12 +28,14 @@ const createUserAuthToken = ({ userUuid, }) => {
|
|
|
28
28
|
const payload = createUserAuthTokenPayload({ userUuid });
|
|
29
29
|
return createAuthTokenFromPayload(payload, userAuthTokenServiceConstants_1.jwtExpiresMs);
|
|
30
30
|
};
|
|
31
|
+
const getRefreshTokenExpireMs = (props) => props?.appInfo?.appId === userAuthTokenServiceConstants_1.arenaMobileAppId ? userAuthTokenServiceConstants_1.jwtRefreshTokenMobileExpireMs : userAuthTokenServiceConstants_1.jwtRefreshTokenExpireMs;
|
|
31
32
|
const createAndStoreRefreshToken = ({ userUuid, props }, client = db_1.DB) => {
|
|
32
33
|
const uuid = arena_core_1.UUIDs.v4();
|
|
33
34
|
const now = new Date();
|
|
34
|
-
const
|
|
35
|
+
const expireMs = getRefreshTokenExpireMs(props);
|
|
36
|
+
const expiresAt = new Date(now.getTime() + expireMs);
|
|
35
37
|
const payload = { ...createUserAuthTokenPayload({ userUuid }), uuid };
|
|
36
|
-
const token = signToken(payload,
|
|
38
|
+
const token = signToken(payload, expireMs / 1000);
|
|
37
39
|
const refreshToken = { uuid, userUuid, token, dateCreated: now, expiresAt, props };
|
|
38
40
|
return repository_1.UserRefreshTokenRepository.insert(refreshToken, client);
|
|
39
41
|
};
|
|
@@ -101,4 +103,5 @@ exports.UserAuthTokenServiceServer = {
|
|
|
101
103
|
var userAuthTokenServiceConstants_2 = require("./userAuthTokenServiceConstants");
|
|
102
104
|
Object.defineProperty(exports, "jwtExpiresMs", { enumerable: true, get: function () { return userAuthTokenServiceConstants_2.jwtExpiresMs; } });
|
|
103
105
|
Object.defineProperty(exports, "jwtRefreshTokenExpireMs", { enumerable: true, get: function () { return userAuthTokenServiceConstants_2.jwtRefreshTokenExpireMs; } });
|
|
106
|
+
Object.defineProperty(exports, "jwtRefreshTokenMobileExpireMs", { enumerable: true, get: function () { return userAuthTokenServiceConstants_2.jwtRefreshTokenMobileExpireMs; } });
|
|
104
107
|
//# sourceMappingURL=index.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Algorithm } from 'jsonwebtoken';
|
|
2
2
|
export declare const jwtExpiresMs: number;
|
|
3
3
|
export declare const jwtRefreshTokenExpireMs: number;
|
|
4
|
+
export declare const jwtRefreshTokenMobileExpireMs: number;
|
|
5
|
+
export declare const arenaMobileAppId = "am";
|
|
4
6
|
export declare const jwtDownloadTokenExpireMs: number;
|
|
5
7
|
export declare const jwtAlgorithm: Algorithm;
|
|
6
8
|
export declare const jwtAlgorithms: Algorithm[];
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.jwtAlgorithms = exports.jwtAlgorithm = exports.jwtDownloadTokenExpireMs = exports.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = void 0;
|
|
3
|
+
exports.jwtAlgorithms = exports.jwtAlgorithm = exports.jwtDownloadTokenExpireMs = exports.arenaMobileAppId = exports.jwtRefreshTokenMobileExpireMs = exports.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = void 0;
|
|
4
4
|
exports.jwtExpiresMs = 60 * 60 * 1000;
|
|
5
5
|
exports.jwtRefreshTokenExpireMs = 7 * 24 * 60 * 60 * 1000;
|
|
6
|
+
exports.jwtRefreshTokenMobileExpireMs = 30 * 24 * 60 * 60 * 1000;
|
|
7
|
+
exports.arenaMobileAppId = 'am';
|
|
6
8
|
exports.jwtDownloadTokenExpireMs = 30 * 60 * 1000;
|
|
7
9
|
exports.jwtAlgorithm = 'HS256';
|
|
8
10
|
exports.jwtAlgorithms = [exports.jwtAlgorithm];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userAuthTokenServiceConstants.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/userAuthTokenServiceConstants.ts"],"names":[],"mappings":";;;AAEa,QAAA,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAC7B,QAAA,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"userAuthTokenServiceConstants.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/userAuthTokenServiceConstants.ts"],"names":[],"mappings":";;;AAEa,QAAA,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAC7B,QAAA,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEjD,QAAA,6BAA6B,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AACxD,QAAA,gBAAgB,GAAG,IAAI,CAAA;AACvB,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEzC,QAAA,YAAY,GAAc,OAAO,CAAA;AACjC,QAAA,aAAa,GAAgB,CAAC,QAAA,YAAY,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"name": "OpenForis",
|
|
5
5
|
"email": "openforis.arena@gmail.com"
|
|
6
6
|
},
|
|
7
|
-
"version": "2.7.
|
|
7
|
+
"version": "2.7.2",
|
|
8
8
|
"description": "",
|
|
9
9
|
"main": "dist/index.js",
|
|
10
10
|
"types": "dist/index.d.ts",
|
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
"@types/passport": "^1.0.17",
|
|
25
25
|
"@types/passport-jwt": "^4.0.1",
|
|
26
26
|
"@types/passport-local": "^1.0.38",
|
|
27
|
-
"@types/pdfkit": "^0.17.
|
|
27
|
+
"@types/pdfkit": "^0.17.7",
|
|
28
28
|
"@types/supertest": "^7.2.1",
|
|
29
|
-
"@typescript-eslint/eslint-plugin": "^8.
|
|
30
|
-
"@typescript-eslint/parser": "^8.
|
|
29
|
+
"@typescript-eslint/eslint-plugin": "^8.72.0",
|
|
30
|
+
"@typescript-eslint/parser": "^8.72.0",
|
|
31
31
|
"@typescript/native": "npm:typescript@7.0.2",
|
|
32
32
|
"copyfiles": "^2.4.1",
|
|
33
|
-
"dotenv": "^18.0.
|
|
33
|
+
"dotenv": "^18.0.9",
|
|
34
34
|
"eslint": "^10.13.0",
|
|
35
35
|
"husky": "9.1.7",
|
|
36
36
|
"jest": "^30.5.2",
|
|
@@ -42,18 +42,18 @@
|
|
|
42
42
|
"ts-jest": "^29.4.15",
|
|
43
43
|
"ts-node": "^10.9.2",
|
|
44
44
|
"typescript": "npm:@typescript/typescript6@6.0.2",
|
|
45
|
-
"typescript-eslint": "^8.
|
|
45
|
+
"typescript-eslint": "^8.72.0"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@aws-sdk/client-s3": "^3.
|
|
48
|
+
"@aws-sdk/client-s3": "^3.1156.0",
|
|
49
49
|
"@godaddy/terminus": "^4.12.1",
|
|
50
|
-
"@openforis/arena-core": "^2.
|
|
50
|
+
"@openforis/arena-core": "^2.11.1",
|
|
51
51
|
"bcryptjs": "^3.0.3",
|
|
52
52
|
"compression": "^1.8.2",
|
|
53
53
|
"cookie-parser": "^1.4.7",
|
|
54
54
|
"db-migrate": "^1.8.1",
|
|
55
55
|
"db-migrate-pg": "^1.7.1",
|
|
56
|
-
"docx": "^9.
|
|
56
|
+
"docx": "^9.14.0",
|
|
57
57
|
"express": "^5.3.0",
|
|
58
58
|
"express-fileupload": "^1.5.2",
|
|
59
59
|
"express-rate-limit": "^8.7.1",
|