Skip to content

[FIX] Select user from native credentials #1266

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
diegolmello merged 2 commits into from
Oct 2, 2019
Merged

[FIX] Select user from native credentials #1266

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
42dea42
Improve migration code
djorkaeffalexandre Oct 1, 2019
ab791dc
Merge branch 'develop' into improve.migration-code
diegolmello Oct 2, 2019
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
8 changes: 4 additions & 4 deletions app/lib/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ const RocketChat = {
const userCollections = serversDB.collections.get('users');
let user = null;
if (userId) {
user = await userCollections.find(userId);
const userRecord = await userCollections.find(userId);
user = {
id: user.id,
token: user.token,
username: user.username
id: userRecord.id,
token: userRecord.token,
username: userRecord.username
};
}
reduxStore.dispatch(shareSetUser({
Expand Down
36 changes: 17 additions & 19 deletions app/sagas/selectServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,29 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
let user = null;
if (userId) {
try {
user = yield userCollections.find(userId);
const userRecord = yield userCollections.find(userId);
user = {
id: user.id,
token: user.token,
username: user.username,
name: user.name,
language: user.language,
status: user.status,
roles: user.roles
id: userRecord.id,
token: userRecord.token,
username: userRecord.username,
name: userRecord.name,
language: userRecord.language,
status: userRecord.status,
roles: userRecord.roles
};
user = { ...user, roles: JSON.parse(user.roles) };
} catch (e) {
// do nothing?
// We only run it if not has user on DB
const servers = yield RNUserDefaults.objectForKey(SERVERS);
const userCredentials = servers && servers.find(srv => srv[SERVER_URL] === server);
user = userCredentials && {
token: userCredentials[TOKEN]
};
}
}

const servers = yield RNUserDefaults.objectForKey(SERVERS);
const userCredentials = servers && servers.find(srv => srv[SERVER_URL] === server);
const userLogin = userCredentials && {
token: userCredentials[TOKEN]
};

if (user || userLogin) {
yield RocketChat.connect({ server, user: user || userLogin });
yield put(setUser(user || userLogin));
if (user) {
yield RocketChat.connect({ server, user });
yield put(setUser(user));
yield put(actions.appStart('inside'));
} else {
yield RocketChat.connect({ server });
Expand Down