diff --git a/apps/login/.eslintrc.cjs b/apps/login/.eslintrc.cjs index 76ad0c10d8..d704a7f0c3 100644 --- a/apps/login/.eslintrc.cjs +++ b/apps/login/.eslintrc.cjs @@ -7,7 +7,10 @@ module.exports = { "@next/next/no-img-element": "off", "react/no-unescaped-entities": "off", "no-unused-vars": "off", - "@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }], + "@typescript-eslint/no-unused-vars": ["error", { + argsIgnorePattern: "^_" , + varsIgnorePattern: "^_" , + }], "no-undef": "off", }, parserOptions: { diff --git a/apps/login/.prettierignore b/apps/login/.prettierignore index 642f919c4e..413c4b52e0 100644 --- a/apps/login/.prettierignore +++ b/apps/login/.prettierignore @@ -1,5 +1,5 @@ -.next -/external -.github/ -dist/ -standalone/ \ No newline at end of file +* +!constants +!src +!locales +!scripts/healthcheck.js \ No newline at end of file diff --git a/apps/login/scripts/healthcheck.js b/apps/login/scripts/healthcheck.js index c1a64c6e75..652524154a 100644 --- a/apps/login/scripts/healthcheck.js +++ b/apps/login/scripts/healthcheck.js @@ -1,14 +1,14 @@ const url = process.argv[2]; if (!url) { - console.error("❌ No URL provided as command line argument."); - process.exit(1); + console.error("❌ No URL provided as command line argument."); + process.exit(1); } try { - const res = await fetch(url); - if (!res.ok) process.exit(1); - process.exit(0); + const res = await fetch(url); + if (!res.ok) process.exit(1); + process.exit(0); } catch (e) { - process.exit(1); + process.exit(1); } diff --git a/apps/login/src/app/(login)/logout/page.tsx b/apps/login/src/app/(login)/logout/page.tsx index 853461d7d6..410dc0e582 100644 --- a/apps/login/src/app/(login)/logout/page.tsx +++ b/apps/login/src/app/(login)/logout/page.tsx @@ -34,7 +34,8 @@ export default async function Page(props: { const organization = searchParams?.organization; const postLogoutRedirectUri = searchParams?.post_logout_redirect_uri; const logoutHint = searchParams?.logout_hint; - const UILocales = searchParams?.ui_locales; // TODO implement with new translation service + // TODO implement with new translation service + // const UILocales = searchParams?.ui_locales; const _headers = await headers(); const { serviceUrl } = getServiceUrlFromHeaders(_headers); diff --git a/apps/login/src/app/(login)/logout/success/page.tsx b/apps/login/src/app/(login)/logout/success/page.tsx index e7ec459f03..a13564664c 100644 --- a/apps/login/src/app/(login)/logout/success/page.tsx +++ b/apps/login/src/app/(login)/logout/success/page.tsx @@ -1,8 +1,7 @@ import { DynamicTheme } from "@/components/dynamic-theme"; import { Translated } from "@/components/translated"; import { getServiceUrlFromHeaders } from "@/lib/service-url"; -import { getBrandingSettings, getDefaultOrg } from "@/lib/zitadel"; -import { Organization } from "@zitadel/proto/zitadel/org/v2/org_pb"; +import { getBrandingSettings } from "@/lib/zitadel"; import { headers } from "next/headers"; export default async function Page(props: { searchParams: Promise }) { @@ -11,17 +10,7 @@ export default async function Page(props: { searchParams: Promise }) { const _headers = await headers(); const { serviceUrl } = getServiceUrlFromHeaders(_headers); - const { login_hint, organization } = searchParams; - - let defaultOrganization; - if (!organization) { - const org: Organization | null = await getDefaultOrg({ - serviceUrl, - }); - if (org) { - defaultOrganization = org.id; - } - } + const { organization } = searchParams; const branding = await getBrandingSettings({ serviceUrl, diff --git a/apps/login/src/app/(login)/otp/[method]/page.tsx b/apps/login/src/app/(login)/otp/[method]/page.tsx index af4159d62e..6ac0eea5ea 100644 --- a/apps/login/src/app/(login)/otp/[method]/page.tsx +++ b/apps/login/src/app/(login)/otp/[method]/page.tsx @@ -30,12 +30,10 @@ export default async function Page(props: { const { loginName, // send from password page - userId, // send from email link requestId, sessionId, organization, code, - submit, } = searchParams; const { method } = params; diff --git a/apps/login/src/app/(login)/otp/[method]/set/page.tsx b/apps/login/src/app/(login)/otp/[method]/set/page.tsx index f74093ce8e..2053bcb347 100644 --- a/apps/login/src/app/(login)/otp/[method]/set/page.tsx +++ b/apps/login/src/app/(login)/otp/[method]/set/page.tsx @@ -70,16 +70,18 @@ export default async function Page(props: { await addOTPSMS({ serviceUrl, userId: session.factors.user.id, - }).catch((error) => { - error = new Error("Could not add OTP via SMS"); + }).catch((_error) => { + // TODO: Throw this error? + new Error("Could not add OTP via SMS"); }); } else if (method === "email") { // works await addOTPEmail({ serviceUrl, userId: session.factors.user.id, - }).catch((error) => { - error = new Error("Could not add OTP via Email"); + }).catch((_error) => { + // TODO: Throw this error? + new Error("Could not add OTP via Email"); }); } else { throw new Error("Invalid method"); diff --git a/apps/login/src/app/(login)/password/page.tsx b/apps/login/src/app/(login)/password/page.tsx index 461c095157..a9ab4091f9 100644 --- a/apps/login/src/app/(login)/password/page.tsx +++ b/apps/login/src/app/(login)/password/page.tsx @@ -17,7 +17,7 @@ export default async function Page(props: { searchParams: Promise>; }) { const searchParams = await props.searchParams; - let { loginName, organization, requestId, alt } = searchParams; + let { loginName, organization, requestId } = searchParams; const _headers = await headers(); const { serviceUrl } = getServiceUrlFromHeaders(_headers); diff --git a/apps/login/src/app/(login)/verify/success/page.tsx b/apps/login/src/app/(login)/verify/success/page.tsx index f216226f7c..5427ecd90e 100644 --- a/apps/login/src/app/(login)/verify/success/page.tsx +++ b/apps/login/src/app/(login)/verify/success/page.tsx @@ -13,7 +13,7 @@ export default async function Page(props: { searchParams: Promise }) { const _headers = await headers(); const { serviceUrl } = getServiceUrlFromHeaders(_headers); - const { loginName, requestId, organization, userId } = searchParams; + const { loginName, organization, userId } = searchParams; const branding = await getBrandingSettings({ serviceUrl, diff --git a/apps/login/src/components/alert.tsx b/apps/login/src/components/alert.tsx index fa18b750f2..01f82627cd 100644 --- a/apps/login/src/components/alert.tsx +++ b/apps/login/src/components/alert.tsx @@ -17,7 +17,7 @@ export enum AlertType { const yellow = "border-yellow-600/40 dark:border-yellow-500/20 bg-yellow-200/30 text-yellow-600 dark:bg-yellow-700/20 dark:text-yellow-200"; -const red = +// const red = "border-red-600/40 dark:border-red-500/20 bg-red-200/30 text-red-600 dark:bg-red-700/20 dark:text-red-200"; const neutral = "border-divider-light dark:border-divider-dark bg-black/5 text-gray-600 dark:bg-white/10 dark:text-gray-200"; diff --git a/apps/login/src/components/authentication-method-radio.tsx b/apps/login/src/components/authentication-method-radio.tsx index 121e257485..93a42ab5f4 100644 --- a/apps/login/src/components/authentication-method-radio.tsx +++ b/apps/login/src/components/authentication-method-radio.tsx @@ -43,7 +43,7 @@ export function AuthenticationMethodRadio({ } boder-divider-light relative flex h-full flex-1 cursor-pointer rounded-lg border px-5 py-4 hover:shadow-lg focus:outline-none dark:border-divider-dark dark:hover:bg-white/10` } > - {({ active, checked }) => ( + {({ checked }) => ( <>
{method === "passkey" && ( diff --git a/apps/login/src/components/language-switcher.tsx b/apps/login/src/components/language-switcher.tsx index 1b2ea9d727..db5df5e14c 100644 --- a/apps/login/src/components/language-switcher.tsx +++ b/apps/login/src/components/language-switcher.tsx @@ -55,7 +55,7 @@ export function LanguageSwitcher() { "transition duration-100 ease-in data-[leave]:data-[closed]:opacity-0", )} > - {LANGS.map((lang, index) => ( + {LANGS.map((lang) => ( (false); + const [_loading, setLoading] = useState(false); async function clearSessionId(id: string) { setLoading(true); @@ -41,9 +41,10 @@ export function SessionClearItem({ const { valid, verifiedAt } = isSessionValid(session); - const [error, setError] = useState(null); + const [_error, setError] = useState(null); - const router = useRouter(); + // TODO: To we have to call this? + useRouter(); return (