@forestadmin/forest-cloud 1.1.3 → 1.1.5
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/commands/login.js
CHANGED
|
@@ -18,8 +18,9 @@ exports.default = (program, context) => {
|
|
|
18
18
|
spinner.start('Logging in');
|
|
19
19
|
const vars = await getEnvironmentVariables();
|
|
20
20
|
(0, environment_variables_1.validateServerUrl)(vars.FOREST_SERVER_URL);
|
|
21
|
+
spinner.stop();
|
|
21
22
|
await login(logger);
|
|
22
23
|
spinner.succeed('You are now logged in');
|
|
23
24
|
}));
|
|
24
25
|
};
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvbG9naW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSw2RUFBb0Q7QUFDcEQsMkZBQWlFO0FBQ2pFLDZFQUFzRTtBQUN0RSwwRUFBaUQ7QUFHakQsa0JBQWUsQ0FBQyxPQUFnQixFQUFFLE9BQXFCLEVBQUUsRUFBRTtJQUN6RCxNQUFNLEVBQUUsTUFBTSxFQUFFLGlCQUFpQixFQUFFLHVCQUF1QixFQUFFLEtBQUssRUFBRSxHQUFHLE9BQU8sQ0FBQztJQUM5RSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsTUFBTSxDQUFDO0lBQzNCLE9BQU87U0FDSixPQUFPLENBQUMsT0FBTyxDQUFDO1NBQ2hCLFdBQVcsQ0FBQyx1QkFBdUIsQ0FBQztTQUNwQyxNQUFNLENBQ0wsSUFBQSx1QkFBWSxFQUFDLE9BQU8sRUFBRSxLQUFLLElBQUksRUFBRTtRQUMvQixNQUFNLElBQUEsOEJBQWtCLEVBQUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLEVBQUUscUJBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1FBRXBGLE9BQU8sQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDNUIsTUFBTSxJQUFJLEdBQUcsTUFBTSx1QkFBdUIsRUFBRSxDQUFDO1FBQzdDLElBQUEseUNBQWlCLEVBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7UUFDMUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2YsTUFBTSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBQzNDLENBQUMsQ0FBQyxDQUNILENBQUM7QUFDTixDQUFDLENBQUMifQ==
|
package/dist/login.d.ts
CHANGED
package/dist/login.js
CHANGED
|
@@ -1,19 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const child_process_1 = require("child_process");
|
|
4
|
-
async function login(
|
|
5
|
-
spinner.stop();
|
|
4
|
+
async function login(logger) {
|
|
6
5
|
return new Promise((resolve, reject) => {
|
|
6
|
+
let hasLoginSuccess = false;
|
|
7
7
|
const pathForest = require.resolve('forest-cli/bin/run');
|
|
8
8
|
const process = (0, child_process_1.exec)(`node ${pathForest} login`);
|
|
9
|
-
process.
|
|
10
|
-
process.
|
|
9
|
+
process.stderr.on('data', logger.error);
|
|
10
|
+
process.stdout.on('data', data => {
|
|
11
|
+
if (data.includes('Login successful'))
|
|
12
|
+
hasLoginSuccess = true;
|
|
13
|
+
logger.log(data);
|
|
14
|
+
});
|
|
11
15
|
process.on('close', () => {
|
|
12
|
-
|
|
16
|
+
if (!hasLoginSuccess)
|
|
17
|
+
return reject(new Error('Login failed'));
|
|
13
18
|
resolve();
|
|
14
19
|
});
|
|
15
|
-
process.on('error', reject);
|
|
16
20
|
});
|
|
17
21
|
}
|
|
18
22
|
exports.default = login;
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbG9naW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBcUM7QUFJdEIsS0FBSyxVQUFVLEtBQUssQ0FBQyxNQUFjO0lBQ2hELE9BQU8sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDM0MsSUFBSSxlQUFlLEdBQUcsS0FBSyxDQUFDO1FBQzVCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUN6RCxNQUFNLE9BQU8sR0FBRyxJQUFBLG9CQUFJLEVBQUMsUUFBUSxVQUFVLFFBQVEsQ0FBQyxDQUFDO1FBQ2pELE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFeEMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQy9CLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQztnQkFBRSxlQUFlLEdBQUcsSUFBSSxDQUFDO1lBQzlELE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7UUFFSCxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUU7WUFDdkIsSUFBSSxDQUFDLGVBQWU7Z0JBQUUsT0FBTyxNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUMvRCxPQUFPLEVBQUUsQ0FBQztRQUNaLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBakJELHdCQWlCQyJ9
|
|
@@ -3,6 +3,7 @@ export declare const defaultEnvs: Readonly<{
|
|
|
3
3
|
FOREST_SERVER_URL: "https://api.forestadmin.com";
|
|
4
4
|
FOREST_SUBSCRIPTION_URL: "wss://api.forestadmin.com/subscriptions";
|
|
5
5
|
NODE_TLS_REJECT_UNAUTHORIZED: "1";
|
|
6
|
+
TOKEN_PATH: string;
|
|
6
7
|
}>;
|
|
7
8
|
export declare function getEnvironmentVariables(): Promise<EnvironmentVariables>;
|
|
8
9
|
export declare function validateServerUrl(serverUrl: string): void;
|
|
@@ -32,8 +32,7 @@ const promises_1 = require("node:fs/promises");
|
|
|
32
32
|
const node_os_1 = require("node:os");
|
|
33
33
|
const path_1 = __importDefault(require("path"));
|
|
34
34
|
const errors_1 = require("../errors");
|
|
35
|
-
const getTokenFromToolbelt = async () => {
|
|
36
|
-
const baseTokenPath = process.env.TOKEN_PATH || (0, node_os_1.homedir)();
|
|
35
|
+
const getTokenFromToolbelt = async (baseTokenPath) => {
|
|
37
36
|
const tokenPath = path_1.default.join(baseTokenPath, '.forest.d', '.forestrc');
|
|
38
37
|
if (fs.existsSync(tokenPath))
|
|
39
38
|
return (0, promises_1.readFile)(tokenPath, 'utf8');
|
|
@@ -43,13 +42,16 @@ exports.defaultEnvs = Object.freeze({
|
|
|
43
42
|
FOREST_SERVER_URL: 'https://api.forestadmin.com',
|
|
44
43
|
FOREST_SUBSCRIPTION_URL: 'wss://api.forestadmin.com/subscriptions',
|
|
45
44
|
NODE_TLS_REJECT_UNAUTHORIZED: '1',
|
|
45
|
+
TOKEN_PATH: (0, node_os_1.homedir)(),
|
|
46
46
|
});
|
|
47
47
|
async function getEnvironmentVariables() {
|
|
48
|
+
const tokenPath = process.env.TOKEN_PATH || exports.defaultEnvs.TOKEN_PATH;
|
|
48
49
|
return {
|
|
49
50
|
FOREST_ENV_SECRET: process.env.FOREST_ENV_SECRET,
|
|
51
|
+
TOKEN_PATH: tokenPath,
|
|
50
52
|
FOREST_SERVER_URL: process.env.FOREST_SERVER_URL || exports.defaultEnvs.FOREST_SERVER_URL,
|
|
51
53
|
FOREST_SUBSCRIPTION_URL: process.env.FOREST_SUBSCRIPTION_URL || exports.defaultEnvs.FOREST_SUBSCRIPTION_URL,
|
|
52
|
-
FOREST_AUTH_TOKEN: process.env.FOREST_AUTH_TOKEN || (await getTokenFromToolbelt()),
|
|
54
|
+
FOREST_AUTH_TOKEN: process.env.FOREST_AUTH_TOKEN || (await getTokenFromToolbelt(tokenPath)),
|
|
53
55
|
NODE_TLS_REJECT_UNAUTHORIZED: process.env.NODE_TLS_REJECT_UNAUTHORIZED || exports.defaultEnvs.NODE_TLS_REJECT_UNAUTHORIZED,
|
|
54
56
|
};
|
|
55
57
|
}
|
|
@@ -95,4 +97,4 @@ function validateEnvironmentVariables(env) {
|
|
|
95
97
|
validateSubscriptionUrl(env.FOREST_SUBSCRIPTION_URL);
|
|
96
98
|
}
|
|
97
99
|
exports.validateEnvironmentVariables = validateEnvironmentVariables;
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52aXJvbm1lbnQtdmFyaWFibGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL2Vudmlyb25tZW50LXZhcmlhYmxlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHVDQUF5QjtBQUN6QiwrQ0FBNEM7QUFDNUMscUNBQWtDO0FBQ2xDLGdEQUF3QjtBQUV4QixzQ0FBMEM7QUFHMUMsTUFBTSxvQkFBb0IsR0FBRyxLQUFLLEVBQUUsYUFBcUIsRUFBMEIsRUFBRTtJQUNuRixNQUFNLFNBQVMsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRSxXQUFXLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFFckUsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztRQUFFLE9BQU8sSUFBQSxtQkFBUSxFQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUVqRSxPQUFPLElBQUksQ0FBQztBQUNkLENBQUMsQ0FBQztBQUVXLFFBQUEsV0FBVyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDdkMsaUJBQWlCLEVBQUUsNkJBQTZCO0lBQ2hELHVCQUF1QixFQUFFLHlDQUF5QztJQUNsRSw0QkFBNEIsRUFBRSxHQUFHO0lBQ2pDLFVBQVUsRUFBRSxJQUFBLGlCQUFPLEdBQUU7Q0FDdEIsQ0FBQyxDQUFDO0FBRUksS0FBSyxVQUFVLHVCQUF1QjtJQUMzQyxNQUFNLFNBQVMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsSUFBSSxtQkFBVyxDQUFDLFVBQVUsQ0FBQztJQUVuRSxPQUFPO1FBQ0wsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUI7UUFDaEQsVUFBVSxFQUFFLFNBQVM7UUFDckIsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsSUFBSSxtQkFBVyxDQUFDLGlCQUFpQjtRQUNqRix1QkFB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
|
package/dist/shared.js
CHANGED
|
@@ -10,6 +10,8 @@ const loginIfMissingAuthAndReturnEnvironmentVariables = async (login, logger, ge
|
|
|
10
10
|
const vars = await getEnvironmentVariables();
|
|
11
11
|
if (vars.FOREST_AUTH_TOKEN)
|
|
12
12
|
return vars;
|
|
13
|
+
// we want to show the spinner only if we need to login
|
|
14
|
+
logger.spinner.stop();
|
|
13
15
|
await login(logger);
|
|
14
16
|
return getEnvironmentVariables();
|
|
15
17
|
};
|
|
@@ -20,4 +22,4 @@ const askToOverwriteCustomizationsOrAbortCommand = async (logger, httpServer) =>
|
|
|
20
22
|
}
|
|
21
23
|
};
|
|
22
24
|
exports.askToOverwriteCustomizationsOrAbortCommand = askToOverwriteCustomizationsOrAbortCommand;
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NoYXJlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxnSEFBcUY7QUFDckYscUNBQXlDO0FBSWxDLE1BQU0sK0NBQStDLEdBQUcsS0FBSyxFQUNsRSxLQUFZLEVBQ1osTUFBYyxFQUNkLHVCQUE0RCxFQUM3QixFQUFFO0lBQ2pDLE1BQU0sSUFBSSxHQUFHLE1BQU0sdUJBQXVCLEVBQUUsQ0FBQztJQUM3QyxJQUFJLElBQUksQ0FBQyxpQkFBaUI7UUFBRSxPQUFPLElBQUksQ0FBQztJQUV4Qyx1REFBdUQ7SUFDdkQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUN0QixNQUFNLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUVwQixPQUFPLHVCQUF1QixFQUFFLENBQUM7QUFDbkMsQ0FBQyxDQUFDO0FBYlcsUUFBQSwrQ0FBK0MsbURBYTFEO0FBRUssTUFBTSwwQ0FBMEMsR0FBRyxLQUFLLEVBQzdELE1BQWMsRUFDZCxVQUFzQixFQUNQLEVBQUU7SUFDakIsSUFDRSxDQUFDLENBQUMsTUFBTSxJQUFBLHlDQUE0QixFQUNsQyxNQUFNLENBQUMsT0FBTyxFQUNkLFVBQVUsQ0FBQywyQkFBMkIsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQ3hELENBQUMsRUFDRjtRQUNBLE1BQU0sSUFBSSxzQkFBYSxDQUFDLG1CQUFtQixDQUFDLENBQUM7S0FDOUM7QUFDSCxDQUFDLENBQUM7QUFaVyxRQUFBLDBDQUEwQyw4Q0FZckQifQ==
|
package/dist/types.d.ts
CHANGED
|
@@ -53,6 +53,7 @@ export type Agent<S extends TSchema = TSchema> = {
|
|
|
53
53
|
use<Options>(plugin: Plugin<Options>, options?: Options): Agent<S>;
|
|
54
54
|
};
|
|
55
55
|
export type EnvironmentVariables = {
|
|
56
|
+
TOKEN_PATH: string;
|
|
56
57
|
FOREST_ENV_SECRET: string;
|
|
57
58
|
FOREST_SERVER_URL: string;
|
|
58
59
|
FOREST_SUBSCRIPTION_URL: string;
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/forest-cloud",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.5",
|
|
4
4
|
"description": "Utility to bootstrap and publish forest admin cloud projects customization",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@forestadmin/agent": "1.38.
|
|
7
|
-
"@forestadmin/datasource-customizer": "1.43.
|
|
8
|
-
"@forestadmin/datasource-sql": "1.9.
|
|
6
|
+
"@forestadmin/agent": "1.38.2",
|
|
7
|
+
"@forestadmin/datasource-customizer": "1.43.2",
|
|
8
|
+
"@forestadmin/datasource-sql": "1.9.2",
|
|
9
9
|
"adm-zip": "^0.5.10",
|
|
10
10
|
"apollo-cache-inmemory": "^1.6.6",
|
|
11
11
|
"apollo-client": "^2.6.10",
|