Skip to content

[FIX] Share Extension shows a server that has no user logged in #4336

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

Merged
dnlsilva merged 2 commits into from
Jul 20, 2022
Merged

[FIX] Share Extension shows a server that has no user logged in #4336

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
606824a
[FIX] Share Extension shows a server that has no user logged in
dnlsilva Jul 4, 2022
b37d9ee
set server after login
dnlsilva Jul 6, 2022
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: 2 additions & 2 deletions app/sagas/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { inquiryRequest, inquiryReset } from '../ee/omnichannel/actions/inquiry'
import { isOmnichannelStatusAvailable } from '../ee/omnichannel/lib';
import { RootEnum } from '../definitions';
import sdk from '../lib/services/sdk';
import { TOKEN_KEY } from '../lib/constants';
import { CURRENT_SERVER, TOKEN_KEY } from '../lib/constants';
import {
getCustomEmojis,
getEnterpriseModules,
Expand Down Expand Up @@ -181,9 +181,9 @@ const handleLoginSuccess = function* handleLoginSuccess({ user }) {

UserPreferences.setString(`${TOKEN_KEY}-${server}`, user.id);
UserPreferences.setString(`${TOKEN_KEY}-${user.id}`, user.token);
UserPreferences.setString(CURRENT_SERVER, server);
yield put(setUser(user));
EventEmitter.emit('connected');

yield put(appStart({ root: RootEnum.ROOT_INSIDE }));
const inviteLinkToken = yield select(state => state.inviteLinks.token);
if (inviteLinkToken) {
Expand Down
2 changes: 1 addition & 1 deletion app/sagas/selectServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
yield put(encryptionStop());
yield put(clearActiveUsers());
const serversDB = database.servers;
UserPreferences.setString(CURRENT_SERVER, server);
const userId = UserPreferences.getString(`${TOKEN_KEY}-${server}`);
const userCollections = serversDB.get('users');
let user = null;
Expand Down Expand Up @@ -117,6 +116,7 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
yield put(setUser(user));
yield connect({ server, logoutOnError: true });
yield put(appStart({ root: RootEnum.ROOT_INSIDE }));
UserPreferences.setString(CURRENT_SERVER, server); // only set server after have a user
} else {
yield put(clearUser());
yield connect({ server });
Expand Down