Skip to content

[FIX] App hanging on splash screen when deep link params are wrong #2359

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 3 commits into from
Jul 30, 2020
Merged

[FIX] App hanging on splash screen when deep link params are wrong #2359

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c966b49
Add rule when there's no host on the deep link params
diegolmello Jul 30, 2020
fca0fc4
Add fallbackNavigation()
diegolmello Jul 30, 2020
10aaa12
Fix insecure hosts
diegolmello Jul 30, 2020
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
23 changes: 21 additions & 2 deletions app/sagas/deepLinking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import { inviteLinksSetToken, inviteLinksRequest } from '../actions/inviteLinks'
import database from '../lib/database';
import RocketChat from '../lib/rocketchat';
import EventEmitter from '../utils/events';
import { appStart, ROOT_INSIDE, ROOT_NEW_SERVER } from '../actions/app';
import {
appStart, ROOT_INSIDE, ROOT_NEW_SERVER, appInit
} from '../actions/app';
import { localAuthenticate } from '../utils/localAuthentication';
import { goRoom } from '../utils/goRoom';
import callJitsi from '../lib/methods/callJitsi';
Expand Down Expand Up @@ -61,6 +63,14 @@ const navigate = function* navigate({ params }) {
}
};

const fallbackNavigation = function* fallbackNavigation() {
const currentRoot = yield select(state => state.app.root);
if (currentRoot) {
return;
}
yield put(appInit());
};

const handleOpen = function* handleOpen({ params }) {
const serversDB = database.servers;
const serversCollection = serversDB.collections.get('servers');
Expand All @@ -76,11 +86,18 @@ const handleOpen = function* handleOpen({ params }) {
});
}

// If there's no host on the deep link params and the app is opened, just call appInit()
if (!host) {
yield fallbackNavigation();
return;
}

// If there's host, continue
if (!/^(http|https)/.test(host)) {
host = `https://${ params.host }`;
host = `https://${ host }`;
} else {
// Notification should always come from https
host = host.replace('http://', 'https://');
}
// remove last "/" from host
if (host.slice(-1) === '/') {
Expand Down Expand Up @@ -119,6 +136,8 @@ const handleOpen = function* handleOpen({ params }) {
// if deep link is from a different server
const result = yield RocketChat.getServerInfo(host);
if (!result.success) {
// Fallback to prevent the app from being stuck on splash screen
yield fallbackNavigation();
return;
}
yield put(appStart({ root: ROOT_NEW_SERVER }));
Expand Down