Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/curvy-flowers-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@svenvw/fdm-core": minor
---

Remove organization functions as better-auth can handle them now server-side as well
5 changes: 5 additions & 0 deletions .changeset/polite-otters-follow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@svenvw/fdm-core": patch
---

Fix type of FdmAuth by including plugins and other settings
5 changes: 5 additions & 0 deletions .changeset/twelve-chicken-poke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@svenvw/fdm-app": patch
---

Use Better-Auth functions for organizations instead of fdm-core functions
13 changes: 7 additions & 6 deletions fdm-app/app/lib/auth.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ if (serverConfig.mail) {
create: {
...auth.options.databaseHooks?.user?.create,
after: async (
user: ExtendedUser,
user: any,
context?: GenericEndpointContext,
) => {
if (originalUserCreateAfter) {
await originalUserCreateAfter(user, context)
await originalUserCreateAfter(user)
}
try {
const email = await renderWelcomeEmail(user)
Expand Down Expand Up @@ -75,10 +75,11 @@ export async function getSession(request: Request): Promise<FdmSession> {
}

// Determine userName
let displayUserName = user.displayUsername
if (!displayUserName) {
displayUserName = createDisplayUsername(user.firstname, user.surname)
}
const displayUserName =
user.displayUsername ||
createDisplayUsername(user.firstname, user.surname) ||
user.name ||
user.email

// Expand session
const sessionWithUserName = {
Expand Down
Loading