Skip to content

fixed issue 1 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: canary
Choose a base branch
from
Open

fixed issue 1 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions apps/dokploy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"start": "node -r dotenv/config dist/server.mjs",
"build-server": "tsx esbuild.config.ts",
"build-next": "next build",
"setup": "tsx -r dotenv/config setup.ts && sleep 5 && pnpm run migration:run",
"setup": "tsx -r dotenv/config setup.ts && pnpm run migration:run",
"reset-password": "node -r dotenv/config dist/reset-password.mjs",
"dev": "tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ",
"dev-turbopack": "TURBOPACK=1 tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json",
Expand Down Expand Up @@ -91,7 +91,7 @@
"@xterm/xterm": "^5.4.0",
"adm-zip": "^0.5.14",
"ai": "^4.0.23",
"bcrypt": "5.1.1",
"bcryptjs": "^2.4.3",
"better-auth": "v1.2.8-beta.7",
"bl": "6.0.11",
"boxen": "^7.1.1",
Expand Down Expand Up @@ -157,7 +157,7 @@
},
"devDependencies": {
"@types/adm-zip": "^0.5.5",
"@types/bcrypt": "5.0.2",
"@types/bcryptjs": "^2.4.6",
"@types/js-cookie": "^3.0.6",
"@types/js-yaml": "4.0.9",
"@types/lodash": "4.17.4",
Expand Down
16 changes: 14 additions & 2 deletions apps/dokploy/server/api/routers/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,15 @@ export const serverRouter = createTRPCRouter({
message: "You cannot create more servers",
});
}

const sanitizedInput = {
...input,
ipAddress: input.ipAddress.trim(),

};
console.log(sanitizedInput);
const project = await createServer(
input,
sanitizedInput,
ctx.session.activeOrganizationId,
);
return project;
Expand Down Expand Up @@ -367,8 +374,13 @@ export const serverRouter = createTRPCRouter({
message: "Server is inactive",
});
}
const currentServer = await updateServerById(input.serverId, {
const sanitizedInput = {
...input,
ipAddress: input.ipAddress.trim()

};
const currentServer = await updateServerById(input.serverId, {
...sanitizedInput,
});

return currentServer;
Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/server/api/routers/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
member,
} from "@dokploy/server/db/schema";
import { TRPCError } from "@trpc/server";
import * as bcrypt from "bcrypt";
import * as bcrypt from "bcryptjs";
import { and, asc, eq, gt } from "drizzle-orm";
import { z } from "zod";
import {
Expand Down
4 changes: 2 additions & 2 deletions packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@trpc/server": "^10.43.6",
"adm-zip": "^0.5.14",
"ai": "^4.0.23",
"bcrypt": "5.1.1",
"bcryptjs": "^2.4.3",
"better-auth": "v1.2.8-beta.7",
"bl": "6.0.11",
"boxen": "^7.1.1",
Expand Down Expand Up @@ -83,7 +83,7 @@
},
"devDependencies": {
"@types/adm-zip": "^0.5.5",
"@types/bcrypt": "5.0.2",
"@types/bcryptjs": "^2.4.6",
"@types/dockerode": "3.3.23",
"@types/js-yaml": "4.0.9",
"@types/lodash": "4.17.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/auth/random-password.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import bcrypt from "bcrypt";
import bcrypt from "bcryptjs";

export const generateRandomPassword = async () => {
const passwordLength = 16;
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/lib/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IncomingMessage } from "node:http";
import * as bcrypt from "bcrypt";
import * as bcrypt from "bcryptjs";
import { betterAuth } from "better-auth";
import { drizzleAdapter } from "better-auth/adapters/drizzle";
import { APIError } from "better-auth/api";
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/utils/traefik/security.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Security } from "@dokploy/server/services/security";
import * as bcrypt from "bcrypt";
import * as bcrypt from "bcryptjs";
import type { ApplicationNested } from "../builders";
import {
loadOrCreateConfig,
Expand Down
Loading