Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/commands/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ import {DEV} from '../env';
import {loginEmulatorOnly} from '../services/auth/login.emulator.services';
import {login as loginServices} from '../services/auth/login.services';
import {reuseController} from '../services/controllers.services';
import {isHeadless} from '../utils/process.utils';
import {confirmAndExit} from '../utils/prompt.utils';
import {confirmAndExitUnlessHeadlessAndDev} from '../utils/prompt.utils';

export const logout = async () => {
await clearCliConfig();
Expand Down Expand Up @@ -63,11 +62,6 @@ const emulatorLogin = async () => {
return;
}

if (isHeadless()) {
await loginEmulatorOnly();
return;
}

const token = await getToken();

if (isNullish(token)) {
Expand All @@ -78,7 +72,7 @@ const emulatorLogin = async () => {
const identity = Ed25519KeyIdentity.fromParsedJson(token);
console.log(`🔐 Your terminal already has access: ${green(identity.getPrincipal().toText())}\n`);

await confirmAndExit(
await confirmAndExitUnlessHeadlessAndDev(
'Would you like to overwrite the saved development authentication on this device'
);

Expand Down
4 changes: 2 additions & 2 deletions src/services/modules/snapshot/_snapshot.loader.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ora from 'ora';
import {listCanisterSnapshots} from '../../../api/ic.api';
import type {AssetKey} from '../../../types/asset-key';
import {displaySegment} from '../../../utils/display.utils';
import {confirmAndExit} from '../../../utils/prompt.utils';
import {confirmAndExitUnlessHeadlessAndDev} from '../../../utils/prompt.utils';

const loadSnapshot = async ({
canisterId
Expand Down Expand Up @@ -54,7 +54,7 @@ export const loadSnapshotAndAssertOverwrite = async ({
const existingSnapshotId = await loadSnapshot({canisterId});

if (nonNullish(existingSnapshotId)) {
await confirmAndExit(
await confirmAndExitUnlessHeadlessAndDev(
`A snapshot for your ${displaySegment(segment)} already exists with ID 0x${encodeSnapshotId(existingSnapshotId)}. Do you want to overwrite it?`
);
}
Expand Down
6 changes: 3 additions & 3 deletions src/services/modules/snapshot/snapshot.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import type {AssetKey} from '../../../types/asset-key';
import {displaySegment} from '../../../utils/display.utils';
import {assertNonNullishFolderExists} from '../../../utils/fs.utils';
import {confirmAndExit} from '../../../utils/prompt.utils';
import {confirmAndExitUnlessHeadlessAndDev} from '../../../utils/prompt.utils';
import {assertMatchingJunoPackage} from './_snapshot.assert.services';
import {
loadSnapshotAndAssertExist,
Expand Down Expand Up @@ -56,7 +56,7 @@ export const restoreSnapshot = async ({

const {snapshotId: existingSnapshotId} = result;

await confirmAndExit(
await confirmAndExitUnlessHeadlessAndDev(
`Restoring the snapshot 0x${encodeSnapshotId(existingSnapshotId)} will permanently overwrite the current state of your ${displaySegment(segment)}. Are you sure you want to proceed?`
);

Expand Down Expand Up @@ -84,7 +84,7 @@ export const deleteSnapshot = async ({

const {snapshotId: existingSnapshotId} = result;

await confirmAndExit(
await confirmAndExitUnlessHeadlessAndDev(
`Are you sure you want to delete the snapshot 0x${encodeSnapshotId(existingSnapshotId)} of your ${displaySegment(segment)}?`
);

Expand Down
10 changes: 10 additions & 0 deletions src/utils/prompt.utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import prompts from 'prompts';
import {DEV} from '../env';
import {isHeadless} from './process.utils';

export const NEW_CMD_LINE = '\n ';

Expand Down Expand Up @@ -46,3 +48,11 @@ export const confirmAndExit = async (message: string) => {
process.exit(1);
}
};

export const confirmAndExitUnlessHeadlessAndDev = async (message: string) => {
if (isHeadless() && DEV) {
return;
}

await confirmAndExit(message);
};
Loading