@hubspot/local-dev-lib 0.2.1-experimental.1 → 0.2.2-experimental.0

package/lib/personalAccessKey.js

@@ -13,6 +13,7 @@ const config_1 = require("../config");
 const config_2 = require("../constants/config");
 const developerTestAccounts_1 = require("../api/developerTestAccounts");
 const logger_1 = require("./logger");
+const CLIConfiguration_1 = require("../config/CLIConfiguration");
 const lang_1 = require("../utils/lang");
 const errors_1 = require("../errors");
 const i18nKey = 'lib.personalAccessKey';
@@ -35,30 +36,30 @@ async function getAccessToken(personalAccessKey, env = environments_1.ENVIRONMEN
     };
 }
 exports.getAccessToken = getAccessToken;
-async function refreshAccessToken(account) {
-    const { personalAccessKey, env, accountId } = account;
+async function refreshAccessToken(personalAccessKey, env = environments_1.ENVIRONMENTS.PROD, accountId) {
     const accessTokenResponse = await getAccessToken(personalAccessKey, env, accountId);
     const { accessToken, expiresAt } = accessTokenResponse;
-    (0, config_1.updateConfigAccount)({
-        ...account,
-        auth: {
-            tokenInfo: {
-                accessToken,
-                expiresAt: expiresAt,
-            },
+    const config = (0, config_1.getAccountConfig)(accountId);
+    (0, config_1.updateAccountConfig)({
+        env,
+        ...config,
+        accountId,
+        tokenInfo: {
+            accessToken,
+            expiresAt: expiresAt,
         },
     });
+    (0, config_1.writeConfig)();
     return accessTokenResponse;
 }
-async function getNewAccessToken(account) {
-    const { personalAccessKey, auth } = account;
-    const key = getRefreshKey(personalAccessKey, auth.tokenInfo.expiresAt);
+async function getNewAccessToken(accountId, personalAccessKey, expiresAt, env) {
+    const key = getRefreshKey(personalAccessKey, expiresAt);
     if (refreshRequests.has(key)) {
         return refreshRequests.get(key);
     }
     let accessTokenResponse;
     try {
-        const refreshAccessPromise = refreshAccessToken(account);
+        const refreshAccessPromise = refreshAccessToken(personalAccessKey, env, accountId);
         if (key) {
             refreshRequests.set(key, refreshAccessPromise);
         }
@@ -73,37 +74,28 @@ async function getNewAccessToken(account) {
     return accessTokenResponse;
 }
 async function getNewAccessTokenByAccountId(accountId) {
-    const account = (0, config_1.getConfigAccountById)(accountId);
+    const account = (0, config_1.getAccountConfig)(accountId);
     if (!account) {
         throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.accountNotFound`, { accountId }));
     }
-    if (account.authType !== auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidAuthType`, {
-            accountId,
-        }));
-    }
-    const accessTokenResponse = await getNewAccessToken(account);
+    const { auth, personalAccessKey, env } = account;
+    const accessTokenResponse = await getNewAccessToken(accountId, personalAccessKey, auth?.tokenInfo?.expiresAt, env);
     return accessTokenResponse;
 }
 async function accessTokenForPersonalAccessKey(accountId, forceRefresh = false) {
-    const account = (0, config_1.getConfigAccountById)(accountId);
+    const account = (0, config_1.getAccountConfig)(accountId);
     if (!account) {
         throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.accountNotFound`, { accountId }));
     }
-    if (account.authType !== auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidAuthType`, {
-            accountId,
-        }));
-    }
-    const { auth } = account;
+    const { auth, personalAccessKey, env } = account;
     const authTokenInfo = auth && auth.tokenInfo;
     const authDataExists = authTokenInfo && auth?.tokenInfo?.accessToken;
     if (!authDataExists ||
         forceRefresh ||
         (0, moment_1.default)().add(5, 'minutes').isAfter((0, moment_1.default)(authTokenInfo.expiresAt))) {
-        return getNewAccessToken(account).then(tokenInfo => tokenInfo.accessToken);
+        return getNewAccessToken(accountId, personalAccessKey, authTokenInfo && authTokenInfo.expiresAt, env).then(tokenInfo => tokenInfo.accessToken);
     }
-    return auth.tokenInfo?.accessToken;
+    return auth?.tokenInfo?.accessToken;
 }
 exports.accessTokenForPersonalAccessKey = accessTokenForPersonalAccessKey;
 async function enabledFeaturesForPersonalAccessKey(accountId) {
@@ -121,10 +113,7 @@ async function authorizedScopesForPortalAndUser(accountId) {
 exports.authorizedScopesForPortalAndUser = authorizedScopesForPortalAndUser;
 async function updateConfigWithAccessToken(token, personalAccessKey, env, name, makeDefault = false) {
     const { portalId, accessToken, expiresAt, accountType } = token;
-    const account = name
-        ? (0, config_1.getConfigAccountByName)(name)
-        : (0, config_1.getConfigDefaultAccount)();
-    const accountEnv = env || account.env;
+    const accountEnv = env || (0, config_1.getEnv)(name);
     let parentAccountId;
     try {
         if (accountType === config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
@@ -157,19 +146,21 @@ async function updateConfigWithAccessToken(token, personalAccessKey, env, name,
         }
         logger_1.logger.debug(err);
     }
-    const updatedAccount = {
+    const updatedAccount = (0, config_1.updateAccountConfig)({
         accountId: portalId,
         accountType,
         personalAccessKey,
-        name: name || account.name,
+        name,
         authType: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-        auth: { tokenInfo: { accessToken, expiresAt } },
+        tokenInfo: { accessToken, expiresAt },
         parentAccountId,
         env: accountEnv,
-    };
-    (0, config_1.updateConfigAccount)(updatedAccount);
+    });
+    if (!CLIConfiguration_1.CLIConfiguration.isActive()) {
+        (0, config_1.writeConfig)();
+    }
     if (makeDefault && name) {
-        (0, config_1.setConfigAccountAsDefault)(name);
+        (0, config_1.updateDefaultAccount)(name);
     }
     return updatedAccount;
 }

package/lib/trackUsage.js

@@ -11,7 +11,6 @@ const http_1 = require("../http");
 const config_1 = require("../config");
 const fileMapper_1 = require("../api/fileMapper");
 const lang_1 = require("../utils/lang");
-const environment_1 = require("./environment");
 const i18nKey = 'lib.trackUsage';
 async function trackUsage(eventName, eventClass, meta = {}, accountId) {
     const usageEvent = {
@@ -36,8 +35,8 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.invalidEvent`, { eventName }));
     }
     const path = `${fileMapper_1.FILE_MAPPER_API_PATH}/${analyticsEndpoint}`;
-    const account = accountId && (0, config_1.getConfigAccountById)(accountId);
-    if (account && account.authType === 'personalaccesskey') {
+    const accountConfig = accountId && (0, config_1.getAccountConfig)(accountId);
+    if (accountConfig && accountConfig.authType === 'personalaccesskey') {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.sendingEventAuthenticated`));
         try {
             await http_1.http.post(accountId, {
@@ -51,9 +50,7 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.retryingEventUnauthenticated`));
         }
     }
-    const env = accountId
-        ? (0, config_1.getConfigAccountEnvironment)(accountId)
-        : (0, environment_1.getValidEnv)();
+    const env = (0, config_1.getEnv)(accountId);
     const axiosConfig = (0, getAxiosConfig_1.getAxiosConfig)({
         env,
         url: path,

package/models/OAuth2Manager.d.ts

@@ -1,11 +1,12 @@
-import { OAuthConfigAccount, WriteTokenInfoFunction, RefreshTokenResponse, ExchangeProof } from '../types/Accounts';
+import { FlatAccountFields, OAuth2ManagerAccountConfig, WriteTokenInfoFunction, RefreshTokenResponse, ExchangeProof } from '../types/Accounts';
 export declare class OAuth2Manager {
-    account: OAuthConfigAccount;
+    account: OAuth2ManagerAccountConfig;
     writeTokenInfo?: WriteTokenInfoFunction;
     refreshTokenRequest: Promise<RefreshTokenResponse> | null;
-    constructor(account: OAuthConfigAccount, writeTokenInfo?: WriteTokenInfoFunction);
+    constructor(account: OAuth2ManagerAccountConfig, writeTokenInfo?: WriteTokenInfoFunction);
     accessToken(): Promise<string | undefined>;
     fetchAccessToken(exchangeProof: ExchangeProof): Promise<void>;
     exchangeForTokens(exchangeProof: ExchangeProof): Promise<void>;
     refreshAccessToken(): Promise<void>;
+    static fromConfig(accountConfig: FlatAccountFields, writeTokenInfo: WriteTokenInfoFunction): OAuth2Manager;
 }

package/models/OAuth2Manager.js

@@ -9,6 +9,8 @@ const moment_1 = __importDefault(require("moment"));
 const urls_1 = require("../lib/urls");
 const environment_1 = require("../lib/environment");
 const logger_1 = require("../lib/logger");
+const getAccountIdentifier_1 = require("../config/getAccountIdentifier");
+const auth_1 = require("../constants/auth");
 const lang_1 = require("../utils/lang");
 const i18nKey = 'models.OAuth2Manager';
 class OAuth2Manager {
@@ -24,23 +26,23 @@ class OAuth2Manager {
         }
     }
     async accessToken() {
-        if (!this.account.auth.tokenInfo.refreshToken) {
+        if (!this.account.tokenInfo?.refreshToken) {
             throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.missingRefreshToken`, {
-                accountId: this.account.accountId,
+                accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
             }));
         }
-        if (!this.account.auth.tokenInfo.accessToken ||
+        if (!this.account.tokenInfo?.accessToken ||
             (0, moment_1.default)()
                 .add(5, 'minutes')
-                .isAfter((0, moment_1.default)(new Date(this.account.auth.tokenInfo.expiresAt || '')))) {
+                .isAfter((0, moment_1.default)(new Date(this.account.tokenInfo.expiresAt || '')))) {
             await this.refreshAccessToken();
         }
-        return this.account.auth.tokenInfo.accessToken;
+        return this.account.tokenInfo.accessToken;
     }
     async fetchAccessToken(exchangeProof) {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.fetchingAccessToken`, {
-            accountId: this.account.accountId,
-            clientId: this.account.auth.clientId,
+            accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
+            clientId: this.account.clientId || '',
         }));
         try {
             const { data } = await (0, axios_1.default)({
@@ -51,20 +53,20 @@ class OAuth2Manager {
             });
             this.refreshTokenRequest = data;
             const { refresh_token: refreshToken, access_token: accessToken, expires_in: expiresIn, } = data;
-            if (!this.account.auth.tokenInfo) {
-                this.account.auth.tokenInfo = {};
+            if (!this.account.tokenInfo) {
+                this.account.tokenInfo = {};
             }
-            this.account.auth.tokenInfo.refreshToken = refreshToken;
-            this.account.auth.tokenInfo.accessToken = accessToken;
-            this.account.auth.tokenInfo.expiresAt = (0, moment_1.default)()
+            this.account.tokenInfo.refreshToken = refreshToken;
+            this.account.tokenInfo.accessToken = accessToken;
+            this.account.tokenInfo.expiresAt = (0, moment_1.default)()
                 .add(Math.round(parseInt(expiresIn) * 0.75), 'seconds')
                 .toString();
             if (this.writeTokenInfo) {
                 logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updatingTokenInfo`, {
-                    accountId: this.account.accountId,
-                    clientId: this.account.auth.clientId,
+                    accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
+                    clientId: this.account.clientId || '',
                 }));
-                this.writeTokenInfo(this.account.auth.tokenInfo);
+                this.writeTokenInfo(this.account.tokenInfo);
             }
         }
         finally {
@@ -74,8 +76,8 @@ class OAuth2Manager {
     async exchangeForTokens(exchangeProof) {
         if (this.refreshTokenRequest) {
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.refreshingAccessToken`, {
-                accountId: this.account.accountId,
-                clientId: this.account.auth.clientId,
+                accountId: (0, getAccountIdentifier_1.getAccountIdentifier)(this.account),
+                clientId: this.account.clientId || '',
             }));
             await this.refreshTokenRequest;
         }
@@ -86,11 +88,18 @@ class OAuth2Manager {
     async refreshAccessToken() {
         const refreshTokenProof = {
             grant_type: 'refresh_token',
-            client_id: this.account.auth.clientId,
-            client_secret: this.account.auth.clientSecret,
-            refresh_token: this.account.auth.tokenInfo.refreshToken,
+            client_id: this.account.clientId,
+            client_secret: this.account.clientSecret,
+            refresh_token: this.account.tokenInfo?.refreshToken,
         };
         await this.exchangeForTokens(refreshTokenProof);
     }
+    static fromConfig(accountConfig, writeTokenInfo) {
+        return new OAuth2Manager({
+            ...accountConfig,
+            authType: auth_1.AUTH_METHODS.oauth.value,
+            ...(accountConfig.auth || {}),
+        }, writeTokenInfo);
+    }
 }
 exports.OAuth2Manager = OAuth2Manager;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.2.1-experimental.1",
+    "version": "0.2.2-experimental.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",
@@ -50,6 +50,7 @@
         "./http": "./http/index.js",
         "./http/*": "./http/*.js",
         "./config/getAccountIdentifier": "./config/getAccountIdentifier.js",
+        "./config/migrate": "./config/migrate.js",
         "./config": "./config/index.js",
         "./constants/*": "./constants/*.js",
         "./models/*": "./models/*.js",
@@ -57,13 +58,13 @@
     },
     "dependencies": {
         "address": "2.0.2",
-        "axios": "1.8.3",
+        "axios": "1.7.2",
         "chalk": "2.4.2",
         "chokidar": "3.6.0",
         "content-disposition": "0.5.4",
         "cors": "2.8.5",
         "debounce": "1.2.1",
-        "express": "4.21.2",
+        "express": "4.19.2",
         "extract-zip": "2.0.1",
         "findup-sync": "5.0.0",
         "fs-extra": "11.2.0",

package/types/Accounts.d.ts

@@ -2,20 +2,45 @@ import { HUBSPOT_ACCOUNT_TYPES } from '../constants/config';
 import { CmsPublishMode } from './Files';
 import { Environment } from './Config';
 import { ValueOf } from './Utils';
-import { PERSONAL_ACCESS_KEY_AUTH_METHOD, OAUTH_AUTH_METHOD, API_KEY_AUTH_METHOD } from '../constants/auth';
 export type AuthType = 'personalaccesskey' | 'apikey' | 'oauth2';
-interface BaseHubSpotConfigAccount {
-    name: string;
+export interface CLIAccount_NEW {
+    name?: string;
     accountId: number;
     accountType?: AccountType;
     defaultCmsPublishMode?: CmsPublishMode;
     env: Environment;
-    authType: AuthType;
-    parentAccountId?: number;
+    authType?: AuthType;
+    auth?: {
+        tokenInfo?: TokenInfo;
+        clientId?: string;
+        clientSecret?: string;
+    };
+    sandboxAccountType?: string | null;
+    parentAccountId?: number | null;
+    apiKey?: string;
+    personalAccessKey?: string;
+}
+export interface CLIAccount_DEPRECATED {
+    name?: string;
+    portalId?: number;
+    defaultCmsPublishMode?: CmsPublishMode;
+    env: Environment;
+    accountType?: AccountType;
+    authType?: AuthType;
+    auth?: {
+        tokenInfo?: TokenInfo;
+        clientId?: string;
+        clientSecret?: string;
+    };
+    sandboxAccountType?: string | null;
+    parentAccountId?: number | null;
+    apiKey?: string;
+    personalAccessKey?: string;
 }
-export type DeprecatedHubSpotConfigAccountFields = {
+export type CLIAccount = CLIAccount_NEW | CLIAccount_DEPRECATED;
+export type GenericAccount = {
     portalId?: number;
-    sandboxAccountType?: string;
+    accountId?: number;
 };
 export type AccountType = ValueOf<typeof HUBSPOT_ACCOUNT_TYPES>;
 export type TokenInfo = {
@@ -23,27 +48,60 @@ export type TokenInfo = {
     expiresAt?: string;
     refreshToken?: string;
 };
-export interface PersonalAccessKeyConfigAccount extends BaseHubSpotConfigAccount {
-    authType: typeof PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+export interface PersonalAccessKeyAccount_NEW extends CLIAccount_NEW {
+    authType: 'personalaccesskey';
+    personalAccessKey: string;
+}
+export interface PersonalAccessKeyAccount_DEPRECATED extends CLIAccount_DEPRECATED {
+    authType: 'personalaccesskey';
     personalAccessKey: string;
+}
+export type PersonalAccessKeyAccount = PersonalAccessKeyAccount_NEW | PersonalAccessKeyAccount_DEPRECATED;
+export interface OAuthAccount_NEW extends CLIAccount_NEW {
+    authType: 'oauth2';
     auth: {
-        tokenInfo: TokenInfo;
+        clientId?: string;
+        clientSecret?: string;
+        scopes?: Array<string>;
+        tokenInfo?: TokenInfo;
     };
 }
-export interface OAuthConfigAccount extends BaseHubSpotConfigAccount {
-    authType: typeof OAUTH_AUTH_METHOD.value;
+export interface OAuthAccount_DEPRECATED extends CLIAccount_DEPRECATED {
+    authType: 'oauth2';
     auth: {
-        clientId: string;
-        clientSecret: string;
-        scopes: Array<string>;
-        tokenInfo: TokenInfo;
+        clientId?: string;
+        clientSecret?: string;
+        scopes?: Array<string>;
+        tokenInfo?: TokenInfo;
     };
 }
-export interface APIKeyConfigAccount extends BaseHubSpotConfigAccount {
-    authType: typeof API_KEY_AUTH_METHOD.value;
+export type OAuthAccount = OAuthAccount_NEW | OAuthAccount_DEPRECATED;
+export interface APIKeyAccount_NEW extends CLIAccount_NEW {
+    authType: 'apikey';
     apiKey: string;
 }
-export type HubSpotConfigAccount = PersonalAccessKeyConfigAccount | OAuthConfigAccount | APIKeyConfigAccount;
+export interface APIKeyAccount_DEPRECATED extends CLIAccount_DEPRECATED {
+    authType: 'apikey';
+    apiKey: string;
+}
+export type APIKeyAccount = APIKeyAccount_NEW | APIKeyAccount_DEPRECATED;
+export interface FlatAccountFields_NEW extends CLIAccount_NEW {
+    tokenInfo?: TokenInfo;
+    clientId?: string;
+    clientSecret?: string;
+    scopes?: Array<string>;
+    apiKey?: string;
+    personalAccessKey?: string;
+}
+export interface FlatAccountFields_DEPRECATED extends CLIAccount_DEPRECATED {
+    tokenInfo?: TokenInfo;
+    clientId?: string;
+    clientSecret?: string;
+    scopes?: Array<string>;
+    apiKey?: string;
+    personalAccessKey?: string;
+}
+export type FlatAccountFields = FlatAccountFields_NEW | FlatAccountFields_DEPRECATED;
 export type ScopeData = {
     portalScopesInGroup: Array<string>;
     userScopesInGroup: Array<string>;
@@ -79,6 +137,27 @@ export type EnabledFeaturesResponse = {
         [key: string]: boolean;
     };
 };
+export type UpdateAccountConfigOptions = Partial<FlatAccountFields_DEPRECATED> & {
+    environment?: Environment;
+};
+export type PersonalAccessKeyOptions = {
+    accountId: number;
+    personalAccessKey: string;
+    env: Environment;
+};
+export type OAuthOptions = {
+    accountId: number;
+    clientId: string;
+    clientSecret: string;
+    refreshToken: string;
+    scopes: Array<string>;
+    env: Environment;
+};
+export type APIKeyOptions = {
+    accountId: number;
+    apiKey: string;
+    env: Environment;
+};
 export type AccessToken = {
     portalId: number;
     accessToken: string;
@@ -91,6 +170,17 @@ export type AccessToken = {
     hubName: string;
     accountType: ValueOf<typeof HUBSPOT_ACCOUNT_TYPES>;
 };
+export type OAuth2ManagerAccountConfig = {
+    name?: string;
+    accountId?: number;
+    clientId?: string;
+    clientSecret?: string;
+    scopes?: Array<string>;
+    env?: Environment;
+    environment?: Environment;
+    tokenInfo?: TokenInfo;
+    authType?: 'oauth2';
+};
 export type WriteTokenInfoFunction = (tokenInfo: TokenInfo) => void;
 export type RefreshTokenResponse = {
     refresh_token: string;
@@ -103,4 +193,3 @@ export type ExchangeProof = {
     client_secret?: string;
     refresh_token?: string;
 };
-export {};

package/types/Config.d.ts

@@ -1,27 +1,40 @@
-import { CONFIG_FLAGS } from '../constants/config';
 import { ENVIRONMENTS } from '../constants/environments';
-import { DeprecatedHubSpotConfigAccountFields, HubSpotConfigAccount } from './Accounts';
+import { CLIAccount_NEW, CLIAccount_DEPRECATED } from './Accounts';
 import { CmsPublishMode } from './Files';
 import { ValueOf } from './Utils';
-export interface HubSpotConfig {
-    accounts: Array<HubSpotConfigAccount>;
+export interface CLIConfig_NEW {
+    accounts: Array<CLIAccount_NEW>;
     allowUsageTracking?: boolean;
-    defaultAccount?: number;
+    defaultAccount?: string | number;
+    defaultMode?: CmsPublishMode;
     defaultCmsPublishMode?: CmsPublishMode;
     httpTimeout?: number;
     env?: Environment;
     httpUseLocalhost?: boolean;
-    useCustomObjectHubfile?: boolean;
 }
-export type DeprecatedHubSpotConfigFields = {
-    portals?: Array<HubSpotConfigAccount & DeprecatedHubSpotConfigAccountFields>;
-    defaultPortal?: string;
+export interface CLIConfig_DEPRECATED {
+    portals: Array<CLIAccount_DEPRECATED>;
+    allowUsageTracking?: boolean;
+    defaultPortal?: string | number;
     defaultMode?: CmsPublishMode;
-};
+    defaultCmsPublishMode?: CmsPublishMode;
+    httpTimeout?: number;
+    env?: Environment;
+    httpUseLocalhost?: boolean;
+}
+export type CLIConfig = CLIConfig_NEW | CLIConfig_DEPRECATED;
 export type Environment = ValueOf<typeof ENVIRONMENTS> | '';
+export type EnvironmentConfigVariables = {
+    apiKey?: string;
+    clientId?: string;
+    clientSecret?: string;
+    personalAccessKey?: string;
+    accountId?: number;
+    refreshToken?: string;
+    env?: Environment;
+};
 export type GitInclusionResult = {
     inGit: boolean;
     configIgnored: boolean;
     gitignoreFiles: Array<string>;
 };
-export type ConfigFlag = ValueOf<typeof CONFIG_FLAGS>;

package/types/Http.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 import { AxiosPromise, ResponseType } from 'axios';
 import { ReadStream } from 'fs';
 import { Stream } from 'stream';

package/utils/accounts.d.ts

@@ -0,0 +1,4 @@
+import { CLIAccount } from '../types/Accounts';
+import { CLIConfig } from '../types/Config';
+export declare function getAccounts(config?: CLIConfig | null): Array<CLIAccount>;
+export declare function getDefaultAccount(config?: CLIConfig | null): string | number | undefined;

package/utils/accounts.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultAccount = exports.getAccounts = void 0;
+function getAccounts(config) {
+    if (!config) {
+        return [];
+    }
+    else if (Object.hasOwn(config, 'portals')) {
+        return config.portals;
+    }
+    else if (Object.hasOwn(config, 'accounts')) {
+        return config.accounts;
+    }
+    return [];
+}
+exports.getAccounts = getAccounts;
+function getDefaultAccount(config) {
+    if (!config) {
+        return undefined;
+    }
+    else if (Object.hasOwn(config, 'defaultPortal')) {
+        return config.defaultPortal;
+    }
+    else if (Object.hasOwn(config, 'defaultAccount')) {
+        return config.defaultAccount;
+    }
+}
+exports.getDefaultAccount = getDefaultAccount;

package/config/defaultAccountOverride.d.ts

@@ -1,2 +0,0 @@
-export declare function getDefaultAccountOverrideAccountId(): number | null;
-export declare function getDefaultAccountOverrideFilePath(): string | null;

package/config/defaultAccountOverride.js

@@ -1,57 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultAccountOverrideFilePath = exports.getDefaultAccountOverrideAccountId = void 0;
-const findup_sync_1 = __importDefault(require("findup-sync"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = require("../lib/path");
-const config_1 = require("../constants/config");
-const lang_1 = require("../utils/lang");
-const FileSystemError_1 = require("../models/FileSystemError");
-const index_1 = require("./index");
-const i18nKey = 'config.defaultAccountOverride';
-function getDefaultAccountOverrideAccountId() {
-    const defaultAccountOverrideFilePath = getDefaultAccountOverrideFilePath();
-    if (!defaultAccountOverrideFilePath) {
-        return null;
-    }
-    let source;
-    try {
-        source = fs_extra_1.default.readFileSync(defaultAccountOverrideFilePath, 'utf8');
-    }
-    catch (e) {
-        throw new FileSystemError_1.FileSystemError({ cause: e }, {
-            filepath: defaultAccountOverrideFilePath,
-            operation: 'read',
-        });
-    }
-    const accountId = parseInt(source);
-    if (isNaN(accountId)) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.getDefaultAccountOverrideAccountId.errorHeader`, {
-            hsAccountFile: defaultAccountOverrideFilePath,
-        }), {
-            // TODO: This is improper use of cause, we should create a custom error class
-            cause: config_1.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID,
-        });
-    }
-    const accounts = (0, index_1.getAllConfigAccounts)();
-    const account = accounts?.find(account => account.accountId === accountId);
-    if (!account) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.getDefaultAccountOverrideAccountId.errorHeader`, {
-            hsAccountFile: defaultAccountOverrideFilePath,
-        }), {
-            // TODO: This is improper use of cause, we should create a custom error class
-            cause: config_1.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND,
-        });
-    }
-    return account.accountId;
-}
-exports.getDefaultAccountOverrideAccountId = getDefaultAccountOverrideAccountId;
-function getDefaultAccountOverrideFilePath() {
-    return (0, findup_sync_1.default)([config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME], {
-        cwd: (0, path_1.getCwd)(),
-    });
-}
-exports.getDefaultAccountOverrideFilePath = getDefaultAccountOverrideFilePath;