Make retrieving git config async

dfrankland · Jul 30, 2019 · 2e45a7b · 2e45a7b
1 parent c08a984
commit 2e45a7b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/src/decorateMenu.ts b/src/decorateMenu.ts
@@ -22,8 +22,10 @@ export default (
 ): MenuItemConstructorOptions[] => {
   const checkAndCallback = (
     callback: (gitConfig: ConfigAndCommands) => void,
-  ): NonNullable<MenuItemConstructorOptions['click']> => (): void => {
-    const commandsAndConfig = checkForMissingSettings();
+  ): NonNullable<MenuItemConstructorOptions['click']> => async (): Promise<
+    void
+  > => {
+    const commandsAndConfig = await checkForMissingSettings();
     if (commandsAndConfig === null) return;
     callback(commandsAndConfig);
   };

diff --git a/src/lib/checkForMissingSettings.ts b/src/lib/checkForMissingSettings.ts
@@ -13,7 +13,7 @@ const hyperApp: App & {
   config?: { getConfig?: () => { syncSettings?: SyncSettings } };
 } = app;
 
-export default (): null | ConfigAndCommands => {
+export default async (): Promise<null | ConfigAndCommands> => {
   const notifyErr = (message: string): void | string =>
     notify({
       title: ERROR_TITLE,
@@ -28,7 +28,7 @@ export default (): null | ConfigAndCommands => {
     );
   }
 
-  const config = getGitConfig();
+  const config = await getGitConfig();
   const { personalAccessToken, gistId } = config;
   const hyperConfig = hyperApp.config.getConfig().syncSettings || {
     quiet: false,

diff --git a/src/lib/getCommands/restore.ts b/src/lib/getCommands/restore.ts
@@ -1,5 +1,5 @@
 import { GitProcess } from 'dugite';
-import { ensureFile, outputFile, readFile } from 'fs-extra';
+import { ensureFile, copyFile } from 'fs-extra';
 import { FILE_RESTORE, FILE_BACKUP, DIR_REPO } from '../../constants';
 import { GitConfig } from '../getGitConfig';
 
@@ -8,6 +8,5 @@ export default async ({ repoPromise }: GitConfig): Promise<void> => {
   await GitProcess.exec(['fetch'], DIR_REPO);
   await GitProcess.exec(['merge', 'origin/master', 'master'], DIR_REPO);
   await ensureFile(FILE_RESTORE);
-  const file = await readFile(FILE_BACKUP);
-  await outputFile(FILE_RESTORE, file, { flag: 'r+' });
+  await copyFile(FILE_BACKUP, FILE_RESTORE);
 };
diff --git a/src/lib/getGitConfig.ts b/src/lib/getGitConfig.ts
@@ -1,5 +1,5 @@
 import { GitProcess } from 'dugite';
-import { copySync, ensureDir, readJsonSync, pathExistsSync } from 'fs-extra';
+import { copyFile, ensureDir, readJson, pathExists } from 'fs-extra';
 import {
   FILE_CONFIG,
   FILE_CONFIG_TEMPLATE,
@@ -20,7 +20,7 @@ export interface GitConfig extends IdAndToken {
   repoPromise: Promise<void>;
 }
 
-const getIdAndToken = (): IdAndToken => {
+const getIdAndToken = async (): Promise<IdAndToken> => {
   let config: IdAndToken = {
     personalAccessToken: '',
     gistId: '',
@@ -36,16 +36,16 @@ const getIdAndToken = (): IdAndToken => {
     !HYPER_SYNC_SETTINGS_GIST_ID
   ) {
     try {
-      if (!pathExistsSync(FILE_CONFIG)) {
+      if (!(await pathExists(FILE_CONFIG))) {
         notify({
           title: ERROR_TITLE,
           body: `no config file found in \`${FILE_CONFIG}\`, creating one`,
           level: 'error',
         });
-        copySync(FILE_CONFIG_TEMPLATE, FILE_CONFIG);
+        await copyFile(FILE_CONFIG_TEMPLATE, FILE_CONFIG);
       } else {
         try {
-          config = readJsonSync(FILE_CONFIG);
+          config = await readJson(FILE_CONFIG);
         } catch (err) {
           notify({
             title: ERROR_TITLE,
@@ -76,9 +76,9 @@ const getIdAndToken = (): IdAndToken => {
 
 getIdAndToken();
 
-export default (): GitConfig => {
+export default async (): Promise<GitConfig> => {
   const config: GitConfig = {
-    ...getIdAndToken(),
+    ...(await getIdAndToken()),
     url: '',
     remoteUrl: '',
     repoPromise: Promise.resolve(),