[#249] added support for assigning a Promise as AsyncAuthStore initia…

…l value

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.18.2
+
+- Added support for assigning a `Promise` as `AsyncAuthStore` initial value ([#249](https://github.com/pocketbase/js-sdk/issues/249)).
+
+
 ## 0.18.1
 
 - Fixed realtime subscriptions auto cancellation to use the proper `requestKey` param.
@@ -64,7 +69,7 @@
 
     const store = new AsyncAuthStore({
         save:    async (serialized) => AsyncStorage.setItem("pb_auth", serialized),
-        initial: await AsyncStorage.getItem("pb_auth"),
+        initial: AsyncStorage.getItem("pb_auth"),
     });
 
     const pb = new PocketBase("https://example.com", store)

dist/pocketbase.es.d.mts

@@ -1205,7 +1205,7 @@ type AsyncClearFunc = () => Promise<void>;
  *
  * const store = new AsyncAuthStore({
  *     save:    async (serialized) => AsyncStorage.setItem("pb_auth", serialized),
- *     initial: await AsyncStorage.getItem("pb_auth"),
+ *     initial: AsyncStorage.getItem("pb_auth"),
  * });
  *
  * const pb = new PocketBase("https://example.com", store)
@@ -1224,8 +1224,8 @@ declare class AsyncAuthStore extends BaseAuthStore {
         ///
         /// If not explicitly set, `saveFunc` with empty data will be used.
         clear?: AsyncClearFunc;
-        // initial data to load into the store
-        initial?: string;
+        // An *optional* initial data to load into the store.
+        initial?: string | Promise<any>;
     });
     /**
      * @inheritdoc

dist/pocketbase.es.d.ts

@@ -1205,7 +1205,7 @@ type AsyncClearFunc = () => Promise<void>;
  *
  * const store = new AsyncAuthStore({
  *     save:    async (serialized) => AsyncStorage.setItem("pb_auth", serialized),
- *     initial: await AsyncStorage.getItem("pb_auth"),
+ *     initial: AsyncStorage.getItem("pb_auth"),
  * });
  *
  * const pb = new PocketBase("https://example.com", store)
@@ -1224,8 +1224,8 @@ declare class AsyncAuthStore extends BaseAuthStore {
         ///
         /// If not explicitly set, `saveFunc` with empty data will be used.
         clear?: AsyncClearFunc;
-        // initial data to load into the store
-        initial?: string;
+        // An *optional* initial data to load into the store.
+        initial?: string | Promise<any>;
     });
     /**
      * @inheritdoc

package.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.18.1",
+    "version": "0.18.2",
     "name": "pocketbase",
     "description": "PocketBase JavaScript SDK",
     "author": "Gani Georgiev",

src/stores/AsyncAuthStore.ts

@@ -19,7 +19,7 @@ type queueFunc = () => Promise<void>;
  *
  * const store = new AsyncAuthStore({
  *     save:    async (serialized) => AsyncStorage.setItem("pb_auth", serialized),
- *     initial: await AsyncStorage.getItem("pb_auth"),
+ *     initial: AsyncStorage.getItem("pb_auth"),
  * });
  *
  * const pb = new PocketBase("https://example.com", store)
@@ -41,15 +41,15 @@ export class AsyncAuthStore extends BaseAuthStore {
         /// If not explicitly set, `saveFunc` with empty data will be used.
         clear?: AsyncClearFunc,
 
-        // initial data to load into the store
-        initial?: string,
+        // An *optional* initial data to load into the store.
+        initial?: string|Promise<any>,
     }) {
         super();
 
         this.saveFunc = config.save;
         this.clearFunc = config.clear;
 
-        this._loadInitial(config.initial);
+        this._enqueue(() => this._loadInitial(config.initial));
     }
 
     /**
@@ -81,19 +81,23 @@ export class AsyncAuthStore extends BaseAuthStore {
         }
     }
 
-
     /**
      * Initializes the auth store state.
      */
-    private _loadInitial(payload?: string) {
-        if (!payload) {
-            return; // nothing to load
-        }
-
+    private async _loadInitial(payload?: string|Promise<any>) {
         try {
-            const parsed = JSON.parse(payload) || {};
+            payload = payload ? await payload : null;
 
-            this.save(parsed.token || "", parsed.model || null);
+            if (payload) {
+                let parsed;
+                if (typeof payload === 'string') {
+                    parsed = JSON.parse(payload) || {};
+                } else if (typeof payload === 'object') {
+                    parsed = payload;
+                }
+
+                this.save(parsed.token || "", parsed.model || null);
+            }
         } catch (_) {}
     }
 

tests/stores/AsyncAuthStore.spec.ts

@@ -21,7 +21,7 @@ describe('AsyncAuthStore', function() {
             await expect(callsPromise).resolves.toStrictEqual([]);
         });
 
-        test('load initial', async function() {
+        test('load initial from string', async function() {
             let calls: any = [];
 
             const store = new AsyncAuthStore({
@@ -31,15 +31,57 @@ describe('AsyncAuthStore', function() {
                 initial: `{"token": "test", "model": {"id": "id1"}}`
             });
 
+            const callsPromise = new Promise((resolve, _) => {
+                setTimeout(() => resolve(calls), 0);
+            });
+            await expect(callsPromise).resolves.toStrictEqual([
+                `{"token":"test","model":{"id":"id1"}}`,
+            ]);
+
+            assert.equal(store.token, 'test');
+            assert.deepEqual(store.model, {'id': 'id1'} as any);
+        });
+
+        test('load initial from Promise<string>', async function() {
+            let calls: any = [];
+
+            const store = new AsyncAuthStore({
+                save: async (payload) => {
+                    calls.push(payload);
+                },
+                initial: Promise.resolve(`{"token": "test", "model": {"id": "id1"}}`)
+            });
+
+            const callsPromise = new Promise((resolve, _) => {
+                setTimeout(() => resolve(calls), 0);
+            });
+            await expect(callsPromise).resolves.toStrictEqual([
+                `{"token":"test","model":{"id":"id1"}}`,
+            ]);
+
             assert.equal(store.token, 'test');
             assert.deepEqual(store.model, {'id': 'id1'} as any);
+        });
+
+        test('load initial from Promise<object>', async function() {
+            let calls: any = [];
+
+            const store = new AsyncAuthStore({
+                save: async (payload) => {
+                    calls.push(payload);
+                },
+                initial: Promise.resolve({"token": "test", "model": {"id": "id1"}})
+            });
 
             const callsPromise = new Promise((resolve, _) => {
                 setTimeout(() => resolve(calls), 0);
             });
             await expect(callsPromise).resolves.toStrictEqual([
                 `{"token":"test","model":{"id":"id1"}}`,
             ]);
+
+            assert.equal(store.token, 'test');
+            assert.deepEqual(store.model, {'id': 'id1'} as any);
         });
     });