feat(clerk): Add machine auth support

Author: wobsoriano

packages/clerk-auth/package.json

@@ -41,8 +41,8 @@
   },
   "homepage": "https://github.com/honojs/middleware",
   "dependencies": {
-    "@clerk/backend": "^2.2.0",
-    "@clerk/types": "^4.61.0"
+    "@clerk/backend": "^2.24.0",
+    "@clerk/shared": "^3.36.0"
   },
   "peerDependencies": {
     "hono": ">=3.0.0"

packages/clerk-auth/src/index.ts

@@ -1,21 +1,21 @@
 import { createClerkClient } from '@clerk/backend'
-import type { ClerkClient, SessionAuthObject } from '@clerk/backend'
-import type { AuthenticateRequestOptions } from '@clerk/backend/internal'
-import { TokenType } from '@clerk/backend/internal'
+import type { ClerkClient } from '@clerk/backend'
+import type { AuthenticateRequestOptions, AuthOptions, GetAuthFn, GetAuthFnNoRequest } from '@clerk/backend/internal'
+import { getAuthObjectForAcceptedToken } from '@clerk/backend/internal'
 import type { Context, MiddlewareHandler } from 'hono'
 import { env } from 'hono/adapter'
 
 declare module 'hono' {
   interface ContextVariableMap {
     clerk: ClerkClient
-    clerkAuth: () => SessionAuthObject | null
+    clerkAuth: GetAuthFnNoRequest
   }
 }
 
-export const getAuth = (c: Context): SessionAuthObject | null => {
+export const getAuth = ((c: Context) => {
   const authFn = c.get('clerkAuth')
   return authFn()
-}
+}) as GetAuthFn<Context>
 
 type ClerkEnv = {
   CLERK_SECRET_KEY: string
@@ -55,7 +55,7 @@ export const clerkMiddleware = (options?: ClerkMiddlewareOptions): MiddlewareHan
       ...rest,
       secretKey,
       publishableKey,
-      acceptsToken: TokenType.SessionToken,
+      acceptsToken: 'any',
     })
 
     if (requestState.headers) {
@@ -72,8 +72,12 @@ export const clerkMiddleware = (options?: ClerkMiddlewareOptions): MiddlewareHan
       }
     }
 
-    // Options will be added soon
-    c.set('clerkAuth', () => requestState.toAuth())
+    const authObjectFn = ((options?: AuthOptions) => getAuthObjectForAcceptedToken({
+      authObject: authObjectFn(options),
+      acceptsToken: 'any'
+    })) as GetAuthFnNoRequest
+
+    c.set('clerkAuth', authObjectFn)
     c.set('clerk', clerkClient)
 
     await next()

yarn.lock

@@ -694,29 +694,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@clerk/backend@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "@clerk/backend@npm:2.2.0"
+"@clerk/backend@npm:^2.24.0":
+  version: 2.24.0
+  resolution: "@clerk/backend@npm:2.24.0"
   dependencies:
-    "@clerk/shared": "npm:^3.9.8"
-    "@clerk/types": "npm:^4.61.0"
+    "@clerk/shared": "npm:^3.36.0"
+    "@clerk/types": "npm:^4.101.3"
     cookie: "npm:1.0.2"
-    snakecase-keys: "npm:8.0.1"
+    standardwebhooks: "npm:^1.0.0"
     tslib: "npm:2.8.1"
-  checksum: 10c0/deaf688e085ec2a28b8e98453b3ce2c293f19adf440acd8b295c71c7d765ad1c98841e8a5e9ee5d254e91d18884533cc11f6880c34ec99f4d3b57b330b47fe70
+  checksum: 10c0/bec210ad221ab15a0a41a138690b54ab2919110ee2fcc8e9b523dcefd1f1e0835dd1f8ccec109628b37b4484ee99688cc2a867b125aaad6c24c91ed2ca8b05fa
   languageName: node
   linkType: hard
 
-"@clerk/shared@npm:^3.9.8":
-  version: 3.9.8
-  resolution: "@clerk/shared@npm:3.9.8"
+"@clerk/shared@npm:^3.36.0":
+  version: 3.36.0
+  resolution: "@clerk/shared@npm:3.36.0"
   dependencies:
-    "@clerk/types": "npm:^4.61.0"
+    csstype: "npm:3.1.3"
     dequal: "npm:2.0.3"
     glob-to-regexp: "npm:0.4.1"
     js-cookie: "npm:3.0.5"
     std-env: "npm:^3.9.0"
-    swr: "npm:^2.3.3"
+    swr: "npm:2.3.4"
   peerDependencies:
     react: ^18.0.0 || ^19.0.0 || ^19.0.0-0
     react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-0
@@ -725,16 +725,16 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 10c0/64f21c38900dd41229c94920ce7fa52dba67b1bb3fdca4468d99a7bca450b1f1d1cfebecd1867657554bf915b26c24cb46d0962746ec9b92dad6d435571f05d2
+  checksum: 10c0/5415e3c0dfd1e0e1e9133650d073d5b28703099d6d9e4f05fcb70d48c3690f175ff7166e17af2a08447590b24c97297d8f6e8d33f656103eb32356e4850573e9
   languageName: node
   linkType: hard
 
-"@clerk/types@npm:^4.61.0":
-  version: 4.61.0
-  resolution: "@clerk/types@npm:4.61.0"
+"@clerk/types@npm:^4.101.3":
+  version: 4.101.3
+  resolution: "@clerk/types@npm:4.101.3"
   dependencies:
-    csstype: "npm:3.1.3"
-  checksum: 10c0/4f05bbdc6562c3e8f114ccfe378bfb7c622ce49338336ec962c7bf7f69bdd7eab98484c69e43dd69ffc8f7d2fea43609c1f8a37a650b475361cf8dea541b9ee3
+    "@clerk/shared": "npm:^3.36.0"
+  checksum: 10c0/f5ab2e56975454ea46fdc74dc4cc34d29b4476100be50bdb4e4fbd9f972d651402024e891cd2d5b08429867e534dc58327e27384a0637f8a1a47061cba0dd99b
   languageName: node
   linkType: hard
 
@@ -2171,8 +2171,8 @@ __metadata:
   resolution: "@hono/clerk-auth@workspace:packages/clerk-auth"
   dependencies:
     "@arethetypeswrong/cli": "npm:^0.17.4"
-    "@clerk/backend": "npm:^2.2.0"
-    "@clerk/types": "npm:^4.61.0"
+    "@clerk/backend": "npm:^2.24.0"
+    "@clerk/shared": "npm:^3.36.0"
     "@types/react": "npm:^18"
     hono: "npm:^4.8.4"
     publint: "npm:^0.3.9"
@@ -4410,6 +4410,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@stablelib/base64@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "@stablelib/base64@npm:1.0.1"
+  checksum: 10c0/6330720f021819d19cecfe274111b79a256caa81df478d6b0ae7effc8842b96915b6aeed85926ff05b4d48ec1fc78ad043d928b730ee4e6cc6e8cba6aa097bed
+  languageName: node
+  linkType: hard
+
 "@standard-schema/spec@npm:1.0.0":
   version: 1.0.0
   resolution: "@standard-schema/spec@npm:1.0.0"
@@ -7025,16 +7032,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dot-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "dot-case@npm:3.0.4"
-  dependencies:
-    no-case: "npm:^3.0.4"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/5b859ea65097a7ea870e2c91b5768b72ddf7fa947223fd29e167bcdff58fe731d941c48e47a38ec8aa8e43044c8fbd15cd8fa21689a526bc34b6548197cd5b05
-  languageName: node
-  linkType: hard
-
 "dot-prop@npm:^5.2.0":
   version: 5.3.0
   resolution: "dot-prop@npm:5.3.0"
@@ -8380,6 +8377,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-sha256@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "fast-sha256@npm:1.3.0"
+  checksum: 10c0/87f9e4baa7639576cf60a2b6235c9f436e1a1c52323abbd8a705b5bea8355500acf176f2aed0c14f2ecd6d6007e26151461bab2f27b8953bcca8d9d6b76a86e4
+  languageName: node
+  linkType: hard
+
 "fast-uri@npm:^3.0.1":
   version: 3.0.6
   resolution: "fast-uri@npm:3.0.6"
@@ -10532,15 +10536,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lower-case@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "lower-case@npm:2.0.2"
-  dependencies:
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/3d925e090315cf7dc1caa358e0477e186ffa23947740e4314a7429b6e62d72742e0bbe7536a5ae56d19d7618ce998aba05caca53c2902bd5742fdca5fc57fd7b
-  languageName: node
-  linkType: hard
-
 "lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
   version: 10.1.0
   resolution: "lru-cache@npm:10.1.0"
@@ -10676,13 +10671,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"map-obj@npm:^4.1.0":
-  version: 4.3.0
-  resolution: "map-obj@npm:4.3.0"
-  checksum: 10c0/1c19e1c88513c8abdab25c316367154c6a0a6a0f77e3e8c391bb7c0e093aefed293f539d026dc013d86219e5e4c25f23b0003ea588be2101ccd757bacc12d43b
-  languageName: node
-  linkType: hard
-
 "markdown-extensions@npm:^2.0.0":
   version: 2.0.0
   resolution: "markdown-extensions@npm:2.0.0"
@@ -11800,16 +11788,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"no-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "no-case@npm:3.0.4"
-  dependencies:
-    lower-case: "npm:^2.0.2"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/8ef545f0b3f8677c848f86ecbd42ca0ff3cd9dd71c158527b344c69ba14710d816d8489c746b6ca225e7b615108938a0bda0a54706f8c255933703ac1cf8e703
-  languageName: node
-  linkType: hard
-
 "node-emoji@npm:^2.2.0":
   version: 2.2.0
   resolution: "node-emoji@npm:2.2.0"
@@ -14311,27 +14289,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"snake-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "snake-case@npm:3.0.4"
-  dependencies:
-    dot-case: "npm:^3.0.4"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/ab19a913969f58f4474fe9f6e8a026c8a2142a01f40b52b79368068343177f818cdfef0b0c6b9558f298782441d5ca8ed5932eb57822439fad791d866e62cecd
-  languageName: node
-  linkType: hard
-
-"snakecase-keys@npm:8.0.1":
-  version: 8.0.1
-  resolution: "snakecase-keys@npm:8.0.1"
-  dependencies:
-    map-obj: "npm:^4.1.0"
-    snake-case: "npm:^3.0.4"
-    type-fest: "npm:^4.15.0"
-  checksum: 10c0/3615126462e413fe5e1637c945362e99c3ac497bc49d867397547ab1a87ff2827ae890d1aa022ef06c27cb3924bcb3714db2f4e76770e6ebd3625f3e16d79d27
-  languageName: node
-  linkType: hard
-
 "socks-proxy-agent@npm:^8.0.3, socks-proxy-agent@npm:^8.0.5":
   version: 8.0.5
   resolution: "socks-proxy-agent@npm:8.0.5"
@@ -14505,6 +14462,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"standardwebhooks@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "standardwebhooks@npm:1.0.0"
+  dependencies:
+    "@stablelib/base64": "npm:^1.0.0"
+    fast-sha256: "npm:^1.3.0"
+  checksum: 10c0/aee097d0f3c05172c19b80df1ed9596a2ce92f8956957650d0bbe47c2ca6d36515796b51d523333cb4a48c889b2ab130d789e7879e14975c4381bc7a61274327
+  languageName: node
+  linkType: hard
+
 "statuses@npm:2.0.1, statuses@npm:^2.0.1":
   version: 2.0.1
   resolution: "statuses@npm:2.0.1"
@@ -14818,15 +14785,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swr@npm:^2.3.3":
-  version: 2.3.3
-  resolution: "swr@npm:2.3.3"
+"swr@npm:2.3.4":
+  version: 2.3.4
+  resolution: "swr@npm:2.3.4"
   dependencies:
     dequal: "npm:^2.0.3"
     use-sync-external-store: "npm:^1.4.0"
   peerDependencies:
     react: ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10c0/882fc8291912860e0c50eae3470ebf0cd58b0144cb12adcc4b14c5cef913ea06479043830508d8b0b3d4061d99ad8dd52485c9c879fbd4e9b893484e6d8da9e3
+  checksum: 10c0/c5cf536c2652fc6b64d64d3ce232f8bbe25dcaffc688f852fb81cf06e28b59280ebebde752429d9801c3af8e7a956ee7242376a6386a599cedc0000b862a712d
   languageName: node
   linkType: hard
 
@@ -15186,7 +15153,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.4.0":
+"tslib@npm:^2.0.1, tslib@npm:^2.1.0, tslib@npm:^2.4.0":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
@@ -15287,7 +15254,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^4.15.0, type-fest@npm:^4.26.1, type-fest@npm:^4.37.0":
+"type-fest@npm:^4.26.1, type-fest@npm:^4.37.0":
   version: 4.38.0
   resolution: "type-fest@npm:4.38.0"
   checksum: 10c0/db9990d682a08697cf8ae67ac3cdbca734c742c96615e8888401d7d54e376b390e6a5d3be25fe3b4b439e1bb88a7da461da678a614ece8caccd9c0a07dd2e5f4