@forestadmin/agent 1.35.10 → 1.35.12
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.
|
@@ -4,11 +4,11 @@ import { RouteType } from '../../types';
|
|
|
4
4
|
import BaseRoute from '../base-route';
|
|
5
5
|
export default class Authentication extends BaseRoute {
|
|
6
6
|
readonly type = RouteType.Authentication;
|
|
7
|
-
private client;
|
|
8
7
|
bootstrap(): Promise<void>;
|
|
9
8
|
setupRoutes(router: Router): void;
|
|
10
9
|
private handleAuthentication;
|
|
11
10
|
private handleAuthenticationCallback;
|
|
12
11
|
private static checkRenderingId;
|
|
12
|
+
private handleError;
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=authentication.d.ts.map
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
|
|
7
|
+
const forestadmin_client_1 = require("@forestadmin/forestadmin-client");
|
|
7
8
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
8
9
|
const koa_jwt_1 = __importDefault(require("koa-jwt"));
|
|
9
10
|
const types_1 = require("../../types");
|
|
@@ -14,11 +15,11 @@ class Authentication extends base_route_1.default {
|
|
|
14
15
|
this.type = types_1.RouteType.Authentication;
|
|
15
16
|
}
|
|
16
17
|
async bootstrap() {
|
|
17
|
-
|
|
18
|
+
await this.options.forestAdminClient.authService.init();
|
|
18
19
|
}
|
|
19
20
|
setupRoutes(router) {
|
|
20
21
|
router.post('/authentication', this.handleAuthentication.bind(this));
|
|
21
|
-
router.get('/authentication/callback', this.handleAuthenticationCallback.bind(this));
|
|
22
|
+
router.get('/authentication/callback', this.handleError.bind(this), this.handleAuthenticationCallback.bind(this));
|
|
22
23
|
router.use((0, koa_jwt_1.default)({ secret: this.options.authSecret, cookie: 'forest_session_token' }));
|
|
23
24
|
}
|
|
24
25
|
async handleAuthentication(context) {
|
|
@@ -26,7 +27,7 @@ class Authentication extends base_route_1.default {
|
|
|
26
27
|
const body = context.request.body;
|
|
27
28
|
const renderingId = Number(body?.renderingId);
|
|
28
29
|
Authentication.checkRenderingId(renderingId);
|
|
29
|
-
const authorizationUrl = this.
|
|
30
|
+
const authorizationUrl = await this.options.forestAdminClient.authService.generateAuthorizationUrl({
|
|
30
31
|
scope: 'openid email profile',
|
|
31
32
|
state: JSON.stringify({ renderingId }),
|
|
32
33
|
});
|
|
@@ -45,9 +46,12 @@ class Authentication extends base_route_1.default {
|
|
|
45
46
|
throw new datasource_toolkit_1.ValidationError('Failed to retrieve renderingId from query[state]');
|
|
46
47
|
}
|
|
47
48
|
// Retrieve user
|
|
48
|
-
const tokenSet = await this.
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
const tokenSet = await this.options.forestAdminClient.authService.generateTokens({
|
|
50
|
+
query,
|
|
51
|
+
state,
|
|
52
|
+
});
|
|
53
|
+
const { accessToken } = tokenSet;
|
|
54
|
+
const user = await this.options.forestAdminClient.authService.getUserInfo(renderingId, accessToken);
|
|
51
55
|
// Generate final token.
|
|
52
56
|
const token = jsonwebtoken_1.default.sign(user, this.options.authSecret, { expiresIn: '1 hours' });
|
|
53
57
|
context.response.body = { token, tokenData: jsonwebtoken_1.default.decode(token) };
|
|
@@ -57,6 +61,23 @@ class Authentication extends base_route_1.default {
|
|
|
57
61
|
throw new datasource_toolkit_1.ValidationError('Rendering id must be a number');
|
|
58
62
|
}
|
|
59
63
|
}
|
|
64
|
+
async handleError(context, next) {
|
|
65
|
+
try {
|
|
66
|
+
await next();
|
|
67
|
+
}
|
|
68
|
+
catch (e) {
|
|
69
|
+
if (e instanceof forestadmin_client_1.AuthenticationError) {
|
|
70
|
+
context.response.status = 401;
|
|
71
|
+
context.response.body = {
|
|
72
|
+
error: e.code,
|
|
73
|
+
error_description: e.description,
|
|
74
|
+
state: e.state,
|
|
75
|
+
};
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
throw e;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
60
81
|
}
|
|
61
82
|
exports.default = Authentication;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aGVudGljYXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGVzL3NlY3VyaXR5L2F1dGhlbnRpY2F0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0VBQWtFO0FBQ2xFLHdFQUFzRTtBQUV0RSxnRUFBd0M7QUFFeEMsc0RBQTBCO0FBRTFCLHVDQUF3QztBQUN4QywrREFBc0M7QUFFdEMsTUFBcUIsY0FBZSxTQUFRLG9CQUFTO0lBQXJEOztRQUNXLFNBQUksR0FBRyxpQkFBUyxDQUFDLGNBQWMsQ0FBQztJQXNGM0MsQ0FBQztJQXBGVSxLQUFLLENBQUMsU0FBUztRQUN0QixNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzFELENBQUM7SUFFRCxXQUFXLENBQUMsTUFBYztRQUN4QixNQUFNLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNyRSxNQUFNLENBQUMsR0FBRyxDQUNSLDBCQUEwQixFQUMxQixJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFDM0IsSUFBSSxDQUFDLDRCQUE0QixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FDN0MsQ0FBQztRQUVGLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBQSxpQkFBRyxFQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxzQkFBc0IsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN2RixDQUFDO0lBRU8sS0FBSyxDQUFDLG9CQUFvQixDQUFDLE9BQWdCO1FBQ2pELDhEQUE4RDtRQUM5RCxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQVcsQ0FBQztRQUN6QyxNQUFNLFdBQVcs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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/agent",
|
|
3
|
-
"version": "1.35.
|
|
3
|
+
"version": "1.35.12",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"@fastify/express": "^1.1.0",
|
|
17
17
|
"@forestadmin/datasource-customizer": "1.36.1",
|
|
18
18
|
"@forestadmin/datasource-toolkit": "1.29.0",
|
|
19
|
-
"@forestadmin/forestadmin-client": "1.24.
|
|
19
|
+
"@forestadmin/forestadmin-client": "1.24.4",
|
|
20
20
|
"@koa/cors": "^4.0.0",
|
|
21
21
|
"@koa/router": "^12.0.0",
|
|
22
22
|
"forest-ip-utils": "^1.0.1",
|