Skip to content

fix: remove deprecated admin-role detection and fix settings 403 #1324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aryan-Verma-999 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: remove deprecated admin-role detection and fix settings 403 #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97712fe
fix: remove deprecated admin-role detection
Aryan-Verma-999 Jun 6, 2026
c886439
fix: retrieve message limit from public settings endpoint
Aryan-Verma-999 Jun 9, 2026
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
35 changes: 12 additions & 23 deletions packages/api/src/EmbeddedChatApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,28 +618,6 @@ export default class EmbeddedChatApi {
}
}

async getUsersInRole(role: string) {
try {
return await this._restRequest(`/v1/roles.getUsersInRole?role=${role}`);
} catch (err: any) {
console.error(err instanceof Error ? err.message : String(err));
return err;
}
}

async getUserRoles() {
try {
const response = await this.getUsersInRole("admin");
if (response && response.success) {
return { result: response.users };
}
return { result: [] };
} catch (err) {
console.error(err instanceof Error ? err.message : err);
return { result: [] };
}
}

async sendTypingStatus(username: string, typing: boolean) {
try {
await this.sdk.call(
Expand Down Expand Up @@ -918,7 +896,18 @@ export default class EmbeddedChatApi {

async getMessageLimit() {
try {
return await this._restRequest("/v1/settings/Message_MaxAllowedSize");
const response = await this._restRequest(
"/v1/settings.public?_id=Message_MaxAllowedSize"
);
if (
response &&
response.success &&
response.settings &&
response.settings.length > 0
) {
return response.settings[0];
}
return null;
} catch (err: any) {
console.error(err instanceof Error ? err.message : err);
return err;
Expand Down
8 changes: 1 addition & 7 deletions packages/react/src/hooks/useFetchChatData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const useFetchChatData = (showRoles) => {
const { RCInstance } = useContext(RCContext);
const setMessages = useMessageStore((state) => state.setMessages);
const setMessagesOffset = useMessageStore((state) => state.setMessagesOffset);
const setAdmins = useMemberStore((state) => state.setAdmins);
const setMemberRoles = useMemberStore((state) => state.setMemberRoles);
const permissionsRef = useRef(null);
const setStarredMessages = useStarredMessageStore(
Expand Down Expand Up @@ -159,11 +158,6 @@ const useFetchChatData = (showRoles) => {

if (showRoles) {
const { roles } = await RCInstance.getChannelRoles(channelIsPrivate);
const fetchedRoles = await RCInstance.getUserRoles();
const fetchedAdmins = fetchedRoles?.result;

const adminUsernames = fetchedAdmins?.map((user) => user.username);
setAdmins(adminUsernames);

const rolesObj =
roles?.length > 0
Expand All @@ -184,7 +178,7 @@ const useFetchChatData = (showRoles) => {
RCInstance,
showRoles,
setMessages,
setAdmins,
setMessagesOffset,
setMemberRoles,
]
);
Expand Down
2 changes: 0 additions & 2 deletions packages/react/src/store/memberStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ const useMemberStore = create((set) => ({
showMembers: false,
setShowMembers: (showMembers) => set(() => ({ showMembers })),
memberRoles: {},
admins: [],
setMemberRoles: (memberRoles) => set((state) => ({ ...state, memberRoles })),
setAdmins: (admins) => set(() => ({ admins })),
setMembersHandler: (memberList) => set(() => ({ members: memberList })),
}));

Expand Down
11 changes: 0 additions & 11 deletions packages/react/src/views/Message/MessageHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ const MessageHeader = ({
const showUsername = ECOptions?.showUsername;
const showName = ECOptions?.showName;
const channelLevelRoles = useMemberStore((state) => state.memberRoles);
const admins = useMemberStore((state) => state.admins);

const isPinned = message.pinned;
const isStarred =
Expand Down Expand Up @@ -137,16 +136,6 @@ const MessageHeader = ({
)}
{!message.t && ECOptions?.showRoles && isRoles && (
<>
{admins?.includes(message?.u?.username) && (
<Box
as="span"
css={styles.userRole}
className={appendClassNames('ec-message-user-role')}
>
Admin
</Box>
)}

{channelLevelRoles[message.u.username]?.roles?.map((role, index) => (
<Box
key={index}
Expand Down