merge the update auth record response with pb.authStore.record instead of replace

Author: ganigeorgiev

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.22.0-rc2
+
+**⚠️ This is a prerelease and works only with PocketBase v0.23.0+!**
+
+- Instead of replacing the entire `pb.authStore.record`, on auth record update we now only replace the available returned response record data ([pocketbase#5638](https://github.com/pocketbase/pocketbase/issues/5638)).
+
+
 ## 0.22.0-rc
 
 **⚠️ This release works only with PocketBase v0.23.0+ and contains breaking changes!**

package.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.22.0-rc",
+    "version": "0.22.0-rc2",
     "name": "pocketbase",
     "description": "PocketBase JavaScript SDK",
     "author": "Gani Georgiev",

src/services/RecordService.ts

@@ -255,7 +255,7 @@ export class RecordService<M = RecordModel> extends CrudService<M> {
      * @inheritdoc
      *
      * If the current `client.authStore.record` matches with the updated id, then
-     * on success the `client.authStore.record` will be updated with the result.
+     * on success the `client.authStore.record` will be updated with the new response record fields.
      */
     async update<T = M>(
         id: string,
@@ -270,7 +270,14 @@ export class RecordService<M = RecordModel> extends CrudService<M> {
                     this.client.authStore.record?.collectionName ===
                         this.collectionIdOrName)
             ) {
-                this.client.authStore.save(this.client.authStore.token, item);
+                let authExpand = Object.assign({}, this.client.authStore.record.expand);
+                let authRecord = Object.assign({}, this.client.authStore.record, item);
+                if (authExpand && item.expand) {
+                    // for now replace only top-level expand
+                    authRecord.expand = Object.assign(authExpand, item.expand)
+                }
+
+                this.client.authStore.save(this.client.authStore.token, authRecord);
             }
 
             return item as any as T;

tests/services/RecordService.spec.ts

@@ -46,17 +46,26 @@ describe("RecordService", function () {
                 replyBody: {
                     id: "test123",
                     email: "[email protected]",
+                    name: "name_new",
+                    expand: {"b": 3},
                 },
             });
 
             service.client.authStore.save("test_token", {
                 id: "test123",
                 collectionName: "sub=",
+                name: "abc",
+                expand: {"a": 1, "b": 2},
             } as any);
 
             await service.update("test123", {});
 
-            assert.equal(service.client.authStore.model?.email, "[email protected]");
+            assert.equal(service.client.authStore.record?.id, "test123");
+            assert.equal(service.client.authStore.record?.collectionName, "sub=");
+            assert.equal(service.client.authStore.record?.name, "name_new");
+            assert.equal(service.client.authStore.record?.email, "[email protected]");
+            assert.equal(service.client.authStore.record?.expand?.a, 1);
+            assert.equal(service.client.authStore.record?.expand?.b, 3);
         });
 
         test("Should not update the AuthStore record model on matching id but mismatched collection", async function () {
@@ -78,7 +87,7 @@ describe("RecordService", function () {
 
             await service.update("test123", {});
 
-            assert.equal(service.client.authStore.model?.email, "[email protected]");
+            assert.equal(service.client.authStore.record?.email, "[email protected]");
         });
 
         test("Should not update the AuthStore record model on mismatched update id", async function () {
@@ -100,7 +109,7 @@ describe("RecordService", function () {
 
             await service.update("test123", {});
 
-            assert.equal(service.client.authStore.model?.email, "[email protected]");
+            assert.equal(service.client.authStore.record?.email, "[email protected]");
         });
 
         test("Should delete the AuthStore record model on matching delete id and collection", async function () {
@@ -177,7 +186,7 @@ describe("RecordService", function () {
             const result = await service.confirmVerification(token);
 
             assert.isTrue(result);
-            assert.isTrue(service.client.authStore.model?.verified);
+            assert.isTrue(service.client.authStore.record?.verified);
         });
 
         test("Should not update the AuthStore record model verified state on mismatched token data", async function () {
@@ -203,7 +212,7 @@ describe("RecordService", function () {
             const result = await service.confirmVerification(token);
 
             assert.isTrue(result);
-            assert.isFalse(service.client.authStore.model?.verified);
+            assert.isFalse(service.client.authStore.record?.verified);
         });
 
         test("Should delete the AuthStore record model matching the token data", async function () {