Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

Merge branch 'main' into oidc

tiran1332b942d292e8f
diff --cc apps/web/src/routes/auth/sign-in.tsx
index 5363b2c87,8906f352b..134226344
--- a/apps/web/src/routes/auth/sign-in.tsx
+++ b/apps/web/src/routes/auth/sign-in.tsx
@@@ -3,8 -3,8 +3,8 @@@ import
useNavigate,
useSearch,
} from "@tanstack/react-router";
- import { Github, KeyRound, UserCheck } from "lucide-react";
+ import { Github, KeyRound } from "lucide-react";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { z } from "zod/v4";
import PageTitle from "@/components/page-title";
@@@ -40,8 -40,6 +40,7 @@@ function SignIn()
const [isGithubLoading, setIsGithubLoading] = useState(false);
const [isGoogleLoading, setIsGoogleLoading] = useState(false);
const [isDiscordLoading, setIsDiscordLoading] = useState(false);
- const [isGuestLoading, setIsGuestLoading] = useState(false);
+ const [autoLoginFailed, setAutoLoginFailed] = useState(false);
const lastLoginMethod = authClient.getLastUsedLoginMethod();
const { data: config, isLoading: isConfigLoading } = useGetConfig();
const {
@@@ -92,27 -89,9 +91,9 @@@
return `${baseUrl}/invitation/accept/${invitationId}`;
}
return `${baseUrl}/dashboard`;
- };
+ }, [invitationId, getSafeRedirectPath]);
- const handleGuestAccess = async () => {
- setIsGuestLoading(true);
- try {
- const result = await authClient.signIn.anonymous();
- if (result.error) {
- throw new Error(result.error.message);
- }
- toast.success(t("auth:signIn.guestSuccess"));
- navigate({ to: "/dashboard" });
- } catch (error) {
- toast.error(
- error instanceof Error ? error.message : t("auth:signIn.guestError"),
- );
- } finally {
- setIsGuestLoading(false);
- }
- };
-
- const handleCustomOAuth = async () => {
+ const handleCustomOAuth = useCallback(async () => {
setIsCustomOAuthLoading(true);
try {
const result = await authClient.signIn.oauth2({
@@@ -378,53 -344,35 +359,39 @@@
)}
</div>
)}
-
- {config?.hasGuestAccess && !invitationId && (
- <Button
- variant="outline"
- onClick={handleGuestAccess}
- disabled={isGuestLoading}
- className="w-full"
- >
- <UserCheck className="w-4 h-4 mr-2" />
- {isGuestLoading
- ? t("auth:signIn.signingIn")
- : t("auth:signUp.continueAsGuest")}
- </Button>
- )}
</div>
- <div className="relative my-6">
- <div className="absolute inset-0 flex items-center">
- <div className="w-full border-t border-border" />
- </div>
- <div className="relative flex justify-center text-sm">
- <span className="px-2 bg-card text-muted-foreground">
- {t("auth:forms.or")}
- </span>
+ {!config?.disableLoginForm && (
+ <div className="relative my-6">
+ <div className="absolute inset-0 flex items-center">
+ <div className="w-full border-t border-border" />
+ </div>
+ <div className="relative flex justify-center text-sm">
+ <span className="px-2 bg-card text-muted-foreground">
+ {t("auth:forms.or")}
+ </span>
+ </div>
</div>
- </div>
+ )}
</>
)}
- {config?.hasSmtp ? (
- <OtpSignInForm
- invitationId={invitationId}
- defaultEmail={defaultEmail}
- redirect={getSafeRedirectPath()}
- onSuccess={handleSignInSuccess}
- />
- ) : (
- <SignInForm
- defaultEmail={defaultEmail}
- onSuccess={handleSignInSuccess}
- />
- )}
+ {!config?.disableLoginForm &&
+ (config?.hasSmtp ? (
+ <OtpSignInForm
+ invitationId={invitationId}
+ defaultEmail={defaultEmail}
+ redirect={getSafeRedirectPath()}
+ onSuccess={handleSignInSuccess}
+ />
+ ) : (
+ <SignInForm
+ defaultEmail={defaultEmail}
+ onSuccess={handleSignInSuccess}
+ />
+ ))}
{config?.disableRegistration ||
- config?.disablePasswordRegistration ? (
+ config?.disablePasswordRegistration ||
+ config?.disableLoginForm ? (
<div className="text-center pt-4">
<p className="text-sm text-muted-foreground">
{config?.disableRegistration