nuxt-auth-utils 0.3.3 → 0.3.5

package/README.md

@@ -233,6 +233,8 @@ export default oauthGitHubEventHandler({
 
 Make sure to set the callback URL in your OAuth app settings as `<your-domain>/auth/github`.
 
+If the redirect URL mismatch in production, this means that the module cannot guess the right redirect URL. You can set the `NUXT_OAUTH_<PROVIDER>_REDIRECT_URL` env variable to overwrite the default one.
+
 ### Extend Session
 
 We leverage hooks to let you extend the session data with your own data or log when the user clears the session.

package/dist/module.d.mts

@@ -2,6 +2,6 @@ import * as _nuxt_schema from '@nuxt/schema';
 
 interface ModuleOptions {
 }
-declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
+declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 
 export { type ModuleOptions, _default as default };

package/dist/module.d.ts

@@ -2,6 +2,6 @@ import * as _nuxt_schema from '@nuxt/schema';
 
 interface ModuleOptions {
 }
-declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
+declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 
 export { type ModuleOptions, _default as default };

package/dist/module.json

@@ -1,9 +1,9 @@
 {
   "name": "auth-utils",
   "configKey": "auth",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "builder": {
-    "@nuxt/module-builder": "0.8.1",
+    "@nuxt/module-builder": "0.8.3",
     "unbuild": "2.0.0"
   }
 }

package/dist/module.mjs

@@ -55,25 +55,30 @@ const module = defineNuxtModule({
     runtimeConfig.oauth = defu(runtimeConfig.oauth, {});
     runtimeConfig.oauth.github = defu(runtimeConfig.oauth.github, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.spotify = defu(runtimeConfig.oauth.spotify, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.google = defu(runtimeConfig.oauth.google, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.twitch = defu(runtimeConfig.oauth.twitch, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.auth0 = defu(runtimeConfig.oauth.auth0, {
       clientId: "",
       clientSecret: "",
       domain: "",
-      audience: ""
+      audience: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.microsoft = defu(runtimeConfig.oauth.microsoft, {
       clientId: "",
@@ -83,55 +88,66 @@ const module = defineNuxtModule({
       authorizationURL: "",
       tokenURL: "",
       userURL: "",
-      redirectUrl: ""
+      redirectURL: ""
     });
     runtimeConfig.oauth.discord = defu(runtimeConfig.oauth.discord, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.battledotnet = defu(runtimeConfig.oauth.battledotnet, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.keycloak = defu(runtimeConfig.oauth.keycloak, {
       clientId: "",
       clientSecret: "",
       serverUrl: "",
-      realm: ""
+      realm: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.linkedin = defu(runtimeConfig.oauth.linkedin, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.cognito = defu(runtimeConfig.oauth.cognito, {
       clientId: "",
       clientSecret: "",
       region: "",
-      userPoolId: ""
+      userPoolId: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.facebook = defu(runtimeConfig.oauth.facebook, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.paypal = defu(runtimeConfig.oauth.paypal, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.steam = defu(runtimeConfig.oauth.steam, {
-      apiKey: ""
+      apiKey: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.x = defu(runtimeConfig.oauth.x, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.xsuaa = defu(runtimeConfig.oauth.xsuaa, {
       clientId: "",
       clientSecret: "",
-      domain: ""
+      domain: "",
+      redirectURL: ""
     });
     runtimeConfig.oauth.yandex = defu(runtimeConfig.oauth.yandex, {
       clientId: "",
-      clientSecret: ""
+      clientSecret: "",
+      redirectURL: ""
     });
   }
 });

package/dist/runtime/app/plugins/session.client.js

@@ -1,6 +1,8 @@
 import { defineNuxtPlugin, useUserSession } from "#imports";
 export default defineNuxtPlugin(async (nuxtApp) => {
-  if (!nuxtApp.payload.serverRendered || Boolean(nuxtApp.payload.prerenderedAt) || Boolean(nuxtApp.payload.isCached)) {
+  if (!nuxtApp.payload.serverRendered) {
+    await useUserSession().fetch();
+  } else if (Boolean(nuxtApp.payload.prerenderedAt) || Boolean(nuxtApp.payload.isCached)) {
     nuxtApp.hook("app:mounted", async () => {
       await useUserSession().fetch();
     });

package/dist/runtime/server/lib/oauth/auth0.d.ts

@@ -51,5 +51,10 @@ export interface OAuthAuth0Config {
      * @example { display: 'popup' }
      */
     authorizationParams?: Record<string, string>;
+    /**
+     * Redirect URL to to allow overriding for situations like prod failing to determine public hostname
+     * @default process.env.NUXT_OAUTH_AUTH0_REDIRECT_URL or current URL
+     */
+    redirectURL?: string;
 }
 export declare function oauthAuth0EventHandler({ config, onSuccess, onError }: OAuthConfig<OAuthAuth0Config>): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;

package/dist/runtime/server/lib/oauth/auth0.js

@@ -1,6 +1,7 @@
-import { eventHandler, createError, getQuery, getRequestURL, sendRedirect } from "h3";
+import { eventHandler, getQuery, getRequestURL, sendRedirect } from "h3";
 import { withQuery, parsePath } from "ufo";
 import { defu } from "defu";
+import { handleMissingConfiguration, handleAccessTokenErrorResponse } from "../utils.js";
 import { useRuntimeConfig } from "#imports";
 export function oauthAuth0EventHandler({ config, onSuccess, onError }) {
   return eventHandler(async (event) => {
@@ -9,16 +10,11 @@ export function oauthAuth0EventHandler({ config, onSuccess, onError }) {
     });
     const { code } = getQuery(event);
     if (!config.clientId || !config.clientSecret || !config.domain) {
-      const error = createError({
-        statusCode: 500,
-        message: "Missing NUXT_OAUTH_AUTH0_CLIENT_ID or NUXT_OAUTH_AUTH0_CLIENT_SECRET or NUXT_OAUTH_AUTH0_DOMAIN env variables."
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleMissingConfiguration(event, "auth0", ["clientId", "clientSecret", "domain"], onError);
     }
     const authorizationURL = `https://${config.domain}/authorize`;
     const tokenURL = `https://${config.domain}/oauth/token`;
-    const redirectUrl = getRequestURL(event).href;
+    const redirectURL = config.redirectURL || getRequestURL(event).href;
     if (!code) {
       config.scope = config.scope || ["openid", "offline_access"];
       if (config.emailRequired && !config.scope.includes("email")) {
@@ -29,7 +25,7 @@ export function oauthAuth0EventHandler({ config, onSuccess, onError }) {
         withQuery(authorizationURL, {
           response_type: "code",
           client_id: config.clientId,
-          redirect_uri: redirectUrl,
+          redirect_uri: redirectURL,
           scope: config.scope.join(" "),
           audience: config.audience || "",
           max_age: config.maxAge || 0,
@@ -49,7 +45,7 @@ export function oauthAuth0EventHandler({ config, onSuccess, onError }) {
           grant_type: "authorization_code",
           client_id: config.clientId,
           client_secret: config.clientSecret,
-          redirect_uri: parsePath(redirectUrl).pathname,
+          redirect_uri: parsePath(redirectURL).pathname,
           code
         }
       }
@@ -57,13 +53,7 @@ export function oauthAuth0EventHandler({ config, onSuccess, onError }) {
       return { error };
     });
     if (tokens.error) {
-      const error = createError({
-        statusCode: 401,
-        message: `Auth0 login failed: ${tokens.error?.data?.error_description || "Unknown error"}`,
-        data: tokens
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleAccessTokenErrorResponse(event, "auth0", tokens, onError);
     }
     const tokenType = tokens.token_type;
     const accessToken = tokens.access_token;

package/dist/runtime/server/lib/oauth/battledotnet.d.ts

@@ -39,5 +39,10 @@ export interface OAuthBattledotnetConfig {
      * @see https://develop.battle.net/documentation/guides/using-oauth/authorization-code-flow
      */
     authorizationParams?: Record<string, string>;
+    /**
+     * Redirect URL to to allow overriding for situations like prod failing to determine public hostname
+     * @default process.env.NUXT_OAUTH_BATTLEDOTNET_REDIRECT_URL or current URL
+     */
+    redirectURL?: string;
 }
 export declare function oauthBattledotnetEventHandler({ config, onSuccess, onError }: OAuthConfig<OAuthBattledotnetConfig>): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;

package/dist/runtime/server/lib/oauth/battledotnet.js

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 import { eventHandler, createError, getQuery, getRequestURL, sendRedirect } from "h3";
 import { withQuery, parsePath } from "ufo";
 import { defu } from "defu";
+import { handleAccessTokenErrorResponse, handleMissingConfiguration } from "../utils.js";
 import { useRuntimeConfig } from "#imports";
 export function oauthBattledotnetEventHandler({ config, onSuccess, onError }) {
   return eventHandler(async (event) => {
@@ -22,13 +23,14 @@ export function oauthBattledotnetEventHandler({ config, onSuccess, onError }) {
       return onError(event, error);
     }
     if (!config.clientId || !config.clientSecret) {
-      const error = createError({
-        statusCode: 500,
-        message: "Missing NUXT_OAUTH_BATTLEDOTNET_CLIENT_ID or NUXT_OAUTH_BATTLEDOTNET_CLIENT_SECRET env variables."
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleMissingConfiguration(
+        event,
+        "battledotnet",
+        ["clientId", "clientSecret"],
+        onError
+      );
     }
+    const redirectURL = config.redirectURL || getRequestURL(event).href;
     if (!code) {
       config.scope = config.scope || ["openid"];
       config.region = config.region || "EU";
@@ -36,12 +38,11 @@ export function oauthBattledotnetEventHandler({ config, onSuccess, onError }) {
         config.authorizationURL = "https://oauth.battlenet.com.cn/authorize";
         config.tokenURL = "https://oauth.battlenet.com.cn/token";
       }
-      const redirectUrl2 = getRequestURL(event).href;
       return sendRedirect(
         event,
         withQuery(config.authorizationURL, {
           client_id: config.clientId,
-          redirect_uri: redirectUrl2,
+          redirect_uri: redirectURL,
           scope: config.scope.join(" "),
           state: randomUUID(),
           // Todo: handle PKCE flow
@@ -50,7 +51,6 @@ export function oauthBattledotnetEventHandler({ config, onSuccess, onError }) {
         })
       );
     }
-    const redirectUrl = getRequestURL(event).href;
     config.scope = config.scope || [];
     if (!config.scope.includes("openid")) {
       config.scope.push("openid");
@@ -68,20 +68,14 @@ export function oauthBattledotnetEventHandler({ config, onSuccess, onError }) {
           code,
           grant_type: "authorization_code",
           scope: config.scope.join(" "),
-          redirect_uri: parsePath(redirectUrl).pathname
+          redirect_uri: parsePath(redirectURL).pathname
         }
       }
     ).catch((error) => {
       return { error };
     });
     if (tokens.error) {
-      const error = createError({
-        statusCode: 401,
-        message: `Battle.net login failed: ${tokens.error || "Unknown error"}`,
-        data: tokens
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleAccessTokenErrorResponse(event, "battle.net", tokens, onError);
     }
     const accessToken = tokens.access_token;
     const user = await $fetch("https://oauth.battle.net/userinfo", {

package/dist/runtime/server/lib/oauth/cognito.d.ts

@@ -30,5 +30,15 @@ export interface OAuthCognitoConfig {
      * @see https://docs.aws.amazon.com/cognito/latest/developerguide/authorization-endpoint.html
      */
     authorizationParams?: Record<string, string>;
+    /**
+     * Redirect URL to to allow overriding for situations like prod failing to determine public hostname
+     * @default process.env.NUXT_OAUTH_COGNITO_REDIRECT_URL or current URL
+     */
+    redirectURL?: string;
+    /**
+     * AWS Cognito App Custom Domain – some pool configurations require this
+     * @default ''
+     */
+    domain?: string;
 }
 export declare function oauthCognitoEventHandler({ config, onSuccess, onError }: OAuthConfig<OAuthCognitoConfig>): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;

package/dist/runtime/server/lib/oauth/cognito.js

@@ -1,6 +1,7 @@
-import { eventHandler, createError, getQuery, getRequestURL, sendRedirect } from "h3";
+import { eventHandler, getQuery, getRequestURL, sendRedirect } from "h3";
 import { withQuery, parsePath } from "ufo";
 import { defu } from "defu";
+import { handleAccessTokenErrorResponse, handleMissingConfiguration } from "../utils.js";
 import { useRuntimeConfig } from "#imports";
 export function oauthCognitoEventHandler({ config, onSuccess, onError }) {
   return eventHandler(async (event) => {
@@ -9,23 +10,19 @@ export function oauthCognitoEventHandler({ config, onSuccess, onError }) {
     });
     const { code } = getQuery(event);
     if (!config.clientId || !config.clientSecret || !config.userPoolId || !config.region) {
-      const error = createError({
-        statusCode: 500,
-        message: "Missing NUXT_OAUTH_COGNITO_CLIENT_ID, NUXT_OAUTH_COGNITO_CLIENT_SECRET, NUXT_OAUTH_COGNITO_USER_POOL_ID, or NUXT_OAUTH_COGNITO_REGION env variables."
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleMissingConfiguration(event, "cognito", ["clientId", "clientSecret", "userPoolId", "region"], onError);
     }
-    const authorizationURL = `https://${config.userPoolId}.auth.${config.region}.amazoncognito.com/oauth2/authorize`;
-    const tokenURL = `https://${config.userPoolId}.auth.${config.region}.amazoncognito.com/oauth2/token`;
-    const redirectUrl = getRequestURL(event).href;
+    const urlBase = config?.domain || `${config.userPoolId}.auth.${config.region}.amazoncognito.com`;
+    const authorizationURL = `https://${urlBase}/oauth2/authorize`;
+    const tokenURL = `https://${urlBase}/oauth2/token`;
+    const redirectURL = config.redirectURL || getRequestURL(event).href;
     if (!code) {
       config.scope = config.scope || ["openid", "profile"];
       return sendRedirect(
         event,
         withQuery(authorizationURL, {
           client_id: config.clientId,
-          redirect_uri: redirectUrl,
+          redirect_uri: redirectURL,
           response_type: "code",
           scope: config.scope.join(" "),
           ...config.authorizationParams
@@ -39,23 +36,17 @@ export function oauthCognitoEventHandler({ config, onSuccess, onError }) {
         headers: {
           "Content-Type": "application/x-www-form-urlencoded"
         },
-        body: `grant_type=authorization_code&client_id=${config.clientId}&client_secret=${config.clientSecret}&redirect_uri=${parsePath(redirectUrl).pathname}&code=${code}`
+        body: `grant_type=authorization_code&client_id=${config.clientId}&client_secret=${config.clientSecret}&redirect_uri=${parsePath(redirectURL).pathname}&code=${code}`
       }
     ).catch((error) => {
       return { error };
     });
     if (tokens.error) {
-      const error = createError({
-        statusCode: 401,
-        message: `Cognito login failed: ${tokens.error_description || "Unknown error"}`,
-        data: tokens
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleAccessTokenErrorResponse(event, "cognito", tokens, onError);
     }
     const tokenType = tokens.token_type;
     const accessToken = tokens.access_token;
-    const user = await $fetch(`https://${config.userPoolId}.auth.${config.region}.amazoncognito.com/oauth2/userInfo`, {
+    const user = await $fetch(`https://${urlBase}/oauth2/userInfo`, {
       headers: {
         Authorization: `${tokenType} ${accessToken}`
       }

package/dist/runtime/server/lib/oauth/discord.d.ts

@@ -44,5 +44,10 @@ export interface OAuthDiscordConfig {
      * @example { allow_signup: 'true' }
      */
     authorizationParams?: Record<string, string>;
+    /**
+     * Redirect URL to to allow overriding for situations like prod failing to determine public hostname
+     * @default process.env.NUXT_OAUTH_DISCORD_REDIRECT_URL or current URL
+     */
+    redirectURL?: string;
 }
 export declare function oauthDiscordEventHandler({ config, onSuccess, onError }: OAuthConfig<OAuthDiscordConfig>): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;

package/dist/runtime/server/lib/oauth/discord.js

@@ -1,6 +1,7 @@
-import { eventHandler, createError, getQuery, getRequestURL, sendRedirect } from "h3";
+import { eventHandler, getQuery, getRequestURL, sendRedirect } from "h3";
 import { withQuery, parseURL, stringifyParsedURL } from "ufo";
 import { defu } from "defu";
+import { handleAccessTokenErrorResponse, handleMissingConfiguration } from "../utils.js";
 import { useRuntimeConfig } from "#imports";
 export function oauthDiscordEventHandler({ config, onSuccess, onError }) {
   return eventHandler(async (event) => {
@@ -12,14 +13,9 @@ export function oauthDiscordEventHandler({ config, onSuccess, onError }) {
     });
     const { code } = getQuery(event);
     if (!config.clientId || !config.clientSecret) {
-      const error = createError({
-        statusCode: 500,
-        message: "Missing NUXT_OAUTH_DISCORD_CLIENT_ID or NUXT_OAUTH_DISCORD_CLIENT_SECRET env variables."
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleMissingConfiguration(event, "discord", ["clientId", "clientSecret"], onError);
     }
-    const redirectUrl = getRequestURL(event).href;
+    const redirectURL = config.redirectURL || getRequestURL(event).href;
     if (!code) {
       config.scope = config.scope || [];
       if (config.emailRequired && !config.scope.includes("email")) {
@@ -33,13 +29,13 @@ export function oauthDiscordEventHandler({ config, onSuccess, onError }) {
         withQuery(config.authorizationURL, {
           response_type: "code",
           client_id: config.clientId,
-          redirect_uri: redirectUrl,
+          redirect_uri: redirectURL,
           scope: config.scope.join(" "),
           ...config.authorizationParams
         })
       );
     }
-    const parsedRedirectUrl = parseURL(redirectUrl);
+    const parsedRedirectUrl = parseURL(redirectURL);
     parsedRedirectUrl.search = "";
     const tokens = await $fetch(
       config.tokenURL,
@@ -60,13 +56,7 @@ export function oauthDiscordEventHandler({ config, onSuccess, onError }) {
       return { error };
     });
     if (tokens.error) {
-      const error = createError({
-        statusCode: 401,
-        message: `Discord login failed: ${tokens.error?.data?.error_description || "Unknown error"}`,
-        data: tokens
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleAccessTokenErrorResponse(event, "discord", tokens, onError);
     }
     const accessToken = tokens.access_token;
     const user = await $fetch("https://discord.com/api/users/@me", {

package/dist/runtime/server/lib/oauth/facebook.d.ts

@@ -39,5 +39,10 @@ export interface OAuthFacebookConfig {
      * @see https://developers.facebook.com/docs/facebook-login/guides/advanced/manual-flow/
      */
     authorizationParams?: Record<string, string>;
+    /**
+     * Redirect URL to to allow overriding for situations like prod failing to determine public hostname
+     * @default process.env.NUXT_OAUTH_FACEBOOK_REDIRECT_URL or current URL
+     */
+    redirectURL?: string;
 }
 export declare function oauthFacebookEventHandler({ config, onSuccess, onError, }: OAuthConfig<OAuthFacebookConfig>): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;

package/dist/runtime/server/lib/oauth/facebook.js

@@ -7,6 +7,7 @@ import {
 } from "h3";
 import { withQuery } from "ufo";
 import { defu } from "defu";
+import { handleAccessTokenErrorResponse, handleMissingConfiguration } from "../utils.js";
 import { useRuntimeConfig } from "#imports";
 export function oauthFacebookEventHandler({
   config,
@@ -30,21 +31,16 @@ export function oauthFacebookEventHandler({
       return onError(event, error);
     }
     if (!config.clientId) {
-      const error = createError({
-        statusCode: 500,
-        message: "Missing NUXT_OAUTH_FACEBOOK_CLIENT_ID or NUXT_OAUTH_FACEBOOK_CLIENT_SECRET env variables."
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleMissingConfiguration(event, "facebook", ["clientId"], onError);
     }
-    const redirectUrl = getRequestURL(event).href;
+    const redirectURL = config.redirectURL || getRequestURL(event).href;
     if (!query.code) {
       config.scope = config.scope || [];
       return sendRedirect(
         event,
         withQuery(config.authorizationURL, {
           client_id: config.clientId,
-          redirect_uri: redirectUrl,
+          redirect_uri: redirectURL,
           scope: config.scope.join(" ")
         })
       );
@@ -54,18 +50,12 @@ export function oauthFacebookEventHandler({
       body: {
         client_id: config.clientId,
         client_secret: config.clientSecret,
-        redirect_uri: redirectUrl,
+        redirect_uri: redirectURL,
         code: query.code
       }
     });
     if (tokens.error) {
-      const error = createError({
-        statusCode: 401,
-        message: `Facebook login failed: ${tokens.error || "Unknown error"}`,
-        data: tokens
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleAccessTokenErrorResponse(event, "facebook", tokens, onError);
     }
     const accessToken = tokens.access_token;
     config.fields = config.fields || ["id", "name"];

package/dist/runtime/server/lib/oauth/github.d.ts

@@ -38,5 +38,11 @@ export interface OAuthGitHubConfig {
      * @example { allow_signup: 'true' }
      */
     authorizationParams?: Record<string, string>;
+    /**
+     * Redirect URL to to allow overriding for situations like prod failing to determine public hostname
+     * @default process.env.NUXT_OAUTH_GITHUB_REDIRECT_URL
+     * @see https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/differences-between-github-apps-and-oauth-apps
+     */
+    redirectURL?: string;
 }
 export declare function oauthGitHubEventHandler({ config, onSuccess, onError }: OAuthConfig<OAuthGitHubConfig>): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;

package/dist/runtime/server/lib/oauth/github.js

@@ -1,6 +1,7 @@
 import { eventHandler, createError, getQuery, getRequestURL, sendRedirect } from "h3";
 import { withQuery } from "ufo";
 import { defu } from "defu";
+import { handleAccessTokenErrorResponse, handleMissingConfiguration } from "../utils.js";
 import { useRuntimeConfig } from "#imports";
 export function oauthGitHubEventHandler({ config, onSuccess, onError }) {
   return eventHandler(async (event) => {
@@ -20,24 +21,19 @@ export function oauthGitHubEventHandler({ config, onSuccess, onError }) {
       return onError(event, error);
     }
     if (!config.clientId || !config.clientSecret) {
-      const error = createError({
-        statusCode: 500,
-        message: "Missing NUXT_OAUTH_GITHUB_CLIENT_ID or NUXT_OAUTH_GITHUB_CLIENT_SECRET env variables."
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleMissingConfiguration(event, "github", ["clientId", "clientSecret"], onError);
     }
     if (!query.code) {
       config.scope = config.scope || [];
       if (config.emailRequired && !config.scope.includes("user:email")) {
         config.scope.push("user:email");
       }
-      const redirectUrl = getRequestURL(event).href;
+      const redirectURL = config.redirectURL || getRequestURL(event).href;
       return sendRedirect(
         event,
         withQuery(config.authorizationURL, {
           client_id: config.clientId,
-          redirect_uri: redirectUrl,
+          redirect_uri: redirectURL,
           scope: config.scope.join(" "),
           ...config.authorizationParams
         })
@@ -55,13 +51,7 @@ export function oauthGitHubEventHandler({ config, onSuccess, onError }) {
       }
     );
     if (tokens.error) {
-      const error = createError({
-        statusCode: 401,
-        message: `GitHub login failed: ${tokens.error || "Unknown error"}`,
-        data: tokens
-      });
-      if (!onError) throw error;
-      return onError(event, error);
+      return handleAccessTokenErrorResponse(event, "github", tokens, onError);
     }
     const accessToken = tokens.access_token;
     const user = await $fetch("https://api.github.com/user", {

package/dist/runtime/server/lib/oauth/google.d.ts

@@ -38,5 +38,10 @@ export interface OAuthGoogleConfig {
      * @example { access_type: 'offline' }
      */
     authorizationParams?: Record<string, string>;
+    /**
+     * Redirect URL to to allow overriding for situations like prod failing to determine public hostname
+     * @default process.env.NUXT_OAUTH_GOOGLE_REDIRECT_URL or current URL
+     */
+    redirectURL?: string;
 }
 export declare function oauthGoogleEventHandler({ config, onSuccess, onError, }: OAuthConfig<OAuthGoogleConfig>): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;