fix(enterprise): handle requests that fail before reaching the server

garden-io · Mar 9, 2021 · c21a1b4 · c21a1b4
1 parent a34fa07
commit c21a1b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 51 deletions.
diff --git a/core/src/enterprise/api.ts b/core/src/enterprise/api.ts
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { got, GotResponse, GotHeaders } from "../util/http"
+import { got, GotResponse, GotHeaders, GotHttpError } from "../util/http"
 import { findProjectConfig } from "../config/base"
 import { CommandError, RuntimeError } from "../exceptions"
 import { LogEntry } from "../logger/log-entry"
@@ -23,6 +23,10 @@ export const authTokenHeader =
 
 export const makeAuthHeader = (clientAuthToken: string) => ({ [authTokenHeader]: clientAuthToken })
 
+function is401Error(error: any): error is GotHttpError {
+  return error instanceof GotHttpError && error.response.statusCode === 401
+}
+
 const refreshThreshold = 10 // Threshold (in seconds) subtracted to jwt validity when checking if a refresh is needed
 
 export interface ApiFetchParams {
@@ -153,9 +157,7 @@ export class EnterpriseApi {
         }
         await this.saveAuthToken(tokenObj)
       } catch (err) {
-        const res = err.response
-
-        if (res && res.statusCode === 401) {
+        if (is401Error(err)) {
           this.log.debug({ msg: `Failed to refresh the token.` })
           await this.clearAuthToken()
           throw new RuntimeError(invalidCredentialsErrorMsg, {})
@@ -289,10 +291,7 @@ export class EnterpriseApi {
       await this.get(log, "token/verify")
       valid = true
     } catch (err) {
-      const res = err.response
-      if (res.statusCode === 401) {
-        valid = false
-      } else {
+      if (!is401Error(err)) {
         throw new RuntimeError(`An error occurred while verifying client auth token with platform: ${err.message}`, {})
       }
     }

diff --git a/core/src/enterprise/secrets/index.ts b/core/src/enterprise/secrets/index.ts
diff --git a/core/src/util/http.ts b/core/src/util/http.ts
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import _got, { Response } from "got"
+import _got, { Response, HTTPError as GotHttpError } from "got"
 import { bootstrap } from "global-agent"
 import { OptionsOfTextResponseBody, Headers } from "got"
 
@@ -22,3 +22,4 @@ export const got = _got
 export type GotOptions = OptionsOfTextResponseBody
 export type GotResponse<T = unknown> = Response<T>
 export type GotHeaders = Headers
+export { GotHttpError }