keep global auth for now

department-of-veterans-affairs · Dec 18, 2023 · 7d462f9 · 7d462f9
1 parent 4209e88
commit 7d462f9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/src/data/queries/event.ts b/src/data/queries/event.ts
@@ -39,10 +39,6 @@ export const data: QueryData<EventDataOpts, NodeEvent> = async (
         opts.context,
         {
           params: params().getQueryObject(),
-          withAuth: {
-            clientId: process.env.DRUPAL_CLIENT_ID,
-            clientSecret: process.env.DRUPAL_CLIENT_SECRET,
-          }
         }
       )
     : // otherwise just lookup by uuid

diff --git a/src/data/queries/newsStory.ts b/src/data/queries/newsStory.ts
@@ -35,10 +35,6 @@ export const data: QueryData<NewsStoryDataOpts, NodeNewsStory> = async (
         opts.context,
         {
           params: params().getQueryObject(),
-          withAuth: {
-            clientId: process.env.DRUPAL_CLIENT_ID,
-            clientSecret: process.env.DRUPAL_CLIENT_SECRET,
-          }
         }
       )
     : // otherwise just lookup by uuid

diff --git a/src/data/queries/storyListing.ts b/src/data/queries/storyListing.ts
@@ -48,10 +48,6 @@ export const data: QueryData<ListingPageDataOpts, StoryListingData> = async (
         opts.context,
         {
           params: params().getQueryObject(),
-          withAuth: {
-            clientId: process.env.DRUPAL_CLIENT_ID,
-            clientSecret: process.env.DRUPAL_CLIENT_SECRET,
-          }
         }
       )
     : // otherwise just lookup by uuid

diff --git a/src/lib/drupal/drupalClient.ts b/src/lib/drupal/drupalClient.ts
@@ -63,6 +63,10 @@ export const drupalClient = new DrupalClient(baseUrl, {
   fetcher,
   useDefaultResourceTypeEntry: true,
   throwJsonApiErrors: false,
+  auth: {
+    clientId: process.env.DRUPAL_CLIENT_ID,
+    clientSecret: process.env.DRUPAL_CLIENT_SECRET,
+  },
   // cache: redisCache(createRedisClient(process.env.REDIS_URL)),
   previewSecret: process.env.DRUPAL_PREVIEW_SECRET,
 })
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
@@ -57,7 +57,7 @@ export async function getStaticProps() {
   try {
     const { headerFooterData } = await getGlobalElements(
       `${process.env.NEXT_PUBLIC_DRUPAL_BASE_URL}/jsonapi`,
-      undefined,
+      undefined, // no banners on 404
       true // header only
     )
     return {