From e5783740cfdb0a9fd3334a25924ff60f031531ac Mon Sep 17 00:00:00 2001
From: GotPPay <bilal@saburly.com>
Date: Tue, 16 Jan 2018 01:44:33 +0100
Subject: [PATCH] fix token expired state

---
 backend/helpers/amazon.js   | 25 ++++++++++++++-----------
 backend/helpers/database.js | 13 ++++++++-----
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/backend/helpers/amazon.js b/backend/helpers/amazon.js
index 3a66cbf..1fd9410 100644
--- a/backend/helpers/amazon.js
+++ b/backend/helpers/amazon.js
@@ -35,17 +35,20 @@ var refreshTokens = function () {
     };
 
     request (options, function (error, response, body) {
-      if (error) reject (error);
-      parsedResponse = JSON.parse (body);
-      if (parsedResponse.refresh_token)
-        return databaseHelper.updateTokens (
-          parsedResponse.refresh_token,
-          parsedResponse.access_token,
-          parsedResponse.expires_in
-        );
-      console.log ('Token refresh failed');
-      console.log (body);
-      reject (body);
+      if (error) {
+        reject (error);
+      }else{
+        parsedResponse = JSON.parse (body);
+        if (parsedResponse.refresh_token){
+          databaseHelper.updateTokens(parsedResponse.refresh_token, parsedResponse.access_token, parsedResponse.expires_in).then(()=>{
+            resolve();
+          }).catch(e=>{
+            reject(e);
+          });
+        }else{
+          reject (body);
+        }
+      }
     });
   });
 };
diff --git a/backend/helpers/database.js b/backend/helpers/database.js
index b5f3abd..6934339 100644
--- a/backend/helpers/database.js
+++ b/backend/helpers/database.js
@@ -43,11 +43,14 @@ module.exports = {
       db
         .collection ('token_list')
         .update ({id: 1}, newTokenDocument, {upsert: true}, (err, result) => {
-          if (err) reject (err);
-          config.REFRESH_TOKEN = refresh_token;
-          config.TOKEN = access_token;
-          config.TOKEN_EXPIRES_IN = newTokenDocument.expires_in;
-          resolve ();
+          if (err) { 
+            reject (err)
+          }else{
+            config.REFRESH_TOKEN = refresh_token;
+            config.TOKEN = access_token;
+            config.TOKEN_EXPIRES_IN = newTokenDocument.expires_in;
+            resolve ();
+          }
         });
     });
   },