sergiodt
/
vn-verdnaturachat
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Subscribe to settings making app to hang on login (#3254)

This commit is contained in:
Diego Mello 2021-07-06 13:22:38 -03:00 committed by GitHub
parent 999f05bbd1
commit 6385daebb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/methods/getSettings.js
View File

@ -131,6 +131,10 @@ export async function setSettings() {
reduxStore.dispatch(addSettings(RocketChat.parseSettings(parsed.slice(0, parsed.length))));
}
export function subscribeSettings() {
return RocketChat.subscribe('stream-notify-all', 'public-settings-changed');
}
export default async function() {
try {
const db = database.active;
@ -146,7 +150,6 @@ export default async function() {
const filteredSettingsIds = filteredSettings.map(s => s._id);
reduxStore.dispatch(addSettings(this.parseSettings(filteredSettings)));
RocketChat.subscribe('stream-notify-all', 'public-settings-changed');
// filter server info
const serverInfo = filteredSettings.filter(i1 => serverInfoKeys.includes(i1._id));

3
app/lib/rocketchat.js
View File

@ -28,7 +28,7 @@ import getUsersPresence, { getUserPresence, subscribeUsersPresence } from './met
import protectedFunction from './methods/helpers/protectedFunction';
import readMessages from './methods/readMessages';
import getSettings, { getLoginSettings, setSettings } from './methods/getSettings';
import getSettings, { getLoginSettings, setSettings, subscribeSettings } from './methods/getSettings';
import getRooms from './methods/getRooms';
import { setPermissions, getPermissions } from './methods/getPermissions';
@ -883,6 +883,7 @@ const RocketChat = {
getSettings,
getLoginSettings,
setSettings,
subscribeSettings,
getPermissions,
setPermissions,
getCustomEmojis,

5
app/sagas/login.js
View File

@ -80,6 +80,10 @@ const handleLoginRequest = function* handleLoginRequest({ credentials, logoutOnE
}
};
const subscribeSettings = function* subscribeSettings() {
yield RocketChat.subscribeSettings();
};
const fetchPermissions = function* fetchPermissions() {
yield RocketChat.getPermissions();
};
@ -133,6 +137,7 @@ const handleLoginSuccess = function* handleLoginSuccess({ user }) {
yield fork(registerPushToken);
yield fork(fetchUsersPresence);
yield fork(fetchEnterpriseModules, { user });
yield fork(subscribeSettings);
yield put(encryptionInit());
setLanguage(user?.language);