diff --git a/.changeset/cold-singers-bow.md b/.changeset/cold-singers-bow.md new file mode 100644 index 00000000..55f310e5 --- /dev/null +++ b/.changeset/cold-singers-bow.md @@ -0,0 +1,5 @@ +--- +'@hono/auth-js': patch +--- + +Update @auth/core version and set default basePath diff --git a/packages/auth-js/package.json b/packages/auth-js/package.json index 5486b0ef..e12719c1 100644 --- a/packages/auth-js/package.json +++ b/packages/auth-js/package.json @@ -57,7 +57,7 @@ "react": ">=18" }, "devDependencies": { - "@auth/core": "^0.19.0", + "@auth/core": "^0.24.0", "@types/react": "^18", "hono": "^3.11.7", "jest": "^29.7.0", diff --git a/packages/auth-js/src/index.ts b/packages/auth-js/src/index.ts index f015bdee..889f87ff 100644 --- a/packages/auth-js/src/index.ts +++ b/packages/auth-js/src/index.ts @@ -35,6 +35,7 @@ function reqWithEnvUrl(req: Request, authUrl?: string): Request { function setEnvDefaults(env: AuthEnv, config: AuthConfig) { config.secret ??= env.AUTH_SECRET + config.basePath ??= '/api/auth' config.trustHost = true config.redirectProxyUrl ??= env.AUTH_REDIRECT_PROXY_URL config.providers = config.providers.map((p) => { @@ -53,13 +54,12 @@ function setEnvDefaults(env: AuthEnv, config: AuthConfig) { export async function getAuthUser(c: Context): Promise { const config = c.get('authConfig') + setEnvDefaults(c.env, config) const origin = new URL(c.req.url, c.env.AUTH_URL).origin - const request = new Request(`${origin}/session`, { + const request = new Request(`${origin}${config.basePath}/session`, { headers: { cookie: c.req.header('cookie') ?? '' }, }) - setEnvDefaults(c.env, config) - let authUser: AuthUser = {} as AuthUser const response = (await Auth(request, { @@ -70,7 +70,6 @@ export async function getAuthUser(c: Context): Promise { authUser = args[0] const session = (await config.callbacks?.session?.(...args)) ?? args[0].session - // @ts-expect-error either user or token will be defined const user = args[0].user ?? args[0].token return { user, ...session } satisfies Session }, diff --git a/yarn.lock b/yarn.lock index 0cc44537..41340f3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -45,9 +45,9 @@ __metadata: languageName: node linkType: hard -"@auth/core@npm:^0.19.0": - version: 0.19.0 - resolution: "@auth/core@npm:0.19.0" +"@auth/core@npm:^0.24.0": + version: 0.24.0 + resolution: "@auth/core@npm:0.24.0" dependencies: "@panva/hkdf": "npm:^1.1.1" "@types/cookie": "npm:0.6.0" @@ -61,7 +61,7 @@ __metadata: peerDependenciesMeta: nodemailer: optional: true - checksum: 27fc81a2e4348fb6a44ded8137001908c4dfbe0fd0375b1479f50d9ea5be73b5fad20f4338c0e3df1eac4200b3831a7a57cfb79fdcad5a2ce1ce04ff76ad9190 + checksum: b8d8c66bc35d18a6ffa80e21b122747cb0c40826f68eb8c22a1b4dda01aba62c2050a1d5e4997e92a6756edad4103faafe8d9a49c7278d991e690c3ebbdb6035 languageName: node linkType: hard @@ -1364,7 +1364,7 @@ __metadata: version: 0.0.0-use.local resolution: "@hono/auth-js@workspace:packages/auth-js" dependencies: - "@auth/core": "npm:^0.19.0" + "@auth/core": "npm:^0.24.0" "@types/react": "npm:^18" hono: "npm:^3.11.7" jest: "npm:^29.7.0"