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

[PR #9206] [MERGED] chore: sync main to next #25402

New Issue
Closed
opened 2026-04-15 22:52:16 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-15 22:52:16 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/better-auth/better-auth/pull/9206
Author: @gustavovalverde
Created: 4/15/2026
Status: ✅ Merged
Merged: 4/15/2026
Merged by: @gustavovalverde

Base: next ← Head: chore/sync-main-to-next

📝 Commits (9)

  • dd6528f docs(guides): move dynamic base url from concepts to guides and options (#9145)
  • acbd6ef fix: honor forceAllowId UUIDs on postgres adapters (#9068)
  • 7be52d9 docs: add docs email normalization on sentinel (#9188)
  • a0caa1f docs(device-authorization): fix approval page query param (#9197)
  • 9aed910 fix(two-factor): revert enforcement broadening from #9122 (#9205)
  • ba03fb5 chore(deps): bump electron and next devDependencies to patched versions (#9166)
  • 39d6af2 chore(adapters): require patched drizzle-orm and kysely peer versions (#9165)
  • 9ec849f chore: release v1.6.4 (#9175)
  • 225976c chore: main to next conflict resolution

📊 Changes

40 files changed (+557 additions, -576 deletions)

View changed files

➕ .changeset/fix-revert-2fa-broadening.md (+9 -0)
➕ .changeset/force-allow-id-uuid.md (+5 -0)
➕ .changeset/tighten-adapter-peerdeps.md (+9 -0)
📝 docs/components/sidebar-content.tsx (+6 -6)
📝 docs/content/blogs/1-5.mdx (+1 -1)
➖ docs/content/docs/concepts/dynamic-base-url.mdx (+0 -261)
➕ docs/content/docs/guides/dynamic-base-url.mdx (+155 -0)
📝 docs/content/docs/infrastructure/plugins/sentinel.mdx (+21 -0)
📝 docs/content/docs/plugins/device-authorization.mdx (+1 -1)
📝 docs/content/docs/reference/options.mdx (+38 -1)
📝 e2e/adapter/test/adapter-factory/adapter-factory.test.ts (+35 -0)
📝 packages/api-key/CHANGELOG.md (+8 -0)
📝 packages/better-auth/CHANGELOG.md (+25 -0)
📝 packages/better-auth/package.json (+2 -2)
📝 packages/better-auth/src/db/db.test.ts (+51 -0)
📝 packages/better-auth/src/plugins/two-factor/index.ts (+3 -8)
📝 packages/better-auth/src/plugins/two-factor/two-factor.test.ts (+20 -15)
📝 packages/cli/CHANGELOG.md (+9 -0)
📝 packages/core/CHANGELOG.md (+2 -0)
📝 packages/core/src/db/adapter/get-id-field.ts (+2 -2)

...and 20 more files

📄 Description

Summary

  • resolve the conflicting main -> next sync from #9173 on a dedicated chore/sync-main-to-next branch
  • keep next package versions at 1.7.0-beta.1 while preserving the stable branch fixes, peer range updates, and docs changes from main
  • keep both changelog streams by inserting the new 1.6.4 sections below the 1.7.0-beta.* entries and regenerate pnpm-lock.yaml

Validation

  • pnpm exec vitest run packages/better-auth/src/plugins/two-factor/two-factor.test.ts packages/better-auth/src/db/db.test.ts e2e/adapter/test/adapter-factory/adapter-factory.test.ts

Merge Notes

  • merge with Create a merge commit to preserve the sync merge structure

Summary by cubic

Syncs main into next after v1.6.4. Keeps next at 1.7.0-beta.1 and pulls in stable fixes, tightened adapter peers, and docs updates (Dynamic Base URL moved to Guides with options reference updates, Sentinel email normalization, device authorization param fix); preserves both changelog streams and updates pnpm-lock.yaml.

  • Bug Fixes

    • Revert 2FA enforcement broadening: challenge only on /sign-in/email, /sign-in/username, and /sign-in/phone-number; non-credential flows are not gated.
    • Honor forceAllowId for UUIDs on PostgreSQL when advanced.database.generateId is "uuid".

  • Dependencies

    • Tighten peers: @better-auth/drizzle-adapter → drizzle-orm ^0.45.2; @better-auth/kysely-adapter → kysely ^0.28.14.
    • Bump dev deps: next ^16.2.3, electron ^38.8.6.

Written for commit 225976c7d2. Summary will update on new commits.

🔄 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/9206 **Author:** [@gustavovalverde](https://github.com/gustavovalverde) **Created:** 4/15/2026 **Status:** ✅ Merged **Merged:** 4/15/2026 **Merged by:** [@gustavovalverde](https://github.com/gustavovalverde) **Base:** `next` ← **Head:** `chore/sync-main-to-next` --- ### 📝 Commits (9) - [`dd6528f`](https://github.com/better-auth/better-auth/commit/dd6528f45b5593f77ee3503abd760beb5605e651) docs(guides): move dynamic base url from concepts to guides and options (#9145) - [`acbd6ef`](https://github.com/better-auth/better-auth/commit/acbd6ef69f88ea54174446ac0465a426bad7ca09) fix: honor forceAllowId UUIDs on postgres adapters (#9068) - [`7be52d9`](https://github.com/better-auth/better-auth/commit/7be52d9403407378b9c2434d9f7419b51495b308) docs: add docs email normalization on sentinel (#9188) - [`a0caa1f`](https://github.com/better-auth/better-auth/commit/a0caa1f6f8b2b9028b2917c8515280426ed2dbe4) docs(device-authorization): fix approval page query param (#9197) - [`9aed910`](https://github.com/better-auth/better-auth/commit/9aed910499eb4cbc3dd0c395ff5534893daab7a4) fix(two-factor): revert enforcement broadening from #9122 (#9205) - [`ba03fb5`](https://github.com/better-auth/better-auth/commit/ba03fb59f4d1ce4309ddf5fa315d4b2d82951990) chore(deps): bump electron and next devDependencies to patched versions (#9166) - [`39d6af2`](https://github.com/better-auth/better-auth/commit/39d6af2a392dc41018a036d1d909dc48c09749c9) chore(adapters): require patched drizzle-orm and kysely peer versions (#9165) - [`9ec849f`](https://github.com/better-auth/better-auth/commit/9ec849ff7147f672a2759515e2aae8af7736962c) chore: release v1.6.4 (#9175) - [`225976c`](https://github.com/better-auth/better-auth/commit/225976c7d2a875f1e903145579876f5dfd225393) chore: main to next conflict resolution ### 📊 Changes **40 files changed** (+557 additions, -576 deletions) <details> <summary>View changed files</summary> ➕ `.changeset/fix-revert-2fa-broadening.md` (+9 -0) ➕ `.changeset/force-allow-id-uuid.md` (+5 -0) ➕ `.changeset/tighten-adapter-peerdeps.md` (+9 -0) 📝 `docs/components/sidebar-content.tsx` (+6 -6) 📝 `docs/content/blogs/1-5.mdx` (+1 -1) ➖ `docs/content/docs/concepts/dynamic-base-url.mdx` (+0 -261) ➕ `docs/content/docs/guides/dynamic-base-url.mdx` (+155 -0) 📝 `docs/content/docs/infrastructure/plugins/sentinel.mdx` (+21 -0) 📝 `docs/content/docs/plugins/device-authorization.mdx` (+1 -1) 📝 `docs/content/docs/reference/options.mdx` (+38 -1) 📝 `e2e/adapter/test/adapter-factory/adapter-factory.test.ts` (+35 -0) 📝 `packages/api-key/CHANGELOG.md` (+8 -0) 📝 `packages/better-auth/CHANGELOG.md` (+25 -0) 📝 `packages/better-auth/package.json` (+2 -2) 📝 `packages/better-auth/src/db/db.test.ts` (+51 -0) 📝 `packages/better-auth/src/plugins/two-factor/index.ts` (+3 -8) 📝 `packages/better-auth/src/plugins/two-factor/two-factor.test.ts` (+20 -15) 📝 `packages/cli/CHANGELOG.md` (+9 -0) 📝 `packages/core/CHANGELOG.md` (+2 -0) 📝 `packages/core/src/db/adapter/get-id-field.ts` (+2 -2) _...and 20 more files_ </details> ### 📄 Description ## Summary - resolve the conflicting `main -> next` sync from #9173 on a dedicated `chore/sync-main-to-next` branch - keep `next` package versions at `1.7.0-beta.1` while preserving the stable branch fixes, peer range updates, and docs changes from `main` - keep both changelog streams by inserting the new `1.6.4` sections below the `1.7.0-beta.*` entries and regenerate `pnpm-lock.yaml` ## Validation - `pnpm exec vitest run packages/better-auth/src/plugins/two-factor/two-factor.test.ts packages/better-auth/src/db/db.test.ts e2e/adapter/test/adapter-factory/adapter-factory.test.ts` ## Merge Notes - merge with **Create a merge commit** to preserve the sync merge structure <!-- This is an auto-generated description by cubic. --> --- ## Summary by cubic Syncs `main` into `next` after v1.6.4. Keeps `next` at 1.7.0-beta.1 and pulls in stable fixes, tightened adapter peers, and docs updates (Dynamic Base URL moved to Guides with options reference updates, Sentinel email normalization, device authorization param fix); preserves both changelog streams and updates `pnpm-lock.yaml`. - **Bug Fixes** - Revert 2FA enforcement broadening: challenge only on `/sign-in/email`, `/sign-in/username`, and `/sign-in/phone-number`; non-credential flows are not gated. - Honor `forceAllowId` for UUIDs on PostgreSQL when `advanced.database.generateId` is `"uuid"`. - **Dependencies** - Tighten peers: `@better-auth/drizzle-adapter` → `drizzle-orm` `^0.45.2`; `@better-auth/kysely-adapter` → `kysely` `^0.28.14`. - Bump dev deps: `next` `^16.2.3`, `electron` `^38.8.6`. <sup>Written for commit 225976c7d2a875f1e903145579876f5dfd225393. Summary will update on new commits.</sup> <!-- 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-15 22:52:16 -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#25402
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?