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

getsentry · Oct 22, 2020 · 1c72bf9 · 1c72bf9
1 parent d03b406
commit 1c72bf9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
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' } },