@oneuptime/cli 14.0.54 → 14.0.56
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.
|
@@ -13,8 +13,14 @@ var ExitCode;
|
|
|
13
13
|
function handleError(error) {
|
|
14
14
|
if (error instanceof Error) {
|
|
15
15
|
const message = error.message;
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
/*
|
|
17
|
+
* Auth-related errors. The API key is matched in any case: OneUptime
|
|
18
|
+
* refuses a key with "Invalid API Key" and a request without one with
|
|
19
|
+
* "API Key not found in the request header", and a key below its plan
|
|
20
|
+
* with "API keys need the ... plan". Matched only as "API key", the first
|
|
21
|
+
* exited as a general error and the second as "Not found".
|
|
22
|
+
*/
|
|
23
|
+
if (message.toLowerCase().includes("api key") ||
|
|
18
24
|
message.includes("credentials") ||
|
|
19
25
|
message.includes("Unauthorized") ||
|
|
20
26
|
message.includes("401")) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorHandler.js","sourceRoot":"","sources":["../../../Core/ErrorHandler.ts"],"names":[],"mappings":";;;AASA,
|
|
1
|
+
{"version":3,"file":"ErrorHandler.js","sourceRoot":"","sources":["../../../Core/ErrorHandler.ts"],"names":[],"mappings":";;;AASA,kCAuCC;AAhDD,uDAA+C;AAE/C,IAAY,QAKX;AALD,WAAY,QAAQ;IAClB,6CAAW,CAAA;IACX,uDAAgB,CAAA;IAChB,iDAAa,CAAA;IACb,+CAAY,CAAA;AACd,CAAC,EALW,QAAQ,wBAAR,QAAQ,QAKnB;AAED,SAAgB,WAAW,CAAC,KAAc;IACxC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAW,KAAK,CAAC,OAAO,CAAC;QAEtC;;;;;;WAMG;QACH,IACE,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;YAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EACvB,CAAC;YACD,IAAA,4BAAU,EAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;YAC/C,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC;QAED,6BAA6B;QAC7B,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7D,IAAA,4BAAU,EAAC,cAAc,OAAO,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAED,qBAAqB;QACrB,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,IAAA,4BAAU,EAAC,OAAO,CAAC,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC;QAED,IAAA,4BAAU,EAAC,UAAU,OAAO,EAAE,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,IAAA,4BAAU,EAAC,UAAU,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -7,6 +7,7 @@ exports.generateAllFieldsSelect = generateAllFieldsSelect;
|
|
|
7
7
|
const Index_1 = __importDefault(require("Common/Models/DatabaseModels/Index"));
|
|
8
8
|
const Index_2 = __importDefault(require("Common/Models/AnalyticsModels/Index"));
|
|
9
9
|
const TableColumn_1 = require("Common/Types/Database/TableColumn");
|
|
10
|
+
const HeldPermissions_1 = require("Common/Types/HeldPermissions");
|
|
10
11
|
const Permission_1 = __importDefault(require("Common/Types/Permission"));
|
|
11
12
|
function shouldIncludeField(columnName, accessControlForColumns) {
|
|
12
13
|
const accessControl = accessControlForColumns[columnName];
|
|
@@ -63,8 +64,7 @@ function generateAllFieldsSelect(tableName, modelType) {
|
|
|
63
64
|
if (!ModelClass) {
|
|
64
65
|
return getDefaultSelect();
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
-
return getDefaultSelect();
|
|
67
|
+
return getAnalyticsSelect(new ModelClass());
|
|
68
68
|
}
|
|
69
69
|
return getDefaultSelect();
|
|
70
70
|
}
|
|
@@ -72,6 +72,34 @@ function generateAllFieldsSelect(tableName, modelType) {
|
|
|
72
72
|
return getDefaultSelect();
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
|
+
/*
|
|
76
|
+
* The columns of a telemetry table that a list may ask for: those whose
|
|
77
|
+
* read rule names someone (as for database models, a rule of only
|
|
78
|
+
* CurrentUser names nobody a key can be), and, where a column declares no
|
|
79
|
+
* read rule, only the ones every select may name (ALWAYS_SELECTABLE_COLUMNS:
|
|
80
|
+
* the server reads a column with no rule as closed). Never the database
|
|
81
|
+
* default: telemetry tables have no updatedAt, and the analytics API refuses
|
|
82
|
+
* a select that names a column its table does not have, so every telemetry
|
|
83
|
+
* list failed with "Unknown column: updatedAt".
|
|
84
|
+
*/
|
|
85
|
+
function getAnalyticsSelect(model) {
|
|
86
|
+
var _a;
|
|
87
|
+
const selectObject = {};
|
|
88
|
+
for (const column of model.getTableColumns()) {
|
|
89
|
+
const read = (_a = column.accessControl) === null || _a === void 0 ? void 0 : _a.read;
|
|
90
|
+
const readable = read
|
|
91
|
+
? read.length > 0 &&
|
|
92
|
+
!(read.length === 1 && read[0] === Permission_1.default.CurrentUser)
|
|
93
|
+
: HeldPermissions_1.ALWAYS_SELECTABLE_COLUMNS.includes(column.key);
|
|
94
|
+
if (readable) {
|
|
95
|
+
selectObject[column.key] = true;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
if (Object.keys(selectObject).length === 0) {
|
|
99
|
+
return { _id: true };
|
|
100
|
+
}
|
|
101
|
+
return selectObject;
|
|
102
|
+
}
|
|
75
103
|
function getDefaultSelect() {
|
|
76
104
|
return {
|
|
77
105
|
_id: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectFieldGenerator.js","sourceRoot":"","sources":["../../../Utils/SelectFieldGenerator.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"SelectFieldGenerator.js","sourceRoot":"","sources":["../../../Utils/SelectFieldGenerator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneuptime/cli",
|
|
3
|
-
"version": "14.0.
|
|
3
|
+
"version": "14.0.56",
|
|
4
4
|
"description": "OneUptime CLI - Command-line interface for managing OneUptime resources",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"chalk": "^4.1.2",
|
|
31
31
|
"cli-table3": "^0.6.5",
|
|
32
32
|
"commander": "^12.1.0",
|
|
33
|
-
"Common": "npm:@oneuptime/common@14.0.
|
|
33
|
+
"Common": "npm:@oneuptime/common@14.0.56",
|
|
34
34
|
"ts-node": "^10.9.2"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|