Merge pull request #101 from B-ki/2FA-chat-fix

2 fa chat fix
B-ki · Nov 24, 2023 · edbcf44 · edbcf44
2 parents 69f016a + 5bfb77e
commit edbcf44
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 49 deletions.
diff --git a/front/src/components/TwoFaActivationInput.tsx b/front/src/components/TwoFaActivationInput.tsx
@@ -39,7 +39,12 @@ export const TwoFACode: React.FC<TwoFACodeProps> = ({ setShowInvalidate }) => {
 
   return (
     <form onSubmit={handleSubmit} className="flex flex-col items-center">
-      <input type="test" name="2FAcode" onChange={handleCodeChange} />
+      <input
+        className="rounded-md border border-dark-3 bg-white-3 p-1 invalid:border-red focus:border-blue focus:outline-none"
+        type="test"
+        name="2FAcode"
+        onChange={handleCodeChange}
+      />
       <Button size="small" type="primary" onClick={() => mutation.mutate(code)}>
         Submit
       </Button>

diff --git a/front/src/components/TwoFaDeactivationInput.tsx b/front/src/components/TwoFaDeactivationInput.tsx
@@ -39,7 +39,12 @@ export const TwoFADeactivation: React.FC<TwoFACodeProps> = ({ setShowInvalidate
 
   return (
     <form onSubmit={handleSubmit} className="flex flex-col items-center">
-      <input type="test" name="2FAcode" onChange={handleCodeChange} />
+      <input
+        className="mb-4 rounded-md border border-dark-3 bg-white-3 p-1 invalid:border-red focus:border-blue focus:outline-none"
+        type="test"
+        name="2FAcode"
+        onChange={handleCodeChange}
+      />
       <Button size="small" type="secondary" onClick={() => mutation.mutate(code)}>
         Deactivate 2FA
       </Button>

diff --git a/front/src/components/TwoFaLoginInput.tsx b/front/src/components/TwoFaLoginInput.tsx
@@ -42,7 +42,12 @@ export const TwoFaLoginInput = (props: any) => {
   return (
     <>
       <form onSubmit={handleSubmit} className="flex flex-col items-center">
-        <input type="test" name="2FAcode" onChange={handleCodeChange} />
+        <input
+          className="rounded-md border border-dark-3 bg-white-3 p-1 invalid:border-red focus:border-blue focus:outline-none"
+          type="test"
+          name="2FAcode"
+          onChange={handleCodeChange}
+        />
       </form>
       <Button size="small" type="primary" onClick={() => mutation.mutateAsync({ code: code })}>
         Submit

diff --git a/front/src/components/chat/Chat.tsx b/front/src/components/chat/Chat.tsx
@@ -15,8 +15,8 @@ import ChatList from './ChatList';
 import ChatModal from './ChatModal';
 import Conversation from './Conversation';
 import CreateChannel from './CreateChannel';
-import DmChannel from './DmChannel';
 import DmConversation from './DmConversation';
+import DmCreate from './DmCreate';
 import DmList from './DmList';
 import JoinChannel from './JoinChannel';
 
@@ -35,17 +35,16 @@ export interface ChannelType {
 }
 
 const Chat = () => {
-  const [showCreateModal, setShowCreateModal] = useState<boolean>(false);
-  const [showJoinModal, setShowJoinModal] = useState<boolean>(false);
-  const [showDmModal, setShowDmModal] = useState<boolean>(false);
+  const [showCreateChannelModal, setShowCreateChannelModal] = useState<boolean>(false);
+  const [showJoinChannelModal, setShowJoinChannelModal] = useState<boolean>(false);
+  const [showDmSomeoneModal, setShowDmSomeoneModal] = useState<boolean>(false);
   const [socket, setSocket] = useState<Socket>();
   const localToken = localStorage.getItem('token');
   const token: string = localToken ? localToken : '';
   const [loading, setLoading] = useState<boolean>(true);
   const [joinedChannels, setJoinedChannels] = useState<ChannelType[]>([]);
   const [currentChannel, setCurrentChannel] = useState<ChannelType | null>(null);
-  const [currentUser, setCurrentUser] = useState<userDto | null>(null);
-  const [show, setShow] = useState<boolean>(false);
+  const [showChannels, setShowChannels] = useState<boolean>(false);
   let me: userDto | undefined;
 
   const { data: user } = useApi().get('get user infos', '/user/me') as UseQueryResult<userDto>;
@@ -70,14 +69,7 @@ const Chat = () => {
       tmpSocket.on('youJoined', (data: ChannelType) => {
         setCurrentChannel(data);
         setJoinedChannels((prev) => [...prev, data]);
-      });
-
-      tmpSocket.on('youLeft', (data: any) => {
-        setCurrentChannel(null);
-        setJoinedChannels(joinedChannels.filter((c) => c.name !== data.channel));
-        if (!data.reason.includes('disconnected')) {
-          alert(`You left ${data.channel}, ${data.reason}`);
-        }
+        console.log('youJoined - channel list :', joinedChannels);
       });
 
       tmpSocket.on('exception', (data) => {
@@ -90,9 +82,26 @@ const Chat = () => {
     });
 
     return () => {
+      socket?.off('youJoined');
+      socket?.off('exception');
       socket?.disconnect();
     };
   }, []);
+
+  useEffect(() => {
+    socket?.on('youLeft', (data: any) => {
+      setCurrentChannel(null);
+      setJoinedChannels(joinedChannels.filter((c) => c.name !== data.channel));
+      if (!data.reason.includes('disconnected')) {
+        alert(`You left ${data.channel}, ${data.reason}`);
+      }
+    });
+
+    return () => {
+      socket?.off('youLeft');
+    };
+  }, [joinedChannels]);
+
   if (loading) return <div>loading</div>;
   if (!socket) return <div>socket not initialized</div>;
   if (isLoading) {
@@ -103,59 +112,59 @@ const Chat = () => {
   }
   me = user;
 
-  const handleShowDm = (boolean: boolean) => {
+  const handleShowChannels = (boolean: boolean) => {
     setCurrentChannel(null);
-    setShow(boolean);
+    setShowChannels(boolean);
   };
 
   return (
     <div className="flex max-h-full min-h-[65%] w-full rounded-lg bg-white-1 md:w-auto">
-      {showCreateModal && (
+      {showCreateChannelModal && (
         <ChatModal>
-          <CreateChannel setShowModal={setShowCreateModal} socket={socket} />
+          <CreateChannel setShowModal={setShowCreateChannelModal} socket={socket} />
         </ChatModal>
       )}
-      {showJoinModal && (
+      {showJoinChannelModal && (
         <ChatModal>
           <JoinChannel
-            setShowModal={setShowJoinModal}
+            setShowModal={setShowJoinChannelModal}
             socket={socket}
             joinedChannels={joinedChannels}
           />
         </ChatModal>
       )}
-      {showDmModal && (
+      {showDmSomeoneModal && (
         <ChatModal>
-          <DmChannel
+          <DmCreate
             setCurrentChannel={setCurrentChannel}
-            setShowModal={setShowDmModal}
+            setShowModal={setShowDmSomeoneModal}
             socket={socket}
             users={users?.filter((user) => user.login !== me?.login)}
           />
         </ChatModal>
       )}
-      {show ? (
+      {showChannels ? (
         <div className="flex w-[35%] flex-col md:w-auto">
           <div className="flex  justify-between px-1 py-3  md:gap-2 md:p-3">
             <h2 className="text-base md:text-xl">Channels</h2>
             <div className="flex w-full gap-1 md:gap-2">
               <button
                 className="rounded-full p-1 hover:bg-white-3"
                 title="Go to direct messages"
-                onClick={() => handleShowDm(false)}
+                onClick={() => handleShowChannels(false)}
               >
                 <img className="w-5 md:w-6" src={chat_channel} alt="Direct messages" />
               </button>
               <button
                 className="rounded-full p-1 hover:bg-white-3"
                 title="Join a channel"
-                onClick={() => setShowJoinModal(true)}
+                onClick={() => setShowJoinChannelModal(true)}
               >
                 <img className="w-5 md:w-6" src={chat_join} alt="join channel" />
               </button>
               <button
                 title="Create a channel"
-                onClick={() => setShowCreateModal(true)}
+                onClick={() => setShowCreateChannelModal(true)}
                 className="rounded-full p-1 hover:bg-white-3"
               >
                 <img className="w-5 md:w-6" src={chat_plus} alt="create channel" />
@@ -176,14 +185,14 @@ const Chat = () => {
               <button
                 className="rounded-full p-1 hover:bg-white-3"
                 title="Go to channels"
-                onClick={() => handleShowDm(true)}
+                onClick={() => handleShowChannels(true)}
               >
                 <img className="w-5 md:w-6" src={chat_DM} alt="Channels" />
               </button>
               <button
                 className="rounded-full p-1 hover:bg-white-3"
                 title="Find someone"
-                onClick={() => setShowDmModal(true)}
+                onClick={() => setShowDmSomeoneModal(true)}
               >
                 <img className="w-5 md:w-6" src={chat_add} alt="Find someone" />
               </button>
@@ -198,7 +207,7 @@ const Chat = () => {
           />
         </div>
       )}
-      {show
+      {showChannels
         ? currentChannel && <Conversation me={me} socket={socket} channel={currentChannel} />
         : currentChannel && (
             <DmConversation

diff --git a/front/src/components/chat/ChatList.tsx b/front/src/components/chat/ChatList.tsx
@@ -21,13 +21,10 @@ const ChatListElem = ({ chatInfos, setCurrentChannel, currentChannel }: ChatList
       }`}
       disabled={currentChannel?.name === chatInfos.name}
     >
-      {/* <img src={chatInfos.profilePicture} alt="conversation" className="h-14 w-14 rounded-full" /> */}
       <div className="flex flex-col">
         <div className="flex items-center gap-1">
           <h3 className="font-bold">{chatInfos.name}</h3>
-          {/* <h3 className="text-sm">@{chatInfos.login}</h3> */}
         </div>
-        {/* <span className="text-sm">{chatInfos.lastMessage}</span> */}
       </div>
     </button>
   );

diff --git a/front/src/components/chat/DmConversation.tsx b/front/src/components/chat/DmConversation.tsx
@@ -75,6 +75,7 @@ const DmConversation = ({ channel, socket, me, allUsers }: ConversationProps) =>
   };
 
   function findUserInfos(chatName: string) {
+    if (!chatName) return '';
     chatName = chatName.substring(1);
     const names = chatName.split('_');
     if (names[0] === me?.login) {

diff --git a/front/src/components/chat/DmChannel.tsx → front/src/components/chat/DmCreate.tsx b/front/src/components/chat/DmChannel.tsx → front/src/components/chat/DmCreate.tsx
@@ -13,7 +13,7 @@ interface DmChannelProps {
   setCurrentChannel: (channel: ChannelType) => void;
 }
 
-const DmChannel = ({ setShowModal, socket, users, setCurrentChannel }: DmChannelProps) => {
+const DmCreate = ({ setShowModal, socket, users, setCurrentChannel }: DmChannelProps) => {
   const [searchUser, setSearchUser] = useState<string>('');
   const [userSelected, setUserSelected] = useState<HTMLButtonElement | null>(null);
   const [userName, setUserName] = useState<string>('');
@@ -106,4 +106,4 @@ const DmChannel = ({ setShowModal, socket, users, setCurrentChannel }: DmChannel
   );
 };
 
-export default DmChannel;
+export default DmCreate;
diff --git a/front/src/components/chat/DmList.tsx b/front/src/components/chat/DmList.tsx
@@ -24,7 +24,7 @@ const DmListElem = ({
   };
   let user;
 
-  function findUserInfos(chatName: string) {
+  const findUserInfos = (chatName: string) => {
     chatName = chatName.substring(1);
     const names = chatName.split('_');
     if (names[0] === me?.login) {
@@ -35,7 +35,7 @@ const DmListElem = ({
       if (user) return user[0].displayName ? user[0].displayName : user[0]?.login;
     }
     return '';
-  }
+  };
 
   return (
     <button

diff --git a/whodid.json b/whodid.json