@@ -4,7 +4,7 @@ import { sso } from "@better-auth/sso";
44import * as bcrypt from "bcrypt" ;
55import { betterAuth } from "better-auth" ;
66import { drizzleAdapter } from "better-auth/adapters/drizzle" ;
7- import { APIError } from "better-auth/api" ;
7+ import { APIError , createAuthMiddleware } from "better-auth/api" ;
88import { admin , organization , twoFactor } from "better-auth/plugins" ;
99import { and , desc , eq } from "drizzle-orm" ;
1010import { IS_CLOUD } from "../constants" ;
@@ -29,6 +29,37 @@ import { getPublicIpWithFallback } from "../wss/utils";
2929import { ac , adminRole , memberRole , ownerRole } from "./access-control" ;
3030import { betterAuthSecret } from "./auth-secret" ;
3131
32+ const resolveTrustedOrigins = async ( ) => {
33+ try {
34+ if ( IS_CLOUD ) {
35+ return await getTrustedOrigins ( ) ;
36+ }
37+ const [ trustedOrigins , settings ] = await Promise . all ( [
38+ getTrustedOrigins ( ) ,
39+ getWebServerSettings ( ) ,
40+ ] ) ;
41+
42+ if ( ! settings ) return [ ] ;
43+
44+ const devOrigins =
45+ process . env . NODE_ENV === "development"
46+ ? [
47+ "http://localhost:3000" ,
48+ "https://absolutely-handy-falcon.ngrok-free.app" ,
49+ ]
50+ : [ ] ;
51+ return [
52+ ...( settings ?. serverIp ? [ `http://${ settings ?. serverIp } :3000` ] : [ ] ) ,
53+ ...( settings ?. host ? [ `https://${ settings ?. host } ` ] : [ ] ) ,
54+ ...devOrigins ,
55+ ...trustedOrigins ,
56+ ] ;
57+ } catch ( error ) {
58+ console . error ( "Failed to resolve trusted origins:" , error ) ;
59+ return [ ] ;
60+ }
61+ } ;
62+
3263const { handler, api } = betterAuth ( {
3364 database : drizzleAdapter ( db , {
3465 provider : "pg" ,
@@ -80,33 +111,14 @@ const { handler, api } = betterAuth({
80111 logger : {
81112 disabled : process . env . NODE_ENV === "production" ,
82113 } ,
83- async trustedOrigins ( ) {
84- try {
85- if ( IS_CLOUD ) {
86- return await getTrustedOrigins ( ) ;
87- }
88- const [ trustedOrigins , settings ] = await Promise . all ( [
89- getTrustedOrigins ( ) ,
90- getWebServerSettings ( ) ,
91- ] ) ;
92- if ( ! settings ) return [ ] ;
93- const devOrigins =
94- process . env . NODE_ENV === "development"
95- ? [
96- "http://localhost:3000" ,
97- "https://absolutely-handy-falcon.ngrok-free.app" ,
98- ]
99- : [ ] ;
100- return [
101- ...( settings ?. serverIp ? [ `http://${ settings ?. serverIp } :3000` ] : [ ] ) ,
102- ...( settings ?. host ? [ `https://${ settings ?. host } ` ] : [ ] ) ,
103- ...devOrigins ,
104- ...trustedOrigins ,
105- ] ;
106- } catch ( error ) {
107- console . error ( "Failed to resolve trusted origins:" , error ) ;
108- return [ ] ;
109- }
114+ trustedOrigins : resolveTrustedOrigins ,
115+ hooks : {
116+ before : createAuthMiddleware ( async ( ctx ) => {
117+ ctx . context . trustedOrigins = [
118+ ...( ctx . context . baseURL ? [ new URL ( ctx . context . baseURL ) . origin ] : [ ] ) ,
119+ ...( await resolveTrustedOrigins ( ) ) ,
120+ ] . filter ( Boolean ) ;
121+ } ) ,
110122 } ,
111123 emailVerification : {
112124 sendOnSignUp : true ,
0 commit comments