Scheduling infrastructure for absolutely everyone.
fix: End Impersonation Without Logging Out Admin (#25395)
Anshumancanrock7dbc88884804
diff --git a/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx b/packages/features/ee/impersonation/components/ImpersonatingBanner.tsxindex a226b7e7e86..82dc2492d6d 100644--- a/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx+++ b/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx@@ -12,29 +12,21 @@ function ImpersonatingBanner({ data }: ImpersonatingBannerProps) {if (!data?.user.impersonatedBy) return null;const returnToId = data.user.impersonatedBy.id;- const canReturnToSelf = data.user.impersonatedBy.role == "ADMIN" || data.user?.org?.id;-return (<><TopBannertext={t("impersonating_user_warning", { user: data.user.orgAwareUsername || data.user.username })}variant="warning"actions={- canReturnToSelf ? (- <form- onSubmit={(e) => {- e.preventDefault();- signIn("impersonation-auth", { returnToId });- }}>- <button className="text-emphasis hover:underline" data-testid="stop-impersonating-button">- {t("impersonating_stop_instructions")}- </button>- </form>- ) : (- <a className="border-b border-b-black" href="/auth/logout">+ <form+ onSubmit={(e) => {+ e.preventDefault();+ signIn("impersonation-auth", { returnToId });+ }}>+ <button className="text-emphasis hover:underline" data-testid="stop-impersonating-button">{t("impersonating_stop_instructions")}- </a>- )+ </button>+ </form>}/></>diff --git a/packages/features/ee/impersonation/lib/ImpersonationProvider.ts b/packages/features/ee/impersonation/lib/ImpersonationProvider.tsindex 7ba23bcaa77..2f601252b48 100644--- a/packages/features/ee/impersonation/lib/ImpersonationProvider.ts+++ b/packages/features/ee/impersonation/lib/ImpersonationProvider.ts@@ -301,13 +301,11 @@ async function isReturningToSelf({ session, creds }: { session: Session | null;});if (returningUser) {- // Skip for none org usersconst inOrg =returningUser.organizationId || // Keep for backwards compatibilityreturningUser.profiles.some((profile) => profile.organizationId !== undefined); // New way of seeing if the user has a profile in orgs.- if (returningUser.role !== UserPermissionRole.ADMIN && !inOrg) return;-const hasTeams = returningUser.teams.length >= 1;+ if (returningUser.role !== UserPermissionRole.ADMIN && !inOrg && !hasTeams) return;const profile = await findProfile(returningUser);return {