Fixing Login Control in Extension

Author: mohammadkaif0211

src/pages/sidepanel/ActiveMeetingTab.tsx

@@ -13,6 +13,7 @@ import {
   updateEndTime,
   addAndGetMeetingInfo,
   getClientTranscript,
+  getCurrentUser,
 } from "../../../utils/supabase";
 import JarvisScreen from "./JarvisScreen";
 
@@ -162,8 +163,9 @@ const ActiveMeetingTab = () => {
   }
 
   async function handleTokens() {
+    const userFound = await getCurrentUser();
     const isSet = await areTokensSet();
-    if (isSet) setLoggedIn(true);
+    if (isSet && userFound) setLoggedIn(true);
   }
 
   useEffect(() => {
@@ -381,7 +383,7 @@ const ActiveMeetingTab = () => {
       ) : (
         <div className="w-full flex">
           <button
-            className="p-2 px-4 bg-gray-500 rounded-md mx-auto"
+            className="p-2 px-4 m-2 bg-gray-500 rounded-md mx-auto"
             onClick={handleLogin}
           >
             LogIn

src/pages/sidepanel/SidePanel.tsx

@@ -13,25 +13,39 @@ import {
   updateEndTime,
   addAndGetMeetingInfo,
   getClientTranscript,
+  getCurrentUser,
 } from "../../../utils/supabase";
 import JarvisScreen from "./JarvisScreen";
 import ActiveMeetingTab from "./ActiveMeetingTab";
 
 const SidePanel = () => {
   const [isMeetingActive, setMeetingActive] = useState<boolean>(true);
+  const [loggedIn, setLoggedIn] = useState(false);
+
+  useEffect(() => {
+    handleTokens();
+  }, []);
+
+  async function handleTokens() {
+    const userFound = await getCurrentUser();
+    const isSet = await areTokensSet();
+    if (isSet && userFound) setLoggedIn(true);
+  }
 
   if (isMeetingActive) {
     return (
       <div>
-        <PlaybookDropdown />
+        {loggedIn ? <PlaybookDropdown /> : null}
         <ActiveMeetingTab />
         <div className="max-w-full w-full fixed bottom-0 p-2">
-          <button
-            onClick={() => setMeetingActive(false)}
-            className="bg-red-500 text-white py-2 rounded-lg w-full"
-          >
-            End meeting
-          </button>
+          {loggedIn ? (
+            <button
+              onClick={() => setMeetingActive(false)}
+              className="bg-red-500 text-white py-2 rounded-lg w-full"
+            >
+              End meeting
+            </button>
+          ) : null}
         </div>
       </div>
     );

utils/supabase.tsx

@@ -131,8 +131,6 @@ export async function getCurrentUser(): Promise<null | User> {
       async (result) => {
         const authAccessToken = result["accessToken"];
         const authRefreshToken = result["refreshToken"];
-        console.log("authAccessToken", authAccessToken);
-        console.log("authRefreshToken", authRefreshToken);
         if (authRefreshToken && authAccessToken) {
           try {
             // set user session from access_token and refresh_token