Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/auth/src/RocketChatAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ class RocketChatAuth {
async onAuthChange(callback: (user: object | null) => void) {
this.authListeners.push(callback);
const user = await this.getCurrentUser();
callback(user);
if (this.authListeners.includes(callback)) {
callback(user);
}
}

async removeAuthListener(callback: (user: object | null) => void) {
Expand Down
27 changes: 21 additions & 6 deletions packages/react/src/views/ChatBody/ChatBody.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,19 @@ const ChatBody = ({
);

useEffect(() => {
RCInstance.auth.onAuthChange((user) => {
const handleAuthChange = (user) => {
if (user) {
RCInstance.addMessageListener(addMessage);
RCInstance.addMessageDeleteListener(removeMessage);
RCInstance.addActionTriggeredListener(onActionTriggerResponse);
RCInstance.addUiInteractionListener(onActionTriggerResponse);
}
});
};

RCInstance.auth.onAuthChange(handleAuthChange);

return () => {
RCInstance.auth.removeAuthListener(handleAuthChange);
RCInstance.removeMessageListener(addMessage);
RCInstance.removeMessageDeleteListener(removeMessage);
RCInstance.removeActionTriggeredListener(onActionTriggerResponse);
Expand All @@ -164,24 +167,36 @@ const ChatBody = ({
}, [RCInstance, addMessage, removeMessage, onActionTriggerResponse]);

useEffect(() => {
RCInstance.auth.onAuthChange((user) => {
const handleAuthChange = (user) => {
if (user) {
getMessagesAndRoles();
setHasMoreMessages(true);
} else {
getMessagesAndRoles(anonymousMode);
}
});
};

RCInstance.auth.onAuthChange(handleAuthChange);

return () => {
RCInstance.auth.removeAuthListener(handleAuthChange);
};
}, [RCInstance, anonymousMode, getMessagesAndRoles]);

useEffect(() => {
RCInstance.auth.onAuthChange((user) => {
const handleAuthChange = (user) => {
if (user) {
fetchAndSetPermissions();
} else {
permissionsRef.current = null;
}
});
};

RCInstance.auth.onAuthChange(handleAuthChange);

return () => {
RCInstance.auth.removeAuthListener(handleAuthChange);
};
}, []);

// Expose clearUnreadDivider function via ref for ChatInput to call
Expand Down
10 changes: 8 additions & 2 deletions packages/react/src/views/ChatInput/ChatInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const ChatInput = ({ scrollToBottom, clearUnreadDividerRef }) => {
);

useEffect(() => {
RCInstance.auth.onAuthChange((user) => {
const handleAuthChange = (user) => {
if (user) {
RCInstance.getCommandsList()
.then((data) => setCommands(data.commands || []))
Expand All @@ -156,7 +156,13 @@ const ChatInput = ({ scrollToBottom, clearUnreadDividerRef }) => {
)
.catch(console.error);
}
});
};

RCInstance.auth.onAuthChange(handleAuthChange);

return () => {
RCInstance.auth.removeAuthListener(handleAuthChange);
};
}, [RCInstance, isChannelPrivate, setMembersHandler]);

useEffect(() => {
Expand Down
10 changes: 8 additions & 2 deletions packages/react/src/views/EmbeddedChat.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const EmbeddedChat = (props) => {
}, [RCInstance, auth, setIsLoginIn]);

useEffect(() => {
RCInstance.auth.onAuthChange((user) => {
const handleAuthChange = (user) => {
if (user) {
RCInstance.connect()
.then(() => {
Expand All @@ -151,7 +151,13 @@ const EmbeddedChat = (props) => {
} else {
setIsUserAuthenticated(false);
}
});
};

RCInstance.auth.onAuthChange(handleAuthChange);

return () => {
RCInstance.auth.removeAuthListener(handleAuthChange);
};
}, [
RCInstance,
setAuthenticatedName,
Expand Down