fix: Preserve original user data for explicitly updated scopes (getsentry#2991)

kamilogorek · web-flow · commit 1c72bf9fe4ec · 2020-10-22T16:39:55.000+02:00
diff --git a/packages/hub/src/scope.ts b/packages/hub/src/scope.ts
@@ -287,7 +287,7 @@ export class Scope implements ScopeInterface {
       this._tags = { ...this._tags, ...captureContext._tags };
       this._extra = { ...this._extra, ...captureContext._extra };
       this._contexts = { ...this._contexts, ...captureContext._contexts };
-      if (captureContext._user) {
+      if (captureContext._user && Object.keys(captureContext._user).length) {
         this._user = captureContext._user;
       }
       if (captureContext._level) {
diff --git a/packages/hub/test/scope.test.ts b/packages/hub/test/scope.test.ts
@@ -399,6 +399,26 @@ describe('Scope', () => {
       expect(updatedScope._fingerprint).toEqual(['bar']);
     });
 
+    test('given an empty instance of Scope, it should preserve all the original scope data', () => {
+      const updatedScope = scope.update(new Scope()) as any;
+
+      expect(updatedScope._tags).toEqual({
+        bar: '2',
+        foo: '1',
+      });
+      expect(updatedScope._extra).toEqual({
+        bar: '2',
+        foo: '1',
+      });
+      expect(updatedScope._contexts).toEqual({
+        bar: { id: '2' },
+        foo: { id: '1' },
+      });
+      expect(updatedScope._user).toEqual({ id: '1337' });
+      expect(updatedScope._level).toEqual(Severity.Info);
+      expect(updatedScope._fingerprint).toEqual(['foo']);
+    });
+
     test('given a plain object, it should merge two together, with the passed object having priority', () => {
       const localAttributes = {
         contexts: { bar: { id: '3' }, baz: { id: '4' } },

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ export class Scope implements ScopeInterface {`
`287`	`287`	`this._tags = { ...this._tags, ...captureContext._tags };`
`288`	`288`	`this._extra = { ...this._extra, ...captureContext._extra };`
`289`	`289`	`this._contexts = { ...this._contexts, ...captureContext._contexts };`
`290`		`- if (captureContext._user) {`
	`290`	`+ if (captureContext._user && Object.keys(captureContext._user).length) {`
`291`	`291`	`this._user = captureContext._user;`
`292`	`292`	`}`
`293`	`293`	`if (captureContext._level) {`