From 513f9b346359956720aab8968e87f8293fdd9054 Mon Sep 17 00:00:00 2001
From: David Dal Busco <david.dalbusco@outlook.com>
Date: Wed, 21 Sep 2022 00:35:14 +0200
Subject: [PATCH] fix: return after resolve to avoid idb to be recreated (#617)

* fix: return after resolve to avoid idb to be recreated

* Update changelog.html

Co-authored-by: Kyle Peacock <kylpeacock@gmail.com>
---
 docs/generated/changelog.html       | 7 +++++++
 packages/auth-client/src/storage.ts | 7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/generated/changelog.html b/docs/generated/changelog.html
index 081550a03..c50a75442 100644
--- a/docs/generated/changelog.html
+++ b/docs/generated/changelog.html
@@ -13,6 +13,13 @@ <h1>Agent-JS Changelog</h1>
       <h2>Version 0.13.4</h2>
       <ul>
         <li>chore: auth-client expose storage constant keys</li>
+        <li>
+            bug: auth-client resolves window.open issue in login function in safari due to async
+            storage call
+        </li>
+        <li>
+            bug: auth-client storage wrapper returns after resolve to avoid idb to be recreated
+        </li>
       </ul>
       <h2>Version 0.13.3</h2>
       <ul>
diff --git a/packages/auth-client/src/storage.ts b/packages/auth-client/src/storage.ts
index 8bbfed55c..b713241cc 100644
--- a/packages/auth-client/src/storage.ts
+++ b/packages/auth-client/src/storage.ts
@@ -68,11 +68,14 @@ export class LocalStorage implements AuthClientStorage {
  * @see implements {@link AuthClientStorage}
  */
 export class IdbStorage implements AuthClientStorage {
-  // Intializes a KeyVal on first request
+  // Initializes a KeyVal on first request
   private initializedDb: IdbKeyVal | undefined;
   get _db(): Promise<IdbKeyVal> {
     return new Promise(resolve => {
-      if (this.initializedDb) resolve(this.initializedDb);
+      if (this.initializedDb) {
+        resolve(this.initializedDb);
+        return;
+      }
       IdbKeyVal.create({ version: DB_VERSION }).then(db => {
         this.initializedDb = db;
         resolve(db);