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
60 changes: 60 additions & 0 deletions __tests__/routes/betterAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,66 @@ describe('betterAuth routes', () => {
return before;
};

it('should reject GitHub OAuth sign-ups when email is not verified', async () => {
const before = await getBeforeHook();

await expect(
before(
{
email: 'unverified@github.example',
name: 'Unverified GitHub User',
emailVerified: false,
createdAt: new Date(),
updatedAt: new Date(),
},
{
request: new Request('http://localhost/auth/callback/github'),
body: {},
},
),
).rejects.toThrow('github_email_not_verified');
});

it('should allow GitHub OAuth sign-ups when email is verified', async () => {
const before = await getBeforeHook();

const result = await before(
{
email: 'verified@github.example',
name: 'Verified GitHub User',
emailVerified: true,
createdAt: new Date(),
updatedAt: new Date(),
},
{
request: new Request('http://localhost/auth/callback/github'),
body: {},
},
);

expect((result as { data: { id: string } }).data.id).toBeDefined();
});

it('should not reject email/password sign-ups when email is unverified', async () => {
const before = await getBeforeHook();

const result = await before(
{
email: 'pending@example.com',
name: 'Pending User',
emailVerified: false,
createdAt: new Date(),
updatedAt: new Date(),
},
{
request: new Request('http://localhost/auth/sign-up/email'),
body: {},
},
);

expect((result as { data: { id: string } }).data.id).toBeDefined();
});

it('should regenerate id when tracking cookie matches a deleted user', async () => {
const before = await getBeforeHook();
const deletedUserId = 'aBcDeFgHiJkLmNoPqRsTu';
Expand Down
13 changes: 13 additions & 0 deletions src/betterAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,19 @@ export const getBetterAuthOptions = (pool: Pool): BetterAuthOptions => {
user: {
create: {
before: async (user, ctx) => {
const hookCtx = ctx as BetterAuthDbHookContext;
const requestPath = hookCtx?.request?.url
? new URL(hookCtx.request.url).pathname
: '';
if (
requestPath.endsWith('/callback/github') &&
user.emailVerified === false
) {
const err = new Error('github_email_not_verified');
err.name = 'APIError';
throw err;
}

const resolved = await resolveSignUpUserId(pool, user, ctx);
resolved.data.id = await ensureNonDeletedUserId(
pool,
Expand Down