Bug 1466814 - Remove the manual login call from TPS, since we'll log in anyway, and shouldn't be holding the sync lock r?markh draft
authorThom Chiovoloni <tchiovoloni@mozilla.com>
Tue, 05 Jun 2018 16:19:07 -0700
changeset 804486 9712dc542ed65bf6a099ff9a07679819953cd85c
parent 804157 752465b44c793318cef36df46ca5ff00c3d8854a
push id112380
push userbmo:tchiovoloni@mozilla.com
push dateTue, 05 Jun 2018 23:19:31 +0000
reviewersmarkh
bugs1466814
milestone62.0a1
Bug 1466814 - Remove the manual login call from TPS, since we'll log in anyway, and shouldn't be holding the sync lock r?markh MozReview-Commit-ID: 3NmFXMplZyV
services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm
--- a/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm
+++ b/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm
@@ -177,20 +177,16 @@ var Authentication = {
 
       let client = new FxAccountsClient();
       let credentials = await client.signIn(account.username, account.password, true);
       await fxAccounts.setSignedInUser(credentials);
       if (!credentials.verified) {
         await this._completeVerification(account.username);
       }
 
-      if (Weave.Status.login !== Weave.LOGIN_SUCCEEDED) {
-        Logger.logInfo("Logging into Weave.");
-        await Weave.Service.login();
-      }
       return true;
     } catch (error) {
       throw new Error("signIn() failed with: " + error.message);
     }
   },
 
   /**
    * Sign out of Firefox Accounts.