github-starred/better-auth
2
0
Fork 0
mirror of https://github.com/better-auth/better-auth.git synced 2026-05-23 15:42:09 -05:00
Code Issues 2.5k Packages Projects Releases 112 Wiki Activity

[PR #4821] [MERGED] fix(last-login-method): custom resolver method default logic #13842

New Issue
Closed
opened 2026-04-13 09:10:35 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-13 09:10:35 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/better-auth/better-auth/pull/4821
Author: @ThibautCuchet
Created: 9/22/2025
Status: ✅ Merged
Merged: 10/2/2025
Merged by: @himself65

Base: canary ← Head: fix/last-login-custom-resolver-method-default-logic

📝 Commits (2)

  • 2bcda4e fix(last-login): update magic link path to match the right route
  • 7c9426f refactor(last-login): fallback on defaultResolveMethod if customResolveMethod returns nullish value

📊 Changes

2 files changed (+15 additions, -10 deletions)

View changed files

📝 docs/content/docs/plugins/last-login-method.mdx (+1 -1)
📝 packages/better-auth/src/plugins/last-login-method/index.ts (+14 -9)

📄 Description

Fix: Fallback to default method resolution when customResolveMethod returns null

Problem

The lastLoginMethod plugin's customResolveMethod option was not properly falling back to the default resolution logic when it returned null or undefined. According to the documentation, when customResolveMethod returns null, it should "use the default resolution logic", but the implementation was not handling this case correctly.

Solution

  • Extracted default resolution logic: Moved the default method resolution logic into a separate defaultResolveMethod function
  • Added nullish coalescing: Updated all three places where customResolveMethod is called to use the nullish coalescing operator (??) to fallback to defaultResolveMethod when customResolveMethod returns null or undefined
  • Maintained backward compatibility: The change is fully backward compatible and doesn't affect existing functionality

Changes Made

  1. Extracted defaultResolveMethod function (lines 53-58):

    const defaultResolveMethod = (ctx: GenericEndpointContext) => {
  if (paths.includes(ctx.path)) {
    return ctx.params?.id ? ctx.params.id : ctx.path.split("/").pop();
  }
  return null;
};

  2. Updated database hooks (lines 78-79, 97-98):

    const lastUsedLoginMethod =
  config.customResolveMethod?.(context) ?? defaultResolveMethod(context);

  3. Updated middleware handler (lines 125-126):

    const lastUsedLoginMethod =
  config.customResolveMethod?.(ctx) ?? defaultResolveMethod(ctx);

Documentation Alignment

This change aligns the implementation with the documented behavior in docs/content/docs/plugins/last-login-method.mdx:

customResolveMethod: (ctx: GenericEndpointContext) => string | null

  • Custom function to determine the login method from the request context
  • Return null to use the default resolution logic

The documentation explicitly states that returning null should trigger the default resolution logic, which this fix now properly implements.

Testing

  • All existing tests continue to pass
  • The change is backward compatible
  • No breaking changes to the API
  • Maintains the same behavior for users who don't provide a customResolveMethod

Documentation Updates

Additionally, this PR includes a documentation fix for the magic link path in the examples:

  • Fixed magic link path: Updated the documentation example from /verify-magic-link to the correct path /magic-link/verify to match the actual Better Auth implementation

Files Changed

  • packages/better-auth/src/plugins/last-login-method/index.ts
  • docs/content/docs/plugins/last-login-method.mdx

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

Summary by cubic

Fixes lastLoginMethod to correctly fall back to the default logic when customResolveMethod returns null or undefined. Also corrects the magic link docs path; no breaking changes.

  • Bug Fixes
    • Extracted defaultResolveMethod and used nullish coalescing to fall back in hooks and middleware.
    • Applied the fallback across all call sites (database hooks and middleware).
    • Updated docs example path from /verify-magic-link to /magic-link/verify.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/better-auth/better-auth/pull/4821 **Author:** [@ThibautCuchet](https://github.com/ThibautCuchet) **Created:** 9/22/2025 **Status:** ✅ Merged **Merged:** 10/2/2025 **Merged by:** [@himself65](https://github.com/himself65) **Base:** `canary` ← **Head:** `fix/last-login-custom-resolver-method-default-logic` --- ### 📝 Commits (2) - [`2bcda4e`](https://github.com/better-auth/better-auth/commit/2bcda4efdda747821fa00201152b66ea15fa1384) fix(last-login): update magic link path to match the right route - [`7c9426f`](https://github.com/better-auth/better-auth/commit/7c9426f98b2f9fef646c08ff71f3cdf311e23834) refactor(last-login): fallback on defaultResolveMethod if customResolveMethod returns nullish value ### 📊 Changes **2 files changed** (+15 additions, -10 deletions) <details> <summary>View changed files</summary> 📝 `docs/content/docs/plugins/last-login-method.mdx` (+1 -1) 📝 `packages/better-auth/src/plugins/last-login-method/index.ts` (+14 -9) </details> ### 📄 Description # Fix: Fallback to default method resolution when customResolveMethod returns null ## Problem The `lastLoginMethod` plugin's `customResolveMethod` option was not properly falling back to the default resolution logic when it returned `null` or `undefined`. According to the documentation, when `customResolveMethod` returns `null`, it should "use the default resolution logic", but the implementation was not handling this case correctly. ## Solution - **Extracted default resolution logic**: Moved the default method resolution logic into a separate `defaultResolveMethod` function - **Added nullish coalescing**: Updated all three places where `customResolveMethod` is called to use the nullish coalescing operator (`??`) to fallback to `defaultResolveMethod` when `customResolveMethod` returns `null` or `undefined` - **Maintained backward compatibility**: The change is fully backward compatible and doesn't affect existing functionality ## Changes Made 1. **Extracted `defaultResolveMethod` function** (lines 53-58): ```typescript const defaultResolveMethod = (ctx: GenericEndpointContext) => { if (paths.includes(ctx.path)) { return ctx.params?.id ? ctx.params.id : ctx.path.split("/").pop(); } return null; }; ``` 2. **Updated database hooks** (lines 78-79, 97-98): ```typescript const lastUsedLoginMethod = config.customResolveMethod?.(context) ?? defaultResolveMethod(context); ``` 3. **Updated middleware handler** (lines 125-126): ```typescript const lastUsedLoginMethod = config.customResolveMethod?.(ctx) ?? defaultResolveMethod(ctx); ``` ## Documentation Alignment This change aligns the implementation with the documented behavior in `docs/content/docs/plugins/last-login-method.mdx`: > **customResolveMethod**: `(ctx: GenericEndpointContext) => string | null` > > - Custom function to determine the login method from the request context > - Return `null` to use the default resolution logic The documentation explicitly states that returning `null` should trigger the default resolution logic, which this fix now properly implements. ## Testing - All existing tests continue to pass - The change is backward compatible - No breaking changes to the API - Maintains the same behavior for users who don't provide a `customResolveMethod` ## Documentation Updates Additionally, this PR includes a documentation fix for the magic link path in the examples: - **Fixed magic link path**: Updated the documentation example from `/verify-magic-link` to the correct path `/magic-link/verify` to match the actual Better Auth implementation ## Files Changed - `packages/better-auth/src/plugins/last-login-method/index.ts` - `docs/content/docs/plugins/last-login-method.mdx` ## Type of Change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [x] Documentation update <!-- This is an auto-generated description by cubic. --> --- ## Summary by cubic Fixes lastLoginMethod to correctly fall back to the default logic when customResolveMethod returns null or undefined. Also corrects the magic link docs path; no breaking changes. - **Bug Fixes** - Extracted defaultResolveMethod and used nullish coalescing to fall back in hooks and middleware. - Applied the fallback across all call sites (database hooks and middleware). - Updated docs example path from /verify-magic-link to /magic-link/verify. <!-- End of auto-generated description by cubic. --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-13 09:10:35 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
adapter
astro
awaiting external contributor
blocked
breaking
breaking change
bug
c-devops
core
credentials
database
dependencies
devops
devtools
docs
documentation
duplicate
elysia
enhancement
enterprise
expo
express
fastify
good first issue
help wanted
hono
identity
infra
integration
invalid
javascript
locked
maintenance
need-more-information
needs: info
needs: repro
nextjs
nuxt
oauth
organization
P0
payments
perf
platform
plugin
pull-request
Mirrored from GitHub Pull Request
 question
ready
regression
remix
security
social-provider
solid
stale
svelte
tanstack-start
tracking
version-bump
vue
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/better-auth#13842
Delete Branch "%!s()"

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?