Fetch new access and refresh tokens when refresh fails (#1338)

* Fetch new access and refresh tokens when refresh fails * Fix typo
Kong · Jan 21, 2019 · 8112f5d · 8112f5d
1 parent c770946
commit 8112f5d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/insomnia-app/app/network/o-auth-2/get-token.js b/packages/insomnia-app/app/network/o-auth-2/get-token.js
@@ -190,6 +190,12 @@ async function _getAccessToken(
     authentication.scope,
   );
 
+  // If we didn't receive an access token it means the refresh token didn't succeed,
+  // so we tell caller to fetch brand new access and refresh tokens.
+  if (!refreshResults.access_token) {
+    return null;
+  }
+
   // ~~~~~~~~~~~~~ //
   // Update the DB //
   // ~~~~~~~~~~~~~ //

diff --git a/packages/insomnia-app/app/network/o-auth-2/refresh-token.js b/packages/insomnia-app/app/network/o-auth-2/refresh-token.js
@@ -48,7 +48,14 @@ export default async function(
   });
 
   const statusCode = response.statusCode || 0;
-  if (statusCode < 200 || statusCode >= 300) {
+
+  if (statusCode === 401) {
+    // If the refresh token was rejected due an unauthorized request, we will
+    // return a null access_token to trigger an authentication request to fetch
+    // brand new refresh and access tokens.
+
+    return responseToObject(null, [c.P_ACCESS_TOKEN]);
+  } else if (statusCode < 200 || statusCode >= 300) {
     throw new Error(`[oauth2] Failed to refresh token url=${url} status=${statusCode}`);
   }