Merge pull request #2777 from matrix-org/jaywink/ensure-scalar-token

Ensure scalar_token is valid before opening integrations manager

src/IntegrationManager.js

@@ -51,6 +51,11 @@ export default class IntegrationManager {
    */
   static async open(integName, integId, onFinished) {
     await IntegrationManager._init();
+    if (global.mxIntegrationManager.client) {
+        await global.mxIntegrationManager.client.connect();
+    } else {
+        return;
+    }
     const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
     if (global.mxIntegrationManager.error ||
         !(global.mxIntegrationManager.client && global.mxIntegrationManager.client.hasCredentials())) {

src/components/views/elements/AppTile.js

@@ -241,11 +241,18 @@ export default class AppTile extends React.Component {
             this.props.onEditClick();
         } else {
             const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
-            const src = this._scalarClient.getScalarInterfaceUrlForRoom(
+            this._scalarClient.connect().done(() => {
-                this.props.room, 'type_' + this.props.type, this.props.id);
+                const src = this._scalarClient.getScalarInterfaceUrlForRoom(
-            Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
+                    this.props.room, 'type_' + this.props.type, this.props.id);
-                src: src,
+                Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
-            }, "mx_IntegrationsManager");
+                    src: src,
+                }, "mx_IntegrationsManager");
+            }, (err) => {
+                this.setState({
+                    error: err.message,
+                });
+                console.error('Error ensuring a valid scalar_token exists', err);
+            });
         }
     }
 

src/components/views/elements/ManageIntegsButton.js

@@ -45,7 +45,7 @@ export default class ManageIntegsButton extends React.Component {
             this.scalarClient.connect().done(() => {
                 this.forceUpdate();
             }, (err) => {
-                this.setState({ scalarError: err});
+                this.setState({scalarError: err});
                 console.error('Error whilst initialising scalarClient for ManageIntegsButton', err);
             });
         }
@@ -61,11 +61,16 @@ export default class ManageIntegsButton extends React.Component {
             return;
         }
         const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
-        Modal.createDialog(IntegrationsManager, {
+        this.scalarClient.connect().done(() => {
-            src: (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
+            Modal.createDialog(IntegrationsManager, {
-                this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room) :
+                src: (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
-                null,
+                    this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room) :
-        }, "mx_IntegrationsManager");
+                    null,
+            }, "mx_IntegrationsManager");
+        }, (err) => {
+            this.setState({scalarError: err});
+            console.error('Error ensuring a valid scalar_token exists', err);
+        });
     }
 
     render() {

src/components/views/rooms/AppsDrawer.js

@@ -144,12 +144,16 @@ module.exports = React.createClass({
 
     _launchManageIntegrations: function() {
         const IntegrationsManager = sdk.getComponent('views.settings.IntegrationsManager');
-        const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
+        this._scalarClient.connect().done(() => {
+            const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
                 this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room, 'add_integ') :
                 null;
-        Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
+            Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
-            src: src,
+                src: src,
-        }, 'mx_IntegrationsManager');
+            }, 'mx_IntegrationsManager');
+        }, (err) => {
+            console.error('Error ensuring a valid scalar_token exists', err);
+        });
     },
 
     onClickAddWidget: function(e) {

src/components/views/rooms/Stickerpicker.js

@@ -310,18 +310,22 @@ export default class Stickerpicker extends React.Component {
      */
     _launchManageIntegrations() {
         const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
-        const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
+        this.scalarClient.connect().done(() => {
+            const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
                 this.scalarClient.getScalarInterfaceUrlForRoom(
                     this.props.room,
                     'type_' + widgetType,
                     this.state.widgetId,
                 ) :
                 null;
-        Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
+            Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
-            src: src,
+                src: src,
-        }, "mx_IntegrationsManager");
+            }, "mx_IntegrationsManager");
-
+            this.setState({showStickers: false});
-        this.setState({showStickers: false});
+        }, (err) => {
+            this.setState({imError: err});
+            console.error('Error ensuring a valid scalar_token exists', err);
+        });
     }
 
     render() {