[DEV-3653] Fixed auth

DFXswiss · Feb 18, 2025 · 1b7a0f1 · 1b7a0f1
1 parent 69c6b89
commit 1b7a0f1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/packages/react/src/hooks/api.hook.ts b/packages/react/src/hooks/api.hook.ts
@@ -21,7 +21,7 @@ export interface CallConfig {
   noJson?: boolean;
   responseType?: ResponseType;
   specialHandling?: SpecialHandling;
-  token?: string;
+  token?: string | false;
 }
 
 interface SpecialHandling {
@@ -49,31 +49,31 @@ export function useApi(): ApiInterface {
     const version = config.version ?? defaultVersion;
     const baseUrl = `${url}/${version}`;
     const responseType = config.responseType ?? ResponseType.JSON;
+    const token = config.token === false ? undefined : config.token ?? authenticationToken;
 
-    return fetch(
-      `${baseUrl}/${config.url}`,
-      buildInit(config.method, config.token ?? authenticationToken, config.data, config.noJson),
-    ).then((response) => {
-      if (response.status === config.specialHandling?.statusCode) {
-        config.specialHandling?.action?.();
-      }
-      if (response.ok) {
-        switch (responseType) {
-          case ResponseType.JSON:
-            return response.json().catch(() => undefined) as Promise<T>;
-          case ResponseType.TEXT:
-            return response.text() as Promise<T>;
-          case ResponseType.BLOB:
-            return response.blob() as Promise<T>;
-          default:
-            throw new Error('Unknown response type');
+    return fetch(`${baseUrl}/${config.url}`, buildInit(config.method, token, config.data, config.noJson)).then(
+      (response) => {
+        if (response.status === config.specialHandling?.statusCode) {
+          config.specialHandling?.action?.();
+        }
+        if (response.ok) {
+          switch (responseType) {
+            case ResponseType.JSON:
+              return response.json().catch(() => undefined) as Promise<T>;
+            case ResponseType.TEXT:
+              return response.text() as Promise<T>;
+            case ResponseType.BLOB:
+              return response.blob() as Promise<T>;
+            default:
+              throw new Error('Unknown response type');
+          }
         }
-      }
 
-      return response.json().then((body) => {
-        throw body;
-      });
-    });
+        return response.json().then((body) => {
+          throw body;
+        });
+      },
+    );
   }
 
   function buildInit(

diff --git a/packages/react/src/hooks/auth.hook.ts b/packages/react/src/hooks/auth.hook.ts
@@ -54,7 +54,7 @@ export function useAuth(): AuthInterface {
     usedRef?: string,
   ): Promise<SignIn> {
     const data = getParams(address, signature, key, specialCode, wallet, usedRef);
-    return call({ url: AuthUrl.auth, method: 'POST', data });
+    return call({ url: AuthUrl.auth, method: 'POST', data, token: false });
   }
 
   async function signIn(address: string, signature: string, key?: string, specialCode?: string): Promise<SignIn> {