@aeriajs/server 0.0.247 → 0.0.248
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/constants.d.ts +1 -0
- package/dist/constants.js +1 -0
- package/dist/constants.mjs +2 -1
- package/dist/handler.js +1 -0
- package/dist/handler.mjs +2 -0
- package/dist/init.d.ts +4 -0
- package/dist/init.js +18 -0
- package/dist/init.mjs +19 -1
- package/package.json +9 -9
package/dist/constants.d.ts
CHANGED
package/dist/constants.js
CHANGED
package/dist/constants.mjs
CHANGED
package/dist/handler.js
CHANGED
|
@@ -12,6 +12,7 @@ const getACErrorHttpCode = (code) => {
|
|
|
12
12
|
case types_1.ACError.FunctionNotFound: return types_1.HTTPStatus.NotFound;
|
|
13
13
|
case types_1.ACError.FunctionNotExposed: return types_1.HTTPStatus.Forbidden;
|
|
14
14
|
case types_1.ACError.AuthorizationError: return types_1.HTTPStatus.Unauthorized;
|
|
15
|
+
case types_1.ACError.InvalidToken: return types_1.HTTPStatus.Unauthorized;
|
|
15
16
|
case types_1.ACError.AuthenticationError: return types_1.HTTPStatus.Forbidden;
|
|
16
17
|
default: return types_1.HTTPStatus.InternalServerError;
|
|
17
18
|
}
|
package/dist/handler.mjs
CHANGED
|
@@ -13,6 +13,8 @@ const getACErrorHttpCode = (code) => {
|
|
|
13
13
|
return HTTPStatus.Forbidden;
|
|
14
14
|
case ACError.AuthorizationError:
|
|
15
15
|
return HTTPStatus.Unauthorized;
|
|
16
|
+
case ACError.InvalidToken:
|
|
17
|
+
return HTTPStatus.Unauthorized;
|
|
16
18
|
case ACError.AuthenticationError:
|
|
17
19
|
return HTTPStatus.Forbidden;
|
|
18
20
|
default:
|
package/dist/init.d.ts
CHANGED
|
@@ -15,6 +15,10 @@ export type InitOptions = {
|
|
|
15
15
|
}>;
|
|
16
16
|
};
|
|
17
17
|
export declare const getToken: (request: GenericRequest, context: RouteContext) => Promise<{
|
|
18
|
+
readonly _tag: "Error";
|
|
19
|
+
readonly error: "INVALID_TOKEN";
|
|
20
|
+
readonly result: undefined;
|
|
21
|
+
} | {
|
|
18
22
|
readonly _tag: "Result";
|
|
19
23
|
readonly error: undefined;
|
|
20
24
|
readonly result: import("@aeriajs/types").UnauthenticatedToken | AuthenticatedToken<true, import("@aeriajs/types").UserRole>;
|
package/dist/init.js
CHANGED
|
@@ -30,6 +30,24 @@ const getToken = async (request, context) => {
|
|
|
30
30
|
Object.assign(decodedToken.userinfo, (0, common_1.throwIfError)(await (0, core_1.traverseDocument)(decodedToken.userinfo, context.collections.user.description, {
|
|
31
31
|
autoCast: true,
|
|
32
32
|
})));
|
|
33
|
+
if (context.config.security.revalidateToken) {
|
|
34
|
+
const userCollection = (0, core_1.getDatabaseCollection)('user');
|
|
35
|
+
const user = await userCollection.findOne({
|
|
36
|
+
_id: decodedToken.sub,
|
|
37
|
+
active: true,
|
|
38
|
+
}, {
|
|
39
|
+
projection: {
|
|
40
|
+
roles: 1,
|
|
41
|
+
},
|
|
42
|
+
});
|
|
43
|
+
if (!user) {
|
|
44
|
+
return types_1.Result.error(types_1.ACError.InvalidToken);
|
|
45
|
+
}
|
|
46
|
+
const rolesMatch = decodedToken.roles.every((role) => user.roles.includes(role));
|
|
47
|
+
if (!rolesMatch) {
|
|
48
|
+
return types_1.Result.error(types_1.ACError.InvalidToken);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
33
51
|
}
|
|
34
52
|
}
|
|
35
53
|
return types_1.Result.result(decodedToken);
|
package/dist/init.mjs
CHANGED
|
@@ -3,7 +3,7 @@ import { Result, ACError, HTTPStatus } from "@aeriajs/types";
|
|
|
3
3
|
import { endpointError, throwIfError, deepMerge } from "@aeriajs/common";
|
|
4
4
|
import { cors, wrapRouteExecution } from "@aeriajs/http";
|
|
5
5
|
import { registerServer } from "@aeriajs/node-http";
|
|
6
|
-
import { createContext, getDatabase, decodeToken, traverseDocument, ObjectId } from "@aeriajs/core";
|
|
6
|
+
import { createContext, getDatabase, getDatabaseCollection, decodeToken, traverseDocument, ObjectId } from "@aeriajs/core";
|
|
7
7
|
import { DEFAULT_API_CONFIG } from "./constants.mjs";
|
|
8
8
|
import { warmup } from "./warmup.mjs";
|
|
9
9
|
import { registerRoutes } from "./routes.mjs";
|
|
@@ -26,6 +26,24 @@ export const getToken = async (request, context) => {
|
|
|
26
26
|
Object.assign(decodedToken.userinfo, throwIfError(await traverseDocument(decodedToken.userinfo, context.collections.user.description, {
|
|
27
27
|
autoCast: true
|
|
28
28
|
})));
|
|
29
|
+
if (context.config.security.revalidateToken) {
|
|
30
|
+
const userCollection = getDatabaseCollection("user");
|
|
31
|
+
const user = await userCollection.findOne({
|
|
32
|
+
_id: decodedToken.sub,
|
|
33
|
+
active: true
|
|
34
|
+
}, {
|
|
35
|
+
projection: {
|
|
36
|
+
roles: 1
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
if (!user) {
|
|
40
|
+
return Result.error(ACError.InvalidToken);
|
|
41
|
+
}
|
|
42
|
+
const rolesMatch = decodedToken.roles.every((role) => user.roles.includes(role));
|
|
43
|
+
if (!rolesMatch) {
|
|
44
|
+
return Result.error(ACError.InvalidToken);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
29
47
|
}
|
|
30
48
|
}
|
|
31
49
|
return Result.result(decodedToken);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aeriajs/server",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.248",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.mjs",
|
|
@@ -33,14 +33,14 @@
|
|
|
33
33
|
"mongodb": "^6.5.0"
|
|
34
34
|
},
|
|
35
35
|
"peerDependencies": {
|
|
36
|
-
"@aeriajs/core": "^0.0.
|
|
37
|
-
"@aeriajs/builtins": "^0.0.
|
|
38
|
-
"@aeriajs/common": "^0.0.
|
|
39
|
-
"@aeriajs/entrypoint": "^0.0.
|
|
40
|
-
"@aeriajs/http": "^0.0.
|
|
41
|
-
"@aeriajs/node-http": "^0.0.
|
|
42
|
-
"@aeriajs/server": "^0.0.
|
|
43
|
-
"@aeriajs/types": "^0.0.
|
|
36
|
+
"@aeriajs/core": "^0.0.246",
|
|
37
|
+
"@aeriajs/builtins": "^0.0.246",
|
|
38
|
+
"@aeriajs/common": "^0.0.137",
|
|
39
|
+
"@aeriajs/entrypoint": "^0.0.141",
|
|
40
|
+
"@aeriajs/http": "^0.0.165",
|
|
41
|
+
"@aeriajs/node-http": "^0.0.165",
|
|
42
|
+
"@aeriajs/server": "^0.0.248",
|
|
43
|
+
"@aeriajs/types": "^0.0.119",
|
|
44
44
|
"mongodb": "^6.5.0"
|
|
45
45
|
},
|
|
46
46
|
"scripts": {
|