Merge pull request #379 from energywebfoundation/revert-374-bug/ICS-1…

…24_random_unauthorized_to_cache Revert "bug/ICS-124 random unauthorized to cache server "
energywebfoundation · Dec 10, 2021 · 441a52a · 441a52a
2 parents 90c086a + 43c00be
commit 441a52a
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/modules/cacheClient/cacheClient.service.ts b/src/modules/cacheClient/cacheClient.service.ts
@@ -56,20 +56,21 @@ export class CacheClient implements ICacheClient {
             }
             if (await this.isAuthenticated()) {
                 this.refresh_token = refreshToken;
+                return;
             }
-        } catch {
-            const pubKeyAndIdentityToken = await this._signerService.publicKeyAndIdentityToken();
-            const {
-                data: { refreshToken, token },
-            } = await this.httpClient.post<{ token: string; refreshToken: string }>("/login", {
-                identityToken: pubKeyAndIdentityToken.identityToken,
-            });
-            if (!this.isBrowser) {
-                this.httpClient.defaults.headers.common["Authorization"] = `Bearer ${token}`;
-            }
-            this.refresh_token = refreshToken;
-            this.pubKeyAndIdentityToken = pubKeyAndIdentityToken;
+        } catch {}
+
+        const pubKeyAndIdentityToken = await this._signerService.publicKeyAndIdentityToken();
+        const {
+            data: { refreshToken, token },
+        } = await this.httpClient.post<{ token: string; refreshToken: string }>("/login", {
+            identityToken: pubKeyAndIdentityToken.identityToken,
+        });
+        if (!this.isBrowser) {
+            this.httpClient.defaults.headers.common["Authorization"] = `Bearer ${token}`;
         }
+        this.refresh_token = refreshToken;
+        this.pubKeyAndIdentityToken = pubKeyAndIdentityToken;
 
         this.failedRequests = this.failedRequests.filter((callback) => callback());
     }