OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove excessive scalar auth checks in manager util class

pull/21833/head
Travis Ralston 2019-06-17 15:50:09 -06:00
parent 974a11ed20
commit d58ab8e6d0
1 changed files with 16 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/IntegrationManager.js
View File

@ -22,31 +22,8 @@ import ScalarAuthClient from './ScalarAuthClient';
import RoomViewStore from './stores/RoomViewStore'; import RoomViewStore from './stores/RoomViewStore';
import MatrixClientPeg from "./MatrixClientPeg"; import MatrixClientPeg from "./MatrixClientPeg";
if (!global.mxIntegrationManager) { // TODO: We should use this everywhere.
global.mxIntegrationManager = {};
}
// TODO: TravisR - What even is this?
export default class IntegrationManager { export default class IntegrationManager {
static _init() {
if (!global.mxIntegrationManager.client || !global.mxIntegrationManager.connected) {
if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
ScalarMessaging.startListening();
global.mxIntegrationManager.client = new ScalarAuthClient();
return global.mxIntegrationManager.client.connect().then(() => {
global.mxIntegrationManager.connected = true;
}).catch((e) => {
console.error("Failed to connect to integrations server", e);
global.mxIntegrationManager.error = e;
});
} else {
console.error('Invalid integration manager config', SdkConfig.get());
}
}
}
/** /**
* Launch the integrations manager on the specified integration page * Launch the integrations manager on the specified integration page
* @param {string} integName integration / widget type * @param {string} integName integration / widget type
@ -54,18 +31,8 @@ export default class IntegrationManager {
* @param {function} onFinished Callback to invoke on integration manager close * @param {function} onFinished Callback to invoke on integration manager close
*/ */
static async open(integName, integId, onFinished) { static async open(integName, integId, onFinished) {
await IntegrationManager._init(); // The dialog will take care of scalar auth for us
if (global.mxIntegrationManager.client) {
await global.mxIntegrationManager.client.connect();
} else {
return;
}
const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager"); const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
if (global.mxIntegrationManager.error ||
!(global.mxIntegrationManager.client && global.mxIntegrationManager.client.hasCredentials())) {
console.error("Scalar error", global.mxIntegrationManager);
return;
}
Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, { Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
room: MatrixClientPeg.get().getRoom(RoomViewStore.getRoomId()), room: MatrixClientPeg.get().getRoom(RoomViewStore.getRoomId()),
screen: 'type_' + integName, screen: 'type_' + integName,