Commit Graph

4267 Commits

Author SHA1 Message Date
Wes Kocher
b5de71ec44 Merge m-c to autoland, a=merge 2016-12-01 15:46:49 -08:00
Wes Kocher
d360bdebf5 Merge inbound to central, a=merge 2016-12-01 15:31:47 -08:00
Ethan Glasser-Camp
b80b66c130 Bug 1319884 - Address FirefoxAdapter feedback from kinto.js#589, r=mgoodwin
Change FirefoxAdapter definitively to require an externally-managed
Sqlite connection in order to function. This connection must be
produced by calling an openConnection() static method, which does the
work of initializing the tables and schema. Passing any other
connection is wrong, but won't be detected at runtime, and might even
work depending on the previous state of the database. Future work
might define a new KintoSqliteConnection type that can only be
produced by this method, so that it's impossible to create an
uninitialized Kinto database.

This change, since it moves Sqlite connections out of the
FirefoxAdapter, also means that the path option is no longer handled
or provided with a default. This means that the previous default,
"kinto.sqlite", is now preserved in a bunch of places all over the
codebase. This is unfortunate, but a migration is outside the scope of
this patch.

MozReview-Commit-ID: BKJqPR3jOTq

--HG--
extra : rebase_source : 91e0027890ac5fd0ba683abddc23e268f672d169
2016-11-23 14:18:53 -05:00
Kit Cambridge
666a52df0a Bug 1319037 - Disable trace logging and increase timeout factor for test_bookmark_tracker.js. a=testonly
MozReview-Commit-ID: EmSdy92cYzc

--HG--
extra : rebase_source : 8e15718c657cbd7fd1ecae0bf4a4c86c51a70b8c
2016-11-29 13:21:56 -07:00
Kit Cambridge
52ddf2d3d0 Bug 1319328 - Wait for pending statements before checking annos in test_mobile_query. a=testonly
MozReview-Commit-ID: BW5b0FgvwMD

--HG--
extra : rebase_source : 6af0f95c3aca4e434533bc496f1b695b8c74100d
2016-11-29 13:13:20 -07:00
André Bargull
82ed270fce Bug 1319937 - Remove String generics uses in services/sync. r=markh 2016-11-24 13:17:08 -08:00
Thom Chiovoloni
39c3163cf7 Bug 1321396 - Skip oversized records without aborting the sync by default in sync engines. r=markh
MozReview-Commit-ID: 7hgzyKb2UxY

--HG--
extra : rebase_source : 7c7f238a8e46b0776afe83798061d1539b07f76c
2016-11-30 17:28:52 -05:00
Mark Hammond
632c46235a Bug 1317216 - consistently use the Sync client GUID as the basis for the device ID in the sync ping. r=tcsc
MozReview-Commit-ID: BDTqnM7de6n

--HG--
extra : rebase_source : 169b3ad54dd19b5ef319d1e09684c0fd474e695b
2016-11-10 19:12:55 +11:00
Mark Hammond
40140fc9de Bug 1319323 (part 2) - improve sync unit tests; SyncTestingInfrastructure now uses the FxA identity provider. r=tcsc
MozReview-Commit-ID: 2zpZMpvbAy

--HG--
extra : rebase_source : a33b15a3ef8acf39a7a423694093a690ca519c88
2016-11-22 15:03:47 +11:00
Mark Hammond
f3312b9b72 Bug 1319323 (part 1) - improve sync unit tests; remove many ensureLegacyIdentityManager calls. r=tcsc
MozReview-Commit-ID: CV6cpo2Tp5O

--HG--
extra : rebase_source : 03f8fb39e69065bf7263b8bc20e4b2641a247b01
2016-11-21 12:22:24 +11:00
Kit Cambridge
73fba410f4 Bug 1173359 - Exclude hidden pages and framed links from syncing. r=markh
MozReview-Commit-ID: 8I4Sulyr0H7

--HG--
extra : rebase_source : 55fb1ff567c0a2916bc0153a09c41b03d396cfeb
2016-11-22 12:52:09 -07:00
Kit Cambridge
ce8909d3fb Bug 1173359 - Convert the history tracker tests to use async functions. r=markh
MozReview-Commit-ID: CFNLQkRa7Qb

--HG--
extra : rebase_source : 086dbe074f6979428e826aa1faa7ab75100a0dad
2016-11-22 12:34:02 -07:00
Mark Hammond
682d81fa5d Bug 1316500 - remove use of tasks and promise.jsm promises from Sync tests. r=tcsc
MozReview-Commit-ID: 5itPSLBKguc

--HG--
extra : rebase_source : 2b16f697902736ef39cded96c1bd98b547136263
2016-11-10 14:34:38 +11:00
Thom Chiovoloni
15acd98009 Bug 1273342 - Don't retry skippable records that fail to sync due to being too large. r=markh
MozReview-Commit-ID: HjzL1crTVDB

--HG--
extra : rebase_source : 887c3364bf0dec05353c2ea7e7c23d6393158fa3
2016-11-21 15:37:35 -05:00
Ethan Glasser-Camp
5a6b486919 Bug 1318669 - Remove stripPrivateProps from blocklist-clients.js, r=mgoodwin
MozReview-Commit-ID: 84yvzpBr3Q6

--HG--
extra : rebase_source : 727b0d86405c9f4db217a290b7fd7c68d689b2f4
2016-11-18 10:07:39 -05:00
Ethan Glasser-Camp
877252b989 Bug 1317841 - Stylistic pass on new kinto-storage-adapter, r=MattN
- Reflow things to try to avoid long lines.

- Add terminal comma where possible.

MozReview-Commit-ID: 1USxo0lO33w

--HG--
extra : rebase_source : 0869cc9f9ba29cc39b227a0694e9cd6d635ccc3f
2016-11-16 11:13:32 -05:00
Ethan Glasser-Camp
4742db4baa Bug 1317841 - Update version of kinto.js to v6.0.0, r=MattN
This major version of kinto.js released without a FirefoxStorage
adapter. Since Gecko is the only project with a need for this adapter
as well as the only one who can use it, that file moves to this repo
as a new kinto-storage-adapter.js. This file is mostly a copy of the
most recent FirefoxStorage.js, plus some other non-exported utility
functions copied from kinto.js to make it work.

This changes the export of the kinto-offline-client.js from a
`loadKinto` function which returns the Kinto class, to the actual
Kinto class itself, with the user expected to "hook up" the
adapter. It turns out that this doesn't change much in how we actually
use Kinto, since we were always previously explicitly selecting the
Kinto adapter.

This release of kinto.js also changes some of the build options
around, which changes the minified output of kinto-offline-client.js.

There are still some outstanding stylistic complaints about
FirefoxAdapter having to do with its _init static method which is
public and the fact that sometimes FirefoxAdapter manages its own
Sqlite connection and sometimes it doesn't. These will be addressed in
a future patch.

MozReview-Commit-ID: HF0oNCEDcFs

--HG--
rename : services/common/kinto-offline-client.js => services/common/kinto-storage-adapter.js
extra : rebase_source : 11d01e573b259798305494ac072575247ac01e2c
2016-11-15 19:38:53 -05:00
Kit Cambridge
8c2abe0611 Bug 1318414 - Default to empty strings for titles and parent titles if not set. r=rnewman,tcsc
MozReview-Commit-ID: DppxJuVrbAM

--HG--
extra : rebase_source : a214d54fda7d25798039fc9844c34cabd3165a27
2016-11-19 08:29:26 -08:00
Kit Cambridge
ccee4d37f5 Bug 1258127 - Add migration logic for old synced bookmarks. r=markh,rnewman
MozReview-Commit-ID: Gye30bYZejy

--HG--
extra : rebase_source : 882c4769d28ad4b56829e5b6037f74c04028f03a
2016-11-18 14:00:56 -08:00
Kit Cambridge
4c26a7b758 Bug 1258127 - Move bookmark deletion logic into PlacesSyncUtils.bookmarks.remove. r=tcsc
This patch moves most of `BookmarksStore::deletePending` and
`BookmarksStore::_shouldReviveRemotelyDeletedRecord` into
`PlacesSyncUtils.bookmarks.remove` and `touch`, respectively. Both
methods use the same approach as `PlacesSyncUtils.bookmarks.dedupe` to
amend the `_modified` changeset with new change records.

We use the new `SYNC_REPARENT_REMOVED_FOLDER_CHILDREN` change source to
bump the change counters for the reparented items and their new
parents, without bumping the score and triggering extra syncs.

MozReview-Commit-ID: 1SZvygWNkgL

--HG--
extra : rebase_source : 97fdac6ccb0d0326a3da7e42259dc6a961994ac3
2016-11-17 15:07:14 -08:00
Kit Cambridge
69350f8b7b Bug 1258127 - Move bookmark de-duping logic into PlacesSyncUtils.bookmarks.dedupe. r=markh
This patch moves the logic from `BookmarksEngine::_switchItemToDupe`
into `PlacesSyncUtils.bookmarks.dedupe`, and updates it to work with
the new tracker. `dedupe` returns an object containing new change
records, which the bookmarks engine merges into the initial changeset
from `PlacesSyncUtils.bookmarks.pullChanges`.

This patch also removes `changeItemID` and
`PlacesSyncUtils.bookmarks.changeGuid`, since `dedupe` subsumes them.

MozReview-Commit-ID: Iw3YRxWuZnK

--HG--
extra : rebase_source : 6fd80c64b160103e1090b87a300ed74b8ef85eed
2016-11-17 15:04:19 -08:00
Kit Cambridge
ccf45973d0 Bug 1258127 - Update the bookmarks engine to pull changes from Places. r=markh
MozReview-Commit-ID: 4YESuxP2rRf

--HG--
extra : rebase_source : 9c2f5830d10ba280e45c30076f19f498e6913fd0
2016-11-17 15:39:15 -08:00
Sebastian Hengst
0849ed2bea Backed out changeset c644b01be649 (bug 1318414) for failing xpcshell test test_bookmark_store.js. r=backout 2016-11-19 09:35:02 +01:00
Kit Cambridge
96702bd1f2 Bug 1318414 - Default to empty strings for titles and parent titles if not set. r=rnewman,tcsc
MozReview-Commit-ID: DppxJuVrbAM

--HG--
extra : rebase_source : 649bc0b945c8a2dd69dade682bf80c874053bc92
2016-11-17 10:42:32 -08:00
Phil Ringnalda
1583627c71 Backed out changeset ca02f30bc3a0 (bug 1316500) for eslint failures 2016-11-16 19:32:10 -08:00
Mark Hammond
a5e2bb0e72 Bug 1317589 - store the most recent hashed UID so we can still report it on transient errors renewing tokens. r=tcsc
MozReview-Commit-ID: 4qCFBltcPi1

--HG--
extra : rebase_source : 4ee6b0725729e8db2ba8d18d06dce7816a5e1da3
2016-11-15 16:03:41 +11:00
Mark Hammond
e35c5ab29f Bug 1316500 - remove use of tasks and promise.jsm promises from Sync tests. r=tcsc
MozReview-Commit-ID: 5itPSLBKguc

--HG--
extra : rebase_source : 9c0ee4387d4b3d7df56c1e9ccda0ec39cd5b11e2
2016-11-10 14:34:38 +11:00
Mark Hammond
9c1b1b298b Bug 1317587 - don't start scheduled sync after shutdown. r=rnewman
MozReview-Commit-ID: GSyWAUa1qyr

--HG--
extra : rebase_source : 45d0dfd5c686803f017230ab6152d0204a3d4c8e
2016-11-15 15:28:52 +11:00
Mark Hammond
e6302fe87d Bug 1317592 - don't try syncing other engines after one fails with a shutdown error. r=rnewman
MozReview-Commit-ID: LZ72JbOtpm4

--HG--
extra : rebase_source : 00493ea6d24470e5b45a2d42e8b64468427f89d3
2016-11-15 16:15:03 +11:00
Mark Hammond
136eb80ff1 Bug 1303831 - have _buildGUIDMap yield to the event loop and have it abort on shutdown. r=rnewman,tcsc
MozReview-Commit-ID: Ff8mq9eHBsQ

--HG--
extra : rebase_source : ab891da610a03791d6c13ea35fc5cd44d305a175
2016-11-15 17:01:22 +11:00
Kit Cambridge
6cd5db91d6 Bug 1303679 - Remove Places roots, reading list items, and pinned sites from the Sync server. r=markh
MozReview-Commit-ID: AhOBOnXsTYi

--HG--
extra : rebase_source : 1f39b406b1a9215ca04ff4602cc8fac54163916f
2016-11-09 14:23:54 -08:00
ffxbld
d07aca95ba Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2016-11-14 13:29:32 +01:00
Ethan Glasser-Camp
ba082acec6 Bug 1253740 - Handle password resets more correctly, r=markh
MozReview-Commit-ID: 1mSvbsYP9fV

--HG--
extra : rebase_source : 24676ce50564a291ce4fdcce40633f76e381bb46
extra : intermediate-source : 385eb385501deec773b4680e64e8014bddaf0edb
extra : source : 8595b3a68fbd2dccbe63324524fd9532ea62bca5
2016-09-30 12:12:58 -04:00
Ethan Glasser-Camp
2ee9c896d5 Bug 1253740 - Add crypto, including tests, r=rnewman
MozReview-Commit-ID: Jq8QRoNtPwb

--HG--
extra : rebase_source : 3524b723c3bf14263b54a97e4b21256d9abd180f
extra : source : 66877faacf75cd4de31ae868ce034d254ec8a080
2016-09-08 14:21:18 -04:00
Ethan Glasser-Camp
ff10caa15d Bug 1253740 - Introduce extension-storage engine with a sanity test, r=markh
Note that this "enables" the engine using a pref, even though it might
not be ready yet, so that the tests can pass.

MozReview-Commit-ID: AZ0TVERiQDU

--HG--
extra : rebase_source : 8ca202c1ec79e068fb9395207792942a228d4433
extra : intermediate-source : 93f41b72d8e7023b5f22c727436e836de87c9ca7
extra : source : 183547f4dbbedc9ee3399b6a474016d0e89a12e8
2016-09-08 14:23:12 -04:00
Wes Kocher
57c08b3b40 Backed out 9 changesets (bug 1253740) for xpcshell failures a=backout
Backed out changeset 903890f218dd (bug 1253740)
Backed out changeset 1b13fe394b66 (bug 1253740)
Backed out changeset e1312ab53299 (bug 1253740)
Backed out changeset 5b5338a2baeb (bug 1253740)
Backed out changeset d3d89d4e2d87 (bug 1253740)
Backed out changeset 96da5e6944b8 (bug 1253740)
Backed out changeset 4fbff333994f (bug 1253740)
Backed out changeset 653788e146f2 (bug 1253740)
Backed out changeset b98fa03d8c15 (bug 1253740)
2016-11-11 18:59:24 -08:00
Ethan Glasser-Camp
4a15ce8b0b Bug 1253740 - Handle password resets more correctly, r=markh
MozReview-Commit-ID: 1mSvbsYP9fV

--HG--
extra : rebase_source : 05079dfd76cebd960efa703fa445a20ce466093c
extra : intermediate-source : 385eb385501deec773b4680e64e8014bddaf0edb
extra : source : 8595b3a68fbd2dccbe63324524fd9532ea62bca5
2016-09-30 12:12:58 -04:00
Ethan Glasser-Camp
8be871dd00 Bug 1253740 - Add crypto, including tests, r=rnewman
MozReview-Commit-ID: Jq8QRoNtPwb

--HG--
extra : rebase_source : f00b8108330a244229cf8b409bc59a4c5f331e2c
extra : source : 66877faacf75cd4de31ae868ce034d254ec8a080
2016-09-08 14:21:18 -04:00
Ethan Glasser-Camp
138ba0ff0a Bug 1253740 - Introduce extension-storage engine with a sanity test, r=markh
Note that this "enables" the engine using a pref, even though it might
not be ready yet, so that the tests can pass.

MozReview-Commit-ID: AZ0TVERiQDU

--HG--
extra : rebase_source : 3078b86c4255afd66a9c4faf895dc2b6fc43a152
extra : intermediate-source : 93f41b72d8e7023b5f22c727436e836de87c9ca7
extra : source : 183547f4dbbedc9ee3399b6a474016d0e89a12e8
2016-09-08 14:23:12 -04:00
Thom Chiovoloni
cd0986ddc7 Bug 1311782 - Make the sync bookmark validator ignore the title for bookmark roots r=markh
MozReview-Commit-ID: Ji1Sar0ld7j

--HG--
extra : rebase_source : 306a7103c63c62059cf05d0966cba405f7aef630
2016-11-08 12:13:37 -05:00
Thom Chiovoloni
8363f8b9c7 Bug 1313573 - Validate the sync ping during TPS test runs r=markh
MozReview-Commit-ID: Jy7VpAvhbPf

--HG--
extra : rebase_source : 36dce5d68a7236d90af50756ac58dbe021d35f4f
2016-11-02 14:25:07 -04:00
Sebastian Hengst
0dc4492dd2 Bug 1310297 - Remove test annotations using b2g, mulet or gonk: services. r=RyanVM
MozReview-Commit-ID: DuzsFEaAeYr

--HG--
extra : rebase_source : b6c4cb95bf0563b0abd48949d50d2c156c86602b
2016-11-05 11:29:21 +01:00
Ethan Glasser-Camp
65d084b973 Bug 1315247 - Update version of Kinto.js client to 5.1.0, r=MattN
MozReview-Commit-ID: K68DXYrpHYX

--HG--
extra : rebase_source : 9c2dd7ff123ce364e9ee5cfaee4efe73ee26c83b
2016-11-04 09:38:34 -04:00
Phil Ringnalda
0f32b67e2d Merge m-i to m-c, a=merge
MozReview-Commit-ID: Hm1RxN6OaoZ
2016-11-03 19:32:48 -07:00
Thom Chiovoloni
a0412a141a Bug 1313731 - Append /v1 to fxaccount's autoconfig's auth_server_base_url if not present r=rfkelly
Currently the fxaccounts content server passes this through directly from its
configuration files, and accepts this as either containing the trailing /v1 or
not. On stage, it contains it, but on dev it does not.

In the near future, it should be possible to append the trailing /v1
unconditionally, as the FxA content server is being changed to never send it
down (which will be consistent with the other prefs), however it's done
conditionally as to not break autoconfig against stage in the mean time.

MozReview-Commit-ID: AStTm2hHVHQ

--HG--
extra : rebase_source : bf98cef357d5834e08a01b3c233a8ccb37243e64
2016-11-02 12:15:26 -04:00
André Bargull
866168d23c Bug 1313798 - Remove Date.prototype.toLocaleFormat uses in services/sync. r=rnewman 2016-10-28 15:31:30 -07:00
Sebastian Hengst
900199872a Backed out changeset 39e08d903b48 (bug 1253740) 2016-11-02 16:40:07 +01:00
Sebastian Hengst
a3865de0a1 Backed out changeset 77be2faa619f (bug 1253740) 2016-11-02 16:40:03 +01:00
Sebastian Hengst
55e6f64d89 Backed out changeset a73da05c87ba (bug 1253740) 2016-11-02 16:39:42 +01:00
Thom Chiovoloni
7799bcc52b Bug 1312031 - Fix failing TPS test_sync.js test. r=markh
This required:

1. Using the same method of updating keywords used by PlacesSyncUtils. Calling
into PlacesSyncUtils directly is not possible here, since it would pass
SOURCE_SYNC as the source, which would ensure that we ignore the changes).
2. Ensuring that we update the keyword *after* the URI in TPS.

Note that neither one of these changes on their own was sufficient.

MozReview-Commit-ID: Ls4kEVBHdNc

--HG--
extra : rebase_source : f97ff29cdcdadd444fd70df98d97354de10511eb
2016-11-01 13:16:38 -04:00