fix(gatsby-oauth): accessToken with executor

AmazeeLabs · Apr 15, 2024 · 7d2893c · 7d2893c
1 parent 8eb7ae8
commit 7d2893c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/apps/website/src/templates/profile.tsx b/apps/website/src/templates/profile.tsx
@@ -7,19 +7,22 @@ import { drupalExecutor } from '../utils/drupal-executor';
 
 export default function ProfilePage() {
   const session = useSession();
-  let accessToken = null;
+  let accessToken: string | undefined = undefined;
   if (session && session.status === 'authenticated') {
     // @ts-ignore
     accessToken = session.data.user.tokens.access_token;
     const authenticatedExecutor = drupalExecutor(
       `${process.env.GATSBY_DRUPAL_URL}/graphql`,
       false,
-      accessToken,
     );
     return (
       <OperationExecutor
         executor={async () => {
-          const data = await authenticatedExecutor(CurrentUserQuery, {});
+          const data = await authenticatedExecutor(
+            CurrentUserQuery,
+            {},
+            accessToken,
+          );
           return {
             currentUser: data.currentUser,
           };

diff --git a/apps/website/src/utils/drupal-executor.ts b/apps/website/src/utils/drupal-executor.ts
@@ -3,14 +3,11 @@ import { AnyOperationId, OperationVariables } from '@custom/schema';
 /**
  * Create an executor that operates against a Drupal endpoint.
  */
-export function drupalExecutor(
-  endpoint: string,
-  forward: boolean = true,
-  accessToken: string | undefined = undefined,
-) {
+export function drupalExecutor(endpoint: string, forward: boolean = true) {
   return async function <OperationId extends AnyOperationId>(
     id: OperationId,
     variables?: OperationVariables<OperationId>,
+    accessToken?: string,
   ) {
     const url = new URL(endpoint, window.location.origin);
     const isMutation = id.includes('Mutation:');

diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts
@@ -39,11 +39,10 @@ export function OperationExecutor<OperationId extends AnyOperationId>(
 export function useExecutor<OperationId extends AnyOperationId>(
   id: OperationId,
   variables?: OperationVariables<OperationId>,
-  accessToken?: string,
 ):
   | OperationResult<OperationId>
   | ((
       variables?: OperationVariables<OperationId>,
     ) => Promise<OperationResult<OperationId>>) {
-  return untypedUseExecutor(id, variables, accessToken);
+  return untypedUseExecutor(id, variables);
 }