浏览代码

Move `clearSession` function to utils

JC Brand 2 年之前
父节点
当前提交
e555469e3f
共有 3 个文件被更改,包括 20 次插入20 次删除
  1. 0 14
      src/headless/core.js
  2. 5 5
      src/headless/shared/connection/index.js
  3. 15 1
      src/headless/utils/core.js

+ 0 - 14
src/headless/core.js

@@ -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;
 

+ 5 - 5
src/headless/shared/connection/index.js

@@ -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;

+ 15 - 1
src/headless/utils/core.js

@@ -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.