andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-10-18 11:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1499 from Dokploy/1455-invalid-origin-on-login

Browse Source 
chore: update better-auth package to version 1.2.4 and kysely to vers…
This commit is contained in:
Mauricio Siu
2025-03-15 14:46:28 -06:00
committed by GitHub
parent c3a5e2a8d6 6f7a5609a3
commit bbe7d5bdc5
5 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx
+4 -3
View File
@@ -64,12 +64,12 @@ export const Enable2FA = () => {
const handlePasswordSubmit = async (formData: PasswordForm) => {
setIsPasswordLoading(true);
try {
const { data: enableData } = await authClient.twoFactor.enable({
const { data: enableData, error } = await authClient.twoFactor.enable({
password: formData.password,
});
if (!enableData) {
throw new Error("No data received from server");
throw new Error(error?.message || "Error enabling 2FA");
}
if (enableData.backupCodes) {
@@ -95,7 +95,8 @@ export const Enable2FA = () => {
error instanceof Error ? error.message : "Error setting up 2FA",
);
passwordForm.setError("password", {
message: "Error verifying password",
message:
error instanceof Error ? error.message : "Error setting up 2FA",
});
} finally {
setIsPasswordLoading(false);
apps/dokploy/package.json
+1 -1
View File
@@ -93,7 +93,7 @@
"adm-zip": "^0.5.14",
"ai": "^4.0.23",
"bcrypt": "5.1.1",
"better-auth": "1.2.0",
"better-auth": "1.2.4",
"bl": "6.0.11",
"boxen": "^7.1.1",
"bullmq": "5.4.2",
packages/server/package.json
+1 -1
View File
@@ -40,7 +40,7 @@
"@oslojs/encoding":"1.1.0",
"@oslojs/crypto":"1.0.1",
"drizzle-dbml-generator":"0.10.0",
"better-auth":"1.2.0",
"better-auth":"1.2.4",
"@faker-js/faker": "^8.4.1",
"@lucia-auth/adapter-drizzle": "1.0.7",
"@octokit/auth-app": "^6.0.4",
packages/server/src/lib/auth.ts
+20
View File
@@ -28,6 +28,26 @@ const { handler, api } = betterAuth({
clientSecret: process.env.GOOGLE_CLIENT_SECRET as string,
},
},
...(!IS_CLOUD && {
async trustedOrigins() {
const admin = await db.query.member.findFirst({
where: eq(schema.member.role, "owner"),
with: {
user: true,
},
});
if (admin) {
return [
...(admin.user.serverIp
? [`http://${admin.user.serverIp}:3000`]
: []),
...(admin.user.host ? [`https://${admin.user.host}`] : []),
];
}
return [];
},
}),
emailVerification: {
sendOnSignUp: true,
autoSignInAfterVerification: true,
pnpm-lock.yaml
Generated
+23 -23
View File
@@ -269,8 +269,8 @@ importers:
specifier: 5.1.1
version: 5.1.1([email protected])
better-auth:
specifier: 1.2.0
version: 1.2.0([email protected])
specifier: 1.2.4
version: 1.2.4([email protected])
bl:
specifier: 6.0.11
version: 6.0.11
@@ -303,10 +303,10 @@ importers:
version: 16.4.5
drizzle-orm:
specifier: ^0.39.1
version: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected])
version: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected])
drizzle-zod:
specifier: 0.5.1
version: 0.5.1([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected]))([email protected])
version: 0.5.1([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected]))([email protected])
fancy-ansi:
specifier: ^0.1.3
version: 0.1.3
@@ -547,7 +547,7 @@ importers:
version: 16.4.5
drizzle-orm:
specifier: ^0.39.1
version: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected])
version: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected])
hono:
specifier: ^4.5.8
version: 4.5.8
@@ -646,8 +646,8 @@ importers:
specifier: 5.1.1
version: 5.1.1([email protected])
better-auth:
specifier: 1.2.0
version: 1.2.0([email protected])
specifier: 1.2.4
version: 1.2.4([email protected])
bl:
specifier: 6.0.11
version: 6.0.11
@@ -665,13 +665,13 @@ importers:
version: 16.4.5
drizzle-dbml-generator:
specifier: 0.10.0
version: 0.10.0([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected]))
version: 0.10.0([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected]))
drizzle-orm:
specifier: ^0.39.1
version: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected])
version: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected])
drizzle-zod:
specifier: 0.5.1
version: 0.5.1([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected]))([email protected])
version: 0.5.1([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected]))([email protected])
hi-base32:
specifier: ^0.5.1
version: 0.5.1
@@ -4030,8 +4030,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==}
[email protected].0:
resolution: {integrity: sha512-eIRGOXfix25bh4fgs8jslZAZssufpIkxfEeEokQu5G4wICoDee1wPctkFb8v80PvhtI4dPm28SuAoZaAdRc6Wg==}
[email protected].4:
resolution: {integrity: sha512-/ZK2jbUjm8JwdeCLFrUWUBmexPyI9PkaLVXWLWtN60sMDHTY8B5G72wcHglo1QMFBaw4G0qFkP5ayl9k6XfDaA==}
[email protected]:
resolution: {integrity: sha512-DUKImKoDIy5UtCvQbHTg0wuBRse6gu1Yvznn7+1B3I5TeY8sclRPFce0HI+4WF2bcb+9PqmkET8nXZubrHQh9A==}
@@ -5486,8 +5486,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
[email protected].5:
resolution: {integrity: sha512-s7hZHcQeSNKpzCkHRm8yA+0JPLjncSWnjb+2TIElwS2JAqYr+Kv3Ess+9KFfJS0C1xcQ1i9NkNHpWwCYpHMWsA==}
[email protected].6:
resolution: {integrity: sha512-FIyV/64EkKhJmjgC0g2hygpBv5RNWVPyNCqSAD7eTCv6eFWNIi4PN1UvdSJGicN/o35bnevgis4Y0UDC0qi8jQ==}
engines: {node: '>=14.0.0'}
[email protected]:
@@ -10902,7 +10902,7 @@ snapshots:
[email protected]: {}
[email protected].0([email protected]):
[email protected].4([email protected]):
dependencies:
'@better-auth/utils': 0.2.3
'@better-fetch/fetch': 1.1.15
@@ -10913,7 +10913,7 @@ snapshots:
better-call: 1.0.3
defu: 6.1.4
jose: 5.9.6
kysely: 0.27.5
kysely: 0.27.6
nanostores: 0.11.3
valibot: 1.0.0-beta.15([email protected])
zod: 3.24.1
@@ -11534,9 +11534,9 @@ snapshots:
[email protected]: {}
[email protected]([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected])):
[email protected]([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected])):
dependencies:
drizzle-orm: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected])
drizzle-orm: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected])
[email protected]:
dependencies:
@@ -11547,18 +11547,18 @@ snapshots:
transitivePeerDependencies:
- supports-color
[email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected]):
[email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected]):
optionalDependencies:
'@opentelemetry/api': 1.9.0
'@types/react': 18.3.5
kysely: 0.27.5
kysely: 0.27.6
postgres: 3.4.4
react: 18.2.0
sqlite3: 5.1.7
[email protected]([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected]))([email protected]):
[email protected]([email protected](@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected]))([email protected]):
dependencies:
drizzle-orm: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].5)([email protected])([email protected])([email protected])
drizzle-orm: 0.39.1(@opentelemetry/[email protected])(@types/[email protected])([email protected].6)([email protected])([email protected])([email protected])
zod: 3.23.8
[email protected]: {}
@@ -12450,7 +12450,7 @@ snapshots:
dependencies:
json-buffer: 3.0.1
[email protected].5: {}
[email protected].6: {}
[email protected]: {}