@objectstack/plugin-auth 7.1.0 → 7.2.1

package/dist/index.js

@@ -71,6 +71,9 @@ module.exports = __toCommonJS(index_exports);
 var import_apps = require("@objectstack/platform-objects/apps");
 var import_pages = require("@objectstack/platform-objects/pages");
 
+// src/auth-manager.ts
+var import_types = require("@objectstack/types");
+
 // src/objectql-adapter.ts
 var import_adapters = require("better-auth/adapters");
 var import_system = require("@objectstack/spec/system");
@@ -783,10 +786,10 @@ var AuthManager = class {
         })
       },
       // Trusted origins for CSRF protection (supports wildcards like "https://*.example.com")
-      // Auto-includes origins from CORS_ORIGIN env var so CORS and CSRF stay in sync.
+      // Auto-includes origins from OS_CORS_ORIGIN env var so CORS and CSRF stay in sync.
       ...(() => {
         const origins = [...this.config.trustedOrigins || []];
-        const corsOrigin = process.env.CORS_ORIGIN;
+        const corsOrigin = (0, import_types.readEnvWithDeprecation)("OS_CORS_ORIGIN", "CORS_ORIGIN");
         if (corsOrigin && corsOrigin !== "*") {
           corsOrigin.split(",").map((s) => s.trim()).filter(Boolean).forEach((o) => {
             if (!origins.includes(o)) origins.push(o);
@@ -948,9 +951,8 @@ var AuthManager = class {
           beforeCreateOrganization: async () => {
             const env = globalThis?.process?.env ?? {};
             const explicit = env.OS_MULTI_ORG_ENABLED;
-            const flag = String(
-              explicit ?? env.OS_MULTI_TENANT ?? "false"
-            ).toLowerCase();
+            const legacy = explicit === void 0 ? (0, import_types.readEnvWithDeprecation)("OS_MULTI_ORG_ENABLED", "OS_MULTI_TENANT") : explicit;
+            const flag = String(legacy ?? "false").toLowerCase();
             if (flag === "false") {
               const { APIError } = await import("better-auth/api");
               throw new APIError("FORBIDDEN", {
@@ -1092,18 +1094,22 @@ var AuthManager = class {
       plugins.push(jwt({ schema: buildJwtPluginSchema() }));
       const { oauthProvider } = await import("@better-auth/oauth-provider");
       const baseUrl = (this.config.baseUrl ?? "").replace(/\/$/, "");
+      const uiBase = (this.config.uiBasePath ?? "/_console").replace(/\/$/, "");
       plugins.push(oauthProvider({
-        // Account SPA renders both pages — see apps/account.
-        loginPage: `${baseUrl}/_account/login`,
-        consentPage: `${baseUrl}/_account/oauth/consent`,
+        // Console SPA renders both pages (replaces the legacy Account SPA at
+        // /_account). Override `uiBasePath` in AuthConfig if Console is
+        // mounted elsewhere.
+        loginPage: `${baseUrl}${uiBase}/login`,
+        consentPage: `${baseUrl}${uiBase}/oauth/consent`,
         schema: buildOauthProviderPluginSchema()
       }));
     }
     if (enabled.deviceAuthorization) {
       const { deviceAuthorization } = await import("better-auth/plugins/device-authorization");
       const baseUrl = (this.config.baseUrl ?? "").replace(/\/$/, "");
+      const uiBase = (this.config.uiBasePath ?? "/_console").replace(/\/$/, "");
       plugins.push(deviceAuthorization({
-        verificationUri: `${baseUrl}/_account/auth/device`,
+        verificationUri: `${baseUrl}${uiBase}/auth/device`,
         schema: buildDeviceAuthorizationPluginSchema()
       }));
     }
@@ -1183,11 +1189,11 @@ var AuthManager = class {
    * Generate a secure secret if not provided
    */
   generateSecret() {
-    const envSecret = process.env.AUTH_SECRET;
+    const envSecret = (0, import_types.readEnvWithDeprecation)("OS_AUTH_SECRET", ["AUTH_SECRET", "BETTER_AUTH_SECRET"]);
     if (!envSecret) {
       const fallbackSecret = "dev-secret-" + Date.now();
       console.warn(
-        "\u26A0\uFE0F  WARNING: No AUTH_SECRET environment variable set! Using a temporary development secret. This is NOT secure for production use. Please set AUTH_SECRET in your environment variables."
+        "\u26A0\uFE0F  WARNING: No OS_AUTH_SECRET environment variable set! Using a temporary development secret. This is NOT secure for production use. Please set OS_AUTH_SECRET in your environment variables."
       );
       return fallbackSecret;
     }
@@ -1340,9 +1346,8 @@ var AuthManager = class {
     };
     const pluginConfig = this.config.plugins ?? {};
     const multiOrgEnv = globalThis?.process?.env ?? {};
-    const multiOrgEnabled = String(
-      multiOrgEnv.OS_MULTI_ORG_ENABLED ?? multiOrgEnv.OS_MULTI_TENANT ?? "false"
-    ).toLowerCase() !== "false";
+    const multiOrgRaw = multiOrgEnv.OS_MULTI_ORG_ENABLED !== void 0 ? multiOrgEnv.OS_MULTI_ORG_ENABLED : (0, import_types.readEnvWithDeprecation)("OS_MULTI_ORG_ENABLED", "OS_MULTI_TENANT") ?? "false";
+    const multiOrgEnabled = String(multiOrgRaw).toLowerCase() !== "false";
     const DEFAULT_TERMS_URL = "https://objectstack.ai/terms";
     const DEFAULT_PRIVACY_URL = "https://objectstack.ai/privacy";
     const rawTermsUrl = globalThis?.process?.env?.OS_TERMS_URL;