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
2 changes: 1 addition & 1 deletion apps/dokploy/lib/auth-client.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ssoClient } from "@better-auth/sso/client";
import { apiKeyClient } from "@better-auth/api-key/client";
import {
adminClient,
apiKeyClient,
inferAdditionalFields,
organizationClient,
twoFactorClient,
Expand Down
5 changes: 3 additions & 2 deletions apps/dokploy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"@ai-sdk/mistral": "^3.0.20",
"@ai-sdk/openai": "^3.0.29",
"@ai-sdk/openai-compatible": "^2.0.30",
"@better-auth/sso": "1.5.0-beta.16",
"@better-auth/api-key": "1.5.4",
"@better-auth/sso": "1.5.4",
"@codemirror/autocomplete": "^6.18.6",
"@codemirror/lang-css": "^6.3.1",
"@codemirror/lang-json": "^6.0.1",
Expand Down Expand Up @@ -99,7 +100,7 @@
"ai": "^6.0.86",
"ai-sdk-ollama": "^3.7.0",
"bcrypt": "5.1.1",
"better-auth": "1.5.0-beta.16",
"better-auth": "1.5.4",
"bl": "6.0.11",
"boxen": "^7.1.1",
"bullmq": "5.67.3",
Expand Down
19 changes: 10 additions & 9 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,22 @@
"@ai-sdk/mistral": "^3.0.20",
"@ai-sdk/openai": "^3.0.29",
"@ai-sdk/openai-compatible": "^2.0.30",
"@better-auth/api-key": "1.5.4",
"@better-auth/sso": "1.5.4",
"@better-auth/utils": "0.3.1",
"@faker-js/faker": "^8.4.1",
"@octokit/auth-app": "^6.1.3",
"@octokit/rest": "^20.1.2",
"@oslojs/crypto": "1.0.1",
"@oslojs/encoding": "1.1.0",
"@react-email/components": "^0.0.21",
"@better-auth/sso": "1.5.0-beta.16",
"@trpc/server": "11.10.0",
"adm-zip": "^0.5.16",
"ai": "^6.0.86",
"ai-sdk-ollama": "^3.7.0",
"bcrypt": "5.1.1",
"better-auth": "1.5.0-beta.16",
"better-auth": "1.5.4",
"better-call": "2.0.2",
"bl": "6.0.11",
"boxen": "^7.1.1",
"date-fns": "3.6.0",
Expand All @@ -59,7 +61,6 @@
"drizzle-dbml-generator": "0.10.0",
"drizzle-orm": "0.45.1",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better-call major version bump may trigger peer dependency warnings

better-call is upgraded from 1.3.2 to 2.0.2 here, but both @better-auth/core@1.5.4 and @better-auth/sso@1.5.4 still declare an exact peer dependency on better-call: 1.3.2 in the lockfile:

'@better-auth/core@1.5.4':
  peerDependencies:
    better-call: 1.3.2   ← exact version, but 2.0.2 is installed

'@better-auth/sso@1.5.4':
  peerDependencies:
    better-call: 1.3.2   ← same

A major version bump (1.x → 2.x) normally signals breaking changes and falls outside semver compatibility. pnpm will likely emit peer dependency mismatch warnings on fresh installs (pnpm install), and CI environments with --strict-peer-dependencies will fail outright.

If the better-auth ecosystem intentionally moved to better-call@2.0.2 in v1.5.4, the peer dep declarations in the published packages appear to be stale/incorrect. It would be worth verifying against the official better-auth v1.5.4 release notes or issue tracker to confirm this upgrade is expected and that no peer-dep warnings are surfaced during install.

"drizzle-zod": "0.5.1",
"yaml": "2.8.1",
"lodash": "4.17.21",
"micromatch": "4.0.8",
"nanoid": "3.3.11",
Expand All @@ -76,19 +77,17 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"resend": "^6.0.2",
"semver": "7.7.3",
"shell-quote": "^1.8.1",
"slugify": "^1.6.6",
"ssh2": "1.15.0",
"toml": "3.0.0",
"ws": "8.16.0",
"zod": "^4.3.6",
"semver": "7.7.3",
"better-call": "1.3.2"
"yaml": "2.8.1",
"zod": "^4.3.6"
},
"devDependencies": {
"rimraf": "6.1.3",
"@better-auth/cli": "1.5.0-beta.13",
"@types/semver": "7.7.1",
"@better-auth/cli": "1.4.21",
"@types/adm-zip": "^0.5.7",
"@types/bcrypt": "5.0.2",
"@types/dockerode": "3.3.23",
Expand All @@ -100,13 +99,15 @@
"@types/qrcode": "^1.5.5",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
"@types/semver": "7.7.1",
"@types/shell-quote": "^1.7.5",
"@types/ssh2": "1.15.1",
"@types/ws": "8.5.10",
"drizzle-kit": "^0.31.4",
"esbuild": "0.20.2",
"esbuild-plugin-alias": "0.2.1",
"postcss": "^8.5.3",
"rimraf": "6.1.3",
"tailwindcss": "^3.4.17",
"tsc-alias": "1.8.10",
"tsx": "^4.16.2",
Expand Down
3 changes: 2 additions & 1 deletion packages/server/src/lib/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import * as bcrypt from "bcrypt";
import { betterAuth } from "better-auth";
import { drizzleAdapter } from "better-auth/adapters/drizzle";
import { APIError } from "better-auth/api";
import { admin, apiKey, organization, twoFactor } from "better-auth/plugins";
import { apiKey } from "@better-auth/api-key";
import { admin, organization, twoFactor } from "better-auth/plugins";
import { and, desc, eq } from "drizzle-orm";
import { BETTER_AUTH_SECRET, IS_CLOUD } from "../constants";
import { db } from "../db";
Expand Down
Loading