Skip to content

Commit e9f2c2e

Browse files
committed
fix signup/login
1 parent 2106bda commit e9f2c2e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

apps/web/src/server/clients.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export const getStorageDisk = (): StorageDisk => {
109109

110110
export const getBetterAuth = () => {
111111
if (!betterAuthInstance) {
112-
const { db } = getAdminPostgresClient()
112+
const adminClient = getAdminPostgresClient()
113113
const webUrl = Effect.runSync(parseEnv("LAT_WEB_URL", "string", "http://localhost:3000"))
114114
const betterAuthSecret = Effect.runSync(parseEnv("LAT_BETTER_AUTH_SECRET", "string"))
115115
const trustedOriginsEnv = Effect.runSync(parseEnvOptional("LAT_TRUSTED_ORIGINS", "string"))
@@ -124,7 +124,7 @@ export const getBetterAuth = () => {
124124
const sendEmailUseCase = sendEmail({ emailSender })
125125

126126
betterAuthInstance = createBetterAuth({
127-
db,
127+
client: adminClient,
128128
secret: betterAuthSecret,
129129
baseUrl: webUrl,
130130
basePath: "/api/auth",

packages/platform/auth-better/src/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { stripe } from "@better-auth/stripe"
22
import { MembershipRepository } from "@domain/organizations"
33
import { UserId, generateId } from "@domain/shared"
44
import { MembershipRepositoryLive, SqlClientLive } from "@platform/db-postgres"
5-
import { type PostgresClient, type PostgresDb, postgresSchema } from "@platform/db-postgres"
5+
import { type PostgresClient, postgresSchema } from "@platform/db-postgres"
66
import { parseEnv, parseEnvOptional } from "@platform/env"
77
import { betterAuth } from "better-auth"
88
import { drizzleAdapter } from "better-auth/adapters/drizzle"
@@ -26,7 +26,7 @@ import Stripe from "stripe"
2626
*/
2727

2828
export interface BetterAuthConfig {
29-
readonly db: PostgresDb
29+
readonly client: PostgresClient
3030
readonly baseUrl?: string
3131
readonly secret?: string
3232
readonly googleClientId?: string
@@ -102,12 +102,11 @@ export const createBetterAuth = (config: BetterAuthConfig) => {
102102
const activeOrganizationIdInSession = "activeOrganizationId" in session ? session.activeOrganizationId : null
103103
if (activeOrganizationIdInSession) return { user, session }
104104

105-
const mockClient = { db: config.db } as PostgresClient
106105
const memberships = await Effect.runPromise(
107106
Effect.gen(function* () {
108107
const repo = yield* MembershipRepository
109108
return yield* repo.findByUserId(UserId(user.id))
110-
}).pipe(Effect.provide(MembershipRepositoryLive), Effect.provide(SqlClientLive(mockClient))),
109+
}).pipe(Effect.provide(MembershipRepositoryLive), Effect.provide(SqlClientLive(config.client))),
111110
)
112111
const activeOrganizationId = memberships[0]?.organizationId
113112

@@ -177,7 +176,7 @@ export const createBetterAuth = (config: BetterAuthConfig) => {
177176
}
178177

179178
return betterAuth({
180-
database: drizzleAdapter(config.db, {
179+
database: drizzleAdapter(config.client.db, {
181180
provider: "pg",
182181
schema: {
183182
user: postgresSchema.user,
@@ -212,6 +211,7 @@ export const createBetterAuth = (config: BetterAuthConfig) => {
212211
},
213212
}),
214213
},
214+
// TODO: review
215215
// Email/password enabled for CLI authentication
216216
// Note: Email verification disabled for MVP - will be enabled in Phase 2
217217
emailAndPassword: {

0 commit comments

Comments
 (0)