fix: Addressed issues related to fetching different informations in p…

…rivate channels. (#431)
RocketChat · Feb 6, 2024 · 3fef94b · 3fef94b
1 parent bff3ed7
commit 3fef94b
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 23 deletions.
diff --git a/packages/api/src/EmbeddedChatApi.ts b/packages/api/src/EmbeddedChatApi.ts
@@ -411,7 +411,7 @@ export default class EmbeddedChatApi {
     try {
       const { userId, authToken } = await this.auth.getCurrentUser() || {};
       const response = await fetch(
-        `${this.host}/api/v1/channels.info?roomId=${this.rid}`,
+        `${this.host}/api/v1/rooms.info?roomId=${this.rid}`,
         {
           headers: {
             'Content-Type': 'application/json',
@@ -445,7 +445,8 @@ export default class EmbeddedChatApi {
     } = {
       query: undefined,
       field: undefined
-    }) {
+    }, isChannelPrivate = false) {
+    const roomType = isChannelPrivate ? 'groups' : 'channels' ;
     const endp = anonymousMode ? 'anonymousread' : 'messages';
     const query = options?.query
       ? `&query=${JSON.stringify(options.query)}`
@@ -456,7 +457,7 @@ export default class EmbeddedChatApi {
     try {
       const { userId, authToken } = await this.auth.getCurrentUser() || {};
       const messages = await fetch(
-        `${this.host}/api/v1/channels.${endp}?roomId=${this.rid}${query}${field}`,
+        `${this.host}/api/v1/${roomType}.${endp}?roomId=${this.rid}${query}${field}`,
         {
           headers: {
             'Content-Type': 'application/json',
@@ -472,19 +473,20 @@ export default class EmbeddedChatApi {
     }
   }
 
-  async getThreadMessages(tmid: string) {
+  async getThreadMessages(tmid: string, isChannelPrivate = false) {
     return this.getMessages(false, {
       query: {
         tmid,
       },
-    });
+    }, isChannelPrivate);
   }
 
-  async getChannelRoles() {
+  async getChannelRoles(isChannelPrivate = false) {
+    const roomType = isChannelPrivate ? 'groups' : 'channels';
     try {
       const { userId, authToken } = await this.auth.getCurrentUser() || {};
       const roles = await fetch(
-        `${this.host}/api/v1/channels.roles?roomId=${this.rid}`,
+        `${this.host}/api/v1/${roomType}.roles?roomId=${this.rid}`,
         {
           headers: {
             'Content-Type': 'application/json',
@@ -800,11 +802,12 @@ export default class EmbeddedChatApi {
     }
   }
 
-  async getChannelMembers() {
+  async getChannelMembers(isChannelPrivate = false) {
+    const roomType = isChannelPrivate ? 'groups' : 'channels';
     try {
       const { userId, authToken } = await this.auth.getCurrentUser() || {};
       const response = await fetch(
-        `${this.host}/api/v1/channels.members?roomId=${this.rid}`,
+        `${this.host}/api/v1/${roomType}.members?roomId=${this.rid}`,
         {
           headers: {
             'Content-Type': 'application/json',

diff --git a/packages/react/src/components/ChatBody/ChatBody.js b/packages/react/src/components/ChatBody/ChatBody.js
@@ -3,7 +3,7 @@ import React, { useCallback, useContext, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { css } from '@emotion/react';
 import RCContext from '../../context/RCInstance';
-import { useMessageStore, useUserStore } from '../../store';
+import { useMessageStore, useUserStore, useChannelStore } from '../../store';
 import MessageList from '../MessageList';
 import TotpModal from '../TotpModal/TwoFactorTotpModal';
 import { Box } from '../Box';
@@ -52,6 +52,7 @@ const ChatBody = ({ height, anonymousMode, showRoles, scrollToBottom, messageLis
   const removeMessage = useMessageStore((state) => state.removeMessage);
   const setFilter = useMessageStore((state) => state.setFilter);
   const setRoles = useUserStore((state) => state.setRoles);
+  const isChannelPrivate = useChannelStore((state) => state.isChannelPrivate);
 
   const [isThreadOpen, threadMainMessage] = useMessageStore((state) => [
     state.isThreadOpen,
@@ -84,7 +85,7 @@ const ChatBody = ({ height, anonymousMode, showRoles, scrollToBottom, messageLis
                 },
               },
             }
-            : undefined
+            : undefined, anonymousMode ? false : isChannelPrivate
         );
         if (messages) {
           setMessages(messages.filter((message) => message._hidden !== true));
@@ -94,12 +95,11 @@ const ChatBody = ({ height, anonymousMode, showRoles, scrollToBottom, messageLis
           return;
         }
         if (showRoles) {
-          const { roles } = await RCInstance.getChannelRoles();
+          const { roles } = await RCInstance.getChannelRoles(isChannelPrivate);
           // convert roles array from api into object for better search
-          const rolesObj = roles.reduce(
-            (obj, item) => Object.assign(obj, { [item.u.username]: item }),
-            {}
-          );
+          const rolesObj = roles?.length > 0
+            ? roles.reduce((obj, item) => ({ ...obj, [item.u.username]: item }), {})
+            : {};
           setRoles(rolesObj);
         }
       } catch (e) {
@@ -113,6 +113,7 @@ const ChatBody = ({ height, anonymousMode, showRoles, scrollToBottom, messageLis
       showRoles,
       setMessages,
       setRoles,
+      isChannelPrivate
     ]
   );
 
@@ -132,7 +133,8 @@ const ChatBody = ({ height, anonymousMode, showRoles, scrollToBottom, messageLis
           return;
         }
         const { messages } = await RCInstance.getThreadMessages(
-          threadMainMessage._id
+          threadMainMessage._id,
+          isChannelPrivate
         );
         setThreadMessages(messages);
       } catch (e) {
@@ -145,6 +147,7 @@ const ChatBody = ({ height, anonymousMode, showRoles, scrollToBottom, messageLis
     RCInstance,
     threadMainMessage?._id,
     setThreadMessages,
+    isChannelPrivate
   ]);
 
   useEffect(() => {

diff --git a/packages/react/src/components/ChatHeader/ChatHeader.js b/packages/react/src/components/ChatHeader/ChatHeader.js
@@ -37,6 +37,8 @@ const ChatHeader = ({
   const setShowChannelinfo = useChannelStore(
     (state) => state.setShowChannelinfo
   );
+  const isChannelPrivate = useChannelStore((state) => state.isChannelPrivate);
+  const setIsChannelPrivate = useChannelStore((state) => state.setIsChannelPrivate);
 
   const { RCInstance } = useRCContext();
 
@@ -91,11 +93,11 @@ const ChatHeader = ({
   }, [RCInstance, setMessages, setFilter]);
 
   const showChannelMembers = useCallback(async () => {
-    const { members = [] } = await RCInstance.getChannelMembers();
+    const { members = [] } = await RCInstance.getChannelMembers(isChannelPrivate);
     setMembersHandler(members);
     toggleShowMembers();
     setShowSearch(false);
-  }, [RCInstance, setMembersHandler, toggleShowMembers, setShowSearch]);
+  }, [RCInstance, setMembersHandler, toggleShowMembers, setShowSearch, isChannelPrivate]);
 
   const showSearchMessage = useCallback(() => {
     setShowSearch(true);
@@ -117,7 +119,8 @@ const ChatHeader = ({
     const getChannelInfo = async () => {
       const res = await RCInstance.channelInfo();
       if (res.success) {
-        setChannelInfo(res.channel);
+        setChannelInfo(res.room);
+        if (res.room.t === 'p') setIsChannelPrivate(true);
       } else {
         if ('errorType' in res && res.errorType === 'error-room-not-found') {
           dispatchToastMessage({
@@ -133,7 +136,7 @@ const ChatHeader = ({
     if (isUserAuthenticated) {
       getChannelInfo();
     }
-  }, [isUserAuthenticated, RCInstance, setChannelInfo]);
+  }, [isUserAuthenticated, RCInstance, setChannelInfo, setIsChannelPrivate]);
 
   const menuOptions = useMemo(() => {
     const options = [];

diff --git a/packages/react/src/components/ChatInput/ChatInput.js b/packages/react/src/components/ChatInput/ChatInput.js
@@ -7,6 +7,7 @@ import {
   useUserStore,
   useMessageStore,
   loginModalStore,
+  useChannelStore
 } from '../../store';
 import ChatInputFormattingToolbar from './ChatInputFormattingToolbar';
 import useAttachmentWindowStore from '../../store/attachmentwindow';
@@ -84,6 +85,8 @@ const ChatInput = ({ scrollToBottom }) => {
   const setIsLoginModalOpen = loginModalStore(
     (state) => state.setIsLoginModalOpen
   );
+  const isChannelPrivate = useChannelStore((state) => state.isChannelPrivate);
+  const setIsChannelPrivate = useChannelStore((state) => state.setIsChannelPrivate);
 
   const {
     editMessage,
@@ -213,12 +216,12 @@ const ChatInput = ({ scrollToBottom }) => {
   };
   const getAllChannelMembers = useCallback(async () => {
     try {
-      const channelMembers = await RCInstance.getChannelMembers();
+      const channelMembers = await RCInstance.getChannelMembers(isChannelPrivate);
       setRoomMembers(channelMembers.members);
     } catch (e) {
       console.error(e);
     }
-  }, [RCInstance, setRoomMembers]);
+  }, [RCInstance, setRoomMembers, isChannelPrivate]);
 
   useEffect(() => {
     if (editMessage.msg) {

diff --git a/packages/react/src/store/channelStore.js b/packages/react/src/store/channelStore.js
@@ -2,9 +2,11 @@ import { create } from 'zustand';
 
 const useChannelStore = create((set) => ({
   showChannelinfo: false,
+  isChannelPrivate: false,
   setShowChannelinfo: (showChannelinfo) => set(() => ({ showChannelinfo })),
   channelInfo: {},
   setChannelInfo: (channelInfo) => set(() => ({ channelInfo })),
+  setIsChannelPrivate: (isChannelPrivate) => set(() => ({ isChannelPrivate }))
 }));
 
 export default useChannelStore;