2.2.2

dist/index.html

@@ -13,7 +13,8 @@
     <script src="./chatbox.js"></script>
     <script>
       var config = {
-        settingsEndpoint: 'https://safesupport-admin.herokuapp.com/api/get-settings'
+        settingsEndpoint: 'https://safesupport-admin.herokuapp.com/api/get-settings',
+        matrixServerUrl: 'https://matrix.safesupport.chat'
       }
 
       EmbeddableChatbox.mount(config);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "private-safesupport-chatbox",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "A secure and private embeddable chatbox that connects to Riot",
   "main": "dist/chatbox.js",
   "scripts": {

public/index.html

@@ -13,7 +13,8 @@
     <script src="./chatbox.js"></script>
     <script>
       var config = {
-        settingsEndpoint: 'https://safesupport-admin.herokuapp.com/api/get-settings'
+        settingsEndpoint: 'https://safesupport-admin.herokuapp.com/api/get-settings',
+        matrixServerUrl: 'https://matrix.safesupport.chat'
       }
 
       EmbeddableChatbox.mount(config);

src/components/ChatboxWithSettings.js

@@ -3,22 +3,22 @@ import PropTypes from 'prop-types';
 import Chatbox from './chatbox';
 
 
-const ChatboxWithSettings = ({ settingsEndpoint, ...rest }) => {
+const ChatboxWithSettings = ({ settingsEndpoint, matrixServerUrl, ...rest }) => {
   const [settings, setSettings] = useState({});
-
   const settingsObj = {};
 
   const getSettings = async () => {
     if (!settingsEndpoint) {
       const props = {
         ...rest,
-        enabled: true
+        enabled: true,
-      }
+      };
 
       return setSettings(props);
     }
 
-    const res = await fetch(settingsEndpoint);
+    const url = `${settingsEndpoint}?homeserver=${encodeURIComponent(matrixServerUrl)}`;
+    const res = await fetch(url);
     const data = await res.json();
     const { fields } = data;
 
@@ -42,12 +42,17 @@ const ChatboxWithSettings = ({ settingsEndpoint, ...rest }) => {
   }, []);
 
   return (
-    <Chatbox {...settings} {...rest} />
+    <Chatbox matrixServerUrl={matrixServerUrl} {...settings} {...rest} />
   );
 };
 
 ChatboxWithSettings.propTypes = {
+  matrixServerUrl: PropTypes.string.isRequired,
   settingsEndpoint: PropTypes.string,
 };
 
+ChatboxWithSettings.defaultProps = {
+  settingsEndpoint: null,
+};
+
 export default ChatboxWithSettings;