Merge pull request #788 from rhelmer/ensure-data-collection-when-user…

…-enrolled issue #787 - ensure that data collection is always enabled in core ad…
mozilla-rally · Feb 4, 2022 · 429fe70 · 429fe70
2 parents f4ef33d + 7213530
commit 429fe70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 [Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.4.2...master)
 
+* [#788](https://github.com/mozilla-rally/rally-core-addon/pull/788): Ensure that data collection is always enabled in core add-on
+when user is enrolled
+
 # v1.4.2 (2022-01-26)
 
 [Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.4.1...v1.4.2)

diff --git a/core-addon/Core.js b/core-addon/Core.js
@@ -34,8 +34,12 @@ export default class Core {
 
     // Initialize the collection engine once we know if
     // user is enrolled or not.
-    this._storage.getRallyID().finally(id =>
-      this._dataCollection.initialize(id !== undefined));
+    this._storage.getRallyID().then(id => {
+      this._dataCollection.initialize(id !== undefined)
+    }).catch(err => {
+      console.error("No Rally ID, initializing data collection in unenrolled state", err);
+      this._dataCollection.initialize(false);
+    });
 
     // Asynchronously get the available studies. We don't need to wait
     // for this to finish, the UI can handle the wait.