groombook/api
13
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(auth): add accountLinking trustedProviders for authentik (GRO-1509) #41

Closed
The Dogfather wants to merge 1 commits from flea-flicker/gro-1509-better-auth-account-not-linked into uat
pull from: flea-flicker/gro-1509-better-auth-account-not-linked
merge into: groombook:uat
Conversation 1 Commits 1 Files Changed 1
+4
The Dogfather commented 2026-05-21 22:22:28 +00:00
Member
Copy Link
Copy Source
No description provided.
The Dogfather added 1 commit 2026-05-21 22:22:29 +00:00
fix(auth): add accountLinking trustedProviders for authentik (GRO-1509) 10c33513eb 
Betters Auth v1.5.6 link-account.mjs:22 rejects OAuth callbacks when the
genericOAuth provider is not in trustedProviders AND email_verified is
falsy. Adding authentik to trustedProviders bypasses this guard so OIDC
login works for TF-created users whose emails were never verified through
an authentik flow.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
The Dogfather closed this pull request 2026-05-21 22:24:42 +00:00
The Dogfather commented 2026-05-21 22:27:29 +00:00
Author
Member
Copy Link
Copy Source

Summary

  • Adds accountLinking.enabled=true and accountLinking.trustedProviders=["authentik"] to the Better Auth account config in src/lib/auth.ts
  • Bypasses the guard in Better Auth v1.5.6 link-account.mjs:22 that rejects OAuth callbacks when the genericOAuth provider is not in trustedProviders AND email_verified is falsy
  • Root cause fix for ?error=account_not_linked on all OIDC logins on UAT

Test plan

  • OIDC login with uat-groomer via the SSO button on UAT does NOT show ?error=account_not_linked
  • After authentik callback, session is created and user lands on dashboard

cc @cpfarhood

## Summary - Adds `accountLinking.enabled=true` and `accountLinking.trustedProviders=["authentik"]` to the Better Auth `account` config in `src/lib/auth.ts` - Bypasses the guard in Better Auth v1.5.6 `link-account.mjs:22` that rejects OAuth callbacks when the genericOAuth provider is not in `trustedProviders` AND `email_verified` is falsy - Root cause fix for `?error=account_not_linked` on all OIDC logins on UAT ## Test plan - [ ] OIDC login with `uat-groomer` via the SSO button on UAT does NOT show `?error=account_not_linked` - [ ] After authentik callback, session is created and user lands on dashboard cc @cpfarhood

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something isn't working
 documentation
Improvements or additions to documentation
 duplicate
This issue or pull request already exists
 enhancement
New feature or request
 good first issue
Good for newcomers
 help wanted
Extra attention is needed
 invalid
This doesn't seem right
 question
Further information is requested
 wontfix
This will not be worked on
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ai-review (AI Review) gb_barkley (Barkley Trimsworth) cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) gb_flea (Flea Flicker) flux (Flux CD) admin (Gitea Admin) gb_lint (Lint Roller) renovate (Mend Renovate) gb_pawla (Pawla Abdul) gb_scrubs (Scrubs McBarkley) gb_shedward (Shedward Scissorhands) gb_dogfather (The Dogfather)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: groombook/api#41
Delete Branch "flea-flicker/gro-1509-better-auth-account-not-linked"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?