Skip to content

Fix/login redirect #4607

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
Wormav wants to merge 2 commits into
base: canary
Choose a base branch
from
+11 −9
Open

Fix/login redirect #4607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92c45ce
fix(auth): resolve login redirect issue
Wormav Jun 9, 2026
4e6f626
style: apply biome formatting
Wormav Jun 9, 2026
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/__test__/git-provider/git-provider-access.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import {
canEditDeployGitSource,
getAccessibleGitProviderIds,
} from "@dokploy/server/services/git-provider";
import { beforeEach, describe, expect, it, vi } from "vitest";

const mockDb = vi.hoisted(() => ({
query: {
Expand Down
14 changes: 8 additions & 6 deletions apps/dokploy/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,12 @@ export default function Home({ IS_CLOUD, enforceSSO }: Props) {
"Your email is not verified. We've sent a new verification link to your email.";
toast.info(msg);
setError(msg);
setIsLoginLoading(false);
return;
}
toast.error(error.message);
setError(error.message || "An error occurred while logging in");
setIsLoginLoading(false);
return;
}

Expand All @@ -107,14 +109,14 @@ export default function Home({ IS_CLOUD, enforceSSO }: Props) {
setTwoFactorCode("");
setIsTwoFactor(true);
toast.info("Please enter your 2FA code");
setIsLoginLoading(false);
return;
}

toast.success("Logged in successfully");
router.push("/dashboard/home");
await router.push("/dashboard/home");
} catch {
toast.error("An error occurred while logging in");
} finally {
setIsLoginLoading(false);
}
};
Expand All @@ -134,14 +136,14 @@ export default function Home({ IS_CLOUD, enforceSSO }: Props) {
if (error) {
toast.error(error.message);
setError(error.message || "An error occurred while verifying 2FA code");
setIsTwoFactorLoading(false);
return;
}

toast.success("Logged in successfully");
router.push("/dashboard/home");
await router.push("/dashboard/home");
} catch {
toast.error("An error occurred while verifying 2FA code");
} finally {
setIsTwoFactorLoading(false);
}
};
Expand All @@ -164,14 +166,14 @@ export default function Home({ IS_CLOUD, enforceSSO }: Props) {
setError(
error.message || "An error occurred while verifying backup code",
);
setIsBackupCodeLoading(false);
return;
}

toast.success("Logged in successfully");
router.push("/dashboard/home");
await router.push("/dashboard/home");
} catch {
toast.error("An error occurred while verifying backup code");
} finally {
setIsBackupCodeLoading(false);
}
};
Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/pages/invitation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const Invitation = ({
});

toast.success("Account created successfully");
router.push("/dashboard/home");
await router.push("/dashboard/home");
} catch {
toast.error("An error occurred while creating your account");
}
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/utils/cluster/upload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { findAllDeploymentsByApplicationId } from "@dokploy/server/services/deployment";
import {
findRegistryByIdWithCredentials,
safeDockerLoginCommand,
type Registry,
safeDockerLoginCommand,
} from "@dokploy/server/services/registry";
import { createRollback } from "@dokploy/server/services/rollbacks";
import type { ApplicationNested } from "../builders";
Expand Down