@based/server 2.8.4 → 2.8.7
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/.turbo/turbo-build.log +5 -5
- package/dist/handlers/handleRequests.js +20 -4
- package/dist/handlers/handleRequests.js.map +1 -1
- package/dist/handlers/rest/file/stream.js +8 -0
- package/dist/handlers/rest/file/stream.js.map +1 -1
- package/dist/handlers/userAuth/index.js +1 -1
- package/dist/secrets.js +37 -19
- package/dist/secrets.js.map +1 -1
- package/package.json +1 -1
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
[
|
|
2
|
-
[
|
|
3
|
-
[
|
|
4
|
-
[
|
|
5
|
-
[
|
|
1
|
+
[36m@based/server:build: [0mcache hit, replaying output [2mde557dd8c05d33c4[0m
|
|
2
|
+
[36m@based/server:build: [0m
|
|
3
|
+
[36m@based/server:build: [0m> @based/server@2.8.6 build
|
|
4
|
+
[36m@based/server:build: [0m> npx tsc
|
|
5
|
+
[36m@based/server:build: [0m
|
|
@@ -15,18 +15,26 @@ exports.default = (server, client, messages) => {
|
|
|
15
15
|
if (auth) {
|
|
16
16
|
if (client.authorizeInProgress) {
|
|
17
17
|
client.authorizeInProgress.then(() => {
|
|
18
|
-
(0, authorize_1.default)(server, client, messages)
|
|
18
|
+
(0, authorize_1.default)(server, client, messages)
|
|
19
|
+
.then((messages) => {
|
|
19
20
|
if (messages) {
|
|
20
21
|
(0, messageParser_1.default)(server, client, messages);
|
|
21
22
|
}
|
|
23
|
+
})
|
|
24
|
+
.catch((err) => {
|
|
25
|
+
console.error('Error with authorize', err);
|
|
22
26
|
});
|
|
23
27
|
});
|
|
24
28
|
}
|
|
25
29
|
else {
|
|
26
|
-
(0, authorize_1.default)(server, client, messages)
|
|
30
|
+
(0, authorize_1.default)(server, client, messages)
|
|
31
|
+
.then((messages) => {
|
|
27
32
|
if (messages) {
|
|
28
33
|
(0, messageParser_1.default)(server, client, messages);
|
|
29
34
|
}
|
|
35
|
+
})
|
|
36
|
+
.catch((err) => {
|
|
37
|
+
console.error('Error with authorize', err);
|
|
30
38
|
});
|
|
31
39
|
}
|
|
32
40
|
}
|
|
@@ -38,18 +46,26 @@ exports.default = (server, client, messages) => {
|
|
|
38
46
|
else {
|
|
39
47
|
if (client.authorizeInProgress) {
|
|
40
48
|
client.authorizeInProgress.then(() => {
|
|
41
|
-
(0, authorize_1.default)(server, client, messages)
|
|
49
|
+
(0, authorize_1.default)(server, client, messages)
|
|
50
|
+
.then((messages) => {
|
|
42
51
|
if (messages) {
|
|
43
52
|
(0, messageParser_1.default)(server, client, messages);
|
|
44
53
|
}
|
|
54
|
+
})
|
|
55
|
+
.catch((err) => {
|
|
56
|
+
console.error('Error with authorize', err);
|
|
45
57
|
});
|
|
46
58
|
});
|
|
47
59
|
}
|
|
48
60
|
else {
|
|
49
|
-
(0, authorize_1.default)(server, client, messages)
|
|
61
|
+
(0, authorize_1.default)(server, client, messages)
|
|
62
|
+
.then((messages) => {
|
|
50
63
|
if (messages) {
|
|
51
64
|
(0, messageParser_1.default)(server, client, messages);
|
|
52
65
|
}
|
|
66
|
+
})
|
|
67
|
+
.catch((err) => {
|
|
68
|
+
console.error('Error with authorize', err);
|
|
53
69
|
});
|
|
54
70
|
}
|
|
55
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleRequests.js","sourceRoot":"","sources":["../../src/handlers/handleRequests.ts"],"names":[],"mappings":";;;;;AAAA,oEAA2C;AAC3C,4DAAmC;AAInC,oDAA+C;AAE/C,kBAAe,CACb,MAAmB,EACnB,MAAc,EACd,QAAoC,EACpC,EAAE;IACF,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;QAC/B,IACE,MAAM,CAAC,MAAM,EAAE,SAAS;YACxB,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzD;YACA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;gBAC5B,IAAA,4BAAY,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACjC,IAAI,IAAI,EAAE;wBACR,IAAI,MAAM,CAAC,mBAAmB,EAAE;4BAC9B,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAG,EAAE;gCACnC,IAAA,mBAAS,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"handleRequests.js","sourceRoot":"","sources":["../../src/handlers/handleRequests.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,8 @@ const smallFile = (server, res, stream, opts) => {
|
|
|
16
16
|
$id: opts.id,
|
|
17
17
|
progress: 1,
|
|
18
18
|
size: opts.size,
|
|
19
|
+
status: 3,
|
|
20
|
+
statusText: 'ready',
|
|
19
21
|
};
|
|
20
22
|
if (opts.name) {
|
|
21
23
|
payload.name = opts.name;
|
|
@@ -35,6 +37,8 @@ const largeFile = (server, res, stream, opts) => {
|
|
|
35
37
|
$id: opts.id,
|
|
36
38
|
progress: 0,
|
|
37
39
|
size: opts.size,
|
|
40
|
+
status: 1,
|
|
41
|
+
statusText: 'uploading',
|
|
38
42
|
};
|
|
39
43
|
if (opts.name) {
|
|
40
44
|
payload.name = opts.name;
|
|
@@ -48,6 +52,10 @@ const largeFile = (server, res, stream, opts) => {
|
|
|
48
52
|
$id: opts.id,
|
|
49
53
|
progress,
|
|
50
54
|
};
|
|
55
|
+
if (progress === 1) {
|
|
56
|
+
payload.status = 3;
|
|
57
|
+
payload.statusText = 'ready';
|
|
58
|
+
}
|
|
51
59
|
server.based.set(payload);
|
|
52
60
|
setInProgress = false;
|
|
53
61
|
}, 250);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../src/handlers/rest/file/stream.ts"],"names":[],"mappings":";;;;;AAAA,6CAAyC;AACzC,4DAAmC;AAInC,4CAAwC;AACxC,4CAAwC;AAExC,MAAM,SAAS,GAAG,CAChB,MAAmB,EACnB,GAAqB,EACrB,MAAkB,EAClB,IAAiB,EACjB,EAAE;IACF,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACjC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC9B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACjB,IAAI,MAAM,EAAE;YACV,MAAM,OAAO,GAAQ;gBACnB,GAAG,EAAE,IAAI,CAAC,EAAE;gBACZ,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../src/handlers/rest/file/stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,7 @@ exports.default = async (server, client, [, authRequestType, reqId, payload]) =>
|
|
|
55
55
|
try {
|
|
56
56
|
const { function: fn } = (await (0, getFromConfig_1.getFunction)(server, 'renewToken')) || {};
|
|
57
57
|
if (!fn) {
|
|
58
|
-
throw new Error('
|
|
58
|
+
throw new Error('Token expired and needs to be renewed.');
|
|
59
59
|
}
|
|
60
60
|
const result = await fn(new Params_1.Params(server, payload, client, ['renewToken']));
|
|
61
61
|
client.send([client_1.RequestTypes.Auth, reqId, result]);
|
package/dist/secrets.js
CHANGED
|
@@ -7,22 +7,27 @@ exports.decodeValueBySecret = exports.encodeValueBySecret = exports.decodeToken
|
|
|
7
7
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
8
8
|
const types_1 = require("@based/types");
|
|
9
9
|
const jwtDecode = (resolve, reject, value, publicKey) => {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
if (err
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
try {
|
|
11
|
+
jsonwebtoken_1.default.verify(value, publicKey, (err, decoded) => {
|
|
12
|
+
if (err) {
|
|
13
|
+
if (err instanceof jsonwebtoken_1.default.TokenExpiredError) {
|
|
14
|
+
const basedError = new types_1.BasedError('Token expired');
|
|
15
|
+
basedError.code = types_1.BasedErrorCodes.TokenExpired;
|
|
16
|
+
basedError.stack = err.stack;
|
|
17
|
+
reject(basedError);
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
resolve(false);
|
|
21
|
+
}
|
|
17
22
|
}
|
|
18
23
|
else {
|
|
19
|
-
resolve(
|
|
24
|
+
resolve(decoded);
|
|
20
25
|
}
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
catch (err) {
|
|
29
|
+
reject(err);
|
|
30
|
+
}
|
|
26
31
|
};
|
|
27
32
|
const getSecret = async (server, secret) => {
|
|
28
33
|
let cert = server.config?.secrets?.[secret];
|
|
@@ -51,7 +56,7 @@ const getSecret = async (server, secret) => {
|
|
|
51
56
|
return cert || false;
|
|
52
57
|
};
|
|
53
58
|
exports.getSecret = getSecret;
|
|
54
|
-
const cleanCarriageReturn = (value) => value.replace(/\n$/, '');
|
|
59
|
+
const cleanCarriageReturn = (value) => typeof value === 'string' ? value.replace(/\n$/, '') : value;
|
|
55
60
|
const decodeToken = (value, publicKey) => {
|
|
56
61
|
return new Promise((resolve, reject) => {
|
|
57
62
|
jwtDecode(resolve, reject, cleanCarriageReturn(value), publicKey);
|
|
@@ -73,7 +78,8 @@ const encodeValueBySecret = (server, payload, privateKeySecretOrKey, type = 'jwt
|
|
|
73
78
|
else {
|
|
74
79
|
reject(new Error('Need to pass a secret name or a key'));
|
|
75
80
|
}
|
|
76
|
-
})
|
|
81
|
+
})
|
|
82
|
+
.then((privateKey) => {
|
|
77
83
|
if (privateKey) {
|
|
78
84
|
const defaultOptions = {
|
|
79
85
|
expiresIn: '2d',
|
|
@@ -90,12 +96,15 @@ const encodeValueBySecret = (server, payload, privateKeySecretOrKey, type = 'jwt
|
|
|
90
96
|
});
|
|
91
97
|
}
|
|
92
98
|
else {
|
|
93
|
-
|
|
99
|
+
reject(new Error(`Encode ${type} not implementedd yet`));
|
|
94
100
|
}
|
|
95
101
|
}
|
|
96
102
|
else {
|
|
97
103
|
reject(new Error(`Secret does not exist ${privateKeySecretOrKey}`));
|
|
98
104
|
}
|
|
105
|
+
})
|
|
106
|
+
.catch((err) => {
|
|
107
|
+
reject(err);
|
|
99
108
|
});
|
|
100
109
|
});
|
|
101
110
|
};
|
|
@@ -103,18 +112,27 @@ exports.encodeValueBySecret = encodeValueBySecret;
|
|
|
103
112
|
const decodeValueBySecret = (server, value, publicKeySecret, type = 'jwt') => {
|
|
104
113
|
return new Promise((resolve, reject) => {
|
|
105
114
|
// make this better
|
|
106
|
-
(0, exports.getSecret)(server, publicKeySecret)
|
|
115
|
+
(0, exports.getSecret)(server, publicKeySecret)
|
|
116
|
+
.then((publicKey) => {
|
|
107
117
|
if (publicKey) {
|
|
108
118
|
if (type === 'jwt') {
|
|
109
|
-
|
|
119
|
+
try {
|
|
120
|
+
jwtDecode(resolve, reject, cleanCarriageReturn(value), publicKey);
|
|
121
|
+
}
|
|
122
|
+
catch (err) {
|
|
123
|
+
reject(err);
|
|
124
|
+
}
|
|
110
125
|
}
|
|
111
126
|
else {
|
|
112
|
-
console.error(`decode ${type} not
|
|
127
|
+
console.error(`decode ${type} not implemented yet`);
|
|
113
128
|
}
|
|
114
129
|
}
|
|
115
130
|
else {
|
|
116
131
|
reject(new Error(`Secret does not exist ${publicKeySecret}`));
|
|
117
132
|
}
|
|
133
|
+
})
|
|
134
|
+
.catch((err) => {
|
|
135
|
+
reject(err);
|
|
118
136
|
});
|
|
119
137
|
});
|
|
120
138
|
};
|
package/dist/secrets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../src/secrets.ts"],"names":[],"mappings":";;;;;;AACA,gEAA+C;AAC/C,wCAA0D;AAE1D,MAAM,SAAS,GAAG,CAChB,OAA6B,EAC7B,MAA6B,EAC7B,KAAa,EACb,SAAiB,EACjB,EAAE;IACF,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../src/secrets.ts"],"names":[],"mappings":"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"}
|