equipped 5.0.0-rc.21 → 5.0.0-rc.23
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/CHANGELOG.md +2 -0
- package/lib/errors/index.d.ts +1 -1
- package/lib/errors/index.js +1 -1
- package/lib/errors/index.js.map +1 -1
- package/lib/errors/types/{accessTokenExpired.d.ts → authorizationExpired.d.ts} +1 -1
- package/lib/errors/types/authorizationExpired.js +13 -0
- package/lib/errors/types/authorizationExpired.js.map +1 -0
- package/lib/requests-auth/tokens.js +4 -4
- package/lib/requests-auth/tokens.js.map +1 -1
- package/lib/server/impls/base.js +4 -4
- package/lib/server/impls/base.js.map +1 -1
- package/lib/server/impls/express.js +5 -5
- package/lib/server/impls/express.js.map +1 -1
- package/lib/server/impls/fastify.js +3 -3
- package/lib/server/impls/fastify.js.map +1 -1
- package/lib/server/middlewares/parseAuthUser.js +3 -3
- package/lib/server/middlewares/parseAuthUser.js.map +1 -1
- package/lib/server/middlewares/requireAuthUser.d.ts +1 -1
- package/lib/server/middlewares/requireAuthUser.js +8 -8
- package/lib/server/middlewares/requireAuthUser.js.map +1 -1
- package/lib/server/requests.d.ts +1 -1
- package/lib/server/types.d.ts +1 -1
- package/lib/server/types.js +1 -1
- package/lib/server/types.js.map +1 -1
- package/package.json +1 -1
- package/lib/errors/types/accessTokenExpired.js +0 -13
- package/lib/errors/types/accessTokenExpired.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [5.0.0-rc.23](https://github.com/kevinand11/equipped/compare/v5.0.0-rc.21...v5.0.0-rc.23) (2025-05-16)
|
|
6
|
+
|
|
5
7
|
## [5.0.0-rc.21](https://github.com/kevinand11/equipped/compare/v5.0.0-rc.20...v5.0.0-rc.21) (2025-05-15)
|
|
6
8
|
|
|
7
9
|
|
package/lib/errors/index.d.ts
CHANGED
package/lib/errors/index.js
CHANGED
|
@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./customError"), exports);
|
|
18
|
-
__exportStar(require("./types/
|
|
18
|
+
__exportStar(require("./types/authorizationExpired"), exports);
|
|
19
19
|
__exportStar(require("./types/badRequestError"), exports);
|
|
20
20
|
__exportStar(require("./types/notAuthenticatedError"), exports);
|
|
21
21
|
__exportStar(require("./types/notAuthorizedError"), exports);
|
package/lib/errors/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/errors/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/errors/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,+DAA4C;AAC5C,0DAAuC;AACvC,gEAA6C;AAC7C,6DAA0C;AAC1C,wDAAqC;AACrC,mEAAgD;AAChD,0DAAuC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AuthorizationExpired = void 0;
|
|
4
|
+
const server_1 = require("../../server");
|
|
5
|
+
const customError_1 = require("../customError");
|
|
6
|
+
class AuthorizationExpired extends customError_1.CustomError {
|
|
7
|
+
constructor(message = 'Access token expired') {
|
|
8
|
+
super(message, [{ message }]);
|
|
9
|
+
this.statusCode = server_1.StatusCodes.AuthorizationExpired;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.AuthorizationExpired = AuthorizationExpired;
|
|
13
|
+
//# sourceMappingURL=authorizationExpired.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authorizationExpired.js","sourceRoot":"","sources":["../../../src/errors/types/authorizationExpired.ts"],"names":[],"mappings":";;;AAAA,yCAA0C;AAC1C,gDAA4C;AAE5C,MAAa,oBAAqB,SAAQ,yBAAW;IAGpD,YAAY,OAAO,GAAG,sBAAsB;QAC3C,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAH9B,eAAU,GAAG,oBAAW,CAAC,oBAAoB,CAAA;IAI7C,CAAC;CACD;AAND,oDAMC"}
|
|
@@ -24,7 +24,7 @@ class BaseTokensUtility {
|
|
|
24
24
|
async exchangeTokens(tokens, getPayload) {
|
|
25
25
|
const authUser = await this.verifyAccessToken(tokens.accessToken).catch((err) => {
|
|
26
26
|
const error = err;
|
|
27
|
-
if (error.statusCode === server_1.StatusCodes.
|
|
27
|
+
if (error.statusCode === server_1.StatusCodes.AuthorizationExpired)
|
|
28
28
|
return null;
|
|
29
29
|
else
|
|
30
30
|
throw err;
|
|
@@ -74,14 +74,14 @@ class CacheTokensUtility extends BaseTokensUtility {
|
|
|
74
74
|
throw new errors_1.NotAuthenticatedError();
|
|
75
75
|
const cachedToken = await this.retrieveAccessTokenFor(user.id);
|
|
76
76
|
if (token && token !== cachedToken)
|
|
77
|
-
throw new errors_1.
|
|
77
|
+
throw new errors_1.AuthorizationExpired();
|
|
78
78
|
return user;
|
|
79
79
|
}
|
|
80
80
|
catch (err) {
|
|
81
|
-
if (err instanceof errors_1.
|
|
81
|
+
if (err instanceof errors_1.AuthorizationExpired)
|
|
82
82
|
throw err;
|
|
83
83
|
if (err instanceof jsonwebtoken_1.default.TokenExpiredError)
|
|
84
|
-
throw new errors_1.
|
|
84
|
+
throw new errors_1.AuthorizationExpired();
|
|
85
85
|
else
|
|
86
86
|
throw new errors_1.NotAuthenticatedError();
|
|
87
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/requests-auth/tokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,gEAA8B;AAG9B,
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/requests-auth/tokens.ts"],"names":[],"mappings":"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"}
|
package/lib/server/impls/base.js
CHANGED
|
@@ -44,19 +44,19 @@ class Server {
|
|
|
44
44
|
components: {
|
|
45
45
|
schemas: {},
|
|
46
46
|
securitySchemes: {
|
|
47
|
-
|
|
47
|
+
Authorization: {
|
|
48
48
|
type: 'apiKey',
|
|
49
|
-
name: '
|
|
49
|
+
name: 'authorization',
|
|
50
50
|
in: 'header',
|
|
51
51
|
},
|
|
52
52
|
RefreshToken: {
|
|
53
53
|
type: 'apiKey',
|
|
54
|
-
name: '
|
|
54
|
+
name: 'x-refresh-token',
|
|
55
55
|
in: 'header',
|
|
56
56
|
},
|
|
57
57
|
ApiKey: {
|
|
58
58
|
type: 'apiKey',
|
|
59
|
-
name: '
|
|
59
|
+
name: 'x-api-key',
|
|
60
60
|
in: 'header',
|
|
61
61
|
},
|
|
62
62
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/server/impls/base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,gDAAuB;AAIvB,0DAA0B;AAC1B,0DAAiC;AAEjC,6CAAyC;AACzC,+CAA0C;AAE1C,gDAA8C;AAG9C,sCAAqC;AAErC,oCAAsC;AAkBtC,MAAsB,MAAM;IAgD3B,YAAY,MAAmB;;QA/C/B,+BAAgB,IAAI,GAAG,EAAqB,EAAA;QAC5C,8BAAe,IAAI,GAAG,EAAqB,EAAA;QAC3C,0BAAoB,EAAE,EAAA;QACtB,2BAA6B,IAAI,EAAA;QACjC,iCAA2C,EAAE,EAAA;QAC7C,sCAAyE,EAAE,EAAA;QAEjE,eAAU,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAA;QAC/C,aAAQ,GAAG,mBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAA;QAClC,mBAAc,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,eAAe,CAAA;QACjE,mBAAc,GAAyB;YAChD,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE;YAChH,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YACnE,KAAK,EAAE,EAAE;YACT,UAAU,EAAE;gBACX,OAAO,EAAE,EAAE;gBACX,eAAe,EAAE;oBAChB,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/server/impls/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,12 +107,12 @@ class ExpressServer extends base_1.Server {
|
|
|
107
107
|
const allHeaders = Object.fromEntries(Object.entries(req.headers).map(([key, val]) => [key, val ?? null]));
|
|
108
108
|
const headers = {
|
|
109
109
|
...allHeaders,
|
|
110
|
-
|
|
111
|
-
RefreshToken: req.get('
|
|
112
|
-
ApiKey: req.get('
|
|
113
|
-
ContentType: req.get('
|
|
110
|
+
Authorization: req.get('authorization'),
|
|
111
|
+
RefreshToken: req.get('x-refresh-token'),
|
|
112
|
+
ApiKey: req.get('x-api-key'),
|
|
113
|
+
ContentType: req.get('content-type'),
|
|
114
114
|
Referer: req.get('referer'),
|
|
115
|
-
UserAgent: req.get('
|
|
115
|
+
UserAgent: req.get('user-agent'),
|
|
116
116
|
};
|
|
117
117
|
const files = Object.fromEntries(await Promise.all(Object.entries(req.files ?? {}).map(async ([key, file]) => {
|
|
118
118
|
const uploads = Array.isArray(file) ? file : [file];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.js","sourceRoot":"","sources":["../../../src/server/impls/express.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"express.js","sourceRoot":"","sources":["../../../src/server/impls/express.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,9 +118,9 @@ class FastifyServer extends base_1.Server {
|
|
|
118
118
|
const allHeaders = Object.fromEntries(Object.entries(req.headers).map(([key, val]) => [key, val ?? null]));
|
|
119
119
|
const headers = {
|
|
120
120
|
...allHeaders,
|
|
121
|
-
|
|
122
|
-
RefreshToken: req.headers['refresh-token']?.toString(),
|
|
123
|
-
ApiKey: req.headers['api-key']?.toString(),
|
|
121
|
+
Authorization: req.headers['authorization']?.toString(),
|
|
122
|
+
RefreshToken: req.headers['x-refresh-token']?.toString(),
|
|
123
|
+
ApiKey: req.headers['x-api-key']?.toString(),
|
|
124
124
|
ContentType: req.headers['content-type']?.toString(),
|
|
125
125
|
Referer: req.headers['referer']?.toString(),
|
|
126
126
|
UserAgent: req.headers['user-agent']?.toString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fastify.js","sourceRoot":"","sources":["../../../src/server/impls/fastify.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fastify.js","sourceRoot":"","sources":["../../../src/server/impls/fastify.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const instance_1 = require("../../instance");
|
|
|
6
6
|
const types_1 = require("../types");
|
|
7
7
|
exports.parseAuthUser = (0, types_1.makeMiddleware)(async (request) => {
|
|
8
8
|
const { requestsAuth } = instance_1.Instance.get().settings;
|
|
9
|
-
const {
|
|
9
|
+
const { Authorization, ApiKey } = request.headers;
|
|
10
10
|
function makeErrorHandler(key) {
|
|
11
11
|
return function (err) {
|
|
12
12
|
if (err instanceof errors_1.CustomError)
|
|
@@ -14,8 +14,8 @@ exports.parseAuthUser = (0, types_1.makeMiddleware)(async (request) => {
|
|
|
14
14
|
return undefined;
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
|
-
if (requestsAuth.tokens &&
|
|
18
|
-
request.users.access.value = await requestsAuth.tokens.verifyAccessToken(
|
|
17
|
+
if (requestsAuth.tokens && Authorization)
|
|
18
|
+
request.users.access.value = await requestsAuth.tokens.verifyAccessToken(Authorization).catch(makeErrorHandler('access'));
|
|
19
19
|
else if (requestsAuth.apiKey && ApiKey)
|
|
20
20
|
request.users.apiKey.value = await requestsAuth.apiKey.verifyApiKey(ApiKey).catch(makeErrorHandler('apiKey'));
|
|
21
21
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseAuthUser.js","sourceRoot":"","sources":["../../../src/server/middlewares/parseAuthUser.ts"],"names":[],"mappings":";;;AAAA,yCAA0C;AAC1C,6CAAyC;AACzC,oCAAyC;AAE5B,QAAA,aAAa,GAAG,IAAA,sBAAc,EAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IAC7D,MAAM,EAAE,YAAY,EAAE,GAAG,mBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAA;IAChD,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"parseAuthUser.js","sourceRoot":"","sources":["../../../src/server/middlewares/parseAuthUser.ts"],"names":[],"mappings":";;;AAAA,yCAA0C;AAC1C,6CAAyC;AACzC,oCAAyC;AAE5B,QAAA,aAAa,GAAG,IAAA,sBAAc,EAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IAC7D,MAAM,EAAE,YAAY,EAAE,GAAG,mBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAA;IAChD,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAA;IACjD,SAAS,gBAAgB,CAAE,GAAwB;QAClD,OAAO,UAAU,GAAQ;YACxB,IAAI,GAAG,YAAY,oBAAW;gBAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,GAAG,CAAA;YAC9D,OAAO,SAAS,CAAA;QACjB,CAAC,CAAA;IACF,CAAC;IACD,IAAI,YAAY,CAAC,MAAM,IAAI,aAAa;QACvC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAA;SACrH,IAAI,YAAY,CAAC,MAAM,IAAI,MAAM;QACrC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAA;AAC/G,CAAC,CAAC,CAAA"}
|
|
@@ -2,7 +2,7 @@ export declare const requireAuthUser: {
|
|
|
2
2
|
cb: import("../types").RouteMiddlewareHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, string>, Record<string, any>, import("../types").HeadersType, import("../types").HeadersType, import("../types").SupportedStatusCodes>>;
|
|
3
3
|
onSetup?: import("../types").HandlerSetup | undefined;
|
|
4
4
|
};
|
|
5
|
-
export declare const
|
|
5
|
+
export declare const requireAuthorizationUser: {
|
|
6
6
|
cb: import("../types").RouteMiddlewareHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, string>, Record<string, any>, import("../types").HeadersType, import("../types").HeadersType, import("../types").SupportedStatusCodes>>;
|
|
7
7
|
onSetup?: import("../types").HandlerSetup | undefined;
|
|
8
8
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.requireRefreshTokenUser = exports.requireApiKeyUser = exports.
|
|
3
|
+
exports.requireRefreshTokenUser = exports.requireApiKeyUser = exports.requireAuthorizationUser = exports.requireAuthUser = void 0;
|
|
4
4
|
const errors_1 = require("../../errors");
|
|
5
5
|
const instance_1 = require("../../instance");
|
|
6
6
|
const types_1 = require("../types");
|
|
@@ -14,11 +14,11 @@ exports.requireAuthUser = (0, types_1.makeMiddleware)(async (request) => {
|
|
|
14
14
|
throw new errors_1.NotAuthenticatedError();
|
|
15
15
|
}, (route) => {
|
|
16
16
|
route.security ??= [];
|
|
17
|
-
route.security.push({
|
|
17
|
+
route.security.push({ Authorization: [] }, { ApiKey: [] });
|
|
18
18
|
route.descriptions ??= [];
|
|
19
19
|
route.descriptions.push('Requires a valid means of authentication.');
|
|
20
20
|
});
|
|
21
|
-
exports.
|
|
21
|
+
exports.requireAuthorizationUser = (0, types_1.makeMiddleware)(async (request) => {
|
|
22
22
|
if (request.users.access.error)
|
|
23
23
|
throw request.users.access.error;
|
|
24
24
|
request.authUser = request.users.access.value;
|
|
@@ -26,9 +26,9 @@ exports.requireAccessTokenUser = (0, types_1.makeMiddleware)(async (request) =>
|
|
|
26
26
|
throw new errors_1.NotAuthenticatedError();
|
|
27
27
|
}, (route) => {
|
|
28
28
|
route.security ??= [];
|
|
29
|
-
route.security.push({
|
|
29
|
+
route.security.push({ Authorization: [] });
|
|
30
30
|
route.descriptions ??= [];
|
|
31
|
-
route.descriptions.push('Requires a valid
|
|
31
|
+
route.descriptions.push('Requires a valid authorization header.');
|
|
32
32
|
});
|
|
33
33
|
exports.requireApiKeyUser = (0, types_1.makeMiddleware)(async (request) => {
|
|
34
34
|
if (request.users.apiKey.error)
|
|
@@ -40,14 +40,14 @@ exports.requireApiKeyUser = (0, types_1.makeMiddleware)(async (request) => {
|
|
|
40
40
|
route.security ??= [];
|
|
41
41
|
route.security.push({ ApiKey: [] });
|
|
42
42
|
route.descriptions ??= [];
|
|
43
|
-
route.descriptions.push('Requires a valid
|
|
43
|
+
route.descriptions.push('Requires a valid x-api-key header.');
|
|
44
44
|
});
|
|
45
45
|
exports.requireRefreshTokenUser = (0, types_1.makeMiddleware)(async (request) => {
|
|
46
46
|
if (request.users.refresh.error)
|
|
47
47
|
throw request.users.refresh.error;
|
|
48
48
|
const refreshToken = request.headers.RefreshToken;
|
|
49
49
|
if (!refreshToken)
|
|
50
|
-
throw new errors_1.NotAuthorizedError('
|
|
50
|
+
throw new errors_1.NotAuthorizedError('x-refresh-token header missing');
|
|
51
51
|
request.users.refresh.value = await instance_1.Instance.get().settings.requestsAuth.tokens?.verifyRefreshToken(refreshToken);
|
|
52
52
|
if (!request.users.refresh.value)
|
|
53
53
|
throw new errors_1.NotAuthorizedError();
|
|
@@ -55,6 +55,6 @@ exports.requireRefreshTokenUser = (0, types_1.makeMiddleware)(async (request) =>
|
|
|
55
55
|
route.security ??= [];
|
|
56
56
|
route.security.push({ RefreshToken: [] });
|
|
57
57
|
route.descriptions ??= [];
|
|
58
|
-
route.descriptions.push('Requires a valid
|
|
58
|
+
route.descriptions.push('Requires a valid x-refresh-token header.');
|
|
59
59
|
});
|
|
60
60
|
//# sourceMappingURL=requireAuthUser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requireAuthUser.js","sourceRoot":"","sources":["../../../src/server/middlewares/requireAuthUser.ts"],"names":[],"mappings":";;;AAAA,yCAAwE;AACxE,6CAAyC;AACzC,oCAAyC;AAE5B,QAAA,eAAe,GAAG,IAAA,sBAAc,EAC5C,KAAK,EAAE,OAAO,EAAE,EAAE;IACjB,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAA;IACrE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAA;IACtE,IAAI,CAAC,IAAI,IAAI,KAAK;QAAE,MAAM,KAAK,CAAA;IAC/B,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAA;IACvB,IAAI,CAAC,OAAO,CAAC,QAAQ;QAAE,MAAM,IAAI,8BAAqB,EAAE,CAAA;AACzD,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;IACT,KAAK,CAAC,QAAQ,KAAK,EAAE,CAAA;IACrB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"requireAuthUser.js","sourceRoot":"","sources":["../../../src/server/middlewares/requireAuthUser.ts"],"names":[],"mappings":"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"}
|
package/lib/server/requests.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import type { AuthUser, RefreshUser } from '../requests-auth';
|
|
|
4
4
|
import type { StorageFile } from '../storage';
|
|
5
5
|
import type { DistributiveOmit, IsInTypeList } from '../types';
|
|
6
6
|
import type { Api, FileSchema, GetApiPart, HeadersType, SupportedStatusCodes } from './types';
|
|
7
|
-
type HeaderKeys = '
|
|
7
|
+
type HeaderKeys = 'Authorization' | 'RefreshToken' | 'ApiKey' | 'Referer' | 'ContentType' | 'UserAgent';
|
|
8
8
|
type IsFileOrFileArray<T> = T extends FileSchema ? StorageFile[] : T extends FileSchema[] ? StorageFile[] : T;
|
|
9
9
|
type ApiToBody<Def extends Api> = MappedUnion<Def['body']>;
|
|
10
10
|
type UnionMapper<T> = {
|
package/lib/server/types.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ export declare const StatusCodes: {
|
|
|
20
20
|
readonly NotFound: 404;
|
|
21
21
|
readonly ValidationError: 422;
|
|
22
22
|
readonly TooManyRequests: 429;
|
|
23
|
-
readonly
|
|
23
|
+
readonly AuthorizationExpired: 461;
|
|
24
24
|
};
|
|
25
25
|
export type SupportedStatusCodes = Enum<typeof StatusCodes>;
|
|
26
26
|
export type GoodStatusCodes = 200 | 302;
|
package/lib/server/types.js
CHANGED
package/lib/server/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/server/types.ts"],"names":[],"mappings":";;;AAOa,QAAA,OAAO,GAAG;IACtB,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;CACP,CAAA;AAIG,QAAA,WAAW,GAAG;IAC1B,EAAE,EAAE,GAAG;IACP,KAAK,EAAE,GAAG;IACV,UAAU,EAAE,GAAG;IACf,gBAAgB,EAAE,GAAG;IACrB,aAAa,EAAE,GAAG;IAClB,QAAQ,EAAE,GAAG;IACb,eAAe,EAAE,GAAG;IACpB,eAAe,EAAE,GAAG;IACpB,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/server/types.ts"],"names":[],"mappings":";;;AAOa,QAAA,OAAO,GAAG;IACtB,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;CACP,CAAA;AAIG,QAAA,WAAW,GAAG;IAC1B,EAAE,EAAE,GAAG;IACP,KAAK,EAAE,GAAG;IACV,UAAU,EAAE,GAAG;IACf,gBAAgB,EAAE,GAAG;IACrB,aAAa,EAAE,GAAG;IAClB,QAAQ,EAAE,GAAG;IACb,eAAe,EAAE,GAAG;IACpB,eAAe,EAAE,GAAG;IACpB,oBAAoB,EAAE,GAAG;CAChB,CAAA;AAsGV,MAAM,iBAAiB;IACtB,YACQ,EAAM,EACN,OAAsB;QADtB,OAAE,GAAF,EAAE,CAAI;QACN,YAAO,GAAP,OAAO,CAAe;IAC3B,CAAC;IAEJ,MAAM,CAAC,IAAI,CAAsB,EAAM,EAAE,OAAsB;QAC9D,OAAO,IAAI,iBAAiB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC;CACD;AAEM,MAAM,cAAc,GAAG,CAAwB,GAAG,IAA4E,EAAE,EAAE,CACxI,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;AADnB,QAAA,cAAc,kBACK;AACzB,MAAM,mBAAmB,GAAG,CAAwB,GAAG,IAAkE,EAAE,EAAE,CACnI,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;AADnB,QAAA,mBAAmB,uBACA"}
|
package/package.json
CHANGED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AccessTokenExpired = void 0;
|
|
4
|
-
const server_1 = require("../../server");
|
|
5
|
-
const customError_1 = require("../customError");
|
|
6
|
-
class AccessTokenExpired extends customError_1.CustomError {
|
|
7
|
-
constructor(message = 'Access token expired') {
|
|
8
|
-
super(message, [{ message }]);
|
|
9
|
-
this.statusCode = server_1.StatusCodes.AccessTokenExpired;
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
exports.AccessTokenExpired = AccessTokenExpired;
|
|
13
|
-
//# sourceMappingURL=accessTokenExpired.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"accessTokenExpired.js","sourceRoot":"","sources":["../../../src/errors/types/accessTokenExpired.ts"],"names":[],"mappings":";;;AAAA,yCAA0C;AAC1C,gDAA4C;AAE5C,MAAa,kBAAmB,SAAQ,yBAAW;IAGlD,YAAY,OAAO,GAAG,sBAAsB;QAC3C,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAH9B,eAAU,GAAG,oBAAW,CAAC,kBAAkB,CAAA;IAI3C,CAAC;CACD;AAND,gDAMC"}
|