Skip to content

Config: split token and account ID into separate file #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
evokateur wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Config: split token and account ID into separate file #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
89 changes: 76 additions & 13 deletions src/utils/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ export interface AccountConfig {
aliases: Record<string, Alias>;
}

interface SessionConfig {
accessToken: string;
accountId: string;
}

export interface Alias {
projectId: number;
taskId: number;
Expand All @@ -22,38 +27,84 @@ export class ConfigNotFoundError extends Error {}

export async function getConfig(): Promise<Config> {
try {
const config = await fs.promises.readFile(await configPath(), "utf-8");
return JSON.parse(config);
} catch {
const [session, parsedConfig] = await Promise.all([
readSessionFile(),
readConfigFile(),
]);

const { accessToken, accountId, ...restConfig } = parsedConfig;

return {
accessToken: session.accessToken,
accountId: session.accountId,
...restConfig,
};
} catch (error) {
throw new ConfigNotFoundError();
}
}

export async function saveConfig(config: Partial<Config>): Promise<void> {
try {
const existingConfig = await getConfig();
const { accessToken, accountId, ...rest } = config;

await fs.promises.writeFile(
await configPath(),
JSON.stringify(Object.assign({}, existingConfig, config)),
);
if (accessToken !== undefined || accountId !== undefined) {
await writeSessionFile({ accessToken, accountId });
}

try {
const existing = await getConfig();
const { accessToken, accountId, ...existingRest } = existing;
await writeConfigFile({ ...existingRest, ...rest });
} catch {
await fs.promises.writeFile(await configPath(), JSON.stringify(config));
await writeConfigFile(rest);
}
}

export function getAliasNamesSync(): string[] {
try {
const sessionFilePath = path.join(ospath.home(), ".hrvst", "session.json");
const configFilePath = path.join(ospath.home(), ".hrvst", "config.json");

const session = JSON.parse(fs.readFileSync(sessionFilePath, "utf-8"));
const config = JSON.parse(fs.readFileSync(configFilePath, "utf-8"));
const aliases =
_.get(config, `accountConfig.${config.accountId}.aliases`) || {};

const aliases = _.get(config, `accountConfig.${session.accountId}.aliases`) || {};
return Object.keys(aliases);
} catch {
} catch (error) {
throw new ConfigNotFoundError();
}
}

async function sessionPath(): Promise<string> {
const dir = path.join(ospath.home(), ".hrvst");

if (!fs.existsSync(dir)) {
await fs.promises.mkdir(dir);
}

return path.join(dir, "session.json");
}

async function readSessionFile(): Promise<SessionConfig> {
const data = await fs.promises.readFile(await sessionPath(), "utf-8");
return JSON.parse(data);
}

async function writeSessionFile(session: Partial<SessionConfig>): Promise<void> {
try {
const existing = await readSessionFile();
await fs.promises.writeFile(
await sessionPath(),
JSON.stringify({ ...existing, ...session }),
);
} catch {
await fs.promises.writeFile(
await sessionPath(),
JSON.stringify(session),
);
}
}

async function configPath(): Promise<string> {
const dir = path.join(ospath.home(), ".hrvst");

Expand All @@ -63,3 +114,15 @@ async function configPath(): Promise<string> {

return path.join(dir, "config.json");
}

async function readConfigFile(): Promise<any> {
const data = await fs.promises.readFile(await configPath(), "utf-8").catch(() => "{}");
return JSON.parse(data);
}

async function writeConfigFile(config: any): Promise<void> {
await fs.promises.writeFile(
await configPath(),
JSON.stringify(config),
);
}
Loading