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
2 changes: 1 addition & 1 deletion src/configs/cli.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
import {assertNonNullish, nonNullish} from '@dfinity/utils';
import type Conf from 'conf';
import {red, yellow} from 'kleur';
import {askForPassword} from '../services/cli.settings.services';
import {getSettingsStore} from '../stores/settings.store';
import type {CliConfig, CliOrbiterConfig, CliSatelliteConfig} from '../types/cli.config';
import type {JsonnableEd25519KeyIdentity} from '../types/identity';
import {loadConfig} from '../utils/config.utils';

// Save in https://github.com/sindresorhus/env-paths#pathsconfig
Expand Down
2 changes: 1 addition & 1 deletion src/services/auth/login.services.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
import {nextArg} from '@junobuild/cli-tools';
import {bold, green, underline} from 'kleur';
import {randomBytes} from 'node:crypto';
Expand All @@ -8,7 +9,6 @@ import path, {dirname} from 'node:path';
import {fileURLToPath} from 'node:url';
import util from 'node:util';
import {saveCliConfig} from '../../configs/cli.config';
import type {JsonnableEd25519KeyIdentity} from '../../types/identity';
import {authUrl, generateToken, requestUrl} from '../../utils/auth.utils';
import {openUrl} from '../../utils/open.utils';
import {getPort} from '../../utils/port.utils';
Expand Down
2 changes: 1 addition & 1 deletion src/types/cli.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
import type {PrincipalText} from '@dfinity/zod-schemas';
import type {JsonnableEd25519KeyIdentity} from './identity';

export interface CliConfig {
token: JsonnableEd25519KeyIdentity;
Expand Down
4 changes: 0 additions & 4 deletions src/types/identity.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/utils/auth.utils.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
import {Ed25519KeyIdentity} from '@dfinity/identity';
import {nonNullish} from '@dfinity/utils';
import type {PrincipalText} from '@dfinity/zod-schemas';
import {REDIRECT_URL} from '../constants/constants';
import {ENV} from '../env';
import type {JsonnableEd25519KeyIdentity} from '../types/identity';

export const generateToken = (): {principal: PrincipalText; token: JsonnableEd25519KeyIdentity} => {
const key = Ed25519KeyIdentity.generate();
Expand Down
2 changes: 1 addition & 1 deletion src/utils/process.utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
import {hasArgs} from '@junobuild/cli-tools';
import {type JsonnableEd25519KeyIdentity} from '../types/identity';

export const getProcessToken = (): JsonnableEd25519KeyIdentity | undefined => {
const envToken = process.env.JUNO_TOKEN;
Expand Down