From 79ce2f53564bfed0804bab9e1752f02eb8d004c0 Mon Sep 17 00:00:00 2001
From: Tudor Stanciu <tudor.stanciu94@gmail.com>
Date: Sun, 31 Mar 2024 00:01:38 +0200
Subject: [PATCH] Rename 'fetch' to 'acquire' to avoid conflict with built-in
 fetch function

---
 README.md                           | 4 ++--
 src/__tests__/TuitioLogin.test.ts   | 4 ++--
 src/__tests__/TuitioLogout.test.ts  | 4 ++--
 src/__tests__/TuitioStorage.test.ts | 4 ++--
 src/index.ts                        | 4 ++--
 src/state.ts                        | 4 ++--
 src/utils/axios.ts                  | 5 ++---
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index a8668bb..574cc61 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,13 @@ The package installation can be done in two ways:
 ## How to use the package
 
 ```javascript!
-const { TuitioClient, fetch } =  require("@flare/tuitio-client");
+const { TuitioClient, acquire } =  require("@flare/tuitio-client");
 const TuitioClient =  require("@flare/tuitio-client");
 const type { TuitioLoginResponse, TuitioLogoutResponse, TuitioState } =  require("@flare/tuitio-client");
 ```
 
 ```javascript!
-import { TuitioClient, fetch } from "@flare/tuitio-client";
+import { TuitioClient, acquire } from "@flare/tuitio-client";
 import TuitioClient from "@flare/tuitio-client";
 import type { TuitioLoginResponse, TuitioLogoutResponse, TuitioState } from "@flare/tuitio-client";
 ```
diff --git a/src/__tests__/TuitioLogin.test.ts b/src/__tests__/TuitioLogin.test.ts
index 3a6c64e..d18ebc8 100644
--- a/src/__tests__/TuitioLogin.test.ts
+++ b/src/__tests__/TuitioLogin.test.ts
@@ -6,7 +6,7 @@
 
 import axios from "axios";
 import { TuitioClient } from "../client";
-import { fetch } from "../state";
+import { acquire } from "../state";
 
 jest.mock("axios");
 
@@ -40,7 +40,7 @@ test.each([240, 100, 20, 10, 5])("Tuitio client: successfully account login", as
   }
   expect(loginResult.error).toBeNull();
 
-  const storage = fetch();
+  const storage = acquire();
   expect(storage).toBeDefined();
   expect(storage?.token).toBe(mock.result.token);
   expect(storage?.userName).toBe("user");
diff --git a/src/__tests__/TuitioLogout.test.ts b/src/__tests__/TuitioLogout.test.ts
index 8d81659..44e034f 100644
--- a/src/__tests__/TuitioLogout.test.ts
+++ b/src/__tests__/TuitioLogout.test.ts
@@ -6,7 +6,7 @@
 
 import axios from "axios";
 import { TuitioClient } from "../client";
-import { fetch } from "../state";
+import { acquire } from "../state";
 import { localStorage } from "@flare/js-utils";
 import { storageKeys } from "../constants";
 
@@ -46,7 +46,7 @@ test("Tuitio client: successfully account logout", async () => {
   expect(logoutResult.result?.userName).toBe("tuitio.user");
   expect(logoutResult.error).toBeNull();
 
-  const storage = fetch();
+  const storage = acquire();
   expect(storage).toBeDefined();
   expect(storage.token).toBeNull();
   expect(storage.validUntil).toBeNull();
diff --git a/src/__tests__/TuitioStorage.test.ts b/src/__tests__/TuitioStorage.test.ts
index 3931332..b49d98d 100644
--- a/src/__tests__/TuitioStorage.test.ts
+++ b/src/__tests__/TuitioStorage.test.ts
@@ -4,10 +4,10 @@
 
 // Copyright (c) 2023 Tudor Stanciu
 
-import { fetch } from "../state";
+import { acquire } from "../state";
 
 test("Tuitio empty storage", () => {
-  const result = fetch();
+  const result = acquire();
   expect(result.token).toBeNull();
   expect(result.validUntil).toBeNull();
   expect(result.userName).toBeNull();
diff --git a/src/index.ts b/src/index.ts
index c510c0b..4224a4c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,10 +1,10 @@
 // Copyright (c) 2023 Tudor Stanciu
 
 import { TuitioClient } from "./client";
-import { fetch } from "./state";
+import { acquire } from "./state";
 import { decodeToken } from "./token";
 
 export * from "./types";
 
-export { TuitioClient, fetch, decodeToken };
+export { TuitioClient, acquire, decodeToken };
 export default TuitioClient;
diff --git a/src/state.ts b/src/state.ts
index e1fe971..5ad372d 100644
--- a/src/state.ts
+++ b/src/state.ts
@@ -8,7 +8,7 @@ const { getItem } = localStorage;
 
 const defaultTuitioState: TuitioState = { token: null, validUntil: null, userName: null };
 
-const fetch = (): TuitioState => {
+const acquire = (): TuitioState => {
   const authData = getItem(storageKeys.AUTH_DATA);
   if (!authData) return defaultTuitioState;
   const { token, validUntil, userName } = authData;
@@ -20,4 +20,4 @@ const fetch = (): TuitioState => {
   return data;
 };
 
-export { fetch };
+export { acquire };
diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index adc9858..ae3506d 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -1,12 +1,11 @@
 // Copyright (c) 2023 Tudor Stanciu
 
-import axios from "axios";
-import { fetch } from "../state";
+import { acquire } from "../state";
 
 type Headers = { [key: string]: string };
 
 function getHeaders(): Headers {
-  const { token } = fetch();
+  const { token } = acquire();
   const headers: Headers = {
     "Content-Type": "application/json"
   };