From 8e027f4c91f0ba53c89395f2f28cd645cec7b49f Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Mon, 14 Jul 2025 13:45:36 +0200 Subject: [PATCH] lint: cleanup login --- login/apps/login/src/app/(login)/accounts/page.tsx | 1 - .../src/app/(login)/authenticator/set/page.tsx | 1 - .../login/src/app/(login)/otp/[method]/page.tsx | 2 -- .../login/src/app/(login)/passkey/set/page.tsx | 2 +- .../login/src/app/(login)/password/set/page.tsx | 2 -- login/apps/login/src/app/(login)/register/page.tsx | 2 -- login/apps/login/src/app/(login)/u2f/page.tsx | 2 -- login/apps/login/src/app/(login)/u2f/set/page.tsx | 2 -- login/apps/login/src/app/(login)/verify/page.tsx | 2 -- .../login/src/app/(login)/verify/success/page.tsx | 14 +------------- login/apps/login/src/components/username-form.tsx | 4 +--- login/apps/login/src/lib/hooks.ts | 14 -------------- login/apps/login/src/lib/server/passkeys.ts | 2 +- login/apps/login/src/lib/server/session.ts | 2 +- login/apps/login/src/lib/server/u2f.ts | 2 +- login/apps/login/src/lib/service-url.ts | 2 +- 16 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 login/apps/login/src/lib/hooks.ts diff --git a/login/apps/login/src/app/(login)/accounts/page.tsx b/login/apps/login/src/app/(login)/accounts/page.tsx index 5af25c1d0b..cebcd014bb 100644 --- a/login/apps/login/src/app/(login)/accounts/page.tsx +++ b/login/apps/login/src/app/(login)/accounts/page.tsx @@ -33,7 +33,6 @@ export default async function Page(props: { searchParams: Promise>; }) { const searchParams = await props.searchParams; - // const locale = getLocale(); const requestId = searchParams?.requestId; const organization = searchParams?.organization; diff --git a/login/apps/login/src/app/(login)/authenticator/set/page.tsx b/login/apps/login/src/app/(login)/authenticator/set/page.tsx index c123395aeb..e08367f589 100644 --- a/login/apps/login/src/app/(login)/authenticator/set/page.tsx +++ b/login/apps/login/src/app/(login)/authenticator/set/page.tsx @@ -26,7 +26,6 @@ export default async function Page(props: { searchParams: Promise>; }) { const searchParams = await props.searchParams; - // const locale = getLocale(); const { loginName, requestId, organization, sessionId } = searchParams; diff --git a/login/apps/login/src/app/(login)/otp/[method]/page.tsx b/login/apps/login/src/app/(login)/otp/[method]/page.tsx index 2d9daac64f..af4159d62e 100644 --- a/login/apps/login/src/app/(login)/otp/[method]/page.tsx +++ b/login/apps/login/src/app/(login)/otp/[method]/page.tsx @@ -11,7 +11,6 @@ import { getLoginSettings, getSession, } from "@/lib/zitadel"; -import { getLocale } from "next-intl/server"; import { headers } from "next/headers"; export default async function Page(props: { @@ -20,7 +19,6 @@ export default async function Page(props: { }) { const params = await props.params; const searchParams = await props.searchParams; - const locale = getLocale(); const _headers = await headers(); const { serviceUrl } = getServiceUrlFromHeaders(_headers); diff --git a/login/apps/login/src/app/(login)/passkey/set/page.tsx b/login/apps/login/src/app/(login)/passkey/set/page.tsx index 939a0c5073..52c195e6cf 100644 --- a/login/apps/login/src/app/(login)/passkey/set/page.tsx +++ b/login/apps/login/src/app/(login)/passkey/set/page.tsx @@ -13,7 +13,7 @@ export default async function Page(props: { }) { const searchParams = await props.searchParams; - const { loginName, prompt, organization, requestId, userId } = searchParams; + const { loginName, prompt, organization, requestId } = searchParams; const _headers = await headers(); const { serviceUrl } = getServiceUrlFromHeaders(_headers); diff --git a/login/apps/login/src/app/(login)/password/set/page.tsx b/login/apps/login/src/app/(login)/password/set/page.tsx index b717fd5d96..c47305929a 100644 --- a/login/apps/login/src/app/(login)/password/set/page.tsx +++ b/login/apps/login/src/app/(login)/password/set/page.tsx @@ -13,14 +13,12 @@ import { } from "@/lib/zitadel"; import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb"; import { HumanUser, User } from "@zitadel/proto/zitadel/user/v2/user_pb"; -import { getLocale } from "next-intl/server"; import { headers } from "next/headers"; export default async function Page(props: { searchParams: Promise>; }) { const searchParams = await props.searchParams; - const locale = getLocale(); const { userId, loginName, organization, requestId, code, initial } = searchParams; diff --git a/login/apps/login/src/app/(login)/register/page.tsx b/login/apps/login/src/app/(login)/register/page.tsx index 3fead718dc..221679ef07 100644 --- a/login/apps/login/src/app/(login)/register/page.tsx +++ b/login/apps/login/src/app/(login)/register/page.tsx @@ -14,14 +14,12 @@ import { } from "@/lib/zitadel"; import { Organization } from "@zitadel/proto/zitadel/org/v2/org_pb"; import { PasskeysType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb"; -import { getLocale } from "next-intl/server"; import { headers } from "next/headers"; export default async function Page(props: { searchParams: Promise>; }) { const searchParams = await props.searchParams; - const locale = getLocale(); let { firstname, lastname, email, organization, requestId } = searchParams; diff --git a/login/apps/login/src/app/(login)/u2f/page.tsx b/login/apps/login/src/app/(login)/u2f/page.tsx index 7fba7be1be..c54b45103f 100644 --- a/login/apps/login/src/app/(login)/u2f/page.tsx +++ b/login/apps/login/src/app/(login)/u2f/page.tsx @@ -7,14 +7,12 @@ import { getSessionCookieById } from "@/lib/cookies"; import { getServiceUrlFromHeaders } from "@/lib/service-url"; import { loadMostRecentSession } from "@/lib/session"; import { getBrandingSettings, getSession } from "@/lib/zitadel"; -import { getLocale } from "next-intl/server"; import { headers } from "next/headers"; export default async function Page(props: { searchParams: Promise>; }) { const searchParams = await props.searchParams; - const locale = getLocale(); const { loginName, requestId, sessionId, organization } = searchParams; diff --git a/login/apps/login/src/app/(login)/u2f/set/page.tsx b/login/apps/login/src/app/(login)/u2f/set/page.tsx index b73e902821..79f64bf67d 100644 --- a/login/apps/login/src/app/(login)/u2f/set/page.tsx +++ b/login/apps/login/src/app/(login)/u2f/set/page.tsx @@ -6,14 +6,12 @@ import { UserAvatar } from "@/components/user-avatar"; import { getServiceUrlFromHeaders } from "@/lib/service-url"; import { loadMostRecentSession } from "@/lib/session"; import { getBrandingSettings } from "@/lib/zitadel"; -import { getLocale } from "next-intl/server"; import { headers } from "next/headers"; export default async function Page(props: { searchParams: Promise>; }) { const searchParams = await props.searchParams; - const locale = getLocale(); const { loginName, organization, requestId, checkAfter } = searchParams; diff --git a/login/apps/login/src/app/(login)/verify/page.tsx b/login/apps/login/src/app/(login)/verify/page.tsx index 55cc8bd1ec..7497698222 100644 --- a/login/apps/login/src/app/(login)/verify/page.tsx +++ b/login/apps/login/src/app/(login)/verify/page.tsx @@ -8,12 +8,10 @@ import { getServiceUrlFromHeaders } from "@/lib/service-url"; import { loadMostRecentSession } from "@/lib/session"; import { getBrandingSettings, getUserByID } from "@/lib/zitadel"; import { HumanUser, User } from "@zitadel/proto/zitadel/user/v2/user_pb"; -import { getLocale } from "next-intl/server"; import { headers } from "next/headers"; export default async function Page(props: { searchParams: Promise }) { const searchParams = await props.searchParams; - const locale = getLocale(); const { userId, loginName, code, organization, requestId, invite, send } = searchParams; diff --git a/login/apps/login/src/app/(login)/verify/success/page.tsx b/login/apps/login/src/app/(login)/verify/success/page.tsx index a0df0327c4..f216226f7c 100644 --- a/login/apps/login/src/app/(login)/verify/success/page.tsx +++ b/login/apps/login/src/app/(login)/verify/success/page.tsx @@ -3,11 +3,7 @@ import { Translated } from "@/components/translated"; import { UserAvatar } from "@/components/user-avatar"; import { getServiceUrlFromHeaders } from "@/lib/service-url"; import { loadMostRecentSession } from "@/lib/session"; -import { - getBrandingSettings, - getLoginSettings, - getUserByID, -} from "@/lib/zitadel"; +import { getBrandingSettings, getUserByID } from "@/lib/zitadel"; import { HumanUser, User } from "@zitadel/proto/zitadel/user/v2/user_pb"; import { headers } from "next/headers"; @@ -31,14 +27,6 @@ export default async function Page(props: { searchParams: Promise }) { console.warn("Error loading session:", error); }); - let loginSettings; - if (!requestId) { - loginSettings = await getLoginSettings({ - serviceUrl, - organization, - }); - } - const id = userId ?? sessionFactors?.factors?.user?.id; if (!id) { diff --git a/login/apps/login/src/components/username-form.tsx b/login/apps/login/src/components/username-form.tsx index 7e636cffde..dbb82a35c9 100644 --- a/login/apps/login/src/components/username-form.tsx +++ b/login/apps/login/src/components/username-form.tsx @@ -3,7 +3,7 @@ import { sendLoginname } from "@/lib/server/loginname"; import { LoginSettings } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb"; import { useRouter } from "next/navigation"; -import { ReactNode, useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import { useForm } from "react-hook-form"; import { Alert } from "./alert"; import { BackButton } from "./back-button"; @@ -24,7 +24,6 @@ type Props = { suffix?: string; submit: boolean; allowRegister: boolean; - children?: ReactNode; }; export function UsernameForm({ @@ -35,7 +34,6 @@ export function UsernameForm({ loginSettings, submit, allowRegister, - children, }: Props) { const { register, handleSubmit, formState } = useForm({ mode: "onBlur", diff --git a/login/apps/login/src/lib/hooks.ts b/login/apps/login/src/lib/hooks.ts deleted file mode 100644 index 2d43fe5adc..0000000000 --- a/login/apps/login/src/lib/hooks.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { useEffect, useState } from "react"; - -// Custom hook to read auth record and user profile doc -export function useUserData() { - const [clientData, setClientData] = useState(null); - - useEffect(() => { - let unsubscribe; - - return unsubscribe; - }, [clientData]); - - return { clientData }; -} diff --git a/login/apps/login/src/lib/server/passkeys.ts b/login/apps/login/src/lib/server/passkeys.ts index 06c2a7554c..60aa2c92b4 100644 --- a/login/apps/login/src/lib/server/passkeys.ts +++ b/login/apps/login/src/lib/server/passkeys.ts @@ -108,7 +108,7 @@ export async function registerPasskeyLink( } } - const [hostname, port] = host.split(":"); + const [hostname] = host.split(":"); if (!hostname) { throw new Error("Could not get hostname"); diff --git a/login/apps/login/src/lib/server/session.ts b/login/apps/login/src/lib/server/session.ts index 2aceb3a1d0..d04d1d25b4 100644 --- a/login/apps/login/src/lib/server/session.ts +++ b/login/apps/login/src/lib/server/session.ts @@ -144,7 +144,7 @@ export async function updateSession(options: UpdateSessionCommand) { challenges.webAuthN && !challenges.webAuthN.domain ) { - const [hostname, port] = host.split(":"); + const [hostname] = host.split(":"); challenges.webAuthN.domain = hostname; } diff --git a/login/apps/login/src/lib/server/u2f.ts b/login/apps/login/src/lib/server/u2f.ts index 12f4bdeecd..70eac14e55 100644 --- a/login/apps/login/src/lib/server/u2f.ts +++ b/login/apps/login/src/lib/server/u2f.ts @@ -42,7 +42,7 @@ export async function addU2F(command: RegisterU2FCommand) { sessionToken: sessionCookie.token, }); - const [hostname, port] = host.split(":"); + const [hostname] = host.split(":"); if (!hostname) { throw new Error("Could not get hostname"); diff --git a/login/apps/login/src/lib/service-url.ts b/login/apps/login/src/lib/service-url.ts index e74ee1f333..cc5e3f04c4 100644 --- a/login/apps/login/src/lib/service-url.ts +++ b/login/apps/login/src/lib/service-url.ts @@ -28,7 +28,7 @@ export function getServiceUrlFromHeaders(headers: ReadonlyHeaders): { const host = headers.get("host"); if (host) { - const [hostname, port] = host.split(":"); + const [hostname] = host.split(":"); if (hostname !== "localhost") { instanceUrl = host.startsWith("http") ? host : `https://${host}`; }