Refactor Authenticated Server Requests to use Promises

chrome/browser/resources/google_now/background.js

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * @fileoverview The event page for Google Now for Chrome implementation.
  * The Google Now event page gets Google Now cards from the server and shows
  * them as Chrome notifications.
@@ skipping 230 matching lines @@
     type: 'histogram-linear',
     min: 1,
     max: GoogleNowEvent.EVENTS_TOTAL,
     buckets: GoogleNowEvent.EVENTS_TOTAL + 1
   };
 
   chrome.metricsPrivate.recordValue(metricDescription, event);
 }
 
 /**
- * Adds authorization behavior to the request.
- * @param {XMLHttpRequest} request Server request.
- * @param {function(boolean)} callbackBoolean Completion callback with 'success'
- *     parameter.
+ * Checks the result of the HTTP Request and updates the authentication
+ * manager on any failure.
+ * @param {XMLHttpRequest} request XMLHTTPRequest that sent the authenticated

[rgustafson, 2014/03/12 21:26:28]

Nitpicky: match capitalization on the second usage

[robliao, 2014/03/12 22:21:32]

Done.

+ *     request.
  */
-function setAuthorization(request, callbackBoolean) {
-  authenticationManager.getAuthToken().then(function(token) {
+function checkAuthenticationStatus(request) {
+  if (request.status == HTTP_FORBIDDEN ||
+      request.status == HTTP_UNAUTHORIZED) {
+    authenticationManager.removeToken(token);
+  }
+}
+
+/**
+ * Builds and sends an authenticated request to the notification server.
+ * @param {string} method Request method.
+ * @param {string} handlerName Server handler to send the request to.
+ * @param {string=} opt_contentType Value for the Content-type header.
+ * @return {Promise} A promise to issue a request to the server.
+ *     The promise rejects if there is a client-side authentication issue.
+ */
+function requestFromServer(method, handlerName, opt_contentType) {
+  return authenticationManager.getAuthToken().then(function(token) {
+    var request = buildServerRequest(method, handlerName, opt_contentType);
     request.setRequestHeader('Authorization', 'Bearer ' + token);
-
-    // Instrument onloadend to remove stale auth tokens.
-    var originalOnLoadEnd = request.onloadend;
-    request.onloadend = wrapper.wrapCallback(function(event) {
-      if (request.status == HTTP_FORBIDDEN ||
-          request.status == HTTP_UNAUTHORIZED) {
-        authenticationManager.removeToken(token).then(function() {
-          originalOnLoadEnd(event);
-        });
-      } else {
-        originalOnLoadEnd(event);
-      }
+    var requestPromise = new Promise(function(resolve) {
+      request.addEventListener('loadend', function() {
+        resolve(request);
+      }, false);
+      request.send();
     });
-
-    callbackBoolean(true);
-  }).catch(function() {
-    callbackBoolean(false);
+    requestPromise.then(checkAuthenticationStatus);
+    return requestPromise;
   });
 }
 
 /**
  * Shows parsed and combined cards as notifications.
  * @param {Object.<string, StoredNotificationGroup>} notificationGroups Map from
  *     group name to group information.
  * @param {Object.<ChromeNotificationId, CombinedCard>} cards Map from
  *     chromeNotificationId to the combined card, containing cards to show.
  * @param {function()} onSuccess Called on success.
@@ skipping 274 matching lines @@
   }
 
   groupNames.forEach(function(groupName) {
     requestParameters += ('&requestTypes=' + groupName);
   });
 
   requestParameters += '&uiLocale=' + navigator.language;
 
   console.log('requestNotificationGroups: request=' + requestParameters);
 
-  var request = buildServerRequest('GET', 'notifications' + requestParameters);
-
-  request.onloadend = function(event) {
-    console.log('requestNotificationGroups-onloadend ' + request.status);
-    if (request.status == HTTP_OK) {
-      recordEvent(GoogleNowEvent.REQUEST_FOR_CARDS_SUCCESS);
-      processServerResponse(
-          JSON.parse(request.responseText), cardShownCallback);
-    }
-  };
-
-  setAuthorization(request, function(success) {
-    if (success)
-      request.send();
-  });
+  requestFromServer('GET', 'notifications' + requestParameters).then(
+    function(request) {
+      console.log('requestNotificationGroups-received ' + request.status);
+      if (request.status == HTTP_OK) {
+        recordEvent(GoogleNowEvent.REQUEST_FOR_CARDS_SUCCESS);
+        processServerResponse(
+            JSON.parse(request.responseText), cardShownCallback);
+      }
+    });
 }
 
 /**
  * Requests the account opted-in state from the server.
  * @param {function()} optedInCallback Function that will be called if
  *     opted-in state is 'true'.
  */
 function requestOptedIn(optedInCallback) {
   console.log('requestOptedIn from ' + NOTIFICATION_CARDS_URL);
 
-  var request = buildServerRequest('GET', 'settings/optin');
-
-  request.onloadend = function(event) {
+  requestFromServer('GET', 'settings/optin').then(function(request) {
     console.log(
-        'requestOptedIn-onloadend ' + request.status + ' ' + request.response);
+        'requestOptedIn-received ' + request.status + ' ' + request.response);
     if (request.status == HTTP_OK) {
       var parsedResponse = JSON.parse(request.responseText);
       if (parsedResponse.value) {
         chrome.storage.local.set({googleNowEnabled: true});
         optedInCallback();
         // Google Now was disabled, now it's enabled. This is a state change.
         onStateChange();
       } else {
         scheduleNextPoll({}, false);
       }
     }
-  };
-
-  setAuthorization(request, function(success) {
-    if (success)
-      request.send();
   });
 }
 
 /**
  * Requests notification cards from the server.
  */
 function requestNotificationCards() {
   console.log('requestNotificationCards');
 
   fillFromChromeLocalStorage({
@@ skipping 78 matching lines @@
   var requestParameters = 'notifications/' + dismissalData.notificationId +
       '?age=' + dismissalAge +
       '&chromeNotificationId=' + chromeNotificationId;
 
   for (var paramField in dismissalData.parameters)
     requestParameters += ('&' + paramField +
     '=' + dismissalData.parameters[paramField]);
 
   console.log('requestCardDismissal: requestParameters=' + requestParameters);
 
-  var request = buildServerRequest('DELETE', requestParameters);
-  request.onloadend = function(event) {
+  requestFromServer('DELETE', requestParameters).then(function(request) {
     console.log('requestDismissingCard-onloadend ' + request.status);
     if (request.status == HTTP_NOCONTENT)
       recordEvent(GoogleNowEvent.DISMISS_REQUEST_SUCCESS);
 
     // A dismissal doesn't require further retries if it was successful or
     // doesn't have a chance for successful completion.
     var done = request.status == HTTP_NOCONTENT ||
         request.status == HTTP_BAD_REQUEST ||
         request.status == HTTP_METHOD_NOT_ALLOWED;
     callbackBoolean(done);
-  };
-
-  setAuthorization(request, function(success) {
-    if (success)
-      request.send();
-    else
-      callbackBoolean(false);
+  }).catch(function() {
+    callbackBoolean(false);
   });
 }
 
 /**
  * Tries to send dismiss requests for all pending dismissals.
  * @param {function(boolean)} callbackBoolean Completion callback with 'success'
  *     parameter. Success means that no pending dismissals are left.
  */
 function processPendingDismissals(callbackBoolean) {
   fillFromChromeLocalStorage({
@@ skipping 421 matching lines @@
             lastPollNowPayloads: items.lastPollNowPayloads,
             notificationGroups: items.notificationGroups
           });
 
           requestCards();
         }
       });
     });
   }
 });