fix: review

Author: feloy

src/exec_auth.ts

@@ -100,11 +100,14 @@ export class ExecAuth implements Authenticator {
             opts = { ...opts, env };
         }
 
-        return new Promise((accept, reject) => {
+        return new Promise((resolve, reject) => {
             let stdoutData: string = '';
             let stderrData: string = '';
+            let savedError: Error | undefined = undefined;
 
             const subprocess = this.execFn(exec.command, exec.args, opts);
+            subprocess.stdout.setEncoding('utf8');
+            subprocess.stderr.setEncoding('utf8');
 
             subprocess.stdout.on('data', (data: Buffer | string) => {
                 stdoutData += data.toString('utf8');
@@ -115,16 +118,26 @@ export class ExecAuth implements Authenticator {
             });
 
             subprocess.on('error', (error) => {
+                savedError = error;
                 throw error;
             });
 
             subprocess.on('close', (code) => {
+                if (savedError) {
+                    reject(savedError);
+                    return;
+                }
                 if (code !== 0) {
-                    throw new Error(stderrData);
+                    reject(new Error(stderrData));
+                    return;
+                }
+                try {
+                    const obj = JSON.parse(stdoutData) as Credential;
+                    this.tokenCache[user.name] = obj;
+                    resolve(obj);
+                } catch (error) {
+                    reject(error);
                 }
-                const obj = JSON.parse(stdoutData) as Credential;
-                this.tokenCache[user.name] = obj;
-                accept(obj);
             });
         });
     }

src/exec_auth_test.ts

@@ -65,11 +65,13 @@ describe('ExecAuth', () => {
         ): child_process.ChildProcessWithoutNullStreams => {
             return {
                 stdout: {
+                    setEncoding: () => {},
                     on: (_data: string, f: (data: Buffer | string) => void) => {
                         f(Buffer.from(JSON.stringify({ status: { token: 'foo' } })));
                     },
                 },
                 stderr: {
+                    setEncoding: () => {},
                     on: () => {},
                 },
                 on: (op: string, f: any) => {
@@ -110,6 +112,7 @@ describe('ExecAuth', () => {
         ): child_process.ChildProcessWithoutNullStreams => {
             return {
                 stdout: {
+                    setEncoding: () => {},
                     on: (_data: string, f: (data: Buffer | string) => void) => {
                         f(
                             Buffer.from(
@@ -121,6 +124,7 @@ describe('ExecAuth', () => {
                     },
                 },
                 stderr: {
+                    setEncoding: () => {},
                     on: () => {},
                 },
                 on: (op: string, f: any) => {
@@ -168,6 +172,7 @@ describe('ExecAuth', () => {
             execCount++;
             return {
                 stdout: {
+                    setEncoding: () => {},
                     on: (_data: string, f: (data: Buffer | string) => void) => {
                         f(
                             Buffer.from(
@@ -179,6 +184,7 @@ describe('ExecAuth', () => {
                     },
                 },
                 stderr: {
+                    setEncoding: () => {},
                     on: () => {},
                 },
                 on: (op: string, f: any) => {
@@ -253,9 +259,11 @@ describe('ExecAuth', () => {
         ): child_process.ChildProcessWithoutNullStreams => {
             return {
                 stdout: {
+                    setEncoding: () => {},
                     on: (_data: string, f: (data: Buffer | string) => void) => {},
                 },
                 stderr: {
+                    setEncoding: () => {},
                     on: () => {},
                 },
                 on: (op: string, f: any) => {
@@ -297,11 +305,13 @@ describe('ExecAuth', () => {
         ): child_process.ChildProcessWithoutNullStreams => {
             return {
                 stdout: {
+                    setEncoding: () => {},
                     on: (_data: string, f: (data: Buffer | string) => void) => {
                         f(Buffer.from(JSON.stringify({ status: { token: 'foo' } })));
                     },
                 },
                 stderr: {
+                    setEncoding: () => {},
                     on: (_data: string, f: (data: Buffer | string) => void) => {
                         f(Buffer.from('Some error!'));
                     },
@@ -346,11 +356,13 @@ describe('ExecAuth', () => {
             optsOut = options;
             return {
                 stdout: {
+                    setEncoding: () => {},
                     on: (_data: string, f: (data: Buffer | string) => void) => {
                         f(Buffer.from(JSON.stringify({ status: { token: 'foo' } })));
                     },
                 },
                 stderr: {
+                    setEncoding: () => {},
                     on: () => {},
                 },
                 on: (op: string, f: any) => {
@@ -402,11 +414,13 @@ describe('ExecAuth', () => {
         ): child_process.ChildProcessWithoutNullStreams => {
             return {
                 stdout: {
+                    setEncoding: () => {},
                     on: (_data: string, f: (data: Buffer | string) => void) => {
                         f(Buffer.from(JSON.stringify({ status: { token: 'foo' } })));
                     },
                 },
                 stderr: {
+                    setEncoding: () => {},
                     on: () => {},
                 },
                 on: (op: string, f: any) => {