ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-02-22 18:12:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor: use checkLoggedIn() instead of exitIfNotLoggedIn()

Browse Source 
Change-type: patch
Signed-off-by: Scott Lowe <scott@balena.io>
This commit is contained in:
Scott Lowe 2020-04-30 10:02:22 +02:00
parent 1d9a397f71
commit 153cdf4bb0
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/actions/logs.ts
View File

@ -91,7 +91,7 @@ export const logs: CommandDefinition<
'../utils/device/logs' '../utils/device/logs'
); );
const { validateIPAddress } = await import('../utils/validation'); const { validateIPAddress } = await import('../utils/validation');
const { exitIfNotLoggedIn, exitWithExpectedError } = await import( const { checkLoggedIn, exitWithExpectedError } = await import(
'../utils/patterns' '../utils/patterns'
); );
const Logger = await import('../utils/logger'); const Logger = await import('../utils/logger');
@ -152,7 +152,7 @@ export const logs: CommandDefinition<
servicesToDisplay, servicesToDisplay,
); );
} else { } else {
await exitIfNotLoggedIn(); await checkLoggedIn();
if (options.tail) { if (options.tail) {
return balena.logs return balena.logs
.subscribe(params.uuidOrDevice, { count: 100 }) .subscribe(params.uuidOrDevice, { count: 100 })

16
lib/utils/patterns.ts
View File

@ -88,22 +88,6 @@ export async function checkLoggedIn(): Promise<void> {
} }
} }
/**
* Check if logged in, and call `exitWithExpectedError()` if not.
* DEPRECATED: Use checkLoggedIn() instead.
*/
export async function exitIfNotLoggedIn(): Promise<void> {
try {
await checkLoggedIn();
} catch (error) {
if (error instanceof NotLoggedInError) {
exitWithExpectedError(error);
} else {
throw error;
}
}
}
export function askLoginType() { export function askLoginType() {
return getForm().ask<'web' | 'credentials' | 'token' | 'register'>({ return getForm().ask<'web' | 'credentials' | 'token' | 'register'>({
message: 'How would you like to login?', message: 'How would you like to login?',