Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Move clearSession function to utils

Browse Source
This commit is contained in:
JC Brand 2022-09-29 14:24:26 +02:00
parent b4eb6c0994
commit e555469e3f
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/headless/core.js
View File

@ -482,20 +482,6 @@ _converse.shouldClearCache = () => (
);
export function clearSession () {
_converse.session?.destroy();
delete _converse.session;
_converse.shouldClearCache() && _converse.api.user.settings.clear();
/**
* Synchronouse event triggered once the user session has been cleared,
* for example when the user has logged out or when Converse has
* disconnected for some other reason.
* @event _converse#clearSession
*/
return _converse.api.trigger('clearSession', {'synchronous': true});
}
_converse.initConnection = function () {
const api = _converse.api;

10
src/headless/shared/connection/index.js
View File

@ -1,13 +1,13 @@
import debounce from 'lodash-es/debounce';
import isElement from 'lodash-es/isElement';
import log from "@converse/headless/log.js";
import log from "../../log.js";
import sizzle from 'sizzle';
import { BOSH_WAIT } from '@converse/headless/shared/constants.js';
import { BOSH_WAIT } from '../../shared/constants.js';
import { Strophe } from 'strophe.js/src/core.js';
import { _converse, api, clearSession } from "@converse/headless/core.js";
import { _converse, api } from "../../core.js";
import { getOpenPromise } from '@converse/openpromise';
import { setUserJID, } from '@converse/headless/utils/init.js';
import { tearDown } from '@converse/headless/utils/core.js';
import { clearSession, tearDown } from "../../utils/core.js";
import { setUserJID, } from '../../utils/init.js';
const i = Object.keys(Strophe.Status).reduce((max, k) => Math.max(max, Strophe.Status[k]), 0);
Strophe.Status.RECONNECTING = i + 1;

16
src/headless/utils/core.js
View File

@ -38,7 +38,6 @@ export function isUniView () {
return ['mobile', 'fullscreen', 'embedded'].includes(settings_api.get("view_mode"));
}
export async function tearDown () {
await _converse.api.trigger('beforeTearDown', {'synchronous': true});
window.removeEventListener('click', _converse.onUserActivity);
@ -51,6 +50,21 @@ export async function tearDown () {
return _converse;
}
export function clearSession () {
_converse.session?.destroy();
delete _converse.session;
_converse.shouldClearCache() && _converse.api.user.settings.clear();
/**
* Synchronouse event triggered once the user session has been cleared,
* for example when the user has logged out or when Converse has
* disconnected for some other reason.
* @event _converse#clearSession
*/
return _converse.api.trigger('clearSession', {'synchronous': true});
}
/**
* Given a message object, return its text with @ chars
* inserted before the mentioned nicknames.