1 files changed, 7 insertions, 8 deletions
diff --git a/src/clients/loaders.ts b/src/clients/loaders.ts
index 2af7770..d9972d5 100644
--- a/src/clients/loaders.ts
+++ b/src/clients/loaders.ts
@@ -12,17 +12,16 @@ export async function loader({ request }) {
 
 export async function accountLoader() {
   const client = new ApiClient();
-  const token = new Token();
+  
+  const account_response = await client.authenticatedGet("/account");
+  const addresses_response = await client.authenticatedGet("/account/addresses");
+  const cards_response = await client.authenticatedGet("/account/cards");
 
-  if(!token.present())
+  // Authentication error handling.
+  if(account_response.response || addresses_response.response || cards_response.response)
     return redirect("/products");
 
-  const headers = {
-    "Authentication": `Bearer ${ token.get() }`
-  };
-
-  const response = await client.get("/account", undefined, headers);
-  return response;
+  return [account_response, addresses_response, cards_response];
 }
 
 export async function productLoader({ params }) {