better-auth-studio 1.0.24-beta.1 → 1.0.25

package/dist/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,MAAM,EAAE,MAAM,SAAS,CAAC;AAY9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AA+C9C,wBAAsB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CA4J/E;AAwBD,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CAk2FR"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,MAAM,EAAE,MAAM,SAAS,CAAC;AAY9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AA+C9C,wBAAsB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CA+I/E;AAwBD,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CAk0FR"}

package/dist/routes.js

@@ -79,7 +79,7 @@ export async function safeImportAuthConfig(authConfigPath) {
                 }
             }
             const jiti = createJiti(import.meta.url, {
-                debug: true, // Enable debug to see what's happening
+                debug: true,
                 fsCache: true,
                 moduleCache: true,
                 interopDefault: true,
@@ -119,17 +119,7 @@ export async function safeImportAuthConfig(authConfigPath) {
                 }
                 currentDir = dirname(currentDir);
             }
-            resolvedContent = resolvedContent.replace(/import\s+prisma\s+from\s+["']\.\/prisma["'];/g, `const prisma = {
-  user: { findMany: () => [], create: () => ({}), update: () => ({}), delete: () => ({}) },
-  session: { findMany: () => [], create: () => ({}), update: () => ({}), delete: () => ({}) },
-  account: { findMany: () => [], create: () => ({}), update: () => ({}), delete: () => ({}) },
-  verification: { findMany: () => [], create: () => ({}), update: () => ({}), delete: () => ({}) },
-  organization: { findMany: () => [], create: () => ({}), update: () => ({}), delete: () => ({}) },
-  member: { findMany: () => [], create: () => ({}), update: () => ({}), delete: () => ({}) },
-  invitation: { findMany: () => [], create: () => ({}), update: () => ({}), delete: () => ({}) },
-  team: { findMany: () => [], create: () => ({}), update: () => ({}), delete: () => ({}) },
-  teamMember: { findMany: () => [], create: () => ({}), update: () => ({}), delete: () => ({}) }
-};`);
+            resolvedContent = '';
             resolvedContent = resolvedContent.replace(/import\s+([^"']*)\s+from\s+["']\.\/[^"']*["'];/g, '// Ignored local import');
             resolvedContent = resolvedContent.replace(/import\s+{\s*magicLink\s*}\s+from\s+["']\.\/magic-link["'];/g, `const magicLink = () => ({ id: 'magic-link', name: 'Magic Link' });`);
             if (nodeModulesPath) {
@@ -138,8 +128,8 @@ export async function safeImportAuthConfig(authConfigPath) {
                 let commonJsContent = resolvedContent
                     .replace(/export\s+const\s+(\w+)\s*=/g, 'const $1 =')
                     .replace(/export\s+default\s+/g, 'module.exports = ')
-                    .replace(/export\s+type\s+.*$/gm, '// $&') // Comment out type exports
-                    .replace(/import\s+type\s+.*$/gm, '// $&'); // Comment out type imports
+                    .replace(/export\s+type\s+.*$/gm, '// $&')
+                    .replace(/import\s+type\s+.*$/gm, '// $&');
                 if (!commonJsContent.includes('module.exports')) {
                     commonJsContent += '\nmodule.exports = { auth };';
                 }
@@ -170,7 +160,7 @@ export async function safeImportAuthConfig(authConfigPath) {
         }
         catch (resolveError) {
             console.error('Import resolution also failed:', resolveError);
-            throw importError; // Throw original error
+            throw importError;
         }
     }
 }
@@ -178,7 +168,7 @@ async function findAuthConfigPath() {
     const { join, dirname } = await import('path');
     const { existsSync } = await import('fs');
     const possiblePaths = [
-        'auth.js', // Prioritize the working CommonJS file
+        'auth.js',
         'auth.ts',
         'src/auth.js',
         'src/auth.ts',
@@ -1558,22 +1548,18 @@ export function createRoutes(authConfig, configPath, geoDbPath) {
             },
         },
     };
-    // Function to generate schema based on selected plugins
     function generateSchema(selectedPlugins) {
         const schema = { tables: [] };
-        // Start with base tables (deep clone to avoid mutations)
         const baseTables = Object.values(BASE_SCHEMA).map((table) => ({
             ...table,
             fields: [...table.fields],
             relationships: [...table.relationships],
         }));
         schema.tables.push(...baseTables);
-        // Apply plugin extensions
         selectedPlugins.forEach((pluginName) => {
             const plugin = PLUGIN_SCHEMAS[pluginName];
             if (!plugin)
                 return;
-            // Add plugin-specific tables
             if (plugin.tables) {
                 Object.values(plugin.tables).forEach((table) => {
                     schema.tables.push({
@@ -1583,17 +1569,14 @@ export function createRoutes(authConfig, configPath, geoDbPath) {
                     });
                 });
             }
-            // Extend existing tables (with duplicate prevention)
             if ('userExtensions' in plugin && plugin.userExtensions) {
                 const userTable = schema.tables.find((t) => t.name === 'user');
                 if (userTable && 'fields' in plugin.userExtensions) {
-                    // Add fields only if they don't already exist
                     (plugin.userExtensions.fields || []).forEach((field) => {
                         if (!userTable.fields.some((f) => f.name === field.name)) {
                             userTable.fields.push(field);
                         }
                     });
-                    // Add relationships only if they don't already exist
                     (plugin.userExtensions.relationships || []).forEach((rel) => {
                         if (!userTable.relationships.some((r) => r.target === rel.target && r.field === rel.field && r.type === rel.type)) {
                             userTable.relationships.push(rel);
@@ -1604,13 +1587,11 @@ export function createRoutes(authConfig, configPath, geoDbPath) {
             if ('sessionExtensions' in plugin && plugin.sessionExtensions) {
                 const sessionTable = schema.tables.find((t) => t.name === 'session');
                 if (sessionTable && 'fields' in plugin.sessionExtensions) {
-                    // Add fields only if they don't already exist
                     (plugin.sessionExtensions.fields || []).forEach((field) => {
                         if (!sessionTable.fields.some((f) => f.name === field.name)) {
                             sessionTable.fields.push(field);
                         }
                     });
-                    // Add relationships only if they don't already exist
                     (plugin.sessionExtensions.relationships || []).forEach((rel) => {
                         if (!sessionTable.relationships.some((r) => r.target === rel.target && r.field === rel.field && r.type === rel.type)) {
                             sessionTable.relationships.push(rel);
@@ -1621,7 +1602,6 @@ export function createRoutes(authConfig, configPath, geoDbPath) {
             if ('organizationExtensions' in plugin && plugin.organizationExtensions) {
                 const orgTable = schema.tables.find((t) => t.name === 'organization');
                 if (orgTable) {
-                    // Add relationships only if they don't already exist
                     (plugin.organizationExtensions.relationships || []).forEach((rel) => {
                         if (!orgTable.relationships.some((r) => r.target === rel.target && r.field === rel.field && r.type === rel.type)) {
                             orgTable.relationships.push(rel);
@@ -1673,45 +1653,36 @@ export function createRoutes(authConfig, configPath, geoDbPath) {
                 });
             }
             try {
-                let authModule;
-                try {
-                    authModule = await safeImportAuthConfig(authConfigPath);
-                }
-                catch (importError) {
-                    // Fallback: read file content directly
-                    const content = readFileSync(authConfigPath, 'utf-8');
-                    authModule = {
-                        auth: {
-                            options: {
-                                _content: content,
-                                plugins: [],
-                            },
-                        },
-                    };
-                }
-                const auth = authModule.auth || authModule.default;
-                if (!auth) {
-                    return res.json({
-                        enabled: false,
-                        error: 'No auth export found',
-                        configPath: authConfigPath,
-                    });
-                }
-                const organizationPlugin = auth.options?.plugins?.find((plugin) => plugin.id === 'organization');
-                const teamOptions = organizationPlugin.options.teams;
-                const teamsEnabled = teamOptions?.enabled;
-                res.json({
-                    enabled: teamsEnabled,
+                const { getConfig } = await import('./config.js');
+                const betterAuthConfig = await getConfig({
+                    cwd: process.cwd(),
                     configPath: authConfigPath,
-                    organizationPlugin: organizationPlugin || null,
+                    shouldThrowOnError: false,
                 });
-            }
-            catch (error) {
-                console.error('Error checking teams plugin:', error);
+                if (betterAuthConfig) {
+                    const plugins = betterAuthConfig.plugins || [];
+                    const organizationPlugin = plugins.find((plugin) => plugin.id === 'organization');
+                    if (organizationPlugin) {
+                        const teamsEnabled = organizationPlugin.options?.teams?.enabled === true;
+                        return res.json({
+                            enabled: teamsEnabled,
+                            configPath: authConfigPath,
+                            organizationPlugin: organizationPlugin || null,
+                        });
+                    }
+                    else {
+                        return res.json({
+                            enabled: false,
+                            configPath: authConfigPath,
+                            organizationPlugin: null,
+                            error: 'Organization plugin not found',
+                        });
+                    }
+                }
                 try {
                     const { readFileSync } = await import('fs');
                     const content = readFileSync(authConfigPath, 'utf-8');
-                    const { extractBetterAuthConfig } = await import('./config');
+                    const { extractBetterAuthConfig } = await import('./config.js');
                     const config = extractBetterAuthConfig(content);
                     if (config && config.plugins) {
                         const organizationPlugin = config.plugins.find((plugin) => plugin.id === 'organization');
@@ -1729,10 +1700,14 @@ export function createRoutes(authConfig, configPath, geoDbPath) {
                 }
                 res.json({
                     enabled: false,
-                    error: 'Failed to load auth config - import failed and regex extraction unavailable',
+                    error: 'Failed to load auth config - getConfig failed and regex extraction unavailable',
                     configPath: authConfigPath,
                 });
             }
+            catch (error) {
+                console.error('Error checking teams plugin:', error);
+                res.status(500).json({ error: 'Failed to check teams status' });
+            }
         }
         catch (error) {
             console.error('Error checking teams status:', error);
@@ -2364,44 +2339,26 @@ export function createRoutes(authConfig, configPath, geoDbPath) {
                 });
             }
             try {
-                let authModule;
-                try {
-                    authModule = await safeImportAuthConfig(authConfigPath);
-                }
-                catch (importError) {
-                    const content = readFileSync(authConfigPath, 'utf-8');
-                    authModule = {
-                        auth: {
-                            options: {
-                                _content: content,
-                                plugins: [],
-                            },
-                        },
-                    };
-                }
-                const auth = authModule.auth || authModule.default;
-                if (!auth) {
+                const { getConfig } = await import('./config.js');
+                const betterAuthConfig = await getConfig({
+                    cwd: process.cwd(),
+                    configPath: authConfigPath,
+                    shouldThrowOnError: false,
+                });
+                if (betterAuthConfig) {
+                    const plugins = betterAuthConfig?.plugins || [];
+                    const hasOrganizationPlugin = plugins.find((plugin) => plugin.id === 'organization');
                     return res.json({
-                        enabled: false,
-                        error: 'No auth export found',
+                        enabled: !!hasOrganizationPlugin,
                         configPath: authConfigPath,
+                        availablePlugins: plugins.map((p) => p.id) || [],
+                        organizationPlugin: hasOrganizationPlugin || null,
                     });
                 }
-                const plugins = auth.options?.plugins || [];
-                const hasOrganizationPlugin = plugins.find((plugin) => plugin.id === 'organization');
-                res.json({
-                    enabled: !!hasOrganizationPlugin,
-                    configPath: authConfigPath,
-                    availablePlugins: plugins.map((p) => p.id) || [],
-                    organizationPlugin: hasOrganizationPlugin || null,
-                });
-            }
-            catch (error) {
-                console.error('Error checking organization plugin:', error);
                 try {
                     const { readFileSync } = await import('fs');
                     const content = readFileSync(authConfigPath, 'utf-8');
-                    const { extractBetterAuthConfig } = await import('./config');
+                    const { extractBetterAuthConfig } = await import('./config.js');
                     const config = extractBetterAuthConfig(content);
                     if (config && config.plugins) {
                         const hasOrganizationPlugin = config.plugins.find((plugin) => plugin.id === 'organization');
@@ -2419,10 +2376,14 @@ export function createRoutes(authConfig, configPath, geoDbPath) {
                 }
                 res.json({
                     enabled: false,
-                    error: 'Failed to load auth config - import failed and regex extraction unavailable',
+                    error: 'Failed to load auth config - getConfig failed and regex extraction unavailable',
                     configPath: authConfigPath,
                 });
             }
+            catch (error) {
+                console.error('Error checking organization plugin:', error);
+                res.status(500).json({ error: 'Failed to check plugin status' });
+            }
         }
         catch (error) {
             console.error('Error checking plugin status:', error);