Bug 1164713 - Return error string from FxAccounts. r=ferjm

Brli · Aug 31, 2015 · 1489453 · 1489453
1 parent 8f7df35
commit 1489453
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/services/fxaccounts/FxAccountsManager.jsm b/services/fxaccounts/FxAccountsManager.jsm
@@ -221,7 +221,7 @@ this.FxAccountsManager = {
         }
       );
     }
-    return Promise.reject(reason);
+    return Promise.reject(reason.message ? { error: reason.message } : reason);
   },
 
   _getAssertion: function(aAudience, aPrincipal) {

diff --git a/services/fxaccounts/tests/xpcshell/test_manager.js b/services/fxaccounts/tests/xpcshell/test_manager.js
@@ -396,6 +396,7 @@ add_test(function() {
       do_throw("Unexpected success");
     },
     error => {
+      do_check_eq(error.error, ERROR_OFFLINE);
       FxAccountsManager._fxAccounts._reset();
       Services.io.offline = false;
       certExpired = false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -221,7 +221,7 @@ this.FxAccountsManager = { @@
             }
           );
         }
-        return Promise.reject(reason);
+        return Promise.reject(reason.message ? { error: reason.message } : reason);
       },
       _getAssertion: function(aAudience, aPrincipal) {
@@ Expand Down @@