Merge pull request #6043 from mozilla/jh/6017/handle-aet-update-fail

feat(aet): handle generateEcosystemAnonId update failure

packages/fxa-content-server/app/scripts/lib/auth-errors.js

@@ -614,6 +614,12 @@ var ERRORS = {
     errno: 1065,
     message: t('The image file size is too large to be uploaded.'),
   },
+  ECOSYSTEM_ANON_ID_UPDATE_CONFLICT: {
+    errno: 190,
+    message: t(
+      'Could not update Ecosystem Anon ID because precondition failed.'
+    ),
+  },
 };
 
 export default _.extend({}, Errors, {

packages/fxa-content-server/app/scripts/models/account.js

@@ -363,6 +363,7 @@ const Account = Backbone.Model.extend(
      *   authenticationMethods,
      *   authenticatorAssuranceLevel,
      *   profileChangedAt,
+     *   ecosystemAnonId,
      * }
      */
     accountProfile() {
@@ -458,9 +459,29 @@ const Account = Backbone.Model.extend(
           );
         }
       } catch (err) {
-        // In the event of errors, we don't want to block any user actions, just log it
+        this.unset('ecosystemAnonId');
-        // TODO: Follow up with some better error handling
+
-        console.log('generateEcosystemAnonId failed...', err);
+        const reportException = () => {
+          if (this._sentryMetrics) {
+            this._sentryMetrics.captureException(err);
+          }
+        };
+
+        // If we get 412 Precondition Failed it means we
+        // tried to update, but another client beat us to
+        // it. Fetch the new anon ID and use it instead.
+        if (AuthErrors.is(err, 'ECOSYSTEM_ANON_ID_UPDATE_CONFLICT')) {
+          try {
+            const { ecosystemAnonId } = await this.accountProfile();
+            if (ecosystemAnonId) {
+              this.set('ecosystemAnonId', ecosystemAnonId);
+            }
+          } catch (err) {
+            reportException(err);
+          }
+        } else {
+          reportException(err);
+        }
       }
     },
 

packages/fxa-content-server/app/tests/spec/models/account.js

@@ -3210,22 +3210,88 @@ describe('models/account', function () {
       assert.isTrue(fxaClient.updateEcosystemAnonId.notCalled);
     });
 
-    it('swallow any errors', async () => {
+    it('ignores with no options', async () => {
-      const err = new Error('failure');
+      await account.generateEcosystemAnonId();
-      sandbox.restore();
+      assert.isTrue(fxaClient.updateEcosystemAnonId.notCalled);
-      sandbox.stub(aet, 'generateEcosystemAnonID').rejects(err);
+    });
-      sandbox.spy(fxaClient, 'updateEcosystemAnonId');
+
+    it('handles 412 errors by looking up existing eco anon id', async () => {
+      fxaClient.updateEcosystemAnonId.restore();
+      account.set({ sessionToken: SESSION_TOKEN });
+      sandbox.spy(account, 'set');
+      sandbox.spy(account, 'accountProfile');
+      sandbox.stub(fxaClient, 'accountProfile').resolves({
+        ecosystemAnonId: 'wow',
+      });
+      sandbox.stub(fxaClient, 'sessionReauth').resolves({
+        keyFetchToken: 'keyFetchToken',
+        unwrapBKey: 'unwrapBKey',
+      });
+      sandbox.stub(fxaClient, 'accountKeys').resolves({
+        kB: 'kB1',
+      });
+      sandbox.stub(fxaClient, 'sessionVerificationStatus').resolves({
+        sessionVerified: true,
+      });
+      sandbox
+        .stub(fxaClient, 'updateEcosystemAnonId')
+        .rejects(AuthErrors.toError('ECOSYSTEM_ANON_ID_UPDATE_CONFLICT'));
 
       await account.generateEcosystemAnonId({
         password: 'passwordzxcv',
       });
 
-      assert.isTrue(fxaClient.updateEcosystemAnonId.notCalled);
+      sinon.assert.called(account.accountProfile);
+      sinon.assert.calledWith(fxaClient.accountProfile, SESSION_TOKEN);
+      sinon.assert.calledWith(account.set, 'ecosystemAnonId', 'wow');
     });
 
-    it('ignores with no options', async () => {
+    it('reports errors thrown by accountProfile when looking up existing eco anon id because of a 412 error', async () => {
-      await account.generateEcosystemAnonId();
+      fxaClient.updateEcosystemAnonId.restore();
-      assert.isTrue(fxaClient.updateEcosystemAnonId.notCalled);
+      account.set({ sessionToken: SESSION_TOKEN });
+      sandbox.spy(account._sentryMetrics, 'captureException');
+      sandbox.spy(account, 'set');
+      sandbox.spy(account, 'accountProfile');
+      sandbox
+        .stub(fxaClient, 'accountProfile')
+        .rejects(AuthErrors.toError('UNAUTHORIZED'));
+      sandbox.stub(fxaClient, 'sessionReauth').resolves({
+        keyFetchToken: 'keyFetchToken',
+        unwrapBKey: 'unwrapBKey',
+      });
+      sandbox.stub(fxaClient, 'accountKeys').resolves({
+        kB: 'kB1',
+      });
+      sandbox.stub(fxaClient, 'sessionVerificationStatus').resolves({
+        sessionVerified: true,
+      });
+      sandbox
+        .stub(fxaClient, 'updateEcosystemAnonId')
+        .rejects(AuthErrors.toError('ECOSYSTEM_ANON_ID_UPDATE_CONFLICT'));
+
+      await account.generateEcosystemAnonId({
+        password: 'passwordzxcv',
+      });
+
+      sinon.assert.called(account.accountProfile);
+      sinon.assert.calledWith(fxaClient.accountProfile, SESSION_TOKEN);
+      sinon.assert.called(account._sentryMetrics.captureException);
+      assert.isFalse(account.has('ecosystemAnonId'));
+    });
+
+    it('reports any other errors to sentry and removes the newly create anon id', async () => {
+      sandbox.restore();
+      sandbox.spy(account._sentryMetrics, 'captureException');
+      sandbox
+        .stub(aet, 'generateEcosystemAnonID')
+        .rejects(new Error('failure'));
+
+      await account.generateEcosystemAnonId({
+        password: 'passwordzxcv',
+      });
+
+      assert.isFalse(account.has('ecosystemAnonId'));
+      sinon.assert.called(account._sentryMetrics.captureException);
     });
   });
 });