Browse Source

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.

j8
paweldomas 10 years ago
parent
commit
ed78c0053c

+ 9
- 1
app.js View File

53
     RTC.addStreamListener(maybeDoJoin, StreamEventTypes.EVENT_TYPE_LOCAL_CREATED);
53
     RTC.addStreamListener(maybeDoJoin, StreamEventTypes.EVENT_TYPE_LOCAL_CREATED);
54
     RTC.start();
54
     RTC.start();
55
 
55
 
56
-    var jid = document.getElementById('jid').value || config.hosts.anonymousdomain || config.hosts.domain || window.location.hostname;
56
+    var configDomain = config.hosts.anonymousdomain || config.hosts.domain;
57
+
58
+    // Force authenticated domain if room is appended with '?login=true'
59
+    if (config.hosts.anonymousdomain &&
60
+        window.location.search.indexOf("login=true") !== -1) {
61
+        configDomain = config.hosts.domain;
62
+    }
63
+
64
+    var jid = document.getElementById('jid').value || configDomain || window.location.hostname;
57
     connect(jid);
65
     connect(jid);
58
 }
66
 }
59
 
67
 

+ 1
- 1
doc/debian/jitsi-meet/jitsi-meet.example View File

17
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
17
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
18
     }
18
     }
19
 
19
 
20
-    location ~ ^/([a-zA-Z0-9]+)$ {
20
+    location ~ ^/([a-zA-Z0-9=\?]+)$ {
21
         rewrite ^/(.*)$ / break;
21
         rewrite ^/(.*)$ / break;
22
     }
22
     }
23
 
23
 

+ 1
- 1
doc/example-config-files/jitsi.example.com.example View File

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

Loading…
Cancel
Save