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

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

This commit is contained in:
Diego Mello 2022-08-17 09:49:13 -03:00 committed by GitHub
parent a607980840
commit c4d3af0e00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/lib/services/connect.ts
View File

@ -45,16 +45,15 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
if (sdk.current?.client?.host === server) { if (sdk.current?.client?.host === server) {
return resolve(); return resolve();
} }
// Check for running requests and abort them before connecting to the server
abort();
disconnect(); disconnect();
database.setActiveDB(server); database.setActiveDB(server);
store.dispatch(connectRequest()); store.dispatch(connectRequest());
// It's not called anywhere else
// if (this.connectTimeout) {
// clearTimeout(this.connectTimeout);
// }
if (connectingListener) { if (connectingListener) {
connectingListener.then(stopListener); connectingListener.then(stopListener);
} }
@ -374,7 +373,6 @@ function abort() {
if (sdk.current) { if (sdk.current) {
return sdk.current.abort(); return sdk.current.abort();
} }
return new AbortController();
} }
function checkAndReopen() { function checkAndReopen() {

3
app/sagas/selectServer.js
View File

@ -108,9 +108,6 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
const basicAuth = UserPreferences.getString(`${BASIC_AUTH_KEY}-${server}`); const basicAuth = UserPreferences.getString(`${BASIC_AUTH_KEY}-${server}`);
setBasicAuth(basicAuth); setBasicAuth(basicAuth);
// Check for running requests and abort them before connecting to the server
Services.abort();
if (user) { if (user) {
yield put(clearSettings()); yield put(clearSettings());
yield put(setUser(user)); yield put(setUser(user));

4
e2e/helpers/app.js
View File

@ -40,7 +40,6 @@ async function navigateToLogin(server) {
await waitFor(element(by.id('login-view'))) await waitFor(element(by.id('login-view')))
.toExist() .toExist()
.withTimeout(2000); .withTimeout(2000);
await expect(element(by.id('login-view'))).toExist();
} }
async function navigateToRegister(server) { async function navigateToRegister(server) {
@ -195,6 +194,9 @@ const checkServer = async server => {
.toBeVisible() .toBeVisible()
.withTimeout(10000); .withTimeout(10000);
await element(by.id('sidebar-close-drawer')).tap(); await element(by.id('sidebar-close-drawer')).tap();
await waitFor(element(by.id('sidebar-close-drawer')))
.not.toBeVisible()
.withTimeout(10000);
}; };
function runCommand(command) { function runCommand(command) {

10
e2e/tests/onboarding/05-login.spec.js
View File

@ -1,4 +1,4 @@
const { navigateToLogin, tapBack, platformTypes } = require('../../helpers/app'); const { navigateToLogin, tapBack, platformTypes, navigateToWorkspace, login } = require('../../helpers/app');
const data = require('../../data'); const data = require('../../data');
describe('Login screen', () => { describe('Login screen', () => {
@ -74,5 +74,13 @@ describe('Login screen', () => {
.toBeVisible() .toBeVisible()
.withTimeout(60000); .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);
});
}); });
}); });