fix: cleanup code and unit tests

salesforcecli · Mar 15, 2021 · 882014d · peternhale · Mar 15, 2021 · RodEsp
1 parent a9dfc1b
commit 882014d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/commands/auth/sfdxurl/store.ts b/src/commands/auth/sfdxurl/store.ts
@@ -8,6 +8,7 @@
 import * as os from 'os';
 import { flags, FlagsConfig, SfdxCommand } from '@salesforce/command';
 import { AuthFields, AuthInfo, fs, Messages } from '@salesforce/core';
+import { AnyJson } from '@salesforce/ts-types';
 import { Prompts } from '../../../prompts';
 import { Common } from '../../../common';
 
@@ -18,6 +19,10 @@ const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'message
 const AUTH_URL_FORMAT1 = 'force://<refreshToken>@<instanceUrl>';
 const AUTH_URL_FORMAT2 = 'force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>';
 
+type AuthJson = AnyJson & {
+  result?: AnyJson & { sfdxAuthUrl: string };
+  sfdxAuthUrl: string;
+};
 export default class Store extends SfdxCommand {
   public static readonly description = messages.getMessage('description', [AUTH_URL_FORMAT1, AUTH_URL_FORMAT2]);
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
@@ -71,13 +76,7 @@ export default class Store extends SfdxCommand {
   }
 
   private async getUrlFromJson(authFile: string): Promise<string> {
-    const authFileJson = (await fs.readJson(authFile)) as Record<string, string>;
-
-    if (authFileJson.result) {
-      // Do a bunch of casting to get TSC to recognize the `sfdxAuthUrl` property as a string
-      return ((authFileJson as unknown) as Record<string, Record<string, string>>).result.sfdxAuthUrl;
-    }
-
-    return authFileJson.sfdxAuthUrl;
+    const authFileJson = (await fs.readJson(authFile)) as AuthJson;
+    return authFileJson.result?.sfdxAuthUrl || authFileJson.sfdxAuthUrl;
   }
 }
diff --git a/test/commands/auth/sfdxurl/store.test.ts b/test/commands/auth/sfdxurl/store.test.ts
@@ -61,9 +61,9 @@ describe('auth:sfdxurl:store', async () => {
   test
     .do(async () => {
       await prepareStubs({ fileDoesNotExist: true });
-      $$.SANDBOX.stub(fs, 'readFile').callsFake(
-        async () => '{"sfdxAuthUrl": "force://PlatformCLI::CoffeeAndBacon@su0503.my.salesforce.com"}'
-      );
+      $$.SANDBOX.stub(fs, 'readJson').callsFake(async () => ({
+        sfdxAuthUrl: 'force://PlatformCLI::CoffeeAndBacon@su0503.my.salesforce.com',
+      }));
     })
     .stdout()
     .command(['auth:sfdxurl:store', '-f', 'path/to/key.json', '--json'])
@@ -77,9 +77,9 @@ describe('auth:sfdxurl:store', async () => {
   test
     .do(async () => {
       await prepareStubs({ fileDoesNotExist: true });
-      $$.SANDBOX.stub(fs, 'readFile').callsFake(
-        async () => '{"result": {"sfdxAuthUrl": "force://PlatformCLI::CoffeeAndBacon@su0503.my.salesforce.com"}}'
-      );
+      $$.SANDBOX.stub(fs, 'readJson').callsFake(async () => ({
+        result: { sfdxAuthUrl: 'force://PlatformCLI::CoffeeAndBacon@su0503.my.salesforce.com' },
+      }));
     })
     .stdout()
     .command(['auth:sfdxurl:store', '-f', 'path/to/key.json', '--json'])