Makes it possible to append URL parameters after room name. Adds ?login=true to enforce authenticated domain when anonymous domain is used. This allows to get moderator permissions after room has been created.

This commit is contained in:
paweldomas 2015-01-16 13:20:40 +01:00
parent 398fd18b8e
commit ed78c0053c
3 changed files with 11 additions and 3 deletions

10
app.js
View File

@ -53,7 +53,15 @@ function init() {
RTC.addStreamListener(maybeDoJoin, StreamEventTypes.EVENT_TYPE_LOCAL_CREATED); RTC.addStreamListener(maybeDoJoin, StreamEventTypes.EVENT_TYPE_LOCAL_CREATED);
RTC.start(); RTC.start();
var jid = document.getElementById('jid').value || config.hosts.anonymousdomain || config.hosts.domain || window.location.hostname; var configDomain = config.hosts.anonymousdomain || config.hosts.domain;
// Force authenticated domain if room is appended with '?login=true'
if (config.hosts.anonymousdomain &&
window.location.search.indexOf("login=true") !== -1) {
configDomain = config.hosts.domain;
}
var jid = document.getElementById('jid').value || configDomain || window.location.hostname;
connect(jid); connect(jid);
} }

View File

@ -17,7 +17,7 @@ server {
alias /etc/jitsi/meet/jitsi-meet.example.com-config.js; alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
} }
location ~ ^/([a-zA-Z0-9]+)$ { location ~ ^/([a-zA-Z0-9=\?]+)$ {
rewrite ^/(.*)$ / break; rewrite ^/(.*)$ / break;
} }

View File

@ -6,7 +6,7 @@ server {
root /srv/jitsi.example.com; root /srv/jitsi.example.com;
index index.html; index index.html;
location ~ ^/([a-zA-Z0-9]+)$ { location ~ ^/([a-zA-Z0-9=\?]+)$ {
rewrite ^/(.*)$ / break; rewrite ^/(.*)$ / break;
} }