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

fix(last-login-method): custom resolver method default logic (#4821)

Browse Source
This commit is contained in:
Thibaut Cuchet
2025-10-02 17:42:12 +02:00
committed by Alex Yang
parent 45cd331156
commit 2616e9878d
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/content/docs/plugins/last-login-method.mdx
View File

@@ -344,7 +344,7 @@ export const auth = betterAuth({
}
// Track magic link authentication
if (ctx.path === "/verify-magic-link") {
if (ctx.path === "/magic-link/verify") {
return "magic-link"
}

23
packages/better-auth/src/plugins/last-login-method/index.ts
View File

@@ -49,15 +49,17 @@ export const lastLoginMethod = <O extends LastLoginMethodOptions>(
"/sign-in/email",
"/sign-up/email",
];
const defaultResolveMethod = (ctx: GenericEndpointContext) => {
if (paths.includes(ctx.path)) {
return ctx.params?.id ? ctx.params.id : ctx.path.split("/").pop();
}
return null;
};
const config = {
cookieName: "better-auth.last_used_login_method",
maxAge: 60 * 60 * 24 * 30,
customResolveMethod: (ctx) => {
if (paths.includes(ctx.path)) {
return ctx.params?.id ? ctx.params.id : ctx.path.split("/").pop();
}
return null;
},
...userConfig,
} satisfies LastLoginMethodOptions;
@@ -73,7 +75,8 @@ export const lastLoginMethod = <O extends LastLoginMethodOptions>(
if (!config.storeInDatabase) return;
if (!context) return;
const lastUsedLoginMethod =
config.customResolveMethod(context);
config.customResolveMethod?.(context) ??
defaultResolveMethod(context);
if (lastUsedLoginMethod) {
return {
data: {
@@ -91,7 +94,8 @@ export const lastLoginMethod = <O extends LastLoginMethodOptions>(
if (!config.storeInDatabase) return;
if (!context) return;
const lastUsedLoginMethod =
config.customResolveMethod(context);
config.customResolveMethod?.(context) ??
defaultResolveMethod(context);
if (lastUsedLoginMethod && session?.userId) {
try {
await ctx.internalAdapter.updateUser(session.userId, {
@@ -118,7 +122,8 @@ export const lastLoginMethod = <O extends LastLoginMethodOptions>(
return true;
},
handler: createAuthMiddleware(async (ctx) => {
const lastUsedLoginMethod = config.customResolveMethod(ctx);
const lastUsedLoginMethod =
config.customResolveMethod?.(ctx) ?? defaultResolveMethod(ctx);
if (lastUsedLoginMethod) {
const setCookie = ctx.context.responseHeaders?.get("set-cookie");
const sessionTokenName =