emdash 1.0.1 → 1.1.0

package/dist/astro/routes/api/auth/magic-link/verify.mjs

@@ -1,23 +1,23 @@
 import "../../../../../config-CvmjJcVw.mjs";
 import "../../../../../after-PcEvMY_6.mjs";
-import "../../../../../base64-DvnNgP7e.mjs";
+import "../../../../../base64-BQBZwXCx.mjs";
 import "../../../../../url-Dn3IStq8.mjs";
-import "../../../../../types-j6MBDjlZ.mjs";
-import "../../../../../errors-CjXd1LgH.mjs";
-import "../../../../../errors-CNvATh_7.mjs";
-import "../../../../../settings-CwcrX-Ay.mjs";
-import "../../../../../site-settings-B7vGFRDT.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-DIYXAVk4.mjs";
-import { n as parseBody, t as isParseError } from "../../../../../parse-5Y0W39xR.mjs";
-import "../../../../../redirects-1nhdEaTq.mjs";
-import "../../../../../entry-lock-yIkBduqJ.mjs";
-import "../../../../../media-Bs6qmlVl.mjs";
-import "../../../../../comments-zrTgWBSg.mjs";
-import { E as magicLinkVerifyBody } from "../../../../../byline-fields-BYbTptTU.mjs";
-import "../../../../../menus-mC_XTxD7.mjs";
-import "../../../../../status-C6IrSLMT.mjs";
+import "../../../../../types-C-Xp0CcN.mjs";
+import "../../../../../errors-CuHQRiBW.mjs";
+import "../../../../../errors-DTE6C3K_.mjs";
+import "../../../../../settings-WHr45II1.mjs";
+import "../../../../../site-settings-KJOqJW6W.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-B0rgPgsQ.mjs";
+import { n as parseBody, t as isParseError } from "../../../../../parse-CmFDTGzp.mjs";
+import "../../../../../redirects-D4EWeXAo.mjs";
+import "../../../../../entry-lock-sxz2PGAT.mjs";
+import "../../../../../media-aahnKHze.mjs";
+import "../../../../../comments-BRtp992B.mjs";
+import { E as magicLinkVerifyBody } from "../../../../../byline-fields-DHJs0Mja.mjs";
+import "../../../../../menus-BQKqf0Up.mjs";
+import "../../../../../status-D39Fpy8R.mjs";
 import "../../../../../api/schemas/index.mjs";
-import { r as sessionUnavailableError } from "../../../../../session-user-C6IEjuty.mjs";
+import { r as sessionUnavailableError } from "../../../../../session-user-CqkPtrPL.mjs";
 import { MagicLinkError, verifyMagicLink } from "@emdash-cms/auth";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 

package/dist/astro/routes/api/auth/me.mjs

@@ -1,21 +1,21 @@
 import "../../../../config-CvmjJcVw.mjs";
-import "../../../../base64-DvnNgP7e.mjs";
+import "../../../../base64-BQBZwXCx.mjs";
 import "../../../../url-Dn3IStq8.mjs";
-import "../../../../types-j6MBDjlZ.mjs";
-import { t as UserRepository } from "../../../../user-BOvuF1sQ.mjs";
-import "../../../../errors-CjXd1LgH.mjs";
-import "../../../../errors-CNvATh_7.mjs";
-import "../../../../settings-CwcrX-Ay.mjs";
-import "../../../../site-settings-B7vGFRDT.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../error-DIYXAVk4.mjs";
-import { n as parseBody, t as isParseError } from "../../../../parse-5Y0W39xR.mjs";
-import "../../../../redirects-1nhdEaTq.mjs";
-import "../../../../entry-lock-yIkBduqJ.mjs";
-import "../../../../media-Bs6qmlVl.mjs";
-import "../../../../comments-zrTgWBSg.mjs";
-import { x as authMeActionBody } from "../../../../byline-fields-BYbTptTU.mjs";
-import "../../../../menus-mC_XTxD7.mjs";
-import "../../../../status-C6IrSLMT.mjs";
+import "../../../../types-C-Xp0CcN.mjs";
+import { t as UserRepository } from "../../../../user-Dnp53zTq.mjs";
+import "../../../../errors-CuHQRiBW.mjs";
+import "../../../../errors-DTE6C3K_.mjs";
+import "../../../../settings-WHr45II1.mjs";
+import "../../../../site-settings-KJOqJW6W.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../error-B0rgPgsQ.mjs";
+import { n as parseBody, t as isParseError } from "../../../../parse-CmFDTGzp.mjs";
+import "../../../../redirects-D4EWeXAo.mjs";
+import "../../../../entry-lock-sxz2PGAT.mjs";
+import "../../../../media-aahnKHze.mjs";
+import "../../../../comments-BRtp992B.mjs";
+import { x as authMeActionBody } from "../../../../byline-fields-DHJs0Mja.mjs";
+import "../../../../menus-BQKqf0Up.mjs";
+import "../../../../status-D39Fpy8R.mjs";
 import "../../../../api/schemas/index.mjs";
 
 //#region src/astro/routes/api/auth/me.ts

package/dist/astro/routes/api/auth/mode.mjs

@@ -1,9 +1,9 @@
-import "../../../../base64-DvnNgP7e.mjs";
-import "../../../../types-j6MBDjlZ.mjs";
-import "../../../../errors-CjXd1LgH.mjs";
-import "../../../../errors-CNvATh_7.mjs";
-import { n as apiSuccess } from "../../../../error-DIYXAVk4.mjs";
-import { t as getAuthMode } from "../../../../mode-B9-gMXL9.mjs";
+import "../../../../base64-BQBZwXCx.mjs";
+import "../../../../types-C-Xp0CcN.mjs";
+import "../../../../errors-CuHQRiBW.mjs";
+import "../../../../errors-DTE6C3K_.mjs";
+import { n as apiSuccess } from "../../../../error-B0rgPgsQ.mjs";
+import { t as getAuthMode } from "../../../../mode-nh0ppSX5.mjs";
 
 //#region src/astro/routes/api/auth/mode.ts
 const prerender = false;

package/dist/astro/routes/api/auth/oauth/_provider_/callback.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"callback.d.mts","names":[],"sources":["../../../../../../../src/astro/routes/api/auth/oauth/[provider]/callback.ts"],"mappings":";;;cAQa,SAAA;AAAA,cAwEA,GAAA,EAAK,QAAA"}
+{"version":3,"file":"callback.d.mts","names":[],"sources":["../../../../../../../src/astro/routes/api/auth/oauth/[provider]/callback.ts"],"mappings":";;;cAQa,SAAA;AAAA,cAyHA,GAAA,EAAK,QAAA"}

package/dist/astro/routes/api/auth/oauth/_provider_/callback.mjs

@@ -1,21 +1,25 @@
 import "../../../../../../dialect-helpers-7_IqPdh9.mjs";
 import "../../../../../../after-PcEvMY_6.mjs";
 import { t as OptionsRepository } from "../../../../../../options-DhrI7eMv.mjs";
-import "../../../../../../base64-DvnNgP7e.mjs";
-import "../../../../../../types-j6MBDjlZ.mjs";
-import "../../../../../../errors-CjXd1LgH.mjs";
-import "../../../../../../errors-CNvATh_7.mjs";
-import "../../../../../../error-DIYXAVk4.mjs";
-import { r as getPublicOrigin } from "../../../../../../public-url-7j0cpCFc.mjs";
-import { t as SESSION_UNAVAILABLE_MESSAGE } from "../../../../../../session-user-C6IEjuty.mjs";
-import { n as finalizeSetup } from "../../../../../../setup-complete-BOrI10UY.mjs";
-import { t as createOAuthStateStore } from "../../../../../../oauth-state-store-CxXTjXdI.mjs";
-import { OAuthError, Role, handleOAuthCallback } from "@emdash-cms/auth";
+import "../../../../../../base64-BQBZwXCx.mjs";
+import "../../../../../../types-C-Xp0CcN.mjs";
+import "../../../../../../errors-CuHQRiBW.mjs";
+import "../../../../../../errors-DTE6C3K_.mjs";
+import "../../../../../../error-B0rgPgsQ.mjs";
+import { r as getPublicOrigin } from "../../../../../../public-url-B5a0QAh6.mjs";
+import { t as SESSION_UNAVAILABLE_MESSAGE } from "../../../../../../session-user-CqkPtrPL.mjs";
+import { n as finalizeSetup } from "../../../../../../setup-complete-B2_dhZZz.mjs";
+import { t as createOAuthStateStore } from "../../../../../../oauth-state-store-CpGi2FZH.mjs";
+import { OAuthError, Role, handleOAuthCallback, isValidMicrosoftTenant } from "@emdash-cms/auth";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 
 //#region src/astro/routes/api/auth/oauth/[provider]/callback.ts
 const prerender = false;
-const VALID_PROVIDERS = new Set(["github", "google"]);
+const VALID_PROVIDERS = new Set([
+	"github",
+	"google",
+	"microsoft"
+]);
 function isValidProvider(provider) {
 	return VALID_PROVIDERS.has(provider);
 }
@@ -27,9 +31,16 @@ function envString(env, ...keys) {
 	}
 }
 /**
+* The `emailVerified` option passed to `microsoft()` in the site config
+*/
+function getMicrosoftEmailVerified(authProviders) {
+	const options = authProviders?.find((p) => p.id === "microsoft")?.config;
+	if (options && typeof options === "object" && "emailVerified" in options && typeof options.emailVerified === "boolean") return options.emailVerified;
+}
+/**
 * Get OAuth config from environment variables
 */
-function getOAuthConfig(env) {
+function getOAuthConfig(env, microsoftEmailVerified) {
 	const providers = {};
 	const githubClientId = envString(env, "EMDASH_OAUTH_GITHUB_CLIENT_ID", "GITHUB_CLIENT_ID");
 	const githubClientSecret = envString(env, "EMDASH_OAUTH_GITHUB_CLIENT_SECRET", "GITHUB_CLIENT_SECRET");
@@ -43,6 +54,15 @@ function getOAuthConfig(env) {
 		clientId: googleClientId,
 		clientSecret: googleClientSecret
 	};
+	const microsoftClientId = envString(env, "EMDASH_OAUTH_MICROSOFT_CLIENT_ID", "MICROSOFT_CLIENT_ID");
+	const microsoftClientSecret = envString(env, "EMDASH_OAUTH_MICROSOFT_CLIENT_SECRET", "MICROSOFT_CLIENT_SECRET");
+	const microsoftTenant = envString(env, "EMDASH_OAUTH_MICROSOFT_TENANT_ID", "MICROSOFT_TENANT_ID");
+	if (microsoftClientId && microsoftClientSecret && microsoftTenant && isValidMicrosoftTenant(microsoftTenant)) providers.microsoft = {
+		clientId: microsoftClientId,
+		clientSecret: microsoftClientSecret,
+		tenant: microsoftTenant,
+		emailVerified: microsoftEmailVerified
+	};
 	return providers;
 }
 const GET = async ({ params, request, locals, session, redirect }) => {
@@ -62,7 +82,7 @@ const GET = async ({ params, request, locals, session, redirect }) => {
 	if (!code || !state) return redirect(`/_emdash/admin/login?error=invalid_callback&message=${encodeURIComponent("Missing code or state parameter")}`);
 	try {
 		const { env: cfEnv } = await import("virtual:emdash/env");
-		const providers = getOAuthConfig(cfEnv ?? import.meta.env);
+		const providers = getOAuthConfig(cfEnv ?? import.meta.env, getMicrosoftEmailVerified(emdash.config.authProviders));
 		if (!providers[provider]) return redirect(`/_emdash/admin/login?error=provider_not_configured&message=${encodeURIComponent(`OAuth provider ${provider} is not configured`)}`);
 		if (!session) return redirect(`/_emdash/admin/login?error=server_error&message=${encodeURIComponent(SESSION_UNAVAILABLE_MESSAGE)}`);
 		const adapter = createKyselyAdapter(emdash.db);
@@ -135,6 +155,9 @@ const GET = async ({ params, request, locals, session, redirect }) => {
 				case "profile_fetch_failed":
 					message = "Failed to retrieve your profile. Please try again.";
 					break;
+				case "id_token_invalid":
+					message = "Could not verify your sign-in with the provider. Please try again.";
+					break;
 				default:
 					message = "Authentication failed. Please try again.";
 					break;

package/dist/astro/routes/api/auth/oauth/_provider_/callback.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"callback.mjs","names":[],"sources":["../../../../../../../src/astro/routes/api/auth/oauth/[provider]/callback.ts"],"sourcesContent":["/**\n * GET /_emdash/api/auth/oauth/[provider]/callback\n *\n * Handle OAuth callback from provider\n */\n\nimport type { APIRoute } from \"astro\";\n\nexport const prerender = false;\n\nimport {\n\thandleOAuthCallback,\n\tOAuthError,\n\tRole,\n\ttype OAuthConsumerConfig,\n\ttype RoleLevel,\n} from \"@emdash-cms/auth\";\nimport { createKyselyAdapter } from \"@emdash-cms/auth/adapters/kysely\";\n\nimport { getPublicOrigin } from \"#api/public-url.js\";\nimport { finalizeSetup } from \"#api/setup-complete.js\";\nimport { createOAuthStateStore } from \"#auth/oauth-state-store.js\";\nimport { OptionsRepository } from \"#db/repositories/options.js\";\n\nimport { SESSION_UNAVAILABLE_MESSAGE } from \"../../../../../session-user.js\";\n\ntype ProviderName = \"github\" | \"google\";\n\nconst VALID_PROVIDERS = new Set<string>([\"github\", \"google\"]);\n\nfunction isValidProvider(provider: string): provider is ProviderName {\n\treturn VALID_PROVIDERS.has(provider);\n}\n\n/** Safely extract a string value from an env-like record */\nfunction envString(env: Record<string, unknown>, ...keys: string[]): string | undefined {\n\tfor (const key of keys) {\n\t\tconst val = env[key];\n\t\tif (typeof val === \"string\" && val) return val;\n\t}\n\treturn undefined;\n}\n\n/**\n * Get OAuth config from environment variables\n */\nfunction getOAuthConfig(env: Record<string, unknown>): OAuthConsumerConfig[\"providers\"] {\n\tconst providers: OAuthConsumerConfig[\"providers\"] = {};\n\n\t// GitHub\n\tconst githubClientId = envString(env, \"EMDASH_OAUTH_GITHUB_CLIENT_ID\", \"GITHUB_CLIENT_ID\");\n\tconst githubClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_GITHUB_CLIENT_SECRET\",\n\t\t\"GITHUB_CLIENT_SECRET\",\n\t);\n\tif (githubClientId && githubClientSecret) {\n\t\tproviders.github = {\n\t\t\tclientId: githubClientId,\n\t\t\tclientSecret: githubClientSecret,\n\t\t};\n\t}\n\n\t// Google\n\tconst googleClientId = envString(env, \"EMDASH_OAUTH_GOOGLE_CLIENT_ID\", \"GOOGLE_CLIENT_ID\");\n\tconst googleClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_GOOGLE_CLIENT_SECRET\",\n\t\t\"GOOGLE_CLIENT_SECRET\",\n\t);\n\tif (googleClientId && googleClientSecret) {\n\t\tproviders.google = {\n\t\t\tclientId: googleClientId,\n\t\t\tclientSecret: googleClientSecret,\n\t\t};\n\t}\n\n\treturn providers;\n}\n\nexport const GET: APIRoute = async ({ params, request, locals, session, redirect }) => {\n\tconst { emdash } = locals;\n\tconst provider = params.provider;\n\n\t// Validate provider\n\tif (!provider || !isValidProvider(provider)) {\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=invalid_provider&message=${encodeURIComponent(\"Invalid OAuth provider\")}`,\n\t\t);\n\t}\n\n\tif (!emdash?.db) {\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=server_error&message=${encodeURIComponent(\"Database not configured\")}`,\n\t\t);\n\t}\n\n\tconst url = new URL(request.url);\n\tconst code = url.searchParams.get(\"code\");\n\tconst state = url.searchParams.get(\"state\");\n\tconst error = url.searchParams.get(\"error\");\n\tconst errorDescription = url.searchParams.get(\"error_description\");\n\n\t// Handle OAuth errors from provider\n\tif (error) {\n\t\tconst message = errorDescription || error;\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=oauth_denied&message=${encodeURIComponent(message)}`,\n\t\t);\n\t}\n\n\t// Validate required params\n\tif (!code || !state) {\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=invalid_callback&message=${encodeURIComponent(\"Missing code or state parameter\")}`,\n\t\t);\n\t}\n\n\ttry {\n\t\t// Get OAuth providers from environment. Astro 6 removed\n\t\t// `Astro.locals.runtime.env` (accessing it throws rather than\n\t\t// returning undefined, so optional-chaining doesn't help) -- read\n\t\t// Cloudflare bindings via the emdash virtual module instead, which\n\t\t// re-exports `cloudflare:workers`' `env` under that adapter and\n\t\t// falls back to `import.meta.env` on Node (#1736).\n\t\t// @ts-ignore - virtual module, generated by the Astro integration\n\t\tconst { env: cfEnv } = (await import(\"virtual:emdash/env\")) as {\n\t\t\tenv?: Record<string, unknown>;\n\t\t};\n\t\tconst env = cfEnv ?? import.meta.env;\n\t\tconst providers = getOAuthConfig(env);\n\n\t\tif (!providers[provider]) {\n\t\t\treturn redirect(\n\t\t\t\t`/_emdash/admin/login?error=provider_not_configured&message=${encodeURIComponent(`OAuth provider ${provider} is not configured`)}`,\n\t\t\t);\n\t\t}\n\n\t\tif (!session) {\n\t\t\treturn redirect(\n\t\t\t\t`/_emdash/admin/login?error=server_error&message=${encodeURIComponent(SESSION_UNAVAILABLE_MESSAGE)}`,\n\t\t\t);\n\t\t}\n\n\t\tconst adapter = createKyselyAdapter(emdash.db);\n\t\tconst stateStore = createOAuthStateStore(emdash.db);\n\n\t\tconst config: OAuthConsumerConfig = {\n\t\t\tbaseUrl: `${getPublicOrigin(url, emdash?.config)}/_emdash`,\n\t\t\tproviders,\n\t\t\tcanSelfSignup: async (email: string) => {\n\t\t\t\t// During setup: first user becomes admin.\n\t\t\t\t// Check setup_complete flag instead of countUsers() to avoid\n\t\t\t\t// a TOCTOU race where concurrent callbacks both see 0 users.\n\t\t\t\tconst options = new OptionsRepository(emdash.db);\n\t\t\t\tconst setupComplete = await options.get(\"emdash:setup_complete\");\n\t\t\t\tif (setupComplete !== true && setupComplete !== \"true\") {\n\t\t\t\t\treturn { allowed: true, role: Role.ADMIN };\n\t\t\t\t}\n\n\t\t\t\t// Extract domain from email\n\t\t\t\tconst domain = email.split(\"@\")[1]?.toLowerCase();\n\t\t\t\tif (!domain) {\n\t\t\t\t\treturn null;\n\t\t\t\t}\n\n\t\t\t\t// Check allowed_domains table for a matching, enabled entry\n\t\t\t\tconst entry = await emdash.db\n\t\t\t\t\t.selectFrom(\"allowed_domains\")\n\t\t\t\t\t.selectAll()\n\t\t\t\t\t.where(\"domain\", \"=\", domain)\n\t\t\t\t\t.where(\"enabled\", \"=\", 1)\n\t\t\t\t\t.executeTakeFirst();\n\n\t\t\t\tif (!entry) {\n\t\t\t\t\treturn null;\n\t\t\t\t}\n\n\t\t\t\t// Map the stored role level to the Role enum\n\t\t\t\tconst roleLevel = entry.default_role;\n\t\t\t\tconst roleMap: Record<number, RoleLevel> = {\n\t\t\t\t\t50: Role.ADMIN,\n\t\t\t\t\t40: Role.EDITOR,\n\t\t\t\t\t30: Role.AUTHOR,\n\t\t\t\t\t20: Role.CONTRIBUTOR,\n\t\t\t\t\t10: Role.SUBSCRIBER,\n\t\t\t\t};\n\t\t\t\tconst role = roleMap[roleLevel] ?? Role.CONTRIBUTOR;\n\t\t\t\tif (!roleMap[roleLevel]) {\n\t\t\t\t\tconsole.warn(\n\t\t\t\t\t\t`[oauth] Unknown role level ${roleLevel} for domain ${domain}, defaulting to CONTRIBUTOR`,\n\t\t\t\t\t);\n\t\t\t\t}\n\n\t\t\t\treturn { allowed: true, role };\n\t\t\t},\n\t\t};\n\n\t\tconst options = new OptionsRepository(emdash.db);\n\t\tconst setupCompleteBefore = await options.get(\"emdash:setup_complete\");\n\t\tconst user = await handleOAuthCallback(config, adapter, provider, code, state, stateStore);\n\t\tconst isFirstUser = setupCompleteBefore !== true && setupCompleteBefore !== \"true\";\n\n\t\t// Finalize setup outside the transaction (idempotent, safe if two callbacks race).\n\t\tif (isFirstUser) {\n\t\t\tawait finalizeSetup(emdash.db);\n\t\t\tconsole.log(`[oauth] Setup complete: created admin user via ${provider} (${user.email})`);\n\t\t}\n\n\t\tsession.set(\"user\", { id: user.id });\n\n\t\t// Redirect to admin dashboard\n\t\treturn redirect(\"/_emdash/admin\");\n\t} catch (callbackError) {\n\t\tconsole.error(\"OAuth callback error:\", callbackError);\n\n\t\tlet message = \"Authentication failed\";\n\t\tlet errorCode = \"oauth_error\";\n\n\t\tif (callbackError instanceof OAuthError) {\n\t\t\terrorCode = callbackError.code;\n\n\t\t\t// Map all error codes to user-friendly messages (never expose raw error.message)\n\t\t\tswitch (callbackError.code) {\n\t\t\t\tcase \"invalid_state\":\n\t\t\t\t\tmessage = \"OAuth session expired or invalid. Please try again.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"signup_not_allowed\":\n\t\t\t\t\tmessage = \"Self-signup is not allowed for your email. Please contact an administrator.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"invite_invalid\":\n\t\t\t\t\tmessage = \"This invite link is invalid or has expired. Please ask for a new one.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"invite_email_mismatch\":\n\t\t\t\t\tmessage = \"This invite was sent to a different email address than your account.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"invite_email_unverified\":\n\t\t\t\t\tmessage =\n\t\t\t\t\t\t\"Your account's email is not verified by the provider. Please verify it and try again.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"user_not_found\":\n\t\t\t\t\tmessage = \"Your account was not found. It may have been deleted.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"token_exchange_failed\":\n\t\t\t\t\tmessage = \"Failed to complete authentication. Please try again.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"profile_fetch_failed\":\n\t\t\t\t\tmessage = \"Failed to retrieve your profile. Please try again.\";\n\t\t\t\t\tbreak;\n\t\t\t\tdefault:\n\t\t\t\t\tmessage = \"Authentication failed. Please try again.\";\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t\t// For generic errors, keep the default \"Authentication failed\" message\n\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=${errorCode}&message=${encodeURIComponent(message)}`,\n\t\t);\n\t}\n};\n"],"mappings":"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"}
+{"version":3,"file":"callback.mjs","names":[],"sources":["../../../../../../../src/astro/routes/api/auth/oauth/[provider]/callback.ts"],"sourcesContent":["/**\n * GET /_emdash/api/auth/oauth/[provider]/callback\n *\n * Handle OAuth callback from provider\n */\n\nimport type { APIRoute } from \"astro\";\n\nexport const prerender = false;\n\nimport {\n\thandleOAuthCallback,\n\tOAuthError,\n\tRole,\n\tisValidMicrosoftTenant,\n\ttype OAuthConsumerConfig,\n\ttype RoleLevel,\n} from \"@emdash-cms/auth\";\nimport { createKyselyAdapter } from \"@emdash-cms/auth/adapters/kysely\";\n\nimport { getPublicOrigin } from \"#api/public-url.js\";\nimport { finalizeSetup } from \"#api/setup-complete.js\";\nimport { createOAuthStateStore } from \"#auth/oauth-state-store.js\";\nimport type { AuthProviderDescriptor } from \"#auth/types.js\";\nimport { OptionsRepository } from \"#db/repositories/options.js\";\n\nimport { SESSION_UNAVAILABLE_MESSAGE } from \"../../../../../session-user.js\";\n\ntype ProviderName = \"github\" | \"google\" | \"microsoft\";\n\nconst VALID_PROVIDERS = new Set<string>([\"github\", \"google\", \"microsoft\"]);\n\nfunction isValidProvider(provider: string): provider is ProviderName {\n\treturn VALID_PROVIDERS.has(provider);\n}\n\n/** Safely extract a string value from an env-like record */\nfunction envString(env: Record<string, unknown>, ...keys: string[]): string | undefined {\n\tfor (const key of keys) {\n\t\tconst val = env[key];\n\t\tif (typeof val === \"string\" && val) return val;\n\t}\n\treturn undefined;\n}\n\n/**\n * The `emailVerified` option passed to `microsoft()` in the site config\n */\nfunction getMicrosoftEmailVerified(\n\tauthProviders: AuthProviderDescriptor[] | undefined,\n): boolean | undefined {\n\tconst options = authProviders?.find((p) => p.id === \"microsoft\")?.config;\n\tif (\n\t\toptions &&\n\t\ttypeof options === \"object\" &&\n\t\t\"emailVerified\" in options &&\n\t\ttypeof options.emailVerified === \"boolean\"\n\t) {\n\t\treturn options.emailVerified;\n\t}\n\treturn undefined;\n}\n\n/**\n * Get OAuth config from environment variables\n */\nfunction getOAuthConfig(\n\tenv: Record<string, unknown>,\n\tmicrosoftEmailVerified: boolean | undefined,\n): OAuthConsumerConfig[\"providers\"] {\n\tconst providers: OAuthConsumerConfig[\"providers\"] = {};\n\n\t// GitHub\n\tconst githubClientId = envString(env, \"EMDASH_OAUTH_GITHUB_CLIENT_ID\", \"GITHUB_CLIENT_ID\");\n\tconst githubClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_GITHUB_CLIENT_SECRET\",\n\t\t\"GITHUB_CLIENT_SECRET\",\n\t);\n\tif (githubClientId && githubClientSecret) {\n\t\tproviders.github = {\n\t\t\tclientId: githubClientId,\n\t\t\tclientSecret: githubClientSecret,\n\t\t};\n\t}\n\n\t// Google\n\tconst googleClientId = envString(env, \"EMDASH_OAUTH_GOOGLE_CLIENT_ID\", \"GOOGLE_CLIENT_ID\");\n\tconst googleClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_GOOGLE_CLIENT_SECRET\",\n\t\t\"GOOGLE_CLIENT_SECRET\",\n\t);\n\tif (googleClientId && googleClientSecret) {\n\t\tproviders.google = {\n\t\t\tclientId: googleClientId,\n\t\t\tclientSecret: googleClientSecret,\n\t\t};\n\t}\n\n\t// Microsoft\n\tconst microsoftClientId = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_MICROSOFT_CLIENT_ID\",\n\t\t\"MICROSOFT_CLIENT_ID\",\n\t);\n\tconst microsoftClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_MICROSOFT_CLIENT_SECRET\",\n\t\t\"MICROSOFT_CLIENT_SECRET\",\n\t);\n\tconst microsoftTenant = envString(env, \"EMDASH_OAUTH_MICROSOFT_TENANT_ID\", \"MICROSOFT_TENANT_ID\");\n\tif (\n\t\tmicrosoftClientId &&\n\t\tmicrosoftClientSecret &&\n\t\tmicrosoftTenant &&\n\t\tisValidMicrosoftTenant(microsoftTenant)\n\t) {\n\t\tproviders.microsoft = {\n\t\t\tclientId: microsoftClientId,\n\t\t\tclientSecret: microsoftClientSecret,\n\t\t\ttenant: microsoftTenant,\n\t\t\temailVerified: microsoftEmailVerified,\n\t\t};\n\t}\n\n\treturn providers;\n}\n\nexport const GET: APIRoute = async ({ params, request, locals, session, redirect }) => {\n\tconst { emdash } = locals;\n\tconst provider = params.provider;\n\n\t// Validate provider\n\tif (!provider || !isValidProvider(provider)) {\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=invalid_provider&message=${encodeURIComponent(\"Invalid OAuth provider\")}`,\n\t\t);\n\t}\n\n\tif (!emdash?.db) {\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=server_error&message=${encodeURIComponent(\"Database not configured\")}`,\n\t\t);\n\t}\n\n\tconst url = new URL(request.url);\n\tconst code = url.searchParams.get(\"code\");\n\tconst state = url.searchParams.get(\"state\");\n\tconst error = url.searchParams.get(\"error\");\n\tconst errorDescription = url.searchParams.get(\"error_description\");\n\n\t// Handle OAuth errors from provider\n\tif (error) {\n\t\tconst message = errorDescription || error;\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=oauth_denied&message=${encodeURIComponent(message)}`,\n\t\t);\n\t}\n\n\t// Validate required params\n\tif (!code || !state) {\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=invalid_callback&message=${encodeURIComponent(\"Missing code or state parameter\")}`,\n\t\t);\n\t}\n\n\ttry {\n\t\t// Get OAuth providers from environment. Astro 6 removed\n\t\t// `Astro.locals.runtime.env` (accessing it throws rather than\n\t\t// returning undefined, so optional-chaining doesn't help) -- read\n\t\t// Cloudflare bindings via the emdash virtual module instead, which\n\t\t// re-exports `cloudflare:workers`' `env` under that adapter and\n\t\t// falls back to `import.meta.env` on Node (#1736).\n\t\t// @ts-ignore - virtual module, generated by the Astro integration\n\t\tconst { env: cfEnv } = (await import(\"virtual:emdash/env\")) as {\n\t\t\tenv?: Record<string, unknown>;\n\t\t};\n\t\tconst env = cfEnv ?? import.meta.env;\n\t\tconst providers = getOAuthConfig(env, getMicrosoftEmailVerified(emdash.config.authProviders));\n\n\t\tif (!providers[provider]) {\n\t\t\treturn redirect(\n\t\t\t\t`/_emdash/admin/login?error=provider_not_configured&message=${encodeURIComponent(`OAuth provider ${provider} is not configured`)}`,\n\t\t\t);\n\t\t}\n\n\t\tif (!session) {\n\t\t\treturn redirect(\n\t\t\t\t`/_emdash/admin/login?error=server_error&message=${encodeURIComponent(SESSION_UNAVAILABLE_MESSAGE)}`,\n\t\t\t);\n\t\t}\n\n\t\tconst adapter = createKyselyAdapter(emdash.db);\n\t\tconst stateStore = createOAuthStateStore(emdash.db);\n\n\t\tconst config: OAuthConsumerConfig = {\n\t\t\tbaseUrl: `${getPublicOrigin(url, emdash?.config)}/_emdash`,\n\t\t\tproviders,\n\t\t\tcanSelfSignup: async (email: string) => {\n\t\t\t\t// During setup: first user becomes admin.\n\t\t\t\t// Check setup_complete flag instead of countUsers() to avoid\n\t\t\t\t// a TOCTOU race where concurrent callbacks both see 0 users.\n\t\t\t\tconst options = new OptionsRepository(emdash.db);\n\t\t\t\tconst setupComplete = await options.get(\"emdash:setup_complete\");\n\t\t\t\tif (setupComplete !== true && setupComplete !== \"true\") {\n\t\t\t\t\treturn { allowed: true, role: Role.ADMIN };\n\t\t\t\t}\n\n\t\t\t\t// Extract domain from email\n\t\t\t\tconst domain = email.split(\"@\")[1]?.toLowerCase();\n\t\t\t\tif (!domain) {\n\t\t\t\t\treturn null;\n\t\t\t\t}\n\n\t\t\t\t// Check allowed_domains table for a matching, enabled entry\n\t\t\t\tconst entry = await emdash.db\n\t\t\t\t\t.selectFrom(\"allowed_domains\")\n\t\t\t\t\t.selectAll()\n\t\t\t\t\t.where(\"domain\", \"=\", domain)\n\t\t\t\t\t.where(\"enabled\", \"=\", 1)\n\t\t\t\t\t.executeTakeFirst();\n\n\t\t\t\tif (!entry) {\n\t\t\t\t\treturn null;\n\t\t\t\t}\n\n\t\t\t\t// Map the stored role level to the Role enum\n\t\t\t\tconst roleLevel = entry.default_role;\n\t\t\t\tconst roleMap: Record<number, RoleLevel> = {\n\t\t\t\t\t50: Role.ADMIN,\n\t\t\t\t\t40: Role.EDITOR,\n\t\t\t\t\t30: Role.AUTHOR,\n\t\t\t\t\t20: Role.CONTRIBUTOR,\n\t\t\t\t\t10: Role.SUBSCRIBER,\n\t\t\t\t};\n\t\t\t\tconst role = roleMap[roleLevel] ?? Role.CONTRIBUTOR;\n\t\t\t\tif (!roleMap[roleLevel]) {\n\t\t\t\t\tconsole.warn(\n\t\t\t\t\t\t`[oauth] Unknown role level ${roleLevel} for domain ${domain}, defaulting to CONTRIBUTOR`,\n\t\t\t\t\t);\n\t\t\t\t}\n\n\t\t\t\treturn { allowed: true, role };\n\t\t\t},\n\t\t};\n\n\t\tconst options = new OptionsRepository(emdash.db);\n\t\tconst setupCompleteBefore = await options.get(\"emdash:setup_complete\");\n\t\tconst user = await handleOAuthCallback(config, adapter, provider, code, state, stateStore);\n\t\tconst isFirstUser = setupCompleteBefore !== true && setupCompleteBefore !== \"true\";\n\n\t\t// Finalize setup outside the transaction (idempotent, safe if two callbacks race).\n\t\tif (isFirstUser) {\n\t\t\tawait finalizeSetup(emdash.db);\n\t\t\tconsole.log(`[oauth] Setup complete: created admin user via ${provider} (${user.email})`);\n\t\t}\n\n\t\tsession.set(\"user\", { id: user.id });\n\n\t\t// Redirect to admin dashboard\n\t\treturn redirect(\"/_emdash/admin\");\n\t} catch (callbackError) {\n\t\tconsole.error(\"OAuth callback error:\", callbackError);\n\n\t\tlet message = \"Authentication failed\";\n\t\tlet errorCode = \"oauth_error\";\n\n\t\tif (callbackError instanceof OAuthError) {\n\t\t\terrorCode = callbackError.code;\n\n\t\t\t// Map all error codes to user-friendly messages (never expose raw error.message)\n\t\t\tswitch (callbackError.code) {\n\t\t\t\tcase \"invalid_state\":\n\t\t\t\t\tmessage = \"OAuth session expired or invalid. Please try again.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"signup_not_allowed\":\n\t\t\t\t\tmessage = \"Self-signup is not allowed for your email. Please contact an administrator.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"invite_invalid\":\n\t\t\t\t\tmessage = \"This invite link is invalid or has expired. Please ask for a new one.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"invite_email_mismatch\":\n\t\t\t\t\tmessage = \"This invite was sent to a different email address than your account.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"invite_email_unverified\":\n\t\t\t\t\tmessage =\n\t\t\t\t\t\t\"Your account's email is not verified by the provider. Please verify it and try again.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"user_not_found\":\n\t\t\t\t\tmessage = \"Your account was not found. It may have been deleted.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"token_exchange_failed\":\n\t\t\t\t\tmessage = \"Failed to complete authentication. Please try again.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"profile_fetch_failed\":\n\t\t\t\t\tmessage = \"Failed to retrieve your profile. Please try again.\";\n\t\t\t\t\tbreak;\n\t\t\t\tcase \"id_token_invalid\":\n\t\t\t\t\tmessage = \"Could not verify your sign-in with the provider. Please try again.\";\n\t\t\t\t\tbreak;\n\t\t\t\tdefault:\n\t\t\t\t\tmessage = \"Authentication failed. Please try again.\";\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t\t// For generic errors, keep the default \"Authentication failed\" message\n\n\t\treturn redirect(\n\t\t\t`/_emdash/admin/login?error=${errorCode}&message=${encodeURIComponent(message)}`,\n\t\t);\n\t}\n};\n"],"mappings":";;;;;;;;;;;;;;;;AAQA,MAAa,YAAY;AAsBzB,MAAM,kBAAkB,IAAI,IAAY;CAAC;CAAU;CAAU;CAAY,CAAC;AAE1E,SAAS,gBAAgB,UAA4C;AACpE,QAAO,gBAAgB,IAAI,SAAS;;;AAIrC,SAAS,UAAU,KAA8B,GAAG,MAAoC;AACvF,MAAK,MAAM,OAAO,MAAM;EACvB,MAAM,MAAM,IAAI;AAChB,MAAI,OAAO,QAAQ,YAAY,IAAK,QAAO;;;;;;AAQ7C,SAAS,0BACR,eACsB;CACtB,MAAM,UAAU,eAAe,MAAM,MAAM,EAAE,OAAO,YAAY,EAAE;AAClE,KACC,WACA,OAAO,YAAY,YACnB,mBAAmB,WACnB,OAAO,QAAQ,kBAAkB,UAEjC,QAAO,QAAQ;;;;;AAQjB,SAAS,eACR,KACA,wBACmC;CACnC,MAAM,YAA8C,EAAE;CAGtD,MAAM,iBAAiB,UAAU,KAAK,iCAAiC,mBAAmB;CAC1F,MAAM,qBAAqB,UAC1B,KACA,qCACA,uBACA;AACD,KAAI,kBAAkB,mBACrB,WAAU,SAAS;EAClB,UAAU;EACV,cAAc;EACd;CAIF,MAAM,iBAAiB,UAAU,KAAK,iCAAiC,mBAAmB;CAC1F,MAAM,qBAAqB,UAC1B,KACA,qCACA,uBACA;AACD,KAAI,kBAAkB,mBACrB,WAAU,SAAS;EAClB,UAAU;EACV,cAAc;EACd;CAIF,MAAM,oBAAoB,UACzB,KACA,oCACA,sBACA;CACD,MAAM,wBAAwB,UAC7B,KACA,wCACA,0BACA;CACD,MAAM,kBAAkB,UAAU,KAAK,oCAAoC,sBAAsB;AACjG,KACC,qBACA,yBACA,mBACA,uBAAuB,gBAAgB,CAEvC,WAAU,YAAY;EACrB,UAAU;EACV,cAAc;EACd,QAAQ;EACR,eAAe;EACf;AAGF,QAAO;;AAGR,MAAa,MAAgB,OAAO,EAAE,QAAQ,SAAS,QAAQ,SAAS,eAAe;CACtF,MAAM,EAAE,WAAW;CACnB,MAAM,WAAW,OAAO;AAGxB,KAAI,CAAC,YAAY,CAAC,gBAAgB,SAAS,CAC1C,QAAO,SACN,uDAAuD,mBAAmB,yBAAyB,GACnG;AAGF,KAAI,CAAC,QAAQ,GACZ,QAAO,SACN,mDAAmD,mBAAmB,0BAA0B,GAChG;CAGF,MAAM,MAAM,IAAI,IAAI,QAAQ,IAAI;CAChC,MAAM,OAAO,IAAI,aAAa,IAAI,OAAO;CACzC,MAAM,QAAQ,IAAI,aAAa,IAAI,QAAQ;CAC3C,MAAM,QAAQ,IAAI,aAAa,IAAI,QAAQ;CAC3C,MAAM,mBAAmB,IAAI,aAAa,IAAI,oBAAoB;AAGlE,KAAI,OAAO;EACV,MAAM,UAAU,oBAAoB;AACpC,SAAO,SACN,mDAAmD,mBAAmB,QAAQ,GAC9E;;AAIF,KAAI,CAAC,QAAQ,CAAC,MACb,QAAO,SACN,uDAAuD,mBAAmB,kCAAkC,GAC5G;AAGF,KAAI;EAQH,MAAM,EAAE,KAAK,UAAW,MAAM,OAAO;EAIrC,MAAM,YAAY,eADN,SAAS,OAAO,KAAK,KACK,0BAA0B,OAAO,OAAO,cAAc,CAAC;AAE7F,MAAI,CAAC,UAAU,UACd,QAAO,SACN,8DAA8D,mBAAmB,kBAAkB,SAAS,oBAAoB,GAChI;AAGF,MAAI,CAAC,QACJ,QAAO,SACN,mDAAmD,mBAAmB,4BAA4B,GAClG;EAGF,MAAM,UAAU,oBAAoB,OAAO,GAAG;EAC9C,MAAM,aAAa,sBAAsB,OAAO,GAAG;EAEnD,MAAM,SAA8B;GACnC,SAAS,GAAG,gBAAgB,KAAK,QAAQ,OAAO,CAAC;GACjD;GACA,eAAe,OAAO,UAAkB;IAKvC,MAAM,gBAAgB,MADN,IAAI,kBAAkB,OAAO,GAAG,CACZ,IAAI,wBAAwB;AAChE,QAAI,kBAAkB,QAAQ,kBAAkB,OAC/C,QAAO;KAAE,SAAS;KAAM,MAAM,KAAK;KAAO;IAI3C,MAAM,SAAS,MAAM,MAAM,IAAI,CAAC,IAAI,aAAa;AACjD,QAAI,CAAC,OACJ,QAAO;IAIR,MAAM,QAAQ,MAAM,OAAO,GACzB,WAAW,kBAAkB,CAC7B,WAAW,CACX,MAAM,UAAU,KAAK,OAAO,CAC5B,MAAM,WAAW,KAAK,EAAE,CACxB,kBAAkB;AAEpB,QAAI,CAAC,MACJ,QAAO;IAIR,MAAM,YAAY,MAAM;IACxB,MAAM,UAAqC;KAC1C,IAAI,KAAK;KACT,IAAI,KAAK;KACT,IAAI,KAAK;KACT,IAAI,KAAK;KACT,IAAI,KAAK;KACT;IACD,MAAM,OAAO,QAAQ,cAAc,KAAK;AACxC,QAAI,CAAC,QAAQ,WACZ,SAAQ,KACP,8BAA8B,UAAU,cAAc,OAAO,6BAC7D;AAGF,WAAO;KAAE,SAAS;KAAM;KAAM;;GAE/B;EAGD,MAAM,sBAAsB,MADZ,IAAI,kBAAkB,OAAO,GAAG,CACN,IAAI,wBAAwB;EACtE,MAAM,OAAO,MAAM,oBAAoB,QAAQ,SAAS,UAAU,MAAM,OAAO,WAAW;AAI1F,MAHoB,wBAAwB,QAAQ,wBAAwB,QAG3D;AAChB,SAAM,cAAc,OAAO,GAAG;AAC9B,WAAQ,IAAI,kDAAkD,SAAS,IAAI,KAAK,MAAM,GAAG;;AAG1F,UAAQ,IAAI,QAAQ,EAAE,IAAI,KAAK,IAAI,CAAC;AAGpC,SAAO,SAAS,iBAAiB;UACzB,eAAe;AACvB,UAAQ,MAAM,yBAAyB,cAAc;EAErD,IAAI,UAAU;EACd,IAAI,YAAY;AAEhB,MAAI,yBAAyB,YAAY;AACxC,eAAY,cAAc;AAG1B,WAAQ,cAAc,MAAtB;IACC,KAAK;AACJ,eAAU;AACV;IACD,KAAK;AACJ,eAAU;AACV;IACD,KAAK;AACJ,eAAU;AACV;IACD,KAAK;AACJ,eAAU;AACV;IACD,KAAK;AACJ,eACC;AACD;IACD,KAAK;AACJ,eAAU;AACV;IACD,KAAK;AACJ,eAAU;AACV;IACD,KAAK;AACJ,eAAU;AACV;IACD,KAAK;AACJ,eAAU;AACV;IACD;AACC,eAAU;AACV;;;AAKH,SAAO,SACN,8BAA8B,UAAU,WAAW,mBAAmB,QAAQ,GAC9E"}

package/dist/astro/routes/api/auth/oauth/_provider_.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"_provider_.d.mts","names":[],"sources":["../../../../../../src/astro/routes/api/auth/oauth/[provider].ts"],"mappings":";;;cAQa,SAAA;AAAA,cAgEA,GAAA,EAAK,QAAA"}
+{"version":3,"file":"_provider_.d.mts","names":[],"sources":["../../../../../../src/astro/routes/api/auth/oauth/[provider].ts"],"mappings":";;;cAQa,SAAA;AAAA,cA6FA,GAAA,EAAK,QAAA"}

package/dist/astro/routes/api/auth/oauth/_provider_.mjs

@@ -1,10 +1,14 @@
-import { r as getPublicOrigin } from "../../../../../public-url-7j0cpCFc.mjs";
-import { t as createOAuthStateStore } from "../../../../../oauth-state-store-CxXTjXdI.mjs";
-import { createAuthorizationUrl } from "@emdash-cms/auth";
+import { r as getPublicOrigin } from "../../../../../public-url-B5a0QAh6.mjs";
+import { t as createOAuthStateStore } from "../../../../../oauth-state-store-CpGi2FZH.mjs";
+import { createAuthorizationUrl, isValidMicrosoftTenant } from "@emdash-cms/auth";
 
 //#region src/astro/routes/api/auth/oauth/[provider].ts
 const prerender = false;
-const VALID_PROVIDERS = new Set(["github", "google"]);
+const VALID_PROVIDERS = new Set([
+	"github",
+	"google",
+	"microsoft"
+]);
 /** Invite tokens are base64url; clamp shape and length before persisting to state. */
 const INVITE_TOKEN_REGEX = /^[A-Za-z0-9_-]{1,256}$/;
 function isValidProvider(provider) {
@@ -34,6 +38,14 @@ function getOAuthConfig(env) {
 		clientId: googleClientId,
 		clientSecret: googleClientSecret
 	};
+	const microsoftClientId = envString(env, "EMDASH_OAUTH_MICROSOFT_CLIENT_ID", "MICROSOFT_CLIENT_ID");
+	const microsoftClientSecret = envString(env, "EMDASH_OAUTH_MICROSOFT_CLIENT_SECRET", "MICROSOFT_CLIENT_SECRET");
+	const microsoftTenant = envString(env, "EMDASH_OAUTH_MICROSOFT_TENANT_ID", "MICROSOFT_TENANT_ID");
+	if (microsoftClientId && microsoftClientSecret && microsoftTenant && isValidMicrosoftTenant(microsoftTenant)) providers.microsoft = {
+		clientId: microsoftClientId,
+		clientSecret: microsoftClientSecret,
+		tenant: microsoftTenant
+	};
 	return providers;
 }
 const GET = async ({ params, request, locals, redirect }) => {
@@ -46,7 +58,10 @@ const GET = async ({ params, request, locals, redirect }) => {
 		const url = new URL(request.url);
 		const { env: cfEnv } = await import("virtual:emdash/env");
 		const providers = getOAuthConfig(cfEnv ?? import.meta.env);
-		if (!providers[provider]) return redirect(`${errorRedirectBase}?error=provider_not_configured&message=${encodeURIComponent(`OAuth provider ${provider} is not configured. Set either EMDASH_OAUTH_${provider.toUpperCase()}_CLIENT_ID and EMDASH_OAUTH_${provider.toUpperCase()}_CLIENT_SECRET, or ${provider.toUpperCase()}_CLIENT_ID and ${provider.toUpperCase()}_CLIENT_SECRET.`)}`);
+		if (!providers[provider]) {
+			const tenantHint = provider === "microsoft" ? " Microsoft also needs EMDASH_OAUTH_MICROSOFT_TENANT_ID or MICROSOFT_TENANT_ID: a directory (tenant) ID, or common, organizations or consumers." : "";
+			return redirect(`${errorRedirectBase}?error=provider_not_configured&message=${encodeURIComponent(`OAuth provider ${provider} is not configured. Set either EMDASH_OAUTH_${provider.toUpperCase()}_CLIENT_ID and EMDASH_OAUTH_${provider.toUpperCase()}_CLIENT_SECRET, or ${provider.toUpperCase()}_CLIENT_ID and ${provider.toUpperCase()}_CLIENT_SECRET.${tenantHint}`)}`);
+		}
 		const config = {
 			baseUrl: `${getPublicOrigin(url, emdash?.config)}/_emdash`,
 			providers

package/dist/astro/routes/api/auth/oauth/_provider_.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"_provider_.mjs","names":[],"sources":["../../../../../../src/astro/routes/api/auth/oauth/[provider].ts"],"sourcesContent":["/**\n * GET /_emdash/api/auth/oauth/[provider]\n *\n * Start OAuth flow - redirects to provider authorization URL\n */\n\nimport type { APIRoute } from \"astro\";\n\nexport const prerender = false;\n\nimport { createAuthorizationUrl, type OAuthConsumerConfig } from \"@emdash-cms/auth\";\n\nimport { getPublicOrigin } from \"#api/public-url.js\";\nimport { createOAuthStateStore } from \"#auth/oauth-state-store.js\";\n\ntype ProviderName = \"github\" | \"google\";\n\nconst VALID_PROVIDERS = new Set<string>([\"github\", \"google\"]);\n\n/** Invite tokens are base64url; clamp shape and length before persisting to state. */\nconst INVITE_TOKEN_REGEX = /^[A-Za-z0-9_-]{1,256}$/;\n\nfunction isValidProvider(provider: string): provider is ProviderName {\n\treturn VALID_PROVIDERS.has(provider);\n}\n\n/** Safely extract a string value from an env-like record */\nfunction envString(env: Record<string, unknown>, ...keys: string[]): string | undefined {\n\tfor (const key of keys) {\n\t\tconst val = env[key];\n\t\tif (typeof val === \"string\" && val) return val;\n\t}\n\treturn undefined;\n}\n\n/**\n * Get OAuth config from environment variables\n */\nfunction getOAuthConfig(env: Record<string, unknown>): OAuthConsumerConfig[\"providers\"] {\n\tconst providers: OAuthConsumerConfig[\"providers\"] = {};\n\n\t// GitHub\n\tconst githubClientId = envString(env, \"EMDASH_OAUTH_GITHUB_CLIENT_ID\", \"GITHUB_CLIENT_ID\");\n\tconst githubClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_GITHUB_CLIENT_SECRET\",\n\t\t\"GITHUB_CLIENT_SECRET\",\n\t);\n\tif (githubClientId && githubClientSecret) {\n\t\tproviders.github = {\n\t\t\tclientId: githubClientId,\n\t\t\tclientSecret: githubClientSecret,\n\t\t};\n\t}\n\n\t// Google\n\tconst googleClientId = envString(env, \"EMDASH_OAUTH_GOOGLE_CLIENT_ID\", \"GOOGLE_CLIENT_ID\");\n\tconst googleClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_GOOGLE_CLIENT_SECRET\",\n\t\t\"GOOGLE_CLIENT_SECRET\",\n\t);\n\tif (googleClientId && googleClientSecret) {\n\t\tproviders.google = {\n\t\t\tclientId: googleClientId,\n\t\t\tclientSecret: googleClientSecret,\n\t\t};\n\t}\n\n\treturn providers;\n}\n\nexport const GET: APIRoute = async ({ params, request, locals, redirect }) => {\n\tconst { emdash } = locals;\n\tconst provider = params.provider;\n\n\t// Determine where to redirect errors (setup wizard or login page)\n\tconst referer = request.headers.get(\"referer\") ?? \"\";\n\tconst errorRedirectBase = referer.includes(\"/setup\")\n\t\t? \"/_emdash/admin/setup\"\n\t\t: \"/_emdash/admin/login\";\n\n\t// Validate provider\n\tif (!provider || !isValidProvider(provider)) {\n\t\treturn redirect(\n\t\t\t`${errorRedirectBase}?error=invalid_provider&message=${encodeURIComponent(\"Invalid OAuth provider\")}`,\n\t\t);\n\t}\n\n\tif (!emdash?.db) {\n\t\treturn redirect(\n\t\t\t`${errorRedirectBase}?error=server_error&message=${encodeURIComponent(\"Database not configured\")}`,\n\t\t);\n\t}\n\n\ttry {\n\t\tconst url = new URL(request.url);\n\n\t\t// Get OAuth providers from environment. Astro 6 removed\n\t\t// `Astro.locals.runtime.env` (accessing it throws rather than\n\t\t// returning undefined, so optional-chaining doesn't help) -- read\n\t\t// Cloudflare bindings via the emdash virtual module instead, which\n\t\t// re-exports `cloudflare:workers`' `env` under that adapter and\n\t\t// falls back to `import.meta.env` on Node (#1736).\n\t\t// @ts-ignore - virtual module, generated by the Astro integration\n\t\tconst { env: cfEnv } = (await import(\"virtual:emdash/env\")) as {\n\t\t\tenv?: Record<string, unknown>;\n\t\t};\n\t\tconst env = cfEnv ?? import.meta.env;\n\t\tconst providers = getOAuthConfig(env);\n\n\t\tif (!providers[provider]) {\n\t\t\treturn redirect(\n\t\t\t\t`${errorRedirectBase}?error=provider_not_configured&message=${encodeURIComponent(`OAuth provider ${provider} is not configured. Set either EMDASH_OAUTH_${provider.toUpperCase()}_CLIENT_ID and EMDASH_OAUTH_${provider.toUpperCase()}_CLIENT_SECRET, or ${provider.toUpperCase()}_CLIENT_ID and ${provider.toUpperCase()}_CLIENT_SECRET.`)}`,\n\t\t\t);\n\t\t}\n\n\t\tconst config: OAuthConsumerConfig = {\n\t\t\tbaseUrl: `${getPublicOrigin(url, emdash?.config)}/_emdash`,\n\t\t\tproviders,\n\t\t};\n\n\t\tconst stateStore = createOAuthStateStore(emdash.db);\n\n\t\t// When the flow starts from an invite link, carry the invite token so the\n\t\t// callback can complete the invite for a matching, verified email. Validate\n\t\t// its shape/length first: this endpoint is unauthenticated, so we avoid\n\t\t// persisting arbitrary or oversized values into the short-lived state store.\n\t\tconst rawInvite = url.searchParams.get(\"invite\");\n\t\tconst inviteToken = rawInvite && INVITE_TOKEN_REGEX.test(rawInvite) ? rawInvite : undefined;\n\n\t\tconst { url: authUrl } = await createAuthorizationUrl(config, provider, stateStore, {\n\t\t\tinviteToken,\n\t\t});\n\n\t\treturn redirect(authUrl);\n\t} catch (error) {\n\t\tconsole.error(\"OAuth initiation error:\", error);\n\t\treturn redirect(\n\t\t\t`${errorRedirectBase}?error=oauth_error&message=${encodeURIComponent(\"Failed to start OAuth flow. Please try again.\")}`,\n\t\t);\n\t}\n};\n"],"mappings":";;;;;AAQA,MAAa,YAAY;AASzB,MAAM,kBAAkB,IAAI,IAAY,CAAC,UAAU,SAAS,CAAC;;AAG7D,MAAM,qBAAqB;AAE3B,SAAS,gBAAgB,UAA4C;AACpE,QAAO,gBAAgB,IAAI,SAAS;;;AAIrC,SAAS,UAAU,KAA8B,GAAG,MAAoC;AACvF,MAAK,MAAM,OAAO,MAAM;EACvB,MAAM,MAAM,IAAI;AAChB,MAAI,OAAO,QAAQ,YAAY,IAAK,QAAO;;;;;;AAQ7C,SAAS,eAAe,KAAgE;CACvF,MAAM,YAA8C,EAAE;CAGtD,MAAM,iBAAiB,UAAU,KAAK,iCAAiC,mBAAmB;CAC1F,MAAM,qBAAqB,UAC1B,KACA,qCACA,uBACA;AACD,KAAI,kBAAkB,mBACrB,WAAU,SAAS;EAClB,UAAU;EACV,cAAc;EACd;CAIF,MAAM,iBAAiB,UAAU,KAAK,iCAAiC,mBAAmB;CAC1F,MAAM,qBAAqB,UAC1B,KACA,qCACA,uBACA;AACD,KAAI,kBAAkB,mBACrB,WAAU,SAAS;EAClB,UAAU;EACV,cAAc;EACd;AAGF,QAAO;;AAGR,MAAa,MAAgB,OAAO,EAAE,QAAQ,SAAS,QAAQ,eAAe;CAC7E,MAAM,EAAE,WAAW;CACnB,MAAM,WAAW,OAAO;CAIxB,MAAM,qBADU,QAAQ,QAAQ,IAAI,UAAU,IAAI,IAChB,SAAS,SAAS,GACjD,yBACA;AAGH,KAAI,CAAC,YAAY,CAAC,gBAAgB,SAAS,CAC1C,QAAO,SACN,GAAG,kBAAkB,kCAAkC,mBAAmB,yBAAyB,GACnG;AAGF,KAAI,CAAC,QAAQ,GACZ,QAAO,SACN,GAAG,kBAAkB,8BAA8B,mBAAmB,0BAA0B,GAChG;AAGF,KAAI;EACH,MAAM,MAAM,IAAI,IAAI,QAAQ,IAAI;EAShC,MAAM,EAAE,KAAK,UAAW,MAAM,OAAO;EAIrC,MAAM,YAAY,eADN,SAAS,OAAO,KAAK,IACI;AAErC,MAAI,CAAC,UAAU,UACd,QAAO,SACN,GAAG,kBAAkB,yCAAyC,mBAAmB,kBAAkB,SAAS,8CAA8C,SAAS,aAAa,CAAC,8BAA8B,SAAS,aAAa,CAAC,qBAAqB,SAAS,aAAa,CAAC,iBAAiB,SAAS,aAAa,CAAC,iBAAiB,GAC3U;EAGF,MAAM,SAA8B;GACnC,SAAS,GAAG,gBAAgB,KAAK,QAAQ,OAAO,CAAC;GACjD;GACA;EAED,MAAM,aAAa,sBAAsB,OAAO,GAAG;EAMnD,MAAM,YAAY,IAAI,aAAa,IAAI,SAAS;EAGhD,MAAM,EAAE,KAAK,YAAY,MAAM,uBAAuB,QAAQ,UAAU,YAAY,EACnF,aAHmB,aAAa,mBAAmB,KAAK,UAAU,GAAG,YAAY,QAIjF,CAAC;AAEF,SAAO,SAAS,QAAQ;UAChB,OAAO;AACf,UAAQ,MAAM,2BAA2B,MAAM;AAC/C,SAAO,SACN,GAAG,kBAAkB,6BAA6B,mBAAmB,gDAAgD,GACrH"}
+{"version":3,"file":"_provider_.mjs","names":[],"sources":["../../../../../../src/astro/routes/api/auth/oauth/[provider].ts"],"sourcesContent":["/**\n * GET /_emdash/api/auth/oauth/[provider]\n *\n * Start OAuth flow - redirects to provider authorization URL\n */\n\nimport type { APIRoute } from \"astro\";\n\nexport const prerender = false;\n\nimport {\n\tcreateAuthorizationUrl,\n\tisValidMicrosoftTenant,\n\ttype OAuthConsumerConfig,\n} from \"@emdash-cms/auth\";\n\nimport { getPublicOrigin } from \"#api/public-url.js\";\nimport { createOAuthStateStore } from \"#auth/oauth-state-store.js\";\n\ntype ProviderName = \"github\" | \"google\" | \"microsoft\";\n\nconst VALID_PROVIDERS = new Set<string>([\"github\", \"google\", \"microsoft\"]);\n\n/** Invite tokens are base64url; clamp shape and length before persisting to state. */\nconst INVITE_TOKEN_REGEX = /^[A-Za-z0-9_-]{1,256}$/;\n\nfunction isValidProvider(provider: string): provider is ProviderName {\n\treturn VALID_PROVIDERS.has(provider);\n}\n\n/** Safely extract a string value from an env-like record */\nfunction envString(env: Record<string, unknown>, ...keys: string[]): string | undefined {\n\tfor (const key of keys) {\n\t\tconst val = env[key];\n\t\tif (typeof val === \"string\" && val) return val;\n\t}\n\treturn undefined;\n}\n\n/**\n * Get OAuth config from environment variables\n */\nfunction getOAuthConfig(env: Record<string, unknown>): OAuthConsumerConfig[\"providers\"] {\n\tconst providers: OAuthConsumerConfig[\"providers\"] = {};\n\n\t// GitHub\n\tconst githubClientId = envString(env, \"EMDASH_OAUTH_GITHUB_CLIENT_ID\", \"GITHUB_CLIENT_ID\");\n\tconst githubClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_GITHUB_CLIENT_SECRET\",\n\t\t\"GITHUB_CLIENT_SECRET\",\n\t);\n\tif (githubClientId && githubClientSecret) {\n\t\tproviders.github = {\n\t\t\tclientId: githubClientId,\n\t\t\tclientSecret: githubClientSecret,\n\t\t};\n\t}\n\n\t// Google\n\tconst googleClientId = envString(env, \"EMDASH_OAUTH_GOOGLE_CLIENT_ID\", \"GOOGLE_CLIENT_ID\");\n\tconst googleClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_GOOGLE_CLIENT_SECRET\",\n\t\t\"GOOGLE_CLIENT_SECRET\",\n\t);\n\tif (googleClientId && googleClientSecret) {\n\t\tproviders.google = {\n\t\t\tclientId: googleClientId,\n\t\t\tclientSecret: googleClientSecret,\n\t\t};\n\t}\n\n\t// Microsoft\n\tconst microsoftClientId = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_MICROSOFT_CLIENT_ID\",\n\t\t\"MICROSOFT_CLIENT_ID\",\n\t);\n\tconst microsoftClientSecret = envString(\n\t\tenv,\n\t\t\"EMDASH_OAUTH_MICROSOFT_CLIENT_SECRET\",\n\t\t\"MICROSOFT_CLIENT_SECRET\",\n\t);\n\tconst microsoftTenant = envString(env, \"EMDASH_OAUTH_MICROSOFT_TENANT_ID\", \"MICROSOFT_TENANT_ID\");\n\tif (\n\t\tmicrosoftClientId &&\n\t\tmicrosoftClientSecret &&\n\t\tmicrosoftTenant &&\n\t\tisValidMicrosoftTenant(microsoftTenant)\n\t) {\n\t\tproviders.microsoft = {\n\t\t\tclientId: microsoftClientId,\n\t\t\tclientSecret: microsoftClientSecret,\n\t\t\ttenant: microsoftTenant,\n\t\t};\n\t}\n\n\treturn providers;\n}\n\nexport const GET: APIRoute = async ({ params, request, locals, redirect }) => {\n\tconst { emdash } = locals;\n\tconst provider = params.provider;\n\n\t// Determine where to redirect errors (setup wizard or login page)\n\tconst referer = request.headers.get(\"referer\") ?? \"\";\n\tconst errorRedirectBase = referer.includes(\"/setup\")\n\t\t? \"/_emdash/admin/setup\"\n\t\t: \"/_emdash/admin/login\";\n\n\t// Validate provider\n\tif (!provider || !isValidProvider(provider)) {\n\t\treturn redirect(\n\t\t\t`${errorRedirectBase}?error=invalid_provider&message=${encodeURIComponent(\"Invalid OAuth provider\")}`,\n\t\t);\n\t}\n\n\tif (!emdash?.db) {\n\t\treturn redirect(\n\t\t\t`${errorRedirectBase}?error=server_error&message=${encodeURIComponent(\"Database not configured\")}`,\n\t\t);\n\t}\n\n\ttry {\n\t\tconst url = new URL(request.url);\n\n\t\t// Get OAuth providers from environment. Astro 6 removed\n\t\t// `Astro.locals.runtime.env` (accessing it throws rather than\n\t\t// returning undefined, so optional-chaining doesn't help) -- read\n\t\t// Cloudflare bindings via the emdash virtual module instead, which\n\t\t// re-exports `cloudflare:workers`' `env` under that adapter and\n\t\t// falls back to `import.meta.env` on Node (#1736).\n\t\t// @ts-ignore - virtual module, generated by the Astro integration\n\t\tconst { env: cfEnv } = (await import(\"virtual:emdash/env\")) as {\n\t\t\tenv?: Record<string, unknown>;\n\t\t};\n\t\tconst env = cfEnv ?? import.meta.env;\n\t\tconst providers = getOAuthConfig(env);\n\n\t\tif (!providers[provider]) {\n\t\t\tconst tenantHint =\n\t\t\t\tprovider === \"microsoft\"\n\t\t\t\t\t? \" Microsoft also needs EMDASH_OAUTH_MICROSOFT_TENANT_ID or MICROSOFT_TENANT_ID: a directory (tenant) ID, or common, organizations or consumers.\"\n\t\t\t\t\t: \"\";\n\t\t\treturn redirect(\n\t\t\t\t`${errorRedirectBase}?error=provider_not_configured&message=${encodeURIComponent(`OAuth provider ${provider} is not configured. Set either EMDASH_OAUTH_${provider.toUpperCase()}_CLIENT_ID and EMDASH_OAUTH_${provider.toUpperCase()}_CLIENT_SECRET, or ${provider.toUpperCase()}_CLIENT_ID and ${provider.toUpperCase()}_CLIENT_SECRET.${tenantHint}`)}`,\n\t\t\t);\n\t\t}\n\n\t\tconst config: OAuthConsumerConfig = {\n\t\t\tbaseUrl: `${getPublicOrigin(url, emdash?.config)}/_emdash`,\n\t\t\tproviders,\n\t\t};\n\n\t\tconst stateStore = createOAuthStateStore(emdash.db);\n\n\t\t// When the flow starts from an invite link, carry the invite token so the\n\t\t// callback can complete the invite for a matching, verified email. Validate\n\t\t// its shape/length first: this endpoint is unauthenticated, so we avoid\n\t\t// persisting arbitrary or oversized values into the short-lived state store.\n\t\tconst rawInvite = url.searchParams.get(\"invite\");\n\t\tconst inviteToken = rawInvite && INVITE_TOKEN_REGEX.test(rawInvite) ? rawInvite : undefined;\n\n\t\tconst { url: authUrl } = await createAuthorizationUrl(config, provider, stateStore, {\n\t\t\tinviteToken,\n\t\t});\n\n\t\treturn redirect(authUrl);\n\t} catch (error) {\n\t\tconsole.error(\"OAuth initiation error:\", error);\n\t\treturn redirect(\n\t\t\t`${errorRedirectBase}?error=oauth_error&message=${encodeURIComponent(\"Failed to start OAuth flow. Please try again.\")}`,\n\t\t);\n\t}\n};\n"],"mappings":";;;;;AAQA,MAAa,YAAY;AAazB,MAAM,kBAAkB,IAAI,IAAY;CAAC;CAAU;CAAU;CAAY,CAAC;;AAG1E,MAAM,qBAAqB;AAE3B,SAAS,gBAAgB,UAA4C;AACpE,QAAO,gBAAgB,IAAI,SAAS;;;AAIrC,SAAS,UAAU,KAA8B,GAAG,MAAoC;AACvF,MAAK,MAAM,OAAO,MAAM;EACvB,MAAM,MAAM,IAAI;AAChB,MAAI,OAAO,QAAQ,YAAY,IAAK,QAAO;;;;;;AAQ7C,SAAS,eAAe,KAAgE;CACvF,MAAM,YAA8C,EAAE;CAGtD,MAAM,iBAAiB,UAAU,KAAK,iCAAiC,mBAAmB;CAC1F,MAAM,qBAAqB,UAC1B,KACA,qCACA,uBACA;AACD,KAAI,kBAAkB,mBACrB,WAAU,SAAS;EAClB,UAAU;EACV,cAAc;EACd;CAIF,MAAM,iBAAiB,UAAU,KAAK,iCAAiC,mBAAmB;CAC1F,MAAM,qBAAqB,UAC1B,KACA,qCACA,uBACA;AACD,KAAI,kBAAkB,mBACrB,WAAU,SAAS;EAClB,UAAU;EACV,cAAc;EACd;CAIF,MAAM,oBAAoB,UACzB,KACA,oCACA,sBACA;CACD,MAAM,wBAAwB,UAC7B,KACA,wCACA,0BACA;CACD,MAAM,kBAAkB,UAAU,KAAK,oCAAoC,sBAAsB;AACjG,KACC,qBACA,yBACA,mBACA,uBAAuB,gBAAgB,CAEvC,WAAU,YAAY;EACrB,UAAU;EACV,cAAc;EACd,QAAQ;EACR;AAGF,QAAO;;AAGR,MAAa,MAAgB,OAAO,EAAE,QAAQ,SAAS,QAAQ,eAAe;CAC7E,MAAM,EAAE,WAAW;CACnB,MAAM,WAAW,OAAO;CAIxB,MAAM,qBADU,QAAQ,QAAQ,IAAI,UAAU,IAAI,IAChB,SAAS,SAAS,GACjD,yBACA;AAGH,KAAI,CAAC,YAAY,CAAC,gBAAgB,SAAS,CAC1C,QAAO,SACN,GAAG,kBAAkB,kCAAkC,mBAAmB,yBAAyB,GACnG;AAGF,KAAI,CAAC,QAAQ,GACZ,QAAO,SACN,GAAG,kBAAkB,8BAA8B,mBAAmB,0BAA0B,GAChG;AAGF,KAAI;EACH,MAAM,MAAM,IAAI,IAAI,QAAQ,IAAI;EAShC,MAAM,EAAE,KAAK,UAAW,MAAM,OAAO;EAIrC,MAAM,YAAY,eADN,SAAS,OAAO,KAAK,IACI;AAErC,MAAI,CAAC,UAAU,WAAW;GACzB,MAAM,aACL,aAAa,cACV,mJACA;AACJ,UAAO,SACN,GAAG,kBAAkB,yCAAyC,mBAAmB,kBAAkB,SAAS,8CAA8C,SAAS,aAAa,CAAC,8BAA8B,SAAS,aAAa,CAAC,qBAAqB,SAAS,aAAa,CAAC,iBAAiB,SAAS,aAAa,CAAC,iBAAiB,aAAa,GACxV;;EAGF,MAAM,SAA8B;GACnC,SAAS,GAAG,gBAAgB,KAAK,QAAQ,OAAO,CAAC;GACjD;GACA;EAED,MAAM,aAAa,sBAAsB,OAAO,GAAG;EAMnD,MAAM,YAAY,IAAI,aAAa,IAAI,SAAS;EAGhD,MAAM,EAAE,KAAK,YAAY,MAAM,uBAAuB,QAAQ,UAAU,YAAY,EACnF,aAHmB,aAAa,mBAAmB,KAAK,UAAU,GAAG,YAAY,QAIjF,CAAC;AAEF,SAAO,SAAS,QAAQ;UAChB,OAAO;AACf,UAAQ,MAAM,2BAA2B,MAAM;AAC/C,SAAO,SACN,GAAG,kBAAkB,6BAA6B,mBAAmB,gDAAgD,GACrH"}

package/dist/astro/routes/api/auth/passkey/_id_.mjs

@@ -1,20 +1,20 @@
 import "../../../../../config-CvmjJcVw.mjs";
-import "../../../../../base64-DvnNgP7e.mjs";
+import "../../../../../base64-BQBZwXCx.mjs";
 import "../../../../../url-Dn3IStq8.mjs";
-import "../../../../../types-j6MBDjlZ.mjs";
-import "../../../../../errors-CjXd1LgH.mjs";
-import "../../../../../errors-CNvATh_7.mjs";
-import "../../../../../settings-CwcrX-Ay.mjs";
-import "../../../../../site-settings-B7vGFRDT.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-DIYXAVk4.mjs";
-import { n as parseBody, t as isParseError } from "../../../../../parse-5Y0W39xR.mjs";
-import "../../../../../redirects-1nhdEaTq.mjs";
-import "../../../../../entry-lock-yIkBduqJ.mjs";
-import "../../../../../media-Bs6qmlVl.mjs";
-import "../../../../../comments-zrTgWBSg.mjs";
-import { A as passkeyRenameBody } from "../../../../../byline-fields-BYbTptTU.mjs";
-import "../../../../../menus-mC_XTxD7.mjs";
-import "../../../../../status-C6IrSLMT.mjs";
+import "../../../../../types-C-Xp0CcN.mjs";
+import "../../../../../errors-CuHQRiBW.mjs";
+import "../../../../../errors-DTE6C3K_.mjs";
+import "../../../../../settings-WHr45II1.mjs";
+import "../../../../../site-settings-KJOqJW6W.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-B0rgPgsQ.mjs";
+import { n as parseBody, t as isParseError } from "../../../../../parse-CmFDTGzp.mjs";
+import "../../../../../redirects-D4EWeXAo.mjs";
+import "../../../../../entry-lock-sxz2PGAT.mjs";
+import "../../../../../media-aahnKHze.mjs";
+import "../../../../../comments-BRtp992B.mjs";
+import { A as passkeyRenameBody } from "../../../../../byline-fields-DHJs0Mja.mjs";
+import "../../../../../menus-BQKqf0Up.mjs";
+import "../../../../../status-D39Fpy8R.mjs";
 import "../../../../../api/schemas/index.mjs";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 

package/dist/astro/routes/api/auth/passkey/index.mjs

@@ -1,8 +1,8 @@
-import "../../../../../base64-DvnNgP7e.mjs";
-import "../../../../../types-j6MBDjlZ.mjs";
-import "../../../../../errors-CjXd1LgH.mjs";
-import "../../../../../errors-CNvATh_7.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-DIYXAVk4.mjs";
+import "../../../../../base64-BQBZwXCx.mjs";
+import "../../../../../types-C-Xp0CcN.mjs";
+import "../../../../../errors-CuHQRiBW.mjs";
+import "../../../../../errors-DTE6C3K_.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-B0rgPgsQ.mjs";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 
 //#region src/astro/routes/api/auth/passkey/index.ts

package/dist/astro/routes/api/auth/passkey/options.mjs

@@ -1,27 +1,27 @@
 import "../../../../../config-CvmjJcVw.mjs";
 import { t as OptionsRepository } from "../../../../../options-DhrI7eMv.mjs";
-import "../../../../../base64-DvnNgP7e.mjs";
+import "../../../../../base64-BQBZwXCx.mjs";
 import "../../../../../url-Dn3IStq8.mjs";
-import "../../../../../types-j6MBDjlZ.mjs";
-import "../../../../../errors-CjXd1LgH.mjs";
-import "../../../../../errors-CNvATh_7.mjs";
-import "../../../../../settings-CwcrX-Ay.mjs";
-import "../../../../../site-settings-B7vGFRDT.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-DIYXAVk4.mjs";
-import { r as parseOptionalBody, t as isParseError } from "../../../../../parse-5Y0W39xR.mjs";
-import "../../../../../redirects-1nhdEaTq.mjs";
-import "../../../../../entry-lock-yIkBduqJ.mjs";
-import "../../../../../media-Bs6qmlVl.mjs";
-import "../../../../../comments-zrTgWBSg.mjs";
-import { D as passkeyOptionsBody } from "../../../../../byline-fields-BYbTptTU.mjs";
-import "../../../../../menus-mC_XTxD7.mjs";
-import "../../../../../status-C6IrSLMT.mjs";
+import "../../../../../types-C-Xp0CcN.mjs";
+import "../../../../../errors-CuHQRiBW.mjs";
+import "../../../../../errors-DTE6C3K_.mjs";
+import "../../../../../settings-WHr45II1.mjs";
+import "../../../../../site-settings-KJOqJW6W.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-B0rgPgsQ.mjs";
+import { r as parseOptionalBody, t as isParseError } from "../../../../../parse-CmFDTGzp.mjs";
+import "../../../../../redirects-D4EWeXAo.mjs";
+import "../../../../../entry-lock-sxz2PGAT.mjs";
+import "../../../../../media-aahnKHze.mjs";
+import "../../../../../comments-BRtp992B.mjs";
+import { D as passkeyOptionsBody } from "../../../../../byline-fields-DHJs0Mja.mjs";
+import "../../../../../menus-BQKqf0Up.mjs";
+import "../../../../../status-D39Fpy8R.mjs";
 import "../../../../../api/schemas/index.mjs";
-import { t as getTrustedProxyHeaders } from "../../../../../trusted-proxy-C0eHXPd-.mjs";
-import { r as getPublicOrigin } from "../../../../../public-url-7j0cpCFc.mjs";
-import { n as createChallengeStore, t as cleanupExpiredChallenges } from "../../../../../challenge-store-VePApay4.mjs";
-import { n as getClientIp, r as rateLimitResponse, t as checkRateLimit } from "../../../../../rate-limit-D0BcE76H.mjs";
-import { t as getPasskeyConfig } from "../../../../../passkey-config-PiQ5cBnt.mjs";
+import { t as getTrustedProxyHeaders } from "../../../../../trusted-proxy-BqfQFs6a.mjs";
+import { r as getPublicOrigin } from "../../../../../public-url-B5a0QAh6.mjs";
+import { n as createChallengeStore, t as cleanupExpiredChallenges } from "../../../../../challenge-store-CxZxPqaw.mjs";
+import { n as getClientIp, r as rateLimitResponse, t as checkRateLimit } from "../../../../../rate-limit-iMvcu3eu.mjs";
+import { t as getPasskeyConfig } from "../../../../../passkey-config-C-MxsV22.mjs";
 import { generateAuthenticationOptions } from "@emdash-cms/auth/passkey";
 
 //#region src/astro/routes/api/auth/passkey/options.ts

package/dist/astro/routes/api/auth/passkey/register/options.mjs

@@ -1,25 +1,25 @@
 import "../../../../../../config-CvmjJcVw.mjs";
 import { t as OptionsRepository } from "../../../../../../options-DhrI7eMv.mjs";
-import "../../../../../../base64-DvnNgP7e.mjs";
+import "../../../../../../base64-BQBZwXCx.mjs";
 import "../../../../../../url-Dn3IStq8.mjs";
-import "../../../../../../types-j6MBDjlZ.mjs";
-import "../../../../../../errors-CjXd1LgH.mjs";
-import "../../../../../../errors-CNvATh_7.mjs";
-import "../../../../../../settings-CwcrX-Ay.mjs";
-import "../../../../../../site-settings-B7vGFRDT.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../../error-DIYXAVk4.mjs";
-import { r as parseOptionalBody, t as isParseError } from "../../../../../../parse-5Y0W39xR.mjs";
-import "../../../../../../redirects-1nhdEaTq.mjs";
-import "../../../../../../entry-lock-yIkBduqJ.mjs";
-import "../../../../../../media-Bs6qmlVl.mjs";
-import "../../../../../../comments-zrTgWBSg.mjs";
-import { O as passkeyRegisterOptionsBody } from "../../../../../../byline-fields-BYbTptTU.mjs";
-import "../../../../../../menus-mC_XTxD7.mjs";
-import "../../../../../../status-C6IrSLMT.mjs";
+import "../../../../../../types-C-Xp0CcN.mjs";
+import "../../../../../../errors-CuHQRiBW.mjs";
+import "../../../../../../errors-DTE6C3K_.mjs";
+import "../../../../../../settings-WHr45II1.mjs";
+import "../../../../../../site-settings-KJOqJW6W.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../../error-B0rgPgsQ.mjs";
+import { r as parseOptionalBody, t as isParseError } from "../../../../../../parse-CmFDTGzp.mjs";
+import "../../../../../../redirects-D4EWeXAo.mjs";
+import "../../../../../../entry-lock-sxz2PGAT.mjs";
+import "../../../../../../media-aahnKHze.mjs";
+import "../../../../../../comments-BRtp992B.mjs";
+import { O as passkeyRegisterOptionsBody } from "../../../../../../byline-fields-DHJs0Mja.mjs";
+import "../../../../../../menus-BQKqf0Up.mjs";
+import "../../../../../../status-D39Fpy8R.mjs";
 import "../../../../../../api/schemas/index.mjs";
-import { r as getPublicOrigin } from "../../../../../../public-url-7j0cpCFc.mjs";
-import { n as createChallengeStore } from "../../../../../../challenge-store-VePApay4.mjs";
-import { t as getPasskeyConfig } from "../../../../../../passkey-config-PiQ5cBnt.mjs";
+import { r as getPublicOrigin } from "../../../../../../public-url-B5a0QAh6.mjs";
+import { n as createChallengeStore } from "../../../../../../challenge-store-CxZxPqaw.mjs";
+import { t as getPasskeyConfig } from "../../../../../../passkey-config-C-MxsV22.mjs";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 import { generateRegistrationOptions } from "@emdash-cms/auth/passkey";
 

package/dist/astro/routes/api/auth/passkey/register/verify.mjs

@@ -1,26 +1,26 @@
 import "../../../../../../config-CvmjJcVw.mjs";
 import { t as OptionsRepository } from "../../../../../../options-DhrI7eMv.mjs";
-import "../../../../../../base64-DvnNgP7e.mjs";
+import "../../../../../../base64-BQBZwXCx.mjs";
 import "../../../../../../url-Dn3IStq8.mjs";
-import "../../../../../../types-j6MBDjlZ.mjs";
-import "../../../../../../errors-CjXd1LgH.mjs";
-import "../../../../../../errors-CNvATh_7.mjs";
-import "../../../../../../settings-CwcrX-Ay.mjs";
-import "../../../../../../site-settings-B7vGFRDT.mjs";
-import { n as apiSuccess, t as apiError } from "../../../../../../error-DIYXAVk4.mjs";
-import { n as parseBody, t as isParseError } from "../../../../../../parse-5Y0W39xR.mjs";
-import "../../../../../../redirects-1nhdEaTq.mjs";
-import "../../../../../../entry-lock-yIkBduqJ.mjs";
-import "../../../../../../media-Bs6qmlVl.mjs";
-import "../../../../../../comments-zrTgWBSg.mjs";
-import { k as passkeyRegisterVerifyBody } from "../../../../../../byline-fields-BYbTptTU.mjs";
-import "../../../../../../menus-mC_XTxD7.mjs";
-import "../../../../../../status-C6IrSLMT.mjs";
+import "../../../../../../types-C-Xp0CcN.mjs";
+import "../../../../../../errors-CuHQRiBW.mjs";
+import "../../../../../../errors-DTE6C3K_.mjs";
+import "../../../../../../settings-WHr45II1.mjs";
+import "../../../../../../site-settings-KJOqJW6W.mjs";
+import { n as apiSuccess, t as apiError } from "../../../../../../error-B0rgPgsQ.mjs";
+import { n as parseBody, t as isParseError } from "../../../../../../parse-CmFDTGzp.mjs";
+import "../../../../../../redirects-D4EWeXAo.mjs";
+import "../../../../../../entry-lock-sxz2PGAT.mjs";
+import "../../../../../../media-aahnKHze.mjs";
+import "../../../../../../comments-BRtp992B.mjs";
+import { k as passkeyRegisterVerifyBody } from "../../../../../../byline-fields-DHJs0Mja.mjs";
+import "../../../../../../menus-BQKqf0Up.mjs";
+import "../../../../../../status-D39Fpy8R.mjs";
 import "../../../../../../api/schemas/index.mjs";
-import { r as getPublicOrigin } from "../../../../../../public-url-7j0cpCFc.mjs";
-import { n as validateAllowedOrigins, t as getConfiguredAllowedOrigins } from "../../../../../../allowed-origins-D78QvbTO.mjs";
-import { n as createChallengeStore } from "../../../../../../challenge-store-VePApay4.mjs";
-import { t as getPasskeyConfig } from "../../../../../../passkey-config-PiQ5cBnt.mjs";
+import { r as getPublicOrigin } from "../../../../../../public-url-B5a0QAh6.mjs";
+import { n as validateAllowedOrigins, t as getConfiguredAllowedOrigins } from "../../../../../../allowed-origins-CFtudhyw.mjs";
+import { n as createChallengeStore } from "../../../../../../challenge-store-CxZxPqaw.mjs";
+import { t as getPasskeyConfig } from "../../../../../../passkey-config-C-MxsV22.mjs";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 import { registerPasskey, verifyRegistrationResponse } from "@emdash-cms/auth/passkey";