Merge pull request 'fix: obs support wss' (#113) from dev into master

Reviewed-on: #113

src/main/webapp/src/pages/competition/editor/CMAdmin.jsx

@@ -331,9 +331,8 @@ function Menu({menuActions, compUuid}) {
                             <strong>{t('config.obs.warn1')}</strong>
                             <div className="input-group mb-3">
                                 <span className="input-group-text">{t('adresseDuServeur')}</span>
-                                <span className="input-group-text">{t('config.obs.ws')}</span>
+                                <input type="text" className="form-control" placeholder="ws://127.0.0.1:4455/" aria-label=""
-                                <input type="text" className="form-control" placeholder="127.0.0.1:4455" aria-label=""
+                                       defaultValue={"ws://127.0.0.1:4455/"}/>
-                                       defaultValue={"127.0.0.1:4455"}/>
                                 <span className="input-group-text">/</span>
                             </div>
                             <div className="input-group mb-3">

src/main/webapp/src/pages/competition/editor/CMTable.jsx

@@ -160,7 +160,7 @@ function Menu({menuActions}) {
                         } else {
                             importOBSConfiguration()
                                 .then(config => {
-                                    connect("ws://" + config.adresse + "/", config.password, config.assets_dir);
+                                    connect(config.adresse, config.password, config.assets_dir);
                                 })
                                 .catch(() => {
                                     toast.error(t('aucuneConfigurationObs'));