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

fix(generic-oauth): emit duplicate id warning (#7779)

Browse Source 
(cherry picked from commit 9f40c35ee4)
(cherry picked from commit d69802ec6a7a1c1b38d946fd090c579cc1e8b203)
This commit is contained in:
Alex Yang
2026-02-18 22:31:37 +08:00
parent 327ee71411
commit c682ac8605
2 changed files with 186 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/better-auth/src/plugins/generic-oauth/generic-oauth.test.ts
+169 -1
View File
@@ -2,7 +2,7 @@ import type { GenericEndpointContext } from "@better-auth/core";
import { runWithEndpointContext } from "@better-auth/core/context";
import { betterFetch } from "@better-fetch/fetch";
import { OAuth2Server } from "oauth2-mock-server";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
import { createAuthClient } from "../../client";
import { parseSetCookieHeader } from "../../cookies";
import { getTestInstance } from "../../test-utils/test-instance";
@@ -1668,6 +1668,174 @@ describe("oauth2", async () => {
expect(session.data?.user.image).toBe(customUserInfo.avatar_url);
});
describe("Duplicate Provider ID Detection", () => {
it("should warn when duplicate provider IDs are detected", async () => {
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
await getTestInstance({
plugins: [
genericOAuth({
config: [
{
providerId: "duplicate-id",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-1",
clientSecret: "secret-1",
},
{
providerId: "duplicate-id",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-2",
clientSecret: "secret-2",
},
],
}),
],
});
expect(warnSpy).toHaveBeenCalledWith(
"Duplicate provider IDs found: duplicate-id",
);
warnSpy.mockRestore();
});
it("should warn about multiple duplicate provider IDs", async () => {
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
await getTestInstance({
plugins: [
genericOAuth({
config: [
{
providerId: "dup-1",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-1",
clientSecret: "secret-1",
},
{
providerId: "dup-1",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-2",
clientSecret: "secret-2",
},
{
providerId: "dup-2",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-3",
clientSecret: "secret-3",
},
{
providerId: "dup-2",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-4",
clientSecret: "secret-4",
},
],
}),
],
});
expect(warnSpy).toHaveBeenCalledWith(
expect.stringContaining("Duplicate provider IDs found:"),
);
const warningMessage = warnSpy.mock.calls[0]?.[0] as string;
expect(warningMessage).toContain("dup-1");
expect(warningMessage).toContain("dup-2");
warnSpy.mockRestore();
});
it("should not warn when all provider IDs are unique", async () => {
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
await getTestInstance({
plugins: [
genericOAuth({
config: [
{
providerId: "unique-1",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-1",
clientSecret: "secret-1",
},
{
providerId: "unique-2",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-2",
clientSecret: "secret-2",
},
],
}),
],
});
expect(warnSpy).not.toHaveBeenCalled();
warnSpy.mockRestore();
});
it("should not warn when only one provider is configured", async () => {
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
await getTestInstance({
plugins: [
genericOAuth({
config: [
{
providerId: "single-provider",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-1",
clientSecret: "secret-1",
},
],
}),
],
});
expect(warnSpy).not.toHaveBeenCalled();
warnSpy.mockRestore();
});
it("should warn when provider ID appears more than twice", async () => {
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
await getTestInstance({
plugins: [
genericOAuth({
config: [
{
providerId: "triple-dup",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-1",
clientSecret: "secret-1",
},
{
providerId: "triple-dup",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-2",
clientSecret: "secret-2",
},
{
providerId: "triple-dup",
discoveryUrl: `http://localhost:${port}/.well-known/openid-configuration`,
clientId: "client-3",
clientSecret: "secret-3",
},
],
}),
],
});
expect(warnSpy).toHaveBeenCalledWith(
"Duplicate provider IDs found: triple-dup",
);
warnSpy.mockRestore();
});
});
describe("RFC 9207 Issuer Validation", () => {
it("should allow callback when iss parameter matches configured issuer", async () => {
server.service.once("beforeUserinfo", (userInfoResponse) => {
packages/better-auth/src/plugins/generic-oauth/index.ts
+17
View File
@@ -45,6 +45,23 @@ export type BaseOAuthProviderOptions = Omit<
* A generic OAuth plugin that can be used to add OAuth support to any provider
*/
export const genericOAuth = (options: GenericOAuthOptions) => {
const seenIds = new Set<string>();
const nonUniqueIds = new Set<string>();
for (const config of options.config) {
const id = config.providerId;
if (seenIds.has(id)) {
nonUniqueIds.add(id);
}
seenIds.add(id);
}
if (nonUniqueIds.size > 0) {
console.warn(
`Duplicate provider IDs found: ${Array.from(nonUniqueIds).join(", ")}`,
);
}
return {
id: "generic-oauth",
init: (ctx: AuthContext) => {