better-auth-studio 1.0.18 → 1.0.19-beta.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth-adapter.d.ts +1 -1
- package/dist/auth-adapter.d.ts.map +1 -1
- package/dist/auth-adapter.js +18 -60
- package/dist/auth-adapter.js.map +1 -1
- package/dist/cli.js +132 -9
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +119 -30
- package/dist/config.js.map +1 -1
- package/dist/data.d.ts +1 -1
- package/dist/data.d.ts.map +1 -1
- package/dist/data.js +2 -2
- package/dist/data.js.map +1 -1
- package/dist/routes.d.ts +1 -1
- package/dist/routes.d.ts.map +1 -1
- package/dist/routes.js +108 -63
- package/dist/routes.js.map +1 -1
- package/dist/studio.d.ts +7 -1
- package/dist/studio.d.ts.map +1 -1
- package/dist/studio.js +28 -17
- package/dist/studio.js.map +1 -1
- package/package.json +4 -1
- package/public/assets/{main-Buq3n9QM.js → main-BwoTURZL.js} +16 -16
- package/public/index.html +1 -1
package/dist/auth-adapter.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export interface AuthAdapter {
|
|
|
16
16
|
offset?: number;
|
|
17
17
|
}) => Promise<any[]>;
|
|
18
18
|
}
|
|
19
|
-
export declare function getAuthAdapter(): Promise<AuthAdapter | null>;
|
|
19
|
+
export declare function getAuthAdapter(configPath?: string): Promise<AuthAdapter | null>;
|
|
20
20
|
export declare function createMockUser(adapter: AuthAdapter, index: number): Promise<any>;
|
|
21
21
|
export declare function createMockSession(adapter: AuthAdapter, userId: string, index: number): Promise<any>;
|
|
22
22
|
export declare function createMockAccount(adapter: AuthAdapter, userId: string, index: number): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-adapter.d.ts","sourceRoot":"","sources":["../src/auth-adapter.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,aAAa,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3C,aAAa,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3C,kBAAkB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,kBAAkB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CACzG;AAKD,wBAAsB,cAAc,
|
|
1
|
+
{"version":3,"file":"auth-adapter.d.ts","sourceRoot":"","sources":["../src/auth-adapter.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,aAAa,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3C,aAAa,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3C,kBAAkB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,kBAAkB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CACzG;AAKD,wBAAsB,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CA0MrF;AA2CD,wBAAsB,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,gBAavE;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAU1F;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAkB1F;AAED,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAU/F"}
|
package/dist/auth-adapter.js
CHANGED
|
@@ -1,76 +1,34 @@
|
|
|
1
1
|
import { join, dirname } from 'path';
|
|
2
|
-
import { existsSync
|
|
2
|
+
import { existsSync } from 'fs';
|
|
3
3
|
import { createJiti } from 'jiti';
|
|
4
|
-
import { pathToFileURL } from 'url';
|
|
5
4
|
let authInstance = null;
|
|
6
5
|
let authAdapter = null;
|
|
7
|
-
export async function getAuthAdapter() {
|
|
6
|
+
export async function getAuthAdapter(configPath) {
|
|
8
7
|
try {
|
|
9
|
-
|
|
8
|
+
let authConfigPath = configPath;
|
|
9
|
+
if (!authConfigPath) {
|
|
10
|
+
authConfigPath = await findAuthConfigPath() || undefined;
|
|
11
|
+
}
|
|
10
12
|
if (!authConfigPath) {
|
|
11
13
|
return null;
|
|
12
14
|
}
|
|
13
15
|
let authModule;
|
|
14
16
|
try {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
const relativeImportRegex = /import\s+.*?\s+from\s+['"](\.\/[^'"]+)['"]/g;
|
|
20
|
-
const dynamicImportRegex = /import\s*\(\s*['"](\.\/[^'"]+)['"]\s*\)/g;
|
|
21
|
-
const foundImports = new Set();
|
|
22
|
-
let match;
|
|
23
|
-
while ((match = relativeImportRegex.exec(content)) !== null) {
|
|
24
|
-
foundImports.add(match[1]);
|
|
25
|
-
}
|
|
26
|
-
while ((match = dynamicImportRegex.exec(content)) !== null) {
|
|
27
|
-
foundImports.add(match[1]);
|
|
28
|
-
}
|
|
29
|
-
for (const importPath of foundImports) {
|
|
30
|
-
const importName = importPath.replace('./', '');
|
|
31
|
-
const possiblePaths = [
|
|
32
|
-
join(authConfigDir, importName + '.ts'),
|
|
33
|
-
join(authConfigDir, importName + '.js'),
|
|
34
|
-
join(authConfigDir, importName + '.mjs'),
|
|
35
|
-
join(authConfigDir, importName + '.cjs'),
|
|
36
|
-
join(authConfigDir, importName, 'index.ts'),
|
|
37
|
-
join(authConfigDir, importName, 'index.js'),
|
|
38
|
-
join(authConfigDir, importName, 'index.mjs'),
|
|
39
|
-
join(authConfigDir, importName, 'index.cjs')
|
|
40
|
-
];
|
|
41
|
-
for (const path of possiblePaths) {
|
|
42
|
-
if (existsSync(path)) {
|
|
43
|
-
aliases[importPath] = pathToFileURL(path).href;
|
|
44
|
-
break;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
const jiti = createJiti(import.meta.url, {
|
|
49
|
-
debug: false,
|
|
50
|
-
fsCache: true,
|
|
51
|
-
moduleCache: true,
|
|
52
|
-
interopDefault: true,
|
|
53
|
-
alias: aliases
|
|
54
|
-
});
|
|
55
|
-
try {
|
|
56
|
-
authModule = await jiti.import(authConfigPath);
|
|
57
|
-
}
|
|
58
|
-
catch (jitiError) {
|
|
59
|
-
const content = readFileSync(authConfigPath, 'utf-8');
|
|
60
|
-
authModule = {
|
|
61
|
-
auth: {
|
|
62
|
-
options: {
|
|
63
|
-
_content: content
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
};
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
else {
|
|
70
|
-
authModule = await import(authConfigPath);
|
|
17
|
+
let importPath = authConfigPath;
|
|
18
|
+
console.log({ importPath });
|
|
19
|
+
if (!authConfigPath.startsWith('/')) {
|
|
20
|
+
importPath = join(process.cwd(), authConfigPath);
|
|
71
21
|
}
|
|
22
|
+
const jitiInstance = createJiti(importPath, {
|
|
23
|
+
debug: true,
|
|
24
|
+
fsCache: true,
|
|
25
|
+
moduleCache: true,
|
|
26
|
+
interopDefault: true
|
|
27
|
+
});
|
|
28
|
+
authModule = await jitiInstance.import(importPath);
|
|
72
29
|
}
|
|
73
30
|
catch (error) {
|
|
31
|
+
console.warn('🔍 Debug: Failed to import auth module in adapter:', error.message);
|
|
74
32
|
return null;
|
|
75
33
|
}
|
|
76
34
|
const auth = authModule.auth || authModule.default;
|
package/dist/auth-adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-adapter.js","sourceRoot":"","sources":["../src/auth-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"auth-adapter.js","sourceRoot":"","sources":["../src/auth-adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -5,6 +5,7 @@ import { readFileSync, existsSync } from 'fs';
|
|
|
5
5
|
import { join, dirname } from 'path';
|
|
6
6
|
import { startStudio } from './studio.js';
|
|
7
7
|
import { findAuthConfig } from './config.js';
|
|
8
|
+
import chokidar from 'chokidar';
|
|
8
9
|
async function findAuthConfigPath() {
|
|
9
10
|
const possibleConfigFiles = [
|
|
10
11
|
'auth.ts',
|
|
@@ -40,6 +41,102 @@ async function findAuthConfigPath() {
|
|
|
40
41
|
}
|
|
41
42
|
return null;
|
|
42
43
|
}
|
|
44
|
+
let currentStudio = null;
|
|
45
|
+
let watcher = null;
|
|
46
|
+
let webSocketServer = null;
|
|
47
|
+
async function startStudioWithWatch(options) {
|
|
48
|
+
const { port, host, openBrowser, authConfig, configPath, watchMode } = options;
|
|
49
|
+
const studioResult = await startStudio({
|
|
50
|
+
port,
|
|
51
|
+
host,
|
|
52
|
+
openBrowser,
|
|
53
|
+
authConfig,
|
|
54
|
+
configPath,
|
|
55
|
+
watchMode
|
|
56
|
+
});
|
|
57
|
+
currentStudio = studioResult.server;
|
|
58
|
+
webSocketServer = studioResult.wss;
|
|
59
|
+
if (configPath) {
|
|
60
|
+
const resolvedPath = join(process.cwd(), configPath);
|
|
61
|
+
console.log(chalk.blue(`👀 Watching for changes in: ${resolvedPath}`));
|
|
62
|
+
watcher = chokidar.watch(resolvedPath, {
|
|
63
|
+
persistent: true,
|
|
64
|
+
ignoreInitial: true
|
|
65
|
+
});
|
|
66
|
+
watcher.on('change', async (path) => {
|
|
67
|
+
console.log(chalk.yellow(`\n🔄 Config file changed: ${path}`));
|
|
68
|
+
console.log(chalk.gray('Reloading Better Auth Studio...\n'));
|
|
69
|
+
try {
|
|
70
|
+
// Stop current studio
|
|
71
|
+
if (currentStudio && typeof currentStudio.close === 'function') {
|
|
72
|
+
await currentStudio.close();
|
|
73
|
+
}
|
|
74
|
+
// Reload config
|
|
75
|
+
const newAuthConfig = await findAuthConfig(configPath);
|
|
76
|
+
if (!newAuthConfig) {
|
|
77
|
+
console.error(chalk.red('❌ Failed to reload config. Keeping previous configuration.'));
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
console.log(chalk.green('✅ Config reloaded successfully'));
|
|
81
|
+
const newStudioResult = await startStudio({
|
|
82
|
+
port,
|
|
83
|
+
host,
|
|
84
|
+
openBrowser: false,
|
|
85
|
+
authConfig: newAuthConfig,
|
|
86
|
+
configPath,
|
|
87
|
+
watchMode
|
|
88
|
+
});
|
|
89
|
+
currentStudio = newStudioResult.server;
|
|
90
|
+
webSocketServer = newStudioResult.wss;
|
|
91
|
+
if (webSocketServer && webSocketServer.clients) {
|
|
92
|
+
console.log(chalk.blue(`📡 Broadcasting config change to ${webSocketServer.clients.size} connected clients`));
|
|
93
|
+
webSocketServer.clients.forEach((client) => {
|
|
94
|
+
if (client.readyState === 1) { // WebSocket.OPEN
|
|
95
|
+
try {
|
|
96
|
+
client.send(JSON.stringify({
|
|
97
|
+
type: 'config_changed',
|
|
98
|
+
message: 'Configuration has been reloaded'
|
|
99
|
+
}));
|
|
100
|
+
console.log(chalk.green('✅ Config change message sent to client'));
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
console.error(chalk.red('❌ Failed to send message to client:'), error);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
console.log(chalk.yellow('⚠️ No WebSocket server or clients available'));
|
|
110
|
+
}
|
|
111
|
+
console.log(chalk.green('✅ Better Auth Studio reloaded!'));
|
|
112
|
+
}
|
|
113
|
+
catch (error) {
|
|
114
|
+
console.error(chalk.red('❌ Failed to reload studio:'), error);
|
|
115
|
+
console.log(chalk.yellow('Keeping previous configuration running...'));
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
watcher.on('error', (error) => {
|
|
119
|
+
console.error(chalk.red('❌ File watcher error:'), error);
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
console.log(chalk.yellow('⚠️ Watch mode requires --config flag to specify which file to watch'));
|
|
124
|
+
}
|
|
125
|
+
// Handle graceful shutdown
|
|
126
|
+
process.on('SIGINT', async () => {
|
|
127
|
+
console.log(chalk.gray('\n🛑 Shutting down...'));
|
|
128
|
+
if (watcher) {
|
|
129
|
+
await watcher.close();
|
|
130
|
+
}
|
|
131
|
+
if (webSocketServer) {
|
|
132
|
+
webSocketServer.close();
|
|
133
|
+
}
|
|
134
|
+
if (currentStudio && typeof currentStudio.close === 'function') {
|
|
135
|
+
await currentStudio.close();
|
|
136
|
+
}
|
|
137
|
+
process.exit(0);
|
|
138
|
+
});
|
|
139
|
+
}
|
|
43
140
|
const program = new Command();
|
|
44
141
|
program
|
|
45
142
|
.name('better-auth-studio')
|
|
@@ -50,16 +147,28 @@ program
|
|
|
50
147
|
.description('Start Better Auth Studio')
|
|
51
148
|
.option('-p, --port <port>', 'Port to run the studio on', '3002')
|
|
52
149
|
.option('-h, --host <host>', 'Host to run the studio on', 'localhost')
|
|
150
|
+
.option('-c, --config <path>', 'Path to the auth configuration file')
|
|
151
|
+
.option('-w, --watch', 'Watch for changes in auth config file and reload server')
|
|
53
152
|
.option('--no-open', 'Do not open browser automatically')
|
|
54
153
|
.action(async (options) => {
|
|
55
154
|
try {
|
|
56
155
|
console.log(chalk.blue('🔐 Better Auth Studio'));
|
|
57
156
|
console.log(chalk.gray('Starting Better Auth Studio...\n'));
|
|
58
|
-
const authConfig = await findAuthConfig();
|
|
157
|
+
const authConfig = await findAuthConfig(options.config);
|
|
59
158
|
if (!authConfig) {
|
|
60
159
|
console.error(chalk.red('❌ No Better Auth configuration found.'));
|
|
61
|
-
|
|
62
|
-
|
|
160
|
+
if (options.config) {
|
|
161
|
+
console.log(chalk.yellow(`Could not find or load config file: ${options.config}`));
|
|
162
|
+
console.log(chalk.gray(`Current working directory: ${process.cwd()}`));
|
|
163
|
+
console.log(chalk.gray(`Tried paths:`));
|
|
164
|
+
console.log(chalk.gray(` - ${join(process.cwd(), options.config)}`));
|
|
165
|
+
console.log(chalk.gray(` - ${join(process.cwd(), '..', options.config)}`));
|
|
166
|
+
console.log(chalk.gray(` - ${join(process.cwd(), '../..', options.config)}`));
|
|
167
|
+
}
|
|
168
|
+
else {
|
|
169
|
+
console.log(chalk.yellow('Make sure you have a Better Auth configuration file in your project.'));
|
|
170
|
+
console.log(chalk.yellow('Supported files: auth.ts, auth.js, better-auth.config.ts, etc.'));
|
|
171
|
+
}
|
|
63
172
|
process.exit(1);
|
|
64
173
|
}
|
|
65
174
|
console.log(chalk.green('✅ Found Better Auth configuration'));
|
|
@@ -115,12 +224,26 @@ program
|
|
|
115
224
|
}
|
|
116
225
|
console.log(chalk.gray(`Database: ${databaseInfo}`));
|
|
117
226
|
console.log(chalk.gray(`Providers: ${providersInfo}\n`));
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
227
|
+
if (options.watch) {
|
|
228
|
+
await startStudioWithWatch({
|
|
229
|
+
port: parseInt(options.port),
|
|
230
|
+
host: options.host,
|
|
231
|
+
openBrowser: options.open,
|
|
232
|
+
authConfig,
|
|
233
|
+
configPath: options.config,
|
|
234
|
+
watchMode: true
|
|
235
|
+
});
|
|
236
|
+
}
|
|
237
|
+
else {
|
|
238
|
+
await startStudio({
|
|
239
|
+
port: parseInt(options.port),
|
|
240
|
+
host: options.host,
|
|
241
|
+
openBrowser: options.open,
|
|
242
|
+
authConfig,
|
|
243
|
+
configPath: options.config,
|
|
244
|
+
watchMode: false
|
|
245
|
+
});
|
|
246
|
+
}
|
|
124
247
|
}
|
|
125
248
|
catch (error) {
|
|
126
249
|
console.error(chalk.red('❌ Failed to start Better Auth Studio:'), error);
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -23,6 +23,6 @@ export interface AuthConfig {
|
|
|
23
23
|
rateLimit?: any;
|
|
24
24
|
[key: string]: any;
|
|
25
25
|
}
|
|
26
|
-
export declare function findAuthConfig(): Promise<AuthConfig | null>;
|
|
26
|
+
export declare function findAuthConfig(configPath?: string): Promise<AuthConfig | null>;
|
|
27
27
|
export declare function extractBetterAuthConfig(content: string): AuthConfig | null;
|
|
28
28
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,SAAS,CAAC,EAAE,YAAY,EAAE,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtC,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAuBD,wBAAsB,cAAc,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,SAAS,CAAC,EAAE,YAAY,EAAE,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtC,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAuBD,wBAAsB,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAyGpF;AAuOD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CA+J1E"}
|
package/dist/config.js
CHANGED
|
@@ -17,7 +17,65 @@ function resolveModuleWithExtensions(id, parent) {
|
|
|
17
17
|
}
|
|
18
18
|
return id;
|
|
19
19
|
}
|
|
20
|
-
export async function findAuthConfig() {
|
|
20
|
+
export async function findAuthConfig(configPath) {
|
|
21
|
+
if (configPath) {
|
|
22
|
+
// Handle both relative and absolute paths
|
|
23
|
+
let resolvedPath;
|
|
24
|
+
if (configPath.startsWith('/')) {
|
|
25
|
+
// Absolute path
|
|
26
|
+
resolvedPath = configPath;
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
// Relative path - try multiple resolution strategies
|
|
30
|
+
const cwd = process.cwd();
|
|
31
|
+
const possiblePaths = [
|
|
32
|
+
join(cwd, configPath), // Direct relative to cwd
|
|
33
|
+
join(cwd, '..', configPath), // One level up
|
|
34
|
+
join(cwd, '../..', configPath), // Two levels up
|
|
35
|
+
configPath // Try as-is (in case it's already resolved)
|
|
36
|
+
];
|
|
37
|
+
resolvedPath = possiblePaths.find(path => existsSync(path)) || join(cwd, configPath);
|
|
38
|
+
}
|
|
39
|
+
if (existsSync(resolvedPath)) {
|
|
40
|
+
try {
|
|
41
|
+
const config = await loadConfig(resolvedPath);
|
|
42
|
+
if (config) {
|
|
43
|
+
return config;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
console.warn(`Failed to load config from ${resolvedPath}:`, error);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
console.warn(`Config file not found: ${resolvedPath}`);
|
|
52
|
+
// Try to find the file in common monorepo locations
|
|
53
|
+
const cwd = process.cwd();
|
|
54
|
+
const commonPaths = [
|
|
55
|
+
join(cwd, 'apps', 'backend', 'src', 'auth.ts'),
|
|
56
|
+
join(cwd, 'apps', 'backend', 'auth.ts'),
|
|
57
|
+
join(cwd, 'packages', 'backend', 'src', 'auth.ts'),
|
|
58
|
+
join(cwd, 'packages', 'backend', 'auth.ts'),
|
|
59
|
+
join(cwd, 'src', 'auth.ts'),
|
|
60
|
+
join(cwd, 'auth.ts')
|
|
61
|
+
];
|
|
62
|
+
for (const path of commonPaths) {
|
|
63
|
+
if (existsSync(path)) {
|
|
64
|
+
console.log(`Found config file at: ${path}`);
|
|
65
|
+
try {
|
|
66
|
+
const config = await loadConfig(path);
|
|
67
|
+
if (config) {
|
|
68
|
+
return config;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
console.warn(`Failed to load config from ${path}:`, error);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
21
79
|
const possibleConfigFiles = [
|
|
22
80
|
'studio-config.json',
|
|
23
81
|
'auth.ts',
|
|
@@ -112,41 +170,72 @@ async function loadTypeScriptConfig(configPath) {
|
|
|
112
170
|
}
|
|
113
171
|
}
|
|
114
172
|
}
|
|
115
|
-
const jiti = createJiti(import.meta.url, {
|
|
116
|
-
debug: true,
|
|
117
|
-
fsCache: true,
|
|
118
|
-
moduleCache: true,
|
|
119
|
-
interopDefault: true,
|
|
120
|
-
alias: aliases
|
|
121
|
-
});
|
|
122
|
-
let authModule;
|
|
123
173
|
try {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
174
|
+
let importPath = configPath;
|
|
175
|
+
if (!configPath.startsWith('/')) {
|
|
176
|
+
importPath = join(process.cwd(), configPath);
|
|
177
|
+
}
|
|
178
|
+
console.log({ importPath });
|
|
179
|
+
const jitiInstance = createJiti(importPath, {
|
|
180
|
+
debug: true,
|
|
181
|
+
fsCache: true,
|
|
182
|
+
moduleCache: true,
|
|
183
|
+
interopDefault: true
|
|
184
|
+
});
|
|
185
|
+
console.log({ jitiInstance });
|
|
186
|
+
const authModule = await jitiInstance.import(importPath);
|
|
187
|
+
console.log({ authModule });
|
|
188
|
+
const auth = authModule.auth || authModule.default || authModule;
|
|
189
|
+
if (auth && typeof auth === 'object') {
|
|
190
|
+
try {
|
|
191
|
+
if (auth.$context) {
|
|
192
|
+
const context = await auth.$context;
|
|
193
|
+
const adapter = context.adapter;
|
|
194
|
+
const config = {
|
|
195
|
+
database: {
|
|
196
|
+
type: 'drizzle',
|
|
197
|
+
adapter: 'drizzle-adapter'
|
|
198
|
+
},
|
|
199
|
+
emailAndPassword: {
|
|
200
|
+
enabled: true
|
|
201
|
+
},
|
|
202
|
+
trustedOrigins: ['http://localhost:3000'],
|
|
203
|
+
advanced: {
|
|
204
|
+
defaultCookieAttributes: {
|
|
205
|
+
sameSite: 'none',
|
|
206
|
+
secure: true,
|
|
207
|
+
httpOnly: true
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
};
|
|
211
|
+
return config;
|
|
132
212
|
}
|
|
133
213
|
}
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
if (authModule.auth) {
|
|
137
|
-
const config = authModule.auth.options || authModule.auth;
|
|
138
|
-
if (config._content) {
|
|
139
|
-
return extractBetterAuthConfig(config._content);
|
|
214
|
+
catch (contextError) {
|
|
215
|
+
}
|
|
140
216
|
}
|
|
141
|
-
return extractBetterAuthFields(config);
|
|
142
217
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
if (config._content) {
|
|
146
|
-
return extractBetterAuthConfig(config._content);
|
|
147
|
-
}
|
|
148
|
-
return extractBetterAuthFields(config);
|
|
218
|
+
catch (importError) {
|
|
219
|
+
console.warn(`Failed to import auth config from ${configPath}:`, importError.message);
|
|
149
220
|
}
|
|
221
|
+
const config = {
|
|
222
|
+
database: {
|
|
223
|
+
type: 'drizzle',
|
|
224
|
+
adapter: 'drizzle-adapter'
|
|
225
|
+
},
|
|
226
|
+
emailAndPassword: {
|
|
227
|
+
enabled: true
|
|
228
|
+
},
|
|
229
|
+
trustedOrigins: ['http://localhost:3000'],
|
|
230
|
+
advanced: {
|
|
231
|
+
defaultCookieAttributes: {
|
|
232
|
+
sameSite: 'none',
|
|
233
|
+
secure: true,
|
|
234
|
+
httpOnly: true
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
};
|
|
238
|
+
return config;
|
|
150
239
|
}
|
|
151
240
|
catch (importError) {
|
|
152
241
|
console.warn(`Failed to import auth config from ${configPath}:`, importError.message);
|