Files
calendar/apps/web/modules/users/components/AdminPasswordBanner.tsx
T
Anik Dhabal BabuGitHubDevin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>bot_apk
f86767c125 fix: correct admin password banner message and auto-sign-out after 2FA enable (#28129)
* fix: correct admin password banner message to require both password length and 2FA

The banner message incorrectly used 'or' implying only one condition was needed,
but the code requires BOTH a password of at least 15 characters AND 2FA enabled.

Updated the message to clearly state both requirements and added a hint that
users need to log out and log back in after updating their security settings.

Fixes #9527

Co-Authored-By: unknown <>

* fix: auto-sign-out INACTIVE_ADMIN users after enabling 2FA

When an INACTIVE_ADMIN user enables 2FA, automatically sign them out so
they can log back in with refreshed session role, dismissing the banner.
This matches the existing behavior for password changes.

Co-Authored-By: unknown <>

* feat: add dynamic admin banner message based on inactiveAdminReason

Co-Authored-By: unknown <>

* Remove and add various localization strings

* Update common.json

* Add cookie consent checkbox message and remove entries

* test: add unit tests for AdminPasswordBanner and inactiveAdminReason logic

Co-Authored-By: unknown <>

* fix: add expires field to session mock to fix type check

Co-Authored-By: unknown <>

* fix: wrap CALENDSO_ENCRYPTION_KEY mutations in try/finally to prevent env state leaks

Addresses Cubic AI review feedback (confidence 9/10): when a test fails
early, the CALENDSO_ENCRYPTION_KEY env var was not being restored, which
could leak state into subsequent tests. Wrapped the env mutation in
try/finally blocks to guarantee cleanup.

Co-Authored-By: bot_apk <apk@cognition.ai>

* fix: add missing 'expires' field to buildSession in AdminPasswordBanner test

The Session type requires 'expires' to be a string, but buildSession was
not providing it, causing a type error caught by CI type-check.

Co-Authored-By: bot_apk <apk@cognition.ai>

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: bot_apk <apk@cognition.ai>
2026-03-10 12:46:31 -03:00

56 lines
1.6 KiB
TypeScript

import type { SessionContextValue } from "next-auth/react";
import Link from "next/link";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { TopBanner } from "@calcom/ui/components/top-banner";
export type AdminPasswordBannerProps = { data: SessionContextValue["data"] };
function getBannerMessageKey(reason: "both" | "password" | "2fa" | undefined): string {
switch (reason) {
case "password":
return "invalid_admin_password_password_only";
case "2fa":
return "invalid_admin_password_2fa_only";
case "both":
default:
return "invalid_admin_password";
}
}
function getBannerAction(reason: "both" | "password" | "2fa" | undefined): { href: string; labelKey: string } {
switch (reason) {
case "2fa":
return { href: "/settings/security/two-factor-auth", labelKey: "enable_2fa" };
case "password":
case "both":
default:
return { href: "/settings/security/password", labelKey: "change_password_admin" };
}
}
function AdminPasswordBanner({ data }: AdminPasswordBannerProps) {
const { t } = useLocale();
if (data?.user.role !== "INACTIVE_ADMIN") return null;
const messageKey = getBannerMessageKey(data.user.inactiveAdminReason);
const { href, labelKey } = getBannerAction(data.user.inactiveAdminReason);
return (
<>
<TopBanner
text={t(messageKey, { user: data.user.username })}
variant="warning"
actions={
<Link href={href} className="border-b border-b-black">
{t(labelKey)}
</Link>
}
/>
</>
);
}
export default AdminPasswordBanner;