⬆️ feat: Update drupal auth version in starters (#160)

enZane · web-flow · commit a5d2919c7066 · 2025-05-01T14:35:09.000-06:00
* ⬆️ feat: Update drupal auth version in starters

* ️💥 feat: Update scaffolding to improve auth client

* ✨ feat: Update scripts
diff --git a/packages/create-drupal-decoupled/src/templates/shared/auth.server.ts b/packages/create-drupal-decoupled/src/templates/shared/auth.server.ts
@@ -7,7 +7,7 @@ interface TokenArgs {
 }
 
 export const getToken = async ({ uri, clientId, clientSecret }: TokenArgs) => {
-  const client = await drupalAuthClient(uri, 'client_credentials', {
+  const client = await drupalAuthClient(uri, {
     clientId,
     clientSecret,
   })
diff --git a/starters/next/package.json b/starters/next/package.json
@@ -26,7 +26,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "composable-functions": "^5.0.0",
-    "drupal-auth-client": "^0.4",
+    "drupal-auth-client": "^1.0",
     "drupal-decoupled": "^0.2.2",
     "gql.tada": "^1.8.10",
     "lucide-react": "^0.474.0",
diff --git a/starters/next/scripts/sync.ts b/starters/next/scripts/sync.ts
@@ -11,14 +11,10 @@ import {
 
   dotenv.config({ path: envPath })
 
-  const authClient = await drupalAuthClient(
-    process.env.DRUPAL_AUTH_URI!,
-    'client_credentials',
-    {
-      clientId: process.env.DRUPAL_CLIENT_ID!,
-      clientSecret: process.env.DRUPAL_CLIENT_SECRET!,
-    }
-  )
+  const authClient = await drupalAuthClient(process.env.DRUPAL_AUTH_URI!, {
+    clientId: process.env.DRUPAL_CLIENT_ID!,
+    clientSecret: process.env.DRUPAL_CLIENT_SECRET!,
+  })
 
   console.log('\n🚀 Generating GraphQL Schema')
   await generateSchema({
diff --git a/starters/next/utils/auth.ts b/starters/next/utils/auth.ts
@@ -7,7 +7,7 @@ interface TokenArgs {
 }
 
 export const getToken = async ({ uri, clientId, clientSecret }: TokenArgs) => {
-  const client = await drupalAuthClient(uri, 'client_credentials', {
+  const client = await drupalAuthClient(uri, {
     clientId,
     clientSecret,
   })
diff --git a/starters/next/yarn.lock b/starters/next/yarn.lock
@@ -3932,10 +3932,10 @@ dotenv@^16.4.5:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26"
   integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==
 
-drupal-auth-client@^0.4:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/drupal-auth-client/-/drupal-auth-client-0.4.0.tgz#1ecec93b3404744546291e6e4f25ddb7b536b536"
-  integrity sha512-isCGyIQazg9Mi+zF/b96wSZ4R4U9mxayHPejvNQqkp/GolxkJ/vkrvxTcU3ShLrk3CkspPYPfr6uGEzyW2F5Rw==
+drupal-auth-client@^1.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/drupal-auth-client/-/drupal-auth-client-1.0.0.tgz#792d00c1c38ff0cab8987e408632cecb5f5c1ed3"
+  integrity sha512-RLsh0J5sCGbgMbkOwpUkGreM6StIgfTUcYtsnbIIV2r/0Y8HlrXPRY1e9x7SKnHH5hwDmpzhJ1YZen4cOHGdlw==
 
 drupal-decoupled@^0.2.2:
   version "0.2.2"
diff --git a/starters/react-router/app/utils/auth.server.ts b/starters/react-router/app/utils/auth.server.ts
@@ -7,7 +7,7 @@ interface TokenArgs {
 }
 
 export const getToken = async ({ uri, clientId, clientSecret }: TokenArgs) => {
-  const client = await drupalAuthClient(uri, 'client_credentials', {
+  const client = await drupalAuthClient(uri, {
     clientId,
     clientSecret,
   })
diff --git a/starters/react-router/package.json b/starters/react-router/package.json
@@ -28,7 +28,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "composable-functions": "^5.0.0",
-    "drupal-auth-client": "^0.4",
+    "drupal-auth-client": "^1.0",
     "drupal-decoupled": "^0.2.2",
     "gql.tada": "^1.8.10",
     "isbot": "^5.1.17",
diff --git a/starters/react-router/scripts/sync.ts b/starters/react-router/scripts/sync.ts
@@ -10,14 +10,10 @@ import {
   const envPath = path.join(process.cwd(), '.env')
   dotenv.config({ path: envPath })
 
-  const authClient = await drupalAuthClient(
-    process.env.DRUPAL_AUTH_URI!,
-    'client_credentials',
-    {
-      clientId: process.env.DRUPAL_CLIENT_ID!,
-      clientSecret: process.env.DRUPAL_CLIENT_SECRET!,
-    }
-  )
+  const authClient = await drupalAuthClient(process.env.DRUPAL_AUTH_URI!, {
+    clientId: process.env.DRUPAL_CLIENT_ID!,
+    clientSecret: process.env.DRUPAL_CLIENT_SECRET!,
+  })
 
   console.log('\n🚀 Generating GraphQL Schema')
   await generateSchema({
diff --git a/starters/react-router/yarn.lock b/starters/react-router/yarn.lock
@@ -2397,10 +2397,10 @@ dom-accessibility-api@^0.6.3:
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz#993e925cc1d73f2c662e7d75dd5a5445259a8fd8"
   integrity sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==
 
-drupal-auth-client@^0.4:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/drupal-auth-client/-/drupal-auth-client-0.4.0.tgz#1ecec93b3404744546291e6e4f25ddb7b536b536"
-  integrity sha512-isCGyIQazg9Mi+zF/b96wSZ4R4U9mxayHPejvNQqkp/GolxkJ/vkrvxTcU3ShLrk3CkspPYPfr6uGEzyW2F5Rw==
+drupal-auth-client@^1.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/drupal-auth-client/-/drupal-auth-client-1.0.0.tgz#792d00c1c38ff0cab8987e408632cecb5f5c1ed3"
+  integrity sha512-RLsh0J5sCGbgMbkOwpUkGreM6StIgfTUcYtsnbIIV2r/0Y8HlrXPRY1e9x7SKnHH5hwDmpzhJ1YZen4cOHGdlw==
 
 drupal-decoupled@^0.2.2:
   version "0.2.2"

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ interface TokenArgs {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`export const getToken = async ({ uri, clientId, clientSecret }: TokenArgs) => {`
`10`		`- const client = await drupalAuthClient(uri, 'client_credentials', {`
	`10`	`+ const client = await drupalAuthClient(uri, {`
`11`	`11`	`clientId,`
`12`	`12`	`clientSecret,`
`13`	`13`	`})`