@ludo.ninja/api 2.8.58 → 2.8.59

package/build/config/index.js

@@ -24,92 +24,60 @@ const resolvePendingRequests = () => {
     pendingRequests = [];
 };
 let apolloClient;
+const handleTokenRefresh = (operation, forward) => {
+    const { refreshToken } = (0, cookies_1.getCookies)();
+    const client = apolloClient ?? createApolloClient();
+    if (!isRefreshing) {
+        isRefreshing = true;
+        return (0, client_1.fromPromise)(client
+            .mutate({
+            context: { uri: index_1.hosts.authHost },
+            variables: { refreshToken },
+            mutation: index_1.authSchema.RefreshTokenDocument,
+        })
+            .then(({ data: { refreshToken: { tokenAuth, tokenRefresh } } }) => {
+            (0, cookies_1.refreshCookies)(tokenAuth, tokenRefresh, mainDomain);
+            resolvePendingRequests();
+            return true;
+        })
+            .catch(async () => {
+            await apolloClient?.mutate({
+                context: { uri: index_1.hosts.authHost },
+                mutation: index_1.authSchema.RevokeTokenDocument,
+            });
+            (0, cookies_1.destroyCookies)(mainDomain);
+            pendingRequests = [];
+            window.location.reload();
+            return false;
+        })
+            .finally(() => {
+            isRefreshing = false;
+        })).filter((value) => Boolean(value));
+    }
+    else {
+        return (0, client_1.fromPromise)(new Promise((resolve) => {
+            // @ts-ignore
+            pendingRequests.push(() => resolve());
+        }));
+    }
+};
 const errorLink = (0, error_1.onError)(({ graphQLErrors, networkError, operation, forward }) => {
-    const { authToken, refreshToken } = (0, cookies_1.getCookies)();
+    const { authToken } = (0, cookies_1.getCookies)();
     if (graphQLErrors) {
         graphQLErrors.forEach(({ message, locations, path }) => console.warn(`[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`));
         for (const err of graphQLErrors) {
             if (err.message.includes("Auth token not found") && authToken) {
-                let forward$;
-                const client = apolloClient ?? createApolloClient();
-                if (!isRefreshing) {
-                    isRefreshing = true;
-                    forward$ = (0, client_1.fromPromise)(client
-                        .mutate({
-                        context: { uri: index_1.hosts.authHost },
-                        variables: { refreshToken },
-                        mutation: index_1.authSchema.RefreshTokenDocument,
-                    })
-                        .then(({ data: { refreshToken: { tokenAuth, tokenRefresh }, }, }) => {
-                        (0, cookies_1.refreshCookies)(tokenAuth, tokenRefresh, mainDomain);
-                        resolvePendingRequests();
-                        return true;
-                    })
-                        .catch(async () => {
-                        await apolloClient?.mutate({
-                            context: { uri: index_1.hosts.authHost },
-                            mutation: index_1.authSchema.RevokeTokenDocument,
-                        });
-                        (0, cookies_1.destroyCookies)(mainDomain);
-                        pendingRequests = [];
-                        window.location.reload();
-                        return false;
-                    })
-                        .finally(() => {
-                        isRefreshing = false;
-                    })).filter((value) => Boolean(value));
-                }
-                else {
-                    forward$ = (0, client_1.fromPromise)(new Promise((resolve) => {
-                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                        // @ts-ignore
-                        pendingRequests.push(() => resolve());
-                    }));
-                }
-                return forward$.flatMap(() => forward(operation));
+                return handleTokenRefresh(operation, forward).flatMap(() => forward(operation));
             }
         }
     }
     if (networkError) {
         console.warn(`[Network error]: ${networkError}`);
+        if (networkError.message.includes("503")) {
+            console.error(`[503 Service Unavailable]: ${networkError.message}`);
+        }
         if (networkError.message.includes("401") && authToken) {
-            let forward$;
-            const client = apolloClient ?? createApolloClient();
-            if (!isRefreshing) {
-                isRefreshing = true;
-                forward$ = (0, client_1.fromPromise)(client
-                    .mutate({
-                    context: { uri: index_1.hosts.authHost },
-                    variables: { refreshToken },
-                    mutation: index_1.authSchema.RefreshTokenDocument,
-                })
-                    .then(({ data: { refreshToken: { tokenAuth, tokenRefresh }, }, }) => {
-                    (0, cookies_1.refreshCookies)(tokenAuth, tokenRefresh, mainDomain);
-                    resolvePendingRequests();
-                    return true;
-                })
-                    .catch(async () => {
-                    await apolloClient?.mutate({
-                        context: { uri: index_1.hosts.authHost },
-                        mutation: index_1.authSchema.RevokeTokenDocument,
-                    });
-                    (0, cookies_1.destroyCookies)(mainDomain);
-                    pendingRequests = [];
-                    window.location.reload();
-                    return false;
-                })
-                    .finally(() => {
-                    isRefreshing = false;
-                })).filter((value) => Boolean(value));
-            }
-            else {
-                forward$ = (0, client_1.fromPromise)(new Promise((resolve) => {
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-ignore
-                    pendingRequests.push(() => resolve());
-                }));
-            }
-            return forward$.flatMap(() => forward(operation));
+            return handleTokenRefresh(operation, forward).flatMap(() => forward(operation));
         }
     }
 });
@@ -158,26 +126,18 @@ function createApolloClient() {
 function initializeApollo(initialState = null, domain) {
     const _apolloClient = apolloClient ?? createApolloClient();
     mainDomain = domain || '';
-    // If your page has Next.js data fetching methods that use Apollo Client, the initial state
-    // gets hydrated here
     if (initialState) {
-        // Get existing cache, loaded during client side data fetching
         const existingCache = _apolloClient.extract();
-        // Merge the initialState from getStaticProps/getServerSideProps in the existing cache
         const data = (0, deepmerge_1.default)(existingCache, initialState, {
-            // combine arrays using object equality (like in sets)
             arrayMerge: (destinationArray, sourceArray) => [
                 ...sourceArray,
                 ...destinationArray.filter((d) => sourceArray.every((s) => !(0, lodash_isequal_1.default)(d, s))),
             ],
         });
-        // Restore the cache with the merged data
         _apolloClient.cache.restore(data);
     }
-    // For SSG and SSR always create a new Apollo Client
     if (typeof window === "undefined")
         return _apolloClient;
-    // Create the Apollo Client once in the client
     if (!apolloClient)
         apolloClient = _apolloClient;
     return _apolloClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ludo.ninja/api",
-  "version": "2.8.58",
+  "version": "2.8.59",
   "main": "./build/index.js",
   "scripts": {
     "test": "jest",

package/src/config/index.ts

@@ -7,17 +7,17 @@ import {
   split,
   ApolloLink,
 } from "@apollo/client";
-import {onError} from "@apollo/client/link/error";
-import {setContext} from "@apollo/client/link/context";
-import {createUploadLink} from "apollo-upload-client";
+import { onError } from "@apollo/client/link/error";
+import { setContext } from "@apollo/client/link/context";
+import { createUploadLink } from "apollo-upload-client";
 import merge from "deepmerge";
 import isEqual from "lodash.isequal";
-import {destroyCookies, getCookies, refreshCookies} from "../cookies";
-import {typePoliciesPortal} from "./typePolicies";
-import {GraphQLWsLink} from "@apollo/client/link/subscriptions";
-import {getMainDefinition} from "@apollo/client/utilities";
-import {createClient} from "graphql-ws";
-import {hosts, authSchema as schema} from "../index";
+import { destroyCookies, getCookies, refreshCookies } from "../cookies";
+import { typePoliciesPortal } from "./typePolicies";
+import { GraphQLWsLink } from "@apollo/client/link/subscriptions";
+import { getMainDefinition } from "@apollo/client/utilities";
+import { createClient } from "graphql-ws";
+import { hosts, authSchema as schema } from "../index";
 
 let isRefreshing = false;
 let pendingRequests: never[] = [];
@@ -30,63 +30,59 @@ const resolvePendingRequests = () => {
 
 let apolloClient: ApolloClient<NormalizedCacheObject> | undefined;
 
-const errorLink = onError(({graphQLErrors, networkError, operation, forward}) => {
-  const {authToken, refreshToken} = getCookies();
+const handleTokenRefresh = (operation: any, forward: any) => {
+  const { refreshToken } = getCookies();
+  const client = apolloClient ?? createApolloClient();
+
+  if (!isRefreshing) {
+    isRefreshing = true;
+    return fromPromise(
+      client
+        .mutate({
+          context: { uri: hosts.authHost },
+          variables: { refreshToken },
+          mutation: schema.RefreshTokenDocument,
+        })
+        .then(({ data: { refreshToken: { tokenAuth, tokenRefresh } } }) => {
+          refreshCookies(tokenAuth, tokenRefresh, mainDomain);
+          resolvePendingRequests();
+          return true;
+        })
+        .catch(async () => {
+          await apolloClient?.mutate({
+            context: { uri: hosts.authHost },
+            mutation: schema.RevokeTokenDocument,
+          });
+          destroyCookies(mainDomain);
+          pendingRequests = [];
+          window.location.reload();
+          return false;
+        })
+        .finally(() => {
+          isRefreshing = false;
+        })
+    ).filter((value) => Boolean(value));
+  } else {
+    return fromPromise(
+      new Promise((resolve) => {
+        // @ts-ignore
+        pendingRequests.push(() => resolve());
+      })
+    );
+  }
+};
+
+const errorLink = onError(({ graphQLErrors, networkError, operation, forward }) => {
+  const { authToken } = getCookies();
 
   if (graphQLErrors) {
-    graphQLErrors.forEach(({message, locations, path}) =>
-      console.warn(`[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`),
+    graphQLErrors.forEach(({ message, locations, path }) =>
+      console.warn(`[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`)
     );
 
     for (const err of graphQLErrors) {
       if (err.message.includes("Auth token not found") && authToken) {
-        let forward$;
-        const client = apolloClient ?? createApolloClient();
-        if (!isRefreshing) {
-          isRefreshing = true;
-          forward$ = fromPromise(
-            client
-              .mutate({
-                context: {uri: hosts.authHost},
-                variables: {refreshToken},
-                mutation: schema.RefreshTokenDocument,
-              })
-              .then(
-                ({
-                   data: {
-                     refreshToken: {tokenAuth, tokenRefresh},
-                   },
-                 }) => {
-                  refreshCookies(tokenAuth, tokenRefresh, mainDomain);
-                  resolvePendingRequests();
-                  return true;
-                },
-              )
-              .catch(async () => {
-                await apolloClient?.mutate({
-                  context: {uri: hosts.authHost},
-                  mutation: schema.RevokeTokenDocument,
-                });
-
-                destroyCookies(mainDomain);
-                pendingRequests = [];
-                window.location.reload();
-                return false;
-              })
-              .finally(() => {
-                isRefreshing = false;
-              }),
-          ).filter((value) => Boolean(value));
-        } else {
-          forward$ = fromPromise(
-            new Promise((resolve) => {
-              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-              // @ts-ignore
-              pendingRequests.push(() => resolve());
-            }),
-          );
-        }
-        return forward$.flatMap(() => forward(operation));
+        return handleTokenRefresh(operation, forward).flatMap(() => forward(operation));
       }
     }
   }
@@ -94,66 +90,24 @@ const errorLink = onError(({graphQLErrors, networkError, operation, forward}) =>
   if (networkError) {
     console.warn(`[Network error]: ${networkError}`);
 
+    if (networkError.message.includes("503")) {
+      console.error(`[503 Service Unavailable]: ${networkError.message}`);
+    }
+
     if (networkError.message.includes("401") && authToken) {
-      let forward$;
-      const client = apolloClient ?? createApolloClient();
-      if (!isRefreshing) {
-        isRefreshing = true;
-        forward$ = fromPromise(
-          client
-            .mutate({
-              context: {uri: hosts.authHost},
-              variables: {refreshToken},
-              mutation: schema.RefreshTokenDocument,
-            })
-            .then(
-              ({
-                 data: {
-                   refreshToken: {tokenAuth, tokenRefresh},
-                 },
-               }) => {
-                refreshCookies(tokenAuth, tokenRefresh, mainDomain);
-                resolvePendingRequests();
-                return true;
-              },
-            )
-            .catch(async () => {
-              await apolloClient?.mutate({
-                context: {uri: hosts.authHost},
-                mutation: schema.RevokeTokenDocument,
-              });
-
-              destroyCookies(mainDomain);
-              pendingRequests = [];
-              window.location.reload();
-              return false;
-            })
-            .finally(() => {
-              isRefreshing = false;
-            }),
-        ).filter((value) => Boolean(value));
-      } else {
-        forward$ = fromPromise(
-          new Promise((resolve) => {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            pendingRequests.push(() => resolve());
-          }),
-        );
-      }
-      return forward$.flatMap(() => forward(operation));
+      return handleTokenRefresh(operation, forward).flatMap(() => forward(operation));
     }
   }
 });
 
-const authLink = setContext(async (operation, {headers}) => {
-  const {authToken} = getCookies();
+const authLink = setContext(async (operation, { headers }) => {
+  const { authToken } = getCookies();
 
   const header = authToken
     ? {
-      headers: {...headers, "x-client-authorization": `${authToken}`},
+      headers: { ...headers, "x-client-authorization": `${authToken}` },
     }
-    : {headers: {...headers}};
+    : { headers: { ...headers } };
 
   return {
     headers: header.headers,
@@ -174,7 +128,7 @@ const wsLink =
           connected: () => console.log("GraphQLWsLink connected"),
           closed: () => console.log("GraphQLWsLink closed"),
         },
-      }),
+      })
     )
     : null;
 
@@ -183,12 +137,12 @@ const opsLink: ApolloLink = from([errorLink, authLink, httpLink as unknown as Ap
 const terminatingLink =
   typeof window !== "undefined" && wsLink !== null
     ? split(
-      ({query}) => {
+      ({ query }) => {
         const definition = getMainDefinition(query);
         return definition.kind === "OperationDefinition" && definition.operation === "subscription";
       },
       wsLink,
-      opsLink,
+      opsLink
     )
     : httpLink;
 
@@ -198,8 +152,8 @@ function createApolloClient() {
     link: terminatingLink as ApolloLink,
     cache: new InMemoryCache({
       typePolicies: typePoliciesPortal,
-        addTypename: true,
-        resultCaching: true,
+      addTypename: true,
+      resultCaching: true,
     }),
   });
 }
@@ -208,27 +162,19 @@ export function initializeApollo(initialState = null, domain?: string) {
   const _apolloClient = apolloClient ?? createApolloClient();
   mainDomain = domain || '';
 
-  // If your page has Next.js data fetching methods that use Apollo Client, the initial state
-  // gets hydrated here
   if (initialState) {
-    // Get existing cache, loaded during client side data fetching
     const existingCache = _apolloClient.extract();
-
-    // Merge the initialState from getStaticProps/getServerSideProps in the existing cache
     const data = merge(existingCache, initialState, {
-      // combine arrays using object equality (like in sets)
       arrayMerge: (destinationArray, sourceArray) => [
         ...sourceArray,
         ...destinationArray.filter((d) => sourceArray.every((s) => !isEqual(d, s))),
       ],
     });
 
-    // Restore the cache with the merged data
     _apolloClient.cache.restore(data);
   }
-  // For SSG and SSR always create a new Apollo Client
+
   if (typeof window === "undefined") return _apolloClient;
-  // Create the Apollo Client once in the client
   if (!apolloClient) apolloClient = _apolloClient;
 
   return _apolloClient;