@signageos/cli 2.3.1 → 2.4.0
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/README.md +54 -19
- package/dist/Applet/Build/appletBuildCommand.js +28 -72
- package/dist/Applet/Generate/Templates/CHANGELOG.md.template +7 -0
- package/dist/Applet/Generate/Templates/README.md.template +3 -0
- package/dist/Applet/Generate/Templates/rspack.config.mjs.template +12 -12
- package/dist/Applet/Generate/appletGenerateCommand.d.ts +23 -62
- package/dist/Applet/Generate/appletGenerateCommand.js +432 -365
- package/dist/Applet/Start/appletStartCommand.js +70 -132
- package/dist/Applet/Test/Upload/appletTestRunCommand.js +90 -178
- package/dist/Applet/Test/Upload/appletTestRunFacade.js +5 -29
- package/dist/Applet/Test/Upload/appletTestUploadCommand.js +99 -224
- package/dist/Applet/Test/Upload/appletTestUploadFacade.js +51 -105
- package/dist/Applet/Test/appletTestCommand.js +6 -36
- package/dist/Applet/Upload/appletUploadCommand.js +199 -305
- package/dist/Applet/Upload/appletUploadCommandHelper.js +129 -144
- package/dist/Applet/Upload/appletUploadFacade.d.ts +2 -2
- package/dist/Applet/Upload/appletUploadFacade.js +184 -265
- package/dist/Applet/Upload/appletUploadFacadeHelper.js +51 -55
- package/dist/Applet/appletCommand.d.ts +25 -157
- package/dist/Applet/appletCommand.js +9 -39
- package/dist/Applet/appletErrors.js +5 -24
- package/dist/Applet/appletFacade.js +122 -147
- package/dist/Applet/appletServerHelper.js +18 -55
- package/dist/Auth/loginCommand.d.ts +2 -2
- package/dist/Auth/loginCommand.js +105 -136
- package/dist/Cache/tmpCache.js +47 -16
- package/dist/Cli/helper.js +3 -5
- package/dist/Cli/packageVersion.js +99 -131
- package/dist/Command/Autocomplete/Install/installAutocompleteCommand.d.ts +10 -0
- package/dist/Command/Autocomplete/Install/installAutocompleteCommand.js +39 -0
- package/dist/Command/Autocomplete/Install/installAutocompleteCommand.ts +30 -0
- package/dist/Command/Autocomplete/Install/sos-completion.sh +63 -0
- package/dist/Command/Autocomplete/Uninstall/uninstallAutocompleteCommand.d.ts +8 -0
- package/dist/Command/Autocomplete/Uninstall/uninstallAutocompleteCommand.js +120 -0
- package/dist/Command/Autocomplete/autocompleteCommand.d.ts +22 -0
- package/dist/Command/Autocomplete/autocompleteCommand.js +32 -0
- package/dist/Command/autoComplete.d.ts +4 -0
- package/dist/Command/autoComplete.js +184 -0
- package/dist/Command/commandDefinition.d.ts +9 -9
- package/dist/Command/commandDefinition.js +1 -3
- package/dist/Command/commandProcessor.js +41 -131
- package/dist/Command/globalArgs.js +9 -8
- package/dist/CommandLine/IProgressBar.js +0 -1
- package/dist/CommandLine/progressBarFactory.d.ts +1 -1
- package/dist/CommandLine/progressBarFactory.js +42 -13
- package/dist/CustomScript/Generate/customScriptGenerateCommand.js +17 -56
- package/dist/CustomScript/Generate/customScriptGenerateFacade.js +94 -109
- package/dist/CustomScript/Upload/customScriptUploadCommand.js +44 -120
- package/dist/CustomScript/customScriptCommand.d.ts +1 -9
- package/dist/CustomScript/customScriptCommand.js +6 -36
- package/dist/CustomScript/customScriptFacade.d.ts +2 -2
- package/dist/CustomScript/customScriptFacade.js +187 -297
- package/dist/Device/Connect/connectCommand.js +73 -137
- package/dist/Device/Content/setContentCommand.js +33 -78
- package/dist/Device/PowerAction/powerActionCommand.js +22 -65
- package/dist/Device/deviceCommand.js +7 -37
- package/dist/Device/deviceFacade.js +71 -127
- package/dist/Emulator/IEmulator.js +0 -1
- package/dist/Emulator/createDomain.d.ts +0 -1
- package/dist/Emulator/createDomain.js +44 -14
- package/dist/Emulator/emulatorFacade.js +75 -133
- package/dist/Emulator/emulatorFactory.js +123 -126
- package/dist/Firmware/Upload/firmwareUploadCommand.js +133 -221
- package/dist/Firmware/Upload/firmwareUploadFacade.js +75 -112
- package/dist/Firmware/Upload/firmwareUploadHelper.js +38 -6
- package/dist/Firmware/firmwareCommand.js +5 -35
- package/dist/Lib/archive.js +56 -62
- package/dist/Lib/childProcess.js +37 -5
- package/dist/Lib/fileSystem.js +76 -87
- package/dist/Lib/git.d.ts +1 -1
- package/dist/Lib/git.js +58 -87
- package/dist/Organization/Get/organizationGetCommand.js +14 -50
- package/dist/Organization/List/organizationListCommand.js +12 -46
- package/dist/Organization/SetDefault/organizationSetDefaultCommand.js +18 -56
- package/dist/Organization/organizationCommand.js +7 -37
- package/dist/Organization/organizationFacade.js +102 -177
- package/dist/RunControl/runControlHelper.js +14 -64
- package/dist/Timer/wait.js +2 -3
- package/dist/Timing/List/timingListCommand.js +20 -62
- package/dist/Timing/timingCommand.js +5 -35
- package/dist/generalCommand.js +1 -2
- package/dist/helper.d.ts +4 -4
- package/dist/helper.js +61 -122
- package/dist/index.js +19 -46
- package/dist/parameters.js +17 -40
- package/package.json +52 -57
- package/dist/Applet/Build/appletBuildCommand.js.map +0 -1
- package/dist/Applet/Generate/appletGenerateCommand.js.map +0 -1
- package/dist/Applet/Start/appletStartCommand.js.map +0 -1
- package/dist/Applet/Test/Upload/appletTestRunCommand.js.map +0 -1
- package/dist/Applet/Test/Upload/appletTestRunFacade.js.map +0 -1
- package/dist/Applet/Test/Upload/appletTestUploadCommand.js.map +0 -1
- package/dist/Applet/Test/Upload/appletTestUploadFacade.js.map +0 -1
- package/dist/Applet/Test/appletTestCommand.js.map +0 -1
- package/dist/Applet/Upload/appletUploadCommand.js.map +0 -1
- package/dist/Applet/Upload/appletUploadCommandHelper.js.map +0 -1
- package/dist/Applet/Upload/appletUploadFacade.js.map +0 -1
- package/dist/Applet/Upload/appletUploadFacadeHelper.js.map +0 -1
- package/dist/Applet/appletCommand.js.map +0 -1
- package/dist/Applet/appletErrors.js.map +0 -1
- package/dist/Applet/appletFacade.js.map +0 -1
- package/dist/Applet/appletServerHelper.js.map +0 -1
- package/dist/Auth/loginCommand.js.map +0 -1
- package/dist/Cache/tmpCache.js.map +0 -1
- package/dist/Cli/helper.js.map +0 -1
- package/dist/Cli/packageVersion.js.map +0 -1
- package/dist/Command/commandDefinition.js.map +0 -1
- package/dist/Command/commandProcessor.js.map +0 -1
- package/dist/Command/globalArgs.js.map +0 -1
- package/dist/CommandLine/IProgressBar.js.map +0 -1
- package/dist/CommandLine/progressBarFactory.js.map +0 -1
- package/dist/CustomScript/Generate/customScriptGenerateCommand.js.map +0 -1
- package/dist/CustomScript/Generate/customScriptGenerateFacade.js.map +0 -1
- package/dist/CustomScript/Upload/customScriptUploadCommand.js.map +0 -1
- package/dist/CustomScript/customScriptCommand.js.map +0 -1
- package/dist/CustomScript/customScriptFacade.js.map +0 -1
- package/dist/Device/Connect/connectCommand.js.map +0 -1
- package/dist/Device/Content/setContentCommand.js.map +0 -1
- package/dist/Device/PowerAction/powerActionCommand.js.map +0 -1
- package/dist/Device/deviceCommand.js.map +0 -1
- package/dist/Device/deviceFacade.js.map +0 -1
- package/dist/Emulator/IEmulator.js.map +0 -1
- package/dist/Emulator/createDomain.js.map +0 -1
- package/dist/Emulator/emulatorFacade.js.map +0 -1
- package/dist/Emulator/emulatorFactory.js.map +0 -1
- package/dist/Firmware/Upload/firmwareUploadCommand.js.map +0 -1
- package/dist/Firmware/Upload/firmwareUploadFacade.js.map +0 -1
- package/dist/Firmware/Upload/firmwareUploadHelper.js.map +0 -1
- package/dist/Firmware/firmwareCommand.js.map +0 -1
- package/dist/Lib/archive.js.map +0 -1
- package/dist/Lib/childProcess.js.map +0 -1
- package/dist/Lib/fileSystem.js.map +0 -1
- package/dist/Lib/git.js.map +0 -1
- package/dist/Organization/Get/organizationGetCommand.js.map +0 -1
- package/dist/Organization/List/organizationListCommand.js.map +0 -1
- package/dist/Organization/SetDefault/organizationSetDefaultCommand.js.map +0 -1
- package/dist/Organization/organizationCommand.js.map +0 -1
- package/dist/Organization/organizationFacade.js.map +0 -1
- package/dist/RunControl/runControlHelper.js.map +0 -1
- package/dist/Timer/wait.js.map +0 -1
- package/dist/Timing/List/timingListCommand.js.map +0 -1
- package/dist/Timing/timingCommand.js.map +0 -1
- package/dist/generalCommand.js.map +0 -1
- package/dist/helper.js.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/parameters.js.map +0 -1
|
@@ -8,37 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.
|
|
40
|
-
|
|
41
|
-
|
|
12
|
+
exports.HOT_RELOAD_OPTION = exports.FORWARD_SERVER_URL_OPTION = exports.DETACH_PROCESS_OPTION = exports.SERVER_FORCE_OPTION = exports.SERVER_PORT_OPTION = exports.SERVER_PUBLIC_URL_OPTION = void 0;
|
|
13
|
+
exports.killAppletServerIfRunningAndForceOption = killAppletServerIfRunningAndForceOption;
|
|
14
|
+
const log_1 = require("@signageos/sdk/dist/Console/log");
|
|
15
|
+
const parameters_1 = require("../parameters");
|
|
42
16
|
exports.SERVER_PUBLIC_URL_OPTION = {
|
|
43
17
|
name: 'server-public-url',
|
|
44
18
|
type: String,
|
|
@@ -69,34 +43,23 @@ exports.FORWARD_SERVER_URL_OPTION = {
|
|
|
69
43
|
exports.HOT_RELOAD_OPTION = {
|
|
70
44
|
name: 'hot-reload',
|
|
71
45
|
type: Boolean,
|
|
72
|
-
description:
|
|
46
|
+
description: `Enable hot reload and build of applet`,
|
|
73
47
|
defaultValue: false,
|
|
74
48
|
};
|
|
75
49
|
function killAppletServerIfRunningAndForceOption(dev, options, appletUid, appletVersion, appletPort) {
|
|
76
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
return [4 /*yield*/, dev.applet.serve.getRunningPort(appletUid, appletVersion)];
|
|
86
|
-
case 1:
|
|
87
|
-
runningAppletPort = _a.sent();
|
|
88
|
-
if (!(runningAppletPort && runningAppletPort !== appletPort)) return [3 /*break*/, 4];
|
|
89
|
-
if (!!force) return [3 /*break*/, 2];
|
|
90
|
-
(0, log_1.log)('warning', "Applet server is already running on port ".concat(runningAppletPort, ". Use --force to kill the running server and start a new one."));
|
|
91
|
-
return [3 /*break*/, 4];
|
|
92
|
-
case 2: return [4 /*yield*/, dev.applet.serve.killRunningServer(appletUid, appletVersion)];
|
|
93
|
-
case 3:
|
|
94
|
-
_a.sent();
|
|
95
|
-
_a.label = 4;
|
|
96
|
-
case 4: return [2 /*return*/];
|
|
50
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
51
|
+
if (!appletUid || !appletVersion) {
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
const force = options[exports.SERVER_FORCE_OPTION.name];
|
|
55
|
+
const runningAppletPort = yield dev.applet.serve.getRunningPort(appletUid, appletVersion);
|
|
56
|
+
if (runningAppletPort && runningAppletPort !== appletPort) {
|
|
57
|
+
if (!force) {
|
|
58
|
+
(0, log_1.log)('warning', `Applet server is already running on port ${runningAppletPort}. Use --force to kill the running server and start a new one.`);
|
|
97
59
|
}
|
|
98
|
-
|
|
60
|
+
else {
|
|
61
|
+
yield dev.applet.serve.killRunningServer(appletUid, appletVersion);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
99
64
|
});
|
|
100
65
|
}
|
|
101
|
-
exports.killAppletServerIfRunningAndForceOption = killAppletServerIfRunningAndForceOption;
|
|
102
|
-
//# sourceMappingURL=appletServerHelper.js.map
|
|
@@ -14,8 +14,8 @@ declare const OPTION_LIST: readonly [{
|
|
|
14
14
|
* Only one from auth0 and legacy authentication can be active at the moment
|
|
15
15
|
*/
|
|
16
16
|
export declare const getIsAuth0OrLegacyEnabled: (options: any) => {
|
|
17
|
-
isAuth0Enabled?: boolean
|
|
18
|
-
isLegacyEnabled?: boolean
|
|
17
|
+
isAuth0Enabled?: boolean;
|
|
18
|
+
isLegacyEnabled?: boolean;
|
|
19
19
|
};
|
|
20
20
|
export declare const login: {
|
|
21
21
|
name: "login";
|
|
@@ -1,15 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
10
26
|
};
|
|
11
|
-
return
|
|
12
|
-
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
13
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -19,48 +41,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
19
41
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
42
|
});
|
|
21
43
|
};
|
|
22
|
-
var
|
|
23
|
-
|
|
24
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
-
function step(op) {
|
|
27
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
-
while (_) try {
|
|
29
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
30
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
-
switch (op[0]) {
|
|
32
|
-
case 0: case 1: t = op; break;
|
|
33
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
-
default:
|
|
37
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
-
if (t[2]) _.ops.pop();
|
|
42
|
-
_.trys.pop(); continue;
|
|
43
|
-
}
|
|
44
|
-
op = body.call(thisArg, _);
|
|
45
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
-
}
|
|
44
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
45
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
48
46
|
};
|
|
49
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
48
|
exports.login = exports.getIsAuth0OrLegacyEnabled = void 0;
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
49
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
50
|
+
const prompts_1 = __importDefault(require("prompts"));
|
|
51
|
+
const debug_1 = __importDefault(require("debug"));
|
|
52
|
+
const os = __importStar(require("os"));
|
|
53
|
+
const apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
|
|
54
|
+
const log_1 = require("@signageos/sdk/dist/Console/log");
|
|
55
|
+
const sosControlHelper_1 = require("@signageos/sdk/dist/SosHelper/sosControlHelper");
|
|
56
|
+
const helper_1 = require("../helper");
|
|
57
|
+
const runControlHelper_1 = require("../RunControl/runControlHelper");
|
|
58
|
+
const parameters_1 = require("../parameters");
|
|
59
|
+
const commandDefinition_1 = require("../Command/commandDefinition");
|
|
60
|
+
const Debug = (0, debug_1.default)('@signageos/cli:Auth:login');
|
|
61
|
+
const OPTION_LIST = [{ name: 'username', type: String, description: `Username or e-mail used for ${parameters_1.parameters.boxHost}` }];
|
|
64
62
|
/**
|
|
65
63
|
* To explicitly enable auth0 authentication add flag --auth0-enabled to command line options
|
|
66
64
|
* { _unknown: [ '--auth0-enabled' ], command: [ 'login' ] }
|
|
@@ -70,9 +68,9 @@ var OPTION_LIST = [{ name: 'username', type: String, description: "Username or e
|
|
|
70
68
|
*
|
|
71
69
|
* Only one from auth0 and legacy authentication can be active at the moment
|
|
72
70
|
*/
|
|
73
|
-
|
|
71
|
+
const getIsAuth0OrLegacyEnabled = (options) => {
|
|
74
72
|
var _a, _b;
|
|
75
|
-
|
|
73
|
+
const queryParams = {};
|
|
76
74
|
if ((_a = options._unknown) === null || _a === void 0 ? void 0 : _a.includes('--auth0-enabled')) {
|
|
77
75
|
queryParams.isAuth0Enabled = true;
|
|
78
76
|
}
|
|
@@ -90,97 +88,68 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
|
|
|
90
88
|
description: 'Login account using username & password',
|
|
91
89
|
optionList: OPTION_LIST,
|
|
92
90
|
commands: [],
|
|
93
|
-
run
|
|
94
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
case 4:
|
|
123
|
-
config = _b.sent();
|
|
124
|
-
apiUrl = (0, helper_1.getApiUrl)(config);
|
|
125
|
-
authQueryParams = (0, exports.getIsAuth0OrLegacyEnabled)(options);
|
|
126
|
-
return [4 /*yield*/, getOrCreateApiSecurityToken(__assign({ identification: identification, password: password, apiUrl: apiUrl }, authQueryParams))];
|
|
127
|
-
case 5:
|
|
128
|
-
_a = _b.sent(), tokenId = _a.id, apiSecurityToken = _a.securityToken, name = _a.name;
|
|
129
|
-
return [4 /*yield*/, (0, runControlHelper_1.saveConfig)({
|
|
130
|
-
apiUrl: apiUrl !== parameters_1.parameters.apiUrl ? apiUrl : undefined,
|
|
131
|
-
identification: tokenId,
|
|
132
|
-
apiSecurityToken: apiSecurityToken,
|
|
133
|
-
})];
|
|
134
|
-
case 6:
|
|
135
|
-
_b.sent();
|
|
136
|
-
(0, log_1.log)('info', "User ".concat(chalk_1.default.green(identification), " has been logged in with token \"").concat(name, "\". Credentials are stored in ").concat(chalk_1.default.blue((0, sosControlHelper_1.getConfigFilePath)())));
|
|
137
|
-
return [2 /*return*/];
|
|
138
|
-
}
|
|
91
|
+
run(options) {
|
|
92
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
93
|
+
let identification = options.username;
|
|
94
|
+
if (!identification) {
|
|
95
|
+
const response = yield (0, prompts_1.default)({
|
|
96
|
+
type: 'text',
|
|
97
|
+
name: 'username',
|
|
98
|
+
message: `Type your username or e-mail used for ${parameters_1.parameters.boxHost}`,
|
|
99
|
+
});
|
|
100
|
+
identification = response.username;
|
|
101
|
+
}
|
|
102
|
+
if (!identification) {
|
|
103
|
+
throw new Error('Missing argument --username <string>');
|
|
104
|
+
}
|
|
105
|
+
const { password } = yield (0, prompts_1.default)({
|
|
106
|
+
type: 'password',
|
|
107
|
+
name: 'password',
|
|
108
|
+
message: `Type your password used for ${parameters_1.parameters.boxHost}`,
|
|
109
|
+
});
|
|
110
|
+
const config = yield (0, runControlHelper_1.loadConfig)();
|
|
111
|
+
const apiUrl = (0, helper_1.getApiUrl)(config);
|
|
112
|
+
const authQueryParams = (0, exports.getIsAuth0OrLegacyEnabled)(options);
|
|
113
|
+
const { id: tokenId, securityToken: apiSecurityToken, name, } = yield getOrCreateApiSecurityToken(Object.assign({ identification,
|
|
114
|
+
password,
|
|
115
|
+
apiUrl }, authQueryParams));
|
|
116
|
+
yield (0, runControlHelper_1.saveConfig)({
|
|
117
|
+
apiUrl: apiUrl !== parameters_1.parameters.apiUrl ? apiUrl : undefined,
|
|
118
|
+
identification: tokenId,
|
|
119
|
+
apiSecurityToken,
|
|
139
120
|
});
|
|
121
|
+
(0, log_1.log)('info', `User ${chalk_1.default.green(identification)} has been logged in with token "${name}". Credentials are stored in ${chalk_1.default.blue((0, sosControlHelper_1.getConfigFilePath)())}`);
|
|
140
122
|
});
|
|
141
123
|
},
|
|
142
124
|
});
|
|
143
125
|
function getOrCreateApiSecurityToken(_a) {
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
if (responseOfPost.status === 201) {
|
|
167
|
-
return [2 /*return*/, bodyOfPost];
|
|
168
|
-
}
|
|
169
|
-
else if (responseOfPost.status === 403) {
|
|
170
|
-
throw new Error("Incorrect username or password");
|
|
171
|
-
}
|
|
172
|
-
else {
|
|
173
|
-
throw new Error('Unknown error: ' + (bodyOfPost && bodyOfPost.message ? bodyOfPost.message : responseOfPost.status));
|
|
174
|
-
}
|
|
175
|
-
return [2 /*return*/];
|
|
176
|
-
}
|
|
177
|
-
});
|
|
126
|
+
return __awaiter(this, arguments, void 0, function* ({ identification, password, apiUrl, isAuth0Enabled, isLegacyEnabled, }) {
|
|
127
|
+
const ACCOUNT_SECURITY_TOKEN_RESOURCE = 'account/security-token';
|
|
128
|
+
const options = {
|
|
129
|
+
url: apiUrl,
|
|
130
|
+
auth: { clientId: undefined, secret: undefined },
|
|
131
|
+
version: apiVersions_1.ApiVersions.V1,
|
|
132
|
+
};
|
|
133
|
+
const tokenName = generateTokenName();
|
|
134
|
+
const query = Object.assign(Object.assign({ identification,
|
|
135
|
+
password, name: tokenName }, (isAuth0Enabled !== undefined ? { isAuth0AuthenticationEnabled: isAuth0Enabled } : {})), (isLegacyEnabled !== undefined ? { isLegacyAuthenticationEnabled: isLegacyEnabled } : {}));
|
|
136
|
+
const responseOfPost = yield (0, helper_1.postResource)(options, ACCOUNT_SECURITY_TOKEN_RESOURCE, query);
|
|
137
|
+
const bodyOfPost = JSON.parse(yield responseOfPost.text(), helper_1.deserializeJSON);
|
|
138
|
+
Debug('POST security-token response', bodyOfPost);
|
|
139
|
+
if (responseOfPost.status === 201) {
|
|
140
|
+
return bodyOfPost;
|
|
141
|
+
}
|
|
142
|
+
else if (responseOfPost.status === 403) {
|
|
143
|
+
throw new Error(`Incorrect username or password`);
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
throw new Error('Unknown error: ' + (bodyOfPost && bodyOfPost.message ? bodyOfPost.message : responseOfPost.status));
|
|
147
|
+
}
|
|
178
148
|
});
|
|
179
149
|
}
|
|
180
150
|
function generateTokenName() {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
return
|
|
151
|
+
const hostname = os.hostname();
|
|
152
|
+
const shortHostname = hostname.split('.')[0];
|
|
153
|
+
const userInfo = os.userInfo();
|
|
154
|
+
return `${userInfo.username}@${shortHostname}`;
|
|
185
155
|
}
|
|
186
|
-
//# sourceMappingURL=loginCommand.js.map
|
package/dist/Cache/tmpCache.js
CHANGED
|
@@ -1,42 +1,73 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
36
|
+
exports.getCachedValue = getCachedValue;
|
|
37
|
+
exports.updateCacheValue = updateCacheValue;
|
|
38
|
+
const os = __importStar(require("os"));
|
|
39
|
+
const fs = __importStar(require("fs-extra"));
|
|
40
|
+
const path = __importStar(require("path"));
|
|
41
|
+
const SOS_CACHE_DIR = 'sos-cache';
|
|
42
|
+
const TMP_BASE_PATH = path.join(os.tmpdir(), SOS_CACHE_DIR);
|
|
9
43
|
function getCachedValue(key) {
|
|
10
44
|
try {
|
|
11
45
|
fs.ensureDirSync(TMP_BASE_PATH);
|
|
12
|
-
|
|
13
|
-
|
|
46
|
+
const cacheValuePath = path.join(TMP_BASE_PATH, key);
|
|
47
|
+
const cachedValue = JSON.parse(fs.readFileSync(cacheValuePath).toString());
|
|
14
48
|
if (hasExpired(cachedValue.expireAt)) {
|
|
15
49
|
return null;
|
|
16
50
|
}
|
|
17
51
|
return cachedValue.value;
|
|
18
52
|
}
|
|
19
|
-
catch (
|
|
53
|
+
catch (_a) {
|
|
20
54
|
return null;
|
|
21
55
|
}
|
|
22
56
|
}
|
|
23
|
-
exports.getCachedValue = getCachedValue;
|
|
24
57
|
function updateCacheValue(key, value, options) {
|
|
25
58
|
try {
|
|
26
59
|
fs.ensureDirSync(TMP_BASE_PATH);
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
value
|
|
60
|
+
const cacheValuePath = path.join(TMP_BASE_PATH, key);
|
|
61
|
+
const cachedValue = {
|
|
62
|
+
value,
|
|
30
63
|
expireAt: new Date().valueOf() + options.expireInMs,
|
|
31
64
|
};
|
|
32
65
|
fs.writeFileSync(cacheValuePath, JSON.stringify(cachedValue));
|
|
33
66
|
}
|
|
34
|
-
catch (
|
|
67
|
+
catch (_a) {
|
|
35
68
|
// skip caching
|
|
36
69
|
}
|
|
37
70
|
}
|
|
38
|
-
exports.updateCacheValue = updateCacheValue;
|
|
39
71
|
function hasExpired(expireAt) {
|
|
40
72
|
return new Date().valueOf() > expireAt;
|
|
41
73
|
}
|
|
42
|
-
//# sourceMappingURL=tmpCache.js.map
|
package/dist/Cli/helper.js
CHANGED
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
3
|
+
exports.getPackageName = getPackageName;
|
|
4
|
+
exports.getPackageVersion = getPackageVersion;
|
|
5
|
+
const parameters_1 = require("../parameters");
|
|
5
6
|
function getPackageName() {
|
|
6
7
|
return parameters_1.parameters.name;
|
|
7
8
|
}
|
|
8
|
-
exports.getPackageName = getPackageName;
|
|
9
9
|
function getPackageVersion() {
|
|
10
10
|
return parameters_1.parameters.version;
|
|
11
11
|
}
|
|
12
|
-
exports.getPackageVersion = getPackageVersion;
|
|
13
|
-
//# sourceMappingURL=helper.js.map
|