@edge-zuq/core 1.2.7 → 1.3.4

package/src/infra/axios-http-client-adapter.ts

@@ -1,6 +1,6 @@
 import { Platform } from 'react-native';
 
-import axios, { AxiosError } from 'axios';
+import axios, { AxiosError, isAxiosError } from 'axios';
 import type { AxiosResponse } from 'axios';
 
 import { HttpClient, type Storage } from '../data/protocols';
@@ -17,7 +17,6 @@ export class AxiosHttpClientAdapter implements HttpClient {
   private readonly storage: Storage;
   private readonly recorder: RecordRequest;
   public readonly login?: UserAuthentication;
-  private isConnected: boolean | null = null;
   public readonly logout?: UserLogout;
   private hasConnection: boolean | null = null;
   private isRefreshingAuth: Promise<any> | null = null;
@@ -31,16 +30,46 @@ export class AxiosHttpClientAdapter implements HttpClient {
     this.client = axios.create({
       baseURL: url,
       headers: {
-        'platform': Platform.OS,
-        'accept': 'application/json',
+        platform: Platform.OS,
+        accept: 'application/json',
         'Content-Type': 'application/json',
       },
     });
-    addEventListener((state) => {
+    addEventListener(state => {
       this.hasConnection = Boolean(
         state.isConnected && state.isInternetReachable
       );
     });
+    this.client.interceptors.response.use(
+      async response => {
+        const { needsLogin, succeded } =
+          await this.refreshAuthIfNeeded(response);
+        if (!needsLogin) {
+          this.recorder.record({
+            url: response.config.url ?? 'NO_URL',
+            data: response.data ?? 'NO_DATA',
+            body: response.config?.data ?? 'NO_BODY',
+            headers: response.config?.headers,
+            query: response.config?.params,
+          });
+          return response;
+        }
+        if (succeded) return await this.client(response.config);
+        return response;
+      },
+      async error => {
+        if (!isAxiosError(error)) throw error;
+        if (!this.hasConnection || error.response?.status) throw error;
+        if (!error.config) throw error;
+        if (error.response) {
+          const { succeded } = await this.refreshAuthIfNeeded(error.response);
+          if (succeded) {
+            return await this.client(error.config);
+          }
+        }
+        throw error;
+      }
+    );
   }
 
   private throwIfNotConnectedOrExecuted(
@@ -93,14 +122,16 @@ export class AxiosHttpClientAdapter implements HttpClient {
 
   private async refreshAuthIfNeeded(response: AxiosResponse<any>) {
     const needsLogin = this.needsLogin(response);
+    let succeded = false;
     if (needsLogin && this.login && this.logout) {
-      const succeded = await this.refreshAuth();
+      succeded = await this.refreshAuth();
       if (!succeded) {
         const [username] = this.storage.getItem<string[]>('__auth') ?? [];
         if (username) await this.logout.logout({ username });
       }
     }
     return {
+      succeded,
       needsLogin,
     };
   }
@@ -128,69 +159,31 @@ export class AxiosHttpClientAdapter implements HttpClient {
   private async execute<T>(
     handler: () => Promise<AxiosResponse<T>>
   ): Promise<HttpClient.Response<T>> {
-    let response: AxiosResponse<T> | undefined;
-    let isRetry = false;
     try {
-      response = await handler();
-      const { needsLogin } = await this.refreshAuthIfNeeded(response);
-      if (!needsLogin) {
-        return {
-          statusCode: response.status,
-          data: response.data,
-          headers: response.headers,
-        };
-      }
-      isRetry = true;
-      response = await handler();
+      const response = await handler();
+      return {
+        statusCode: response.status,
+        data: response.data,
+        headers: response.headers,
+      };
     } catch (e) {
       if (!(e instanceof AxiosError)) throw e;
       if (!e.response?.status) throw e;
-      const error = this.fromAxiosError<T>(e);
-      if (isRetry) throw error;
-      try {
-        if (response) await this.refreshAuthIfNeeded(response);
-        else if (e.response) await this.refreshAuthIfNeeded(e.response);
-        response = await handler();
-      } catch (e) {
-        if (!(e instanceof AxiosError)) throw e;
-        throw this.fromAxiosError<T>(e);
-      }
-    }
-    if (this.isConnected && this.needsLogin(response)) {
-      const [username] = this.storage.getItem<string[]>('__auth') ?? [];
-      if (username) await this.logout?.logout({ username });
-      throw new Error('Needs login');
+      throw this.fromAxiosError<T>(e);
     }
-    return {
-      statusCode: response.status,
-      data: response.data,
-      headers: response.headers,
-    };
   }
 
   async get<T = any>(
     url: string,
     config?: HttpClient.Config
   ): Promise<HttpClient.Response<T>> {
-    const response = await this.execute<T>(() => this.client.get(url, config));
-    this.recorder.record({
-      url,
-      data: response.data,
-      headers: config?.headers,
-      query: config?.params,
-    });
-    return response;
+    return await this.execute<T>(() => this.client.get(url, config));
   }
 
   async delete(
     url: string,
     config?: HttpClient.Config
   ): Promise<HttpClient.Response<undefined>> {
-    this.recorder.record({
-      url,
-      headers: config?.headers,
-      query: config?.params,
-    });
     this.throwIfNotConnectedOrExecuted(
       HttpClient.Method.delete,
       url,
@@ -205,12 +198,6 @@ export class AxiosHttpClientAdapter implements HttpClient {
     body: any,
     config?: HttpClient.Config
   ): Promise<HttpClient.Response<T>> {
-    this.recorder.record({
-      url,
-      body,
-      headers: config?.headers,
-      query: config?.params,
-    });
     this.throwIfNotConnectedOrExecuted(
       HttpClient.Method.post,
       url,
@@ -225,12 +212,6 @@ export class AxiosHttpClientAdapter implements HttpClient {
     body: any,
     config?: HttpClient.Config
   ): Promise<HttpClient.Response<T>> {
-    this.recorder.record({
-      url,
-      body,
-      headers: config?.headers,
-      query: config?.params,
-    });
     this.throwIfNotConnectedOrExecuted(
       HttpClient.Method.patch,
       url,
@@ -245,12 +226,6 @@ export class AxiosHttpClientAdapter implements HttpClient {
     body: any,
     config?: HttpClient.Config
   ): Promise<HttpClient.Response<T>> {
-    this.recorder.record({
-      url,
-      body,
-      headers: config?.headers,
-      query: config?.params,
-    });
     this.throwIfNotConnectedOrExecuted(
       HttpClient.Method.put,
       url,
@@ -267,5 +242,6 @@ export namespace AxiosHttpClientAdapter {
     recorder: RecordRequest;
     login?: UserAuthentication;
     logout?: UserLogout;
+    fallbackUrl?: string;
   };
 }

package/src/infra/offline-mutation-queue.ts

@@ -65,7 +65,7 @@ export class OfflineMutationQueue {
   }
 
   private areDependenciesExecuted(offlineMutation: OfflineMutation) {
-    return offlineMutation.dependencies.every((key) => {
+    return offlineMutation.dependencies.every(key => {
       let currentKey;
       if (key instanceof IsomorphicIdManager.IsomorphicId) {
         const isomorphicId = this.isomorphicIdManager?.get(key.getOfflineId());
@@ -139,7 +139,7 @@ export class OfflineMutationQueue {
 
   private async executeRequest(key: string, offlineMutation: OfflineMutation) {
     this.updateStatus(key, OfflineMutationStatus.EXECUTING);
-    const dependencies = offlineMutation.dependencies.map((dependency) =>
+    const dependencies = offlineMutation.dependencies.map(dependency =>
       dependency instanceof IsomorphicIdManager.IsomorphicId
         ? this.queue.get(String(dependency.getOfflineId()))
         : this.queue.get(dependency)
@@ -184,7 +184,7 @@ export class OfflineMutationQueue {
   }
 
   private assertOfflineMutation(key: string, offlineMutation: OfflineMutation) {
-    const isValid = offlineMutation.dependencies.every((dependencyKey) => {
+    const isValid = offlineMutation.dependencies.every(dependencyKey => {
       let dependency: OfflineMutation | undefined;
       if (dependencyKey instanceof IsomorphicIdManager.IsomorphicId) {
         const isomorphicId = this.isomorphicIdManager?.get(
@@ -201,7 +201,7 @@ export class OfflineMutationQueue {
       }
       if (dependency) {
         const existsDependencyLoop = dependency.dependencies.some(
-          (innerKey) => innerKey === key
+          innerKey => innerKey === key
         );
         return !existsDependencyLoop;
       } else {

package/src/infra/rnp-permission-manager-adapter.ts

@@ -58,7 +58,7 @@ export class RNPPermissionManagerAdapter implements PermissionManager {
     permissions: PermissionManager.Permission[]
   ): Promise<PermissionManager.Result[]> {
     return await Promise.all(
-      permissions.map((permission) => this.get(permission))
+      permissions.map(permission => this.get(permission))
     );
   }
 
@@ -99,7 +99,7 @@ export class RNPPermissionManagerAdapter implements PermissionManager {
     }>
   ): Promise<PermissionManager.Result[]> {
     return await Promise.all(
-      data.map((item) => this.request(item.permission, item.options))
+      data.map(item => this.request(item.permission, item.options))
     );
   }
 
@@ -140,8 +140,8 @@ export class RNPPermissionManagerAdapter implements PermissionManager {
     permissions: PermissionManager.Permission[]
   ): Promise<boolean> {
     const result = await Promise.all(
-      permissions.map(async (permission) => this.has(permission))
+      permissions.map(async permission => this.has(permission))
     );
-    return result.every((item) => Boolean(item));
+    return result.every(item => Boolean(item));
   }
 }