Skip to content

[FIX] Requests being skipped after reconnecting on onboarding #4429

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
Aug 17, 2022
Merged

[FIX] Requests being skipped after reconnecting on onboarding #4429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23b38c1
Fix abort being called before actually needed
diegolmello Aug 11, 2022
18bb877
Write regression test
diegolmello Aug 11, 2022
d269857
Make helper less flaky
diegolmello Aug 11, 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
10 changes: 4 additions & 6 deletions app/lib/services/connect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,15 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
if (sdk.current?.client?.host === server) {
return resolve();
}

// Check for running requests and abort them before connecting to the server
abort();

disconnect();
database.setActiveDB(server);

store.dispatch(connectRequest());

// It's not called anywhere else
// if (this.connectTimeout) {
// clearTimeout(this.connectTimeout);
// }

if (connectingListener) {
connectingListener.then(stopListener);
}
Expand Down Expand Up @@ -374,7 +373,6 @@ function abort() {
if (sdk.current) {
return sdk.current.abort();
}
return new AbortController();
}

function checkAndReopen() {
Expand Down
3 changes: 0 additions & 3 deletions app/sagas/selectServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
const basicAuth = UserPreferences.getString(`${BASIC_AUTH_KEY}-${server}`);
setBasicAuth(basicAuth);

// Check for running requests and abort them before connecting to the server
Services.abort();

if (user) {
yield put(clearSettings());
yield put(setUser(user));
Expand Down
4 changes: 3 additions & 1 deletion e2e/helpers/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ async function navigateToLogin(server) {
await waitFor(element(by.id('login-view')))
.toExist()
.withTimeout(2000);
await expect(element(by.id('login-view'))).toExist();
}

async function navigateToRegister(server) {
Expand Down Expand Up @@ -195,6 +194,9 @@ const checkServer = async server => {
.toBeVisible()
.withTimeout(10000);
await element(by.id('sidebar-close-drawer')).tap();
await waitFor(element(by.id('sidebar-close-drawer')))
.not.toBeVisible()
.withTimeout(10000);
};

function runCommand(command) {
Expand Down
10 changes: 9 additions & 1 deletion e2e/tests/onboarding/05-login.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { navigateToLogin, tapBack, platformTypes } = require('../../helpers/app');
const { navigateToLogin, tapBack, platformTypes, navigateToWorkspace, login } = require('../../helpers/app');
const data = require('../../data');

describe('Login screen', () => {
Expand Down Expand Up @@ -74,5 +74,13 @@ describe('Login screen', () => {
.toBeVisible()
.withTimeout(60000);
});

it('should connect, go back, connect to the same server and login', async () => {
await device.launchApp({ permissions: { notifications: 'YES' }, newInstance: true, delete: true });
await navigateToWorkspace();
await tapBack();
await navigateToLogin();
await login(data.users.regular.username, data.users.regular.password);
});
});
});