balena-cli 16.7.8 → 16.7.9
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/CHANGELOG.md +800 -1
- package/build/commands/api-keys/index.js +1 -1
- package/build/commands/api-keys/index.js.map +1 -1
- package/build/commands/deploy.js +4 -4
- package/build/commands/deploy.js.map +1 -1
- package/build/commands/login.js +8 -2
- package/build/commands/login.js.map +1 -1
- package/build/commands/ssh.js +3 -3
- package/build/commands/ssh.js.map +1 -1
- package/build/commands/whoami.js +2 -3
- package/build/commands/whoami.js.map +1 -1
- package/build/utils/bootstrap.js +1 -1
- package/build/utils/bootstrap.js.map +1 -1
- package/build/utils/promote.js +6 -2
- package/build/utils/promote.js.map +1 -1
- package/build/utils/sdk.js +1 -1
- package/build/utils/sdk.js.map +1 -1
- package/build/utils/tunnel.js +1 -1
- package/build/utils/tunnel.js.map +1 -1
- package/lib/commands/api-keys/index.ts +1 -1
- package/lib/commands/deploy.ts +4 -4
- package/lib/commands/login.ts +7 -2
- package/lib/commands/ssh.ts +3 -3
- package/lib/commands/whoami.ts +3 -3
- package/lib/utils/bootstrap.ts +1 -1
- package/lib/utils/promote.ts +6 -3
- package/lib/utils/sdk.ts +1 -1
- package/lib/utils/tunnel.ts +1 -1
- package/npm-shrinkwrap.json +36 -46
- package/oclif.manifest.json +1 -1
- package/package.json +5 -5
|
@@ -13,7 +13,7 @@ class ApiKeysCmd extends command_2.default {
|
|
|
13
13
|
? (await getApplication((0, lazy_1.getBalenaSdk)(), options.fleet, {
|
|
14
14
|
$select: 'actor',
|
|
15
15
|
})).actor
|
|
16
|
-
: await (0, lazy_1.getBalenaSdk)().auth.
|
|
16
|
+
: await (0, lazy_1.getBalenaSdk)().auth.getActorId();
|
|
17
17
|
const keys = await (0, lazy_1.getBalenaSdk)().pine.get({
|
|
18
18
|
resource: 'api_key',
|
|
19
19
|
options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/commands/api-keys/index.ts"],"names":[],"mappings":";;AAiBA,4CAAuC;AACvC,2CAAoC;AACpC,+CAA+C;AAC/C,2CAAyE;AAQzE,MAAqB,UAAW,SAAQ,iBAAO;IAyBvC,KAAK,CAAC,GAAG;QACf,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAe,UAAU,CAAC,CAAC;QAEhE,IAAI;YACH,MAAM,EAAE,cAAc,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;YAC3D,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK;gBAC5B,CAAC,CAAC,CACA,MAAM,cAAc,CAAC,IAAA,mBAAY,GAAE,EAAE,OAAO,CAAC,KAAK,EAAE;oBACnD,OAAO,EAAE,OAAO;iBAChB,CAAC,CACD,CAAC,KAAK;gBACT,CAAC,CAAC,MAAM,IAAA,mBAAY,GAAE,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/commands/api-keys/index.ts"],"names":[],"mappings":";;AAiBA,4CAAuC;AACvC,2CAAoC;AACpC,+CAA+C;AAC/C,2CAAyE;AAQzE,MAAqB,UAAW,SAAQ,iBAAO;IAyBvC,KAAK,CAAC,GAAG;QACf,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAe,UAAU,CAAC,CAAC;QAEhE,IAAI;YACH,MAAM,EAAE,cAAc,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;YAC3D,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK;gBAC5B,CAAC,CAAC,CACA,MAAM,cAAc,CAAC,IAAA,mBAAY,GAAE,EAAE,OAAO,CAAC,KAAK,EAAE;oBACnD,OAAO,EAAE,OAAO;iBAChB,CAAC,CACD,CAAC,KAAK;gBACT,CAAC,CAAC,MAAM,IAAA,mBAAY,GAAE,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,MAAM,IAAA,mBAAY,GAAE,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC1C,QAAQ,EAAE,SAAS;gBACnB,OAAO,EAAE;oBACR,OAAO,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC;oBACnE,OAAO,EAAE;wBACR,YAAY,EAAE,OAAO;wBACrB,GAAG,CAAC,OAAO,CAAC,IAAI;4BACf,CAAC,CAAC;gCACA,IAAI,EAAE;oCACL,GAAG,EAAE,IAAI;iCACT;6BACA;4BACH,CAAC,CAAC,EAAE,CAAC;qBACN;oBACD,QAAQ,EAAE,UAAU;iBACpB;aACD,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;YAC1E,MAAM,CAAC,GAAG,2CAAa,QAAQ,EAAC,CAAC;YACjC,OAAO,CAAC,GAAG,CACV,IAAA,iBAAU,GAAE,CAAC,KAAK,CAAC,UAAU,CAC5B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,KAAK,CAAC,CAAC,EAC1D,MAAM,CACN,CACD,CAAC;SACF;QAAC,OAAO,CAAC,EAAE;YACX,MAAM,CAAC,CAAC;SACR;IACF,CAAC;;AAhEa,sBAAW,GAAG,IAAA,kBAAW,EAAA;;;;;;CAMvC,CAAC;AACa,mBAAQ,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAEjC,eAAI,GAAG,EAAE,CAAC;AAEV,gBAAK,GAAG,UAAU,CAAC;AAEnB,gBAAK,GAA0B;IAC5C,IAAI,EAAE,EAAE,CAAC,IAAI;IACb,IAAI,EAAE,eAAK,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,6BAA6B;KAC1C,CAAC;IACF,KAAK,EAAE,EAAE,CAAC,KAAK;CACf,CAAC;AAEY,wBAAa,GAAG,IAAI,CAAC;kBAvBf,UAAU"}
|
package/build/commands/deploy.js
CHANGED
|
@@ -126,9 +126,9 @@ class DeployCmd extends command_2.default {
|
|
|
126
126
|
const { deployLegacy } = require('../utils/deploy-legacy');
|
|
127
127
|
const msg = (0, lazy_1.getChalk)().yellow('Target fleet requires legacy deploy method.');
|
|
128
128
|
logger.logWarn(msg);
|
|
129
|
-
const [token, username, url, options] = await Promise.all([
|
|
129
|
+
const [token, { username }, url, options] = await Promise.all([
|
|
130
130
|
sdk.auth.getToken(),
|
|
131
|
-
sdk.auth.
|
|
131
|
+
sdk.auth.getUserInfo(),
|
|
132
132
|
sdk.settings.get('balenaUrl'),
|
|
133
133
|
{
|
|
134
134
|
appName: opts.appName,
|
|
@@ -143,8 +143,8 @@ class DeployCmd extends command_2.default {
|
|
|
143
143
|
});
|
|
144
144
|
}
|
|
145
145
|
else {
|
|
146
|
-
const [userId, auth, apiEndpoint] = await Promise.all([
|
|
147
|
-
sdk.auth.
|
|
146
|
+
const [{ id: userId }, auth, apiEndpoint] = await Promise.all([
|
|
147
|
+
sdk.auth.getUserInfo(),
|
|
148
148
|
sdk.auth.getToken(),
|
|
149
149
|
sdk.settings.get('apiUrl'),
|
|
150
150
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../lib/commands/deploy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../lib/commands/deploy.ts"],"names":[],"mappings":"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"}
|
package/build/commands/login.js
CHANGED
|
@@ -17,7 +17,7 @@ class LoginCmd extends command_2.default {
|
|
|
17
17
|
console.log(messages.balenaAsciiArt);
|
|
18
18
|
console.log(`\nLogging in to ${balenaUrl}`);
|
|
19
19
|
await this.doLogin(options, balenaUrl, params.token);
|
|
20
|
-
const username = await balena.auth.
|
|
20
|
+
const { username } = await balena.auth.getUserInfo();
|
|
21
21
|
console.info(`Successfully logged in as: ${username}`);
|
|
22
22
|
console.info(`\
|
|
23
23
|
|
|
@@ -38,7 +38,13 @@ ${messages.reachingOut}`);
|
|
|
38
38
|
}
|
|
39
39
|
const balena = (0, lazy_1.getBalenaSdk)();
|
|
40
40
|
await balena.auth.loginWithToken(token);
|
|
41
|
-
|
|
41
|
+
try {
|
|
42
|
+
await balena.auth.getUserInfo();
|
|
43
|
+
}
|
|
44
|
+
catch (err) {
|
|
45
|
+
if (process.env.DEBUG) {
|
|
46
|
+
console.error(`Get user info failed with: ${err.message}`);
|
|
47
|
+
}
|
|
42
48
|
throw new errors_1.ExpectedError('Token authentication failed');
|
|
43
49
|
}
|
|
44
50
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/commands/login.ts"],"names":[],"mappings":";;AAiBA,4CAAuC;AACvC,wCAAiC;AACjC,4CAA4C;AAC5C,wCAAsE;AACtE,sCAA0C;AAiB1C,MAAqB,QAAS,SAAQ,iBAAO;IAmFrC,KAAK,CAAC,GAAG;QACf,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAClD,QAAQ,CACR,CAAC;QAEF,MAAM,MAAM,GAAG,IAAA,mBAAY,GAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,2CAAa,mBAAmB,EAAC,CAAC;QACnD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAGzD,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE;YACzB,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;SAC7B;QAED,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAErD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/commands/login.ts"],"names":[],"mappings":"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"}
|
package/build/commands/ssh.js
CHANGED
|
@@ -27,9 +27,9 @@ class SshCmd extends command_2.default {
|
|
|
27
27
|
await command_2.default.checkLoggedIn();
|
|
28
28
|
const deviceUuid = await getOnlineTargetDeviceUuid(sdk, params.fleetOrDevice);
|
|
29
29
|
const { which } = await Promise.resolve().then(() => require('../utils/which'));
|
|
30
|
-
const [whichProxytunnel, username, proxyUrl] = await Promise.all([
|
|
30
|
+
const [whichProxytunnel, { username }, proxyUrl] = await Promise.all([
|
|
31
31
|
useProxy ? which('proxytunnel', false) : undefined,
|
|
32
|
-
sdk.auth.
|
|
32
|
+
sdk.auth.getUserInfo(),
|
|
33
33
|
sdk.settings.get('proxyUrl'),
|
|
34
34
|
]);
|
|
35
35
|
const getSshProxyCommand = () => {
|
|
@@ -68,7 +68,7 @@ class SshCmd extends command_2.default {
|
|
|
68
68
|
port: options.port || 'cloud',
|
|
69
69
|
proxyCommand,
|
|
70
70
|
service: params.service,
|
|
71
|
-
username
|
|
71
|
+
username,
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
let accessCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../lib/commands/ssh.ts"],"names":[],"mappings":";;AAiBA,4CAAuC;AACvC,wCAAiC;AACjC,4CAA4C;AAC5C,wCAA0D;AAC1D,oDAAgF;AAehF,MAAqB,MAAO,SAAQ,iBAAO;IAmFnC,KAAK,CAAC,GAAG;QACf,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAClD,MAAM,CACN,CAAC;QAGF,IAAI,IAAA,sCAAyB,EAAC,MAAM,CAAC,aAAa,CAAC,EAAE;YACpD,MAAM,EAAE,qBAAqB,EAAE,GAAG,2CAAa,qBAAqB,EAAC,CAAC;YACtE,OAAO,MAAM,qBAAqB,CAAC;gBAClC,QAAQ,EAAE,MAAM,CAAC,aAAa;gBAC9B,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,OAAO;gBAC7B,QAAQ,EAAE,OAAO,CAAC,GAAG;gBACrB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,MAAM,CAAC,OAAO;aACvB,CAAC,CAAC;SACH;QAGD,MAAM,EAAE,cAAc,EAAE,GAAG,2CAAa,kBAAkB,EAAC,CAAC;QAC5D,MAAM,EAAE,yBAAyB,EAAE,GAAG,2CAAa,mBAAmB,EAAC,CAAC;QACxE,MAAM,GAAG,GAAG,IAAA,mBAAY,GAAE,CAAC;QAE3B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,CAAC,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAGnD,MAAM,iBAAO,CAAC,wBAAwB,EAAE,CAAC;QACzC,MAAM,iBAAO,CAAC,aAAa,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,MAAM,yBAAyB,CACjD,GAAG,EACH,MAAM,CAAC,aAAa,CACpB,CAAC;QAEF,MAAM,EAAE,KAAK,EAAE,GAAG,2CAAa,gBAAgB,EAAC,CAAC;QAEjD,MAAM,CAAC,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../lib/commands/ssh.ts"],"names":[],"mappings":"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"}
|
package/build/commands/whoami.js
CHANGED
|
@@ -6,9 +6,8 @@ class WhoamiCmd extends command_1.default {
|
|
|
6
6
|
async run() {
|
|
7
7
|
this.parse(WhoamiCmd);
|
|
8
8
|
const balena = (0, lazy_1.getBalenaSdk)();
|
|
9
|
-
const [username, email, url] = await Promise.all([
|
|
10
|
-
balena.auth.
|
|
11
|
-
balena.auth.getEmail(),
|
|
9
|
+
const [{ username, email }, url] = await Promise.all([
|
|
10
|
+
balena.auth.getUserInfo(),
|
|
12
11
|
balena.settings.get('balenaUrl'),
|
|
13
12
|
]);
|
|
14
13
|
console.log((0, lazy_1.getVisuals)().table.vertical({ username, email, url }, [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../lib/commands/whoami.ts"],"names":[],"mappings":";;AAiBA,wCAAiC;AACjC,wCAAsE;AAEtE,MAAqB,SAAU,SAAQ,iBAAO;IAatC,KAAK,CAAC,GAAG;QACf,IAAI,CAAC,KAAK,CAAS,SAAS,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,IAAA,mBAAY,GAAE,CAAC;QAE9B,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../lib/commands/whoami.ts"],"names":[],"mappings":";;AAiBA,wCAAiC;AACjC,wCAAsE;AAEtE,MAAqB,SAAU,SAAQ,iBAAO;IAatC,KAAK,CAAC,GAAG;QACf,IAAI,CAAC,KAAK,CAAS,SAAS,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,IAAA,mBAAY,GAAE,CAAC;QAE9B,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE;YACzB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC;SAChC,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CACV,IAAA,iBAAU,GAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACrD,uBAAuB;YACvB,UAAU;YACV,OAAO;YACP,KAAK;SACL,CAAC,CACF,CAAC;IACH,CAAC;;AA9Ba,qBAAW,GAAG,IAAA,kBAAW,EAAA;;;;EAItC,CAAC;AAEY,kBAAQ,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAE/B,eAAK,GAAG,QAAQ,CAAC;AAEjB,uBAAa,GAAG,IAAI,CAAC;kBAXf,SAAS"}
|
package/build/utils/bootstrap.js
CHANGED
|
@@ -104,7 +104,7 @@ async function getCachedUsername() {
|
|
|
104
104
|
catch (_b) {
|
|
105
105
|
}
|
|
106
106
|
try {
|
|
107
|
-
const username = await getBalenaSdk().auth.
|
|
107
|
+
const { username } = await getBalenaSdk().auth.getUserInfo();
|
|
108
108
|
if (username) {
|
|
109
109
|
cachedUsername = { token, username };
|
|
110
110
|
await storage.set('cachedUsername', cachedUsername);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../lib/utils/bootstrap.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../lib/utils/bootstrap.ts"],"names":[],"mappings":"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"}
|
package/build/utils/promote.js
CHANGED
|
@@ -259,8 +259,12 @@ async function createOrSelectApp(sdk, compatibleDeviceTypesFilter, deviceType) {
|
|
|
259
259
|
}
|
|
260
260
|
async function createApplication(sdk, deviceType, name) {
|
|
261
261
|
const validation = await Promise.resolve().then(() => require('./validation'));
|
|
262
|
-
|
|
263
|
-
|
|
262
|
+
let username;
|
|
263
|
+
try {
|
|
264
|
+
const userInfo = await sdk.auth.getUserInfo();
|
|
265
|
+
username = userInfo.username;
|
|
266
|
+
}
|
|
267
|
+
catch (err) {
|
|
264
268
|
throw new sdk.errors.BalenaNotLoggedIn();
|
|
265
269
|
}
|
|
266
270
|
const applicationName = await new Promise(async (resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promote.js","sourceRoot":"","sources":["../../lib/utils/promote.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"promote.js","sourceRoot":"","sources":["../../lib/utils/promote.ts"],"names":[],"mappings":"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"}
|
package/build/utils/sdk.js
CHANGED
package/build/utils/sdk.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../lib/utils/sdk.ts"],"names":[],"mappings":";;;AAuCO,KAAK,UAAU,cAAc,CACnC,GAAc,EACd,cAA+B,EAC/B,OAAkC;IAElC,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,cAAc,EAAC,CAAC;IAC5D,IACC,OAAO,cAAc,KAAK,QAAQ;QAClC,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAClC;QAGD,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAC/C,cAAc,EACd,OAAO,EACP,qBAAqB,CACrB,CAAC;KACF;IACD,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CACxD,cAAc,EACd,OAAO,CACP,CAAC;AACH,CAAC;AAtBD,wCAsBC;AASM,KAAK,UAAU,YAAY,CACjC,GAAc,EACd,UAAkB;IAElB,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,cAAc,EAAC,CAAC;IAC5D,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;QAGpC,OAAO,CAAC,MAAM,cAAc,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACzE;IACD,OAAO,UAAU,CAAC,WAAW,EAAE,CAAC;AACjC,CAAC;AAXD,oCAWC;AAaM,KAAK,UAAU,mBAAmB,CACxC,GAAc,EACd,OAAmC;IAEnC,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAC1C,GAAG,CAAC,KAAK,CAAC,gBAAgB,CACzB;QACC,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,IAAI,EAAE;oBACL,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE;wBACN,GAAG,EAAE;4BACJ,IAAI,EAAE,MAAM,GAAG,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../lib/utils/sdk.ts"],"names":[],"mappings":";;;AAuCO,KAAK,UAAU,cAAc,CACnC,GAAc,EACd,cAA+B,EAC/B,OAAkC;IAElC,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,cAAc,EAAC,CAAC;IAC5D,IACC,OAAO,cAAc,KAAK,QAAQ;QAClC,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAClC;QAGD,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAC/C,cAAc,EACd,OAAO,EACP,qBAAqB,CACrB,CAAC;KACF;IACD,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CACxD,cAAc,EACd,OAAO,CACP,CAAC;AACH,CAAC;AAtBD,wCAsBC;AASM,KAAK,UAAU,YAAY,CACjC,GAAc,EACd,UAAkB;IAElB,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,cAAc,EAAC,CAAC;IAC5D,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;QAGpC,OAAO,CAAC,MAAM,cAAc,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACzE;IACD,OAAO,UAAU,CAAC,WAAW,EAAE,CAAC;AACjC,CAAC;AAXD,oCAWC;AAaM,KAAK,UAAU,mBAAmB,CACxC,GAAc,EACd,OAAmC;IAEnC,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAC1C,GAAG,CAAC,KAAK,CAAC,gBAAgB,CACzB;QACC,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,IAAI,EAAE;oBACL,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE;wBACN,GAAG,EAAE;4BACJ,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE;yBACvC;qBACD;iBACD;aACD;SACD;QACD,QAAQ,EAAE,UAAU;KACpB,EACD,OAAO,CACP,CACD,CAAC;AACH,CAAC;AAxBD,kDAwBC"}
|
package/build/utils/tunnel.js
CHANGED
|
@@ -26,7 +26,7 @@ const tunnelConnectionToDevice = (uuid, port, sdk) => {
|
|
|
26
26
|
sdk.auth.getToken(),
|
|
27
27
|
]).then(([tunnelUrl, whoami, token]) => {
|
|
28
28
|
const auth = {
|
|
29
|
-
user: whoami || 'root',
|
|
29
|
+
user: (whoami === null || whoami === void 0 ? void 0 : whoami.actorType) === 'user' ? whoami.username : 'root',
|
|
30
30
|
password: token,
|
|
31
31
|
};
|
|
32
32
|
return (client) => openPortThroughProxy(tunnelUrl, 443, auth, uuid, port)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../lib/utils/tunnel.ts"],"names":[],"mappings":";;;AAiBA,2BAA2B;AAC3B,6CAAyC;AACzC,sCAA0C;AAE1C,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAEvC,MAAM,2BAA4B,SAAQ,sBAAa;CAAG;AAE1D,MAAM,oBAAqB,SAAQ,wBAAU;IAG5C,YAAY,UAAkB,EAAE,MAAc;QAC7C,KAAK,CAAC,sBAAsB,UAAU,IAAI,MAAM,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC9B,CAAC;CACD;AAED,MAAM,wBAAyB,SAAQ,wBAAU;IAEhD,YAAY,IAAY;QACvB,KAAK,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;CACD;AAEM,MAAM,wBAAwB,GAAG,CACvC,IAAY,EACZ,IAAY,EACZ,GAAc,EACb,EAAE;IACH,OAAO,OAAO,CAAC,GAAG,CAAC;QAClB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE;QACjB,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;KACnB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG;YACZ,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../lib/utils/tunnel.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,7 +62,7 @@ export default class ApiKeysCmd extends Command {
|
|
|
62
62
|
$select: 'actor',
|
|
63
63
|
})
|
|
64
64
|
).actor
|
|
65
|
-
: await getBalenaSdk().auth.
|
|
65
|
+
: await getBalenaSdk().auth.getActorId();
|
|
66
66
|
const keys = await getBalenaSdk().pine.get({
|
|
67
67
|
resource: 'api_key',
|
|
68
68
|
options: {
|
package/lib/commands/deploy.ts
CHANGED
|
@@ -346,9 +346,9 @@ ${dockerignoreHelp}
|
|
|
346
346
|
);
|
|
347
347
|
logger.logWarn(msg);
|
|
348
348
|
|
|
349
|
-
const [token, username, url, options] = await Promise.all([
|
|
349
|
+
const [token, { username }, url, options] = await Promise.all([
|
|
350
350
|
sdk.auth.getToken(),
|
|
351
|
-
sdk.auth.
|
|
351
|
+
sdk.auth.getUserInfo(),
|
|
352
352
|
sdk.settings.get('balenaUrl'),
|
|
353
353
|
{
|
|
354
354
|
// opts.appName may be prefixed by 'owner/', unlike opts.app.app_name
|
|
@@ -371,8 +371,8 @@ ${dockerignoreHelp}
|
|
|
371
371
|
$select: ['commit'],
|
|
372
372
|
});
|
|
373
373
|
} else {
|
|
374
|
-
const [userId, auth, apiEndpoint] = await Promise.all([
|
|
375
|
-
sdk.auth.
|
|
374
|
+
const [{ id: userId }, auth, apiEndpoint] = await Promise.all([
|
|
375
|
+
sdk.auth.getUserInfo(),
|
|
376
376
|
sdk.auth.getToken(),
|
|
377
377
|
sdk.settings.get('apiUrl'),
|
|
378
378
|
]);
|
package/lib/commands/login.ts
CHANGED
|
@@ -137,7 +137,7 @@ export default class LoginCmd extends Command {
|
|
|
137
137
|
console.log(`\nLogging in to ${balenaUrl}`);
|
|
138
138
|
await this.doLogin(options, balenaUrl, params.token);
|
|
139
139
|
|
|
140
|
-
const username = await balena.auth.
|
|
140
|
+
const { username } = await balena.auth.getUserInfo();
|
|
141
141
|
|
|
142
142
|
console.info(`Successfully logged in as: ${username}`);
|
|
143
143
|
console.info(`\
|
|
@@ -165,7 +165,12 @@ ${messages.reachingOut}`);
|
|
|
165
165
|
}
|
|
166
166
|
const balena = getBalenaSdk();
|
|
167
167
|
await balena.auth.loginWithToken(token!);
|
|
168
|
-
|
|
168
|
+
try {
|
|
169
|
+
await balena.auth.getUserInfo();
|
|
170
|
+
} catch (err) {
|
|
171
|
+
if (process.env.DEBUG) {
|
|
172
|
+
console.error(`Get user info failed with: ${err.message}`);
|
|
173
|
+
}
|
|
169
174
|
throw new ExpectedError('Token authentication failed');
|
|
170
175
|
}
|
|
171
176
|
return;
|
package/lib/commands/ssh.ts
CHANGED
|
@@ -152,9 +152,9 @@ export default class SshCmd extends Command {
|
|
|
152
152
|
|
|
153
153
|
const { which } = await import('../utils/which');
|
|
154
154
|
|
|
155
|
-
const [whichProxytunnel, username, proxyUrl] = await Promise.all([
|
|
155
|
+
const [whichProxytunnel, { username }, proxyUrl] = await Promise.all([
|
|
156
156
|
useProxy ? which('proxytunnel', false) : undefined,
|
|
157
|
-
sdk.auth.
|
|
157
|
+
sdk.auth.getUserInfo(),
|
|
158
158
|
// note that `proxyUrl` refers to the balenaCloud "resin-proxy"
|
|
159
159
|
// service, currently "balena-devices.com", rather than some
|
|
160
160
|
// local proxy server URL
|
|
@@ -208,7 +208,7 @@ export default class SshCmd extends Command {
|
|
|
208
208
|
port: options.port || 'cloud',
|
|
209
209
|
proxyCommand,
|
|
210
210
|
service: params.service,
|
|
211
|
-
username
|
|
211
|
+
username,
|
|
212
212
|
});
|
|
213
213
|
}
|
|
214
214
|
|
package/lib/commands/whoami.ts
CHANGED
|
@@ -36,11 +36,11 @@ export default class WhoamiCmd extends Command {
|
|
|
36
36
|
|
|
37
37
|
const balena = getBalenaSdk();
|
|
38
38
|
|
|
39
|
-
const [username, email, url] = await Promise.all([
|
|
40
|
-
balena.auth.
|
|
41
|
-
balena.auth.getEmail(),
|
|
39
|
+
const [{ username, email }, url] = await Promise.all([
|
|
40
|
+
balena.auth.getUserInfo(),
|
|
42
41
|
balena.settings.get('balenaUrl'),
|
|
43
42
|
]);
|
|
43
|
+
|
|
44
44
|
console.log(
|
|
45
45
|
getVisuals().table.vertical({ username, email, url }, [
|
|
46
46
|
'$account information$',
|
package/lib/utils/bootstrap.ts
CHANGED
|
@@ -167,7 +167,7 @@ export async function getCachedUsername(): Promise<CachedUsername | undefined> {
|
|
|
167
167
|
// ignore
|
|
168
168
|
}
|
|
169
169
|
try {
|
|
170
|
-
const username = await getBalenaSdk().auth.
|
|
170
|
+
const { username } = await getBalenaSdk().auth.getUserInfo();
|
|
171
171
|
if (username) {
|
|
172
172
|
cachedUsername = { token, username };
|
|
173
173
|
await storage.set('cachedUsername', cachedUsername);
|
package/lib/utils/promote.ts
CHANGED
|
@@ -386,8 +386,11 @@ async function createApplication(
|
|
|
386
386
|
): Promise<ApplicationWithDeviceTypeSlug> {
|
|
387
387
|
const validation = await import('./validation');
|
|
388
388
|
|
|
389
|
-
|
|
390
|
-
|
|
389
|
+
let username: string;
|
|
390
|
+
try {
|
|
391
|
+
const userInfo = await sdk.auth.getUserInfo();
|
|
392
|
+
username = userInfo.username;
|
|
393
|
+
} catch (err) {
|
|
391
394
|
throw new sdk.errors.BalenaNotLoggedIn();
|
|
392
395
|
}
|
|
393
396
|
|
|
@@ -404,7 +407,7 @@ async function createApplication(
|
|
|
404
407
|
try {
|
|
405
408
|
await sdk.models.application.getDirectlyAccessible(appName, {
|
|
406
409
|
$filter: {
|
|
407
|
-
slug: { $startswith: `${username
|
|
410
|
+
slug: { $startswith: `${username.toLowerCase()}/` },
|
|
408
411
|
},
|
|
409
412
|
});
|
|
410
413
|
// TODO: This is the only example in the codebase where `printErrorMessage()`
|
package/lib/utils/sdk.ts
CHANGED
package/lib/utils/tunnel.ts
CHANGED