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
--- 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.