From 93a14b190e8be8cb6f86be005cf5f75ee562e9f0 Mon Sep 17 00:00:00 2001
From: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date: Fri, 25 Nov 2022 12:36:33 +0000
Subject: [PATCH] Fix Impersonation Refresh Bug (#5679)

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
---
 .../pages/settings/admin/impersonation.tsx    |  4 +--
 .../components/ImpersonatingBanner.tsx        | 29 ++++++++-----------
 packages/ui/v2/core/layouts/AdminLayout.tsx   |  2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/apps/web/pages/settings/admin/impersonation.tsx b/apps/web/pages/settings/admin/impersonation.tsx
index 8ab2f39a73..993d37ba53 100644
--- a/apps/web/pages/settings/admin/impersonation.tsx
+++ b/apps/web/pages/settings/admin/impersonation.tsx
@@ -16,9 +16,7 @@ function AdminView() {
         onSubmit={(e) => {
           e.preventDefault();
           const enteredUsername = usernameRef.current?.value.toLowerCase();
-          signIn("impersonation-auth", { username: enteredUsername }).then((res) => {
-            console.log(res);
-          });
+          signIn("impersonation-auth", { username: enteredUsername });
         }}>
         <div className="flex items-center space-x-2">
           <TextField
diff --git a/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx b/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx
index ba8cc74f0f..89f8e25587 100644
--- a/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx
+++ b/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx
@@ -1,8 +1,7 @@
 import { useSession } from "next-auth/react";
-import { Trans } from "next-i18next";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert } from "@calcom/ui";
+import { TopBanner } from "@calcom/ui";
 
 function ImpersonatingBanner() {
   const { t } = useLocale();
@@ -11,21 +10,17 @@ function ImpersonatingBanner() {
   if (!data?.user.impersonatedByUID) return null;
 
   return (
-    <Alert
-      severity="warning"
-      title={
-        <>
-          {t("impersonating_user_warning", { user: data.user.username })}{" "}
-          <Trans i18nKey="impersonating_stop_instructions">
-            <a href="/auth/logout" className="underline">
-              Click Here To stop
-            </a>
-            .
-          </Trans>
-        </>
-      }
-      className="mx-4 mb-2 sm:mx-6  md:mx-8"
-    />
+    <>
+      <TopBanner
+        text={t("impersonating_user_warning", { user: data.user.username })}
+        variant="warning"
+        actions={
+          <a className="border-b border-b-black" href="/auth/logout">
+            Click Here To stop
+          </a>
+        }
+      />
+    </>
   );
 }
 
diff --git a/packages/ui/v2/core/layouts/AdminLayout.tsx b/packages/ui/v2/core/layouts/AdminLayout.tsx
index 0f2ff14321..1dcd4b9208 100644
--- a/packages/ui/v2/core/layouts/AdminLayout.tsx
+++ b/packages/ui/v2/core/layouts/AdminLayout.tsx
@@ -17,7 +17,7 @@ export default function AdminLayout({
   // Force redirect on component level
   useEffect(() => {
     if (session.data && session.data.user.role !== UserPermissionRole.ADMIN) {
-      router.replace("/settings");
+      router.replace("/settings/my-account/profile");
     }
   }, [session, router]);