diff --git a/app.js b/app.js
index 5cee715dc..0d51d6239 100644
--- a/app.js
+++ b/app.js
@@ -24,6 +24,659 @@ function init() {
RTC.start();
xmpp.start(UI.getCreadentials);
+<<<<<<< HEAD
+=======
+ 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);
+}
+
+function connect(jid, password) {
+ connection = new Strophe.Connection(document.getElementById('boshURL').value || config.bosh || '/http-bind');
+
+ var settings = UI.getSettings();
+ var email = settings.email;
+ var displayName = settings.displayName;
+ if(email) {
+ connection.emuc.addEmailToPresence(email);
+ } else {
+ connection.emuc.addUserIdToPresence(settings.uid);
+ }
+ if(displayName) {
+ connection.emuc.addDisplayNameToPresence(displayName);
+ }
+
+ if (connection.disco) {
+ // for chrome, add multistream cap
+ }
+ connection.jingle.pc_constraints = RTC.getPCConstraints();
+ if (config.useIPv6) {
+ // https://code.google.com/p/webrtc/issues/detail?id=2828
+ if (!connection.jingle.pc_constraints.optional) connection.jingle.pc_constraints.optional = [];
+ connection.jingle.pc_constraints.optional.push({googIPv6: true});
+ }
+
+ if(!password)
+ password = document.getElementById('password').value;
+
+ var anonymousConnectionFailed = false;
+ connection.connect(jid, password, function (status, msg) {
+ console.log('Strophe status changed to', Strophe.getStatusString(status));
+ if (status === Strophe.Status.CONNECTED) {
+ if (config.useStunTurn) {
+ connection.jingle.getStunAndTurnCredentials();
+ }
+ document.getElementById('connect').disabled = true;
+
+ console.info("My Jabber ID: " + connection.jid);
+
+ if(password)
+ authenticatedUser = true;
+ maybeDoJoin();
+ } else if (status === Strophe.Status.CONNFAIL) {
+ if(msg === 'x-strophe-bad-non-anon-jid') {
+ anonymousConnectionFailed = true;
+ }
+ } else if (status === Strophe.Status.DISCONNECTED) {
+ if(anonymousConnectionFailed) {
+ // prompt user for username and password
+ $(document).trigger('passwordrequired.main');
+ }
+ } else if (status === Strophe.Status.AUTHFAIL) {
+ // wrong password or username, prompt user
+ $(document).trigger('passwordrequired.main');
+
+ }
+ });
+}
+
+
+
+function maybeDoJoin() {
+ if (connection && connection.connected && Strophe.getResourceFromJid(connection.jid) // .connected is true while connecting?
+ && (RTC.localAudio || RTC.localVideo)) {
+ doJoin();
+ }
+}
+
+function doJoin() {
+ if (!roomName) {
+ UI.generateRoomName();
+ }
+
+ Moderator.allocateConferenceFocus(
+ roomName, doJoinAfterFocus);
+}
+
+function doJoinAfterFocus() {
+
+ // Close authentication dialog if opened
+ if (authDialog) {
+ UI.messageHandler.closeDialog();
+ authDialog = null;
+ }
+ // Clear retry interval, so that we don't call 'doJoinAfterFocus' twice
+ if (authRetryId) {
+ window.clearTimeout(authRetryId);
+ authRetryId = null;
+ }
+
+ var roomjid;
+ roomjid = roomName;
+
+ if (config.useNicks) {
+ var nick = window.prompt('Your nickname (optional)');
+ if (nick) {
+ roomjid += '/' + nick;
+ } else {
+ roomjid += '/' + Strophe.getNodeFromJid(connection.jid);
+ }
+ } else {
+
+ var tmpJid = Strophe.getNodeFromJid(connection.jid);
+
+ if(!authenticatedUser)
+ tmpJid = tmpJid.substr(0, 8);
+
+ roomjid += '/' + tmpJid;
+ }
+ connection.emuc.doJoin(roomjid);
+}
+
+function waitForRemoteVideo(selector, ssrc, stream, jid) {
+ // XXX(gp) so, every call to this function is *always* preceded by a call
+ // to the RTC.attachMediaStream() function but that call is *not* followed
+ // by an update to the videoSrcToSsrc map!
+ //
+ // The above way of doing things results in video SRCs that don't correspond
+ // to any SSRC for a short period of time (to be more precise, for as long
+ // the waitForRemoteVideo takes to complete). This causes problems (see
+ // bellow).
+ //
+ // I'm wondering why we need to do that; i.e. why call RTC.attachMediaStream()
+ // a second time in here and only then update the videoSrcToSsrc map? Why
+ // not simply update the videoSrcToSsrc map when the RTC.attachMediaStream()
+ // is called the first time? I actually do that in the lastN changed event
+ // handler because the "orphan" video SRC is causing troubles there. The
+ // purpose of this method would then be to fire the "videoactive.jingle".
+ //
+ // Food for though I guess :-)
+
+ if (selector.removed || !selector.parent().is(":visible")) {
+ console.warn("Media removed before had started", selector);
+ return;
+ }
+
+ if (stream.id === 'mixedmslabel') return;
+
+ if (selector[0].currentTime > 0) {
+ var videoStream = simulcast.getReceivingVideoStream(stream);
+ RTC.attachMediaStream(selector, videoStream); // FIXME: why do i have to do this for FF?
+
+ // FIXME: add a class that will associate peer Jid, video.src, it's ssrc and video type
+ // in order to get rid of too many maps
+ if (ssrc && jid) {
+ jid2Ssrc[Strophe.getResourceFromJid(jid)] = ssrc;
+ } else {
+ console.warn("No ssrc given for jid", jid);
+ }
+
+ $(document).trigger('videoactive.jingle', [selector]);
+ } else {
+ setTimeout(function () {
+ waitForRemoteVideo(selector, ssrc, stream, jid);
+ }, 250);
+ }
+}
+
+$(document).bind('remotestreamadded.jingle', function (event, data, sid) {
+ waitForPresence(data, sid);
+});
+
+function waitForPresence(data, sid) {
+ var sess = connection.jingle.sessions[sid];
+
+ var thessrc;
+
+ // look up an associated JID for a stream id
+ if (data.stream.id && data.stream.id.indexOf('mixedmslabel') === -1) {
+ // look only at a=ssrc: and _not_ at a=ssrc-group: lines
+
+ var ssrclines
+ = SDPUtil.find_lines(sess.peerconnection.remoteDescription.sdp, 'a=ssrc:');
+ ssrclines = ssrclines.filter(function (line) {
+ // NOTE(gp) previously we filtered on the mslabel, but that property
+ // is not always present.
+ // return line.indexOf('mslabel:' + data.stream.label) !== -1;
+
+ return ((line.indexOf('msid:' + data.stream.id) !== -1));
+ });
+ if (ssrclines.length) {
+ thessrc = ssrclines[0].substring(7).split(' ')[0];
+
+ // We signal our streams (through Jingle to the focus) before we set
+ // our presence (through which peers associate remote streams to
+ // jids). So, it might arrive that a remote stream is added but
+ // ssrc2jid is not yet updated and thus data.peerjid cannot be
+ // successfully set. Here we wait for up to a second for the
+ // presence to arrive.
+
+ if (!ssrc2jid[thessrc]) {
+ // TODO(gp) limit wait duration to 1 sec.
+ setTimeout(function(d, s) {
+ return function() {
+ waitForPresence(d, s);
+ }
+ }(data, sid), 250);
+ return;
+ }
+
+ // ok to overwrite the one from focus? might save work in colibri.js
+ console.log('associated jid', ssrc2jid[thessrc], data.peerjid);
+ if (ssrc2jid[thessrc]) {
+ data.peerjid = ssrc2jid[thessrc];
+ }
+ }
+ }
+
+ //TODO: this code should be removed when firefox implement multistream support
+ if(RTC.getBrowserType() == RTCBrowserType.RTC_BROWSER_FIREFOX)
+ {
+ if((notReceivedSSRCs.length == 0) ||
+ !ssrc2jid[notReceivedSSRCs[notReceivedSSRCs.length - 1]])
+ {
+ // TODO(gp) limit wait duration to 1 sec.
+ setTimeout(function(d, s) {
+ return function() {
+ waitForPresence(d, s);
+ }
+ }(data, sid), 250);
+ return;
+ }
+
+ thessrc = notReceivedSSRCs.pop();
+ if (ssrc2jid[thessrc]) {
+ data.peerjid = ssrc2jid[thessrc];
+ }
+ }
+
+ RTC.createRemoteStream(data, sid, thessrc);
+
+ var isVideo = data.stream.getVideoTracks().length > 0;
+ // an attempt to work around https://github.com/jitsi/jitmeet/issues/32
+ if (isVideo &&
+ data.peerjid && sess.peerjid === data.peerjid &&
+ data.stream.getVideoTracks().length === 0 &&
+ RTC.localVideo.getTracks().length > 0) {
+ //
+ window.setTimeout(function () {
+ sendKeyframe(sess.peerconnection);
+ }, 3000);
+ }
+}
+
+// an attempt to work around https://github.com/jitsi/jitmeet/issues/32
+function sendKeyframe(pc) {
+ console.log('sendkeyframe', pc.iceConnectionState);
+ if (pc.iceConnectionState !== 'connected') return; // safe...
+ pc.setRemoteDescription(
+ pc.remoteDescription,
+ function () {
+ pc.createAnswer(
+ function (modifiedAnswer) {
+ pc.setLocalDescription(
+ modifiedAnswer,
+ function () {
+ // noop
+ },
+ function (error) {
+ console.log('triggerKeyframe setLocalDescription failed', error);
+ UI.messageHandler.showError();
+ }
+ );
+ },
+ function (error) {
+ console.log('triggerKeyframe createAnswer failed', error);
+ UI.messageHandler.showError();
+ }
+ );
+ },
+ function (error) {
+ console.log('triggerKeyframe setRemoteDescription failed', error);
+ UI.messageHandler.showError();
+ }
+ );
+}
+
+// Really mute video, i.e. dont even send black frames
+function muteVideo(pc, unmute) {
+ // FIXME: this probably needs another of those lovely state safeguards...
+ // which checks for iceconn == connected and sigstate == stable
+ pc.setRemoteDescription(pc.remoteDescription,
+ function () {
+ pc.createAnswer(
+ function (answer) {
+ var sdp = new SDP(answer.sdp);
+ if (sdp.media.length > 1) {
+ if (unmute)
+ sdp.media[1] = sdp.media[1].replace('a=recvonly', 'a=sendrecv');
+ else
+ sdp.media[1] = sdp.media[1].replace('a=sendrecv', 'a=recvonly');
+ sdp.raw = sdp.session + sdp.media.join('');
+ answer.sdp = sdp.raw;
+ }
+ pc.setLocalDescription(answer,
+ function () {
+ console.log('mute SLD ok');
+ },
+ function (error) {
+ console.log('mute SLD error');
+ UI.messageHandler.showError('Error',
+ 'Oops! Something went wrong and we failed to ' +
+ 'mute! (SLD Failure)');
+ }
+ );
+ },
+ function (error) {
+ console.log(error);
+ UI.messageHandler.showError();
+ }
+ );
+ },
+ function (error) {
+ console.log('muteVideo SRD error');
+ UI.messageHandler.showError('Error',
+ 'Oops! Something went wrong and we failed to stop video!' +
+ '(SRD Failure)');
+
+ }
+ );
+}
+
+$(document).bind('setLocalDescription.jingle', function (event, sid) {
+ // put our ssrcs into presence so other clients can identify our stream
+ var sess = connection.jingle.sessions[sid];
+ var newssrcs = [];
+ var media = simulcast.parseMedia(sess.peerconnection.localDescription);
+ media.forEach(function (media) {
+
+ if(Object.keys(media.sources).length > 0) {
+ // TODO(gp) maybe exclude FID streams?
+ Object.keys(media.sources).forEach(function (ssrc) {
+ newssrcs.push({
+ 'ssrc': ssrc,
+ 'type': media.type,
+ 'direction': media.direction
+ });
+ });
+ }
+ else if(sess.localStreamsSSRC && sess.localStreamsSSRC[media.type])
+ {
+ newssrcs.push({
+ 'ssrc': sess.localStreamsSSRC[media.type],
+ 'type': media.type,
+ 'direction': media.direction
+ });
+ }
+
+ });
+
+ console.log('new ssrcs', newssrcs);
+
+ // Have to clear presence map to get rid of removed streams
+ connection.emuc.clearPresenceMedia();
+
+ if (newssrcs.length > 0) {
+ for (var i = 1; i <= newssrcs.length; i ++) {
+ // Change video type to screen
+ if (newssrcs[i-1].type === 'video' && desktopsharing.isUsingScreenStream()) {
+ newssrcs[i-1].type = 'screen';
+ }
+ connection.emuc.addMediaToPresence(i,
+ newssrcs[i-1].type, newssrcs[i-1].ssrc, newssrcs[i-1].direction);
+ }
+
+ connection.emuc.sendPresence();
+ }
+});
+
+$(document).bind('iceconnectionstatechange.jingle', function (event, sid, session) {
+ switch (session.peerconnection.iceConnectionState) {
+ case 'checking':
+ session.timeChecking = (new Date()).getTime();
+ session.firstconnect = true;
+ break;
+ case 'completed': // on caller side
+ case 'connected':
+ if (session.firstconnect) {
+ session.firstconnect = false;
+ var metadata = {};
+ metadata.setupTime = (new Date()).getTime() - session.timeChecking;
+ session.peerconnection.getStats(function (res) {
+ if(res && res.result) {
+ res.result().forEach(function (report) {
+ if (report.type == 'googCandidatePair' && report.stat('googActiveConnection') == 'true') {
+ metadata.localCandidateType = report.stat('googLocalCandidateType');
+ metadata.remoteCandidateType = report.stat('googRemoteCandidateType');
+
+ // log pair as well so we can get nice pie charts
+ metadata.candidatePair = report.stat('googLocalCandidateType') + ';' + report.stat('googRemoteCandidateType');
+
+ if (report.stat('googRemoteAddress').indexOf('[') === 0) {
+ metadata.ipv6 = true;
+ }
+ }
+ });
+ }
+ });
+ }
+ break;
+ }
+});
+
+$(document).bind('presence.muc', function (event, jid, info, pres) {
+
+ //check if the video bridge is available
+ if($(pres).find(">bridgeIsDown").length > 0 && !bridgeIsDown) {
+ bridgeIsDown = true;
+ UI.messageHandler.showError("Error",
+ "Jitsi Videobridge is currently unavailable. Please try again later!");
+ }
+
+ if (info.isFocus)
+ {
+ return;
+ }
+
+ // Remove old ssrcs coming from the jid
+ Object.keys(ssrc2jid).forEach(function (ssrc) {
+ if (ssrc2jid[ssrc] == jid) {
+ delete ssrc2jid[ssrc];
+ delete ssrc2videoType[ssrc];
+ }
+ });
+
+ $(pres).find('>media[xmlns="http://estos.de/ns/mjs"]>source').each(function (idx, ssrc) {
+ //console.log(jid, 'assoc ssrc', ssrc.getAttribute('type'), ssrc.getAttribute('ssrc'));
+ var ssrcV = ssrc.getAttribute('ssrc');
+ ssrc2jid[ssrcV] = jid;
+ notReceivedSSRCs.push(ssrcV);
+
+ var type = ssrc.getAttribute('type');
+ ssrc2videoType[ssrcV] = type;
+
+ // might need to update the direction if participant just went from sendrecv to recvonly
+ if (type === 'video' || type === 'screen') {
+ var el = $('#participant_' + Strophe.getResourceFromJid(jid) + '>video');
+ switch (ssrc.getAttribute('direction')) {
+ case 'sendrecv':
+ el.show();
+ break;
+ case 'recvonly':
+ el.hide();
+ // FIXME: Check if we have to change large video
+ //VideoLayout.updateLargeVideo(el);
+ break;
+ }
+ }
+ });
+
+ var displayName = !config.displayJids
+ ? info.displayName : Strophe.getResourceFromJid(jid);
+
+ if (displayName && displayName.length > 0)
+ $(document).trigger('displaynamechanged',
+ [jid, displayName]);
+ /*if (focus !== null && info.displayName !== null) {
+ focus.setEndpointDisplayName(jid, info.displayName);
+ }*/
+
+ //check if the video bridge is available
+ if($(pres).find(">bridgeIsDown").length > 0 && !bridgeIsDown) {
+ bridgeIsDown = true;
+ UI.messageHandler.showError("Error",
+ "Jitsi Videobridge is currently unavailable. Please try again later!");
+ }
+
+ var id = $(pres).find('>userID').text();
+ var email = $(pres).find('>email');
+ if(email.length > 0) {
+ id = email.text();
+ }
+ UI.setUserAvatar(jid, id);
+
+});
+
+$(document).bind('kicked.muc', function (event, jid) {
+ console.info(jid + " has been kicked from MUC!");
+ if (connection.emuc.myroomjid === jid) {
+ sessionTerminated = true;
+ disposeConference(false);
+ connection.emuc.doLeave();
+ UI.messageHandler.openMessageDialog("Session Terminated",
+ "Ouch! You have been kicked out of the meet!");
+ }
+});
+
+$(document).bind('passwordrequired.main', function (event) {
+ console.log('password is required');
+
+ UI.messageHandler.openTwoButtonDialog(null,
+ 'Password required
' +
+ '' +
+ '',
+ true,
+ "Ok",
+ function (e, v, m, f) {
+ if (v) {
+ var username = document.getElementById('passwordrequired.username');
+ var password = document.getElementById('passwordrequired.password');
+
+ if (username.value !== null && password.value != null) {
+ connect(username.value, password.value);
+ }
+ }
+ },
+ function (event) {
+ document.getElementById('passwordrequired.username').focus();
+ }
+ );
+});
+
+/**
+ * Checks if video identified by given src is desktop stream.
+ * @param videoSrc eg.
+ * blob:https%3A//pawel.jitsi.net/9a46e0bd-131e-4d18-9c14-a9264e8db395
+ * @returns {boolean}
+ */
+function isVideoSrcDesktop(jid) {
+ // FIXME: fix this mapping mess...
+ // figure out if large video is desktop stream or just a camera
+
+ if(!jid)
+ return false;
+ var isDesktop = false;
+ if (connection.emuc.myroomjid &&
+ Strophe.getResourceFromJid(connection.emuc.myroomjid) === jid) {
+ // local video
+ isDesktop = desktopsharing.isUsingScreenStream();
+ } else {
+ // Do we have associations...
+ var videoSsrc = jid2Ssrc[jid];
+ if (videoSsrc) {
+ var videoType = ssrc2videoType[videoSsrc];
+ if (videoType) {
+ // Finally there...
+ isDesktop = videoType === 'screen';
+ } else {
+ console.error("No video type for ssrc: " + videoSsrc);
+ }
+ } else {
+ console.error("No ssrc for jid: " + jid);
+ }
+ }
+ return isDesktop;
+}
+
+/**
+ * Mutes/unmutes the local video.
+ *
+ * @param mute true to mute the local video; otherwise, false
+ * @param options an object which specifies optional arguments such as the
+ * boolean key byUser with default value true which
+ * specifies whether the method was initiated in response to a user command (in
+ * contrast to an automatic decision taken by the application logic)
+ */
+function setVideoMute(mute, options) {
+ if (connection && RTC.localVideo) {
+ if (activecall) {
+ activecall.setVideoMute(
+ mute,
+ function (mute) {
+ var video = $('#video');
+ var communicativeClass = "icon-camera";
+ var muteClass = "icon-camera icon-camera-disabled";
+
+ if (mute) {
+ video.removeClass(communicativeClass);
+ video.addClass(muteClass);
+ } else {
+ video.removeClass(muteClass);
+ video.addClass(communicativeClass);
+ }
+ connection.emuc.addVideoInfoToPresence(mute);
+ connection.emuc.sendPresence();
+ },
+ options);
+ }
+ }
+}
+
+$(document).on('inlastnchanged', function (event, oldValue, newValue) {
+ if (config.muteLocalVideoIfNotInLastN) {
+ setVideoMute(!newValue, { 'byUser': false });
+ }
+});
+
+/**
+ * Mutes/unmutes the local video.
+ */
+function toggleVideo() {
+ buttonClick("#video", "icon-camera icon-camera-disabled");
+
+ if (connection && activecall && RTC.localVideo ) {
+ setVideoMute(!RTC.localVideo.isMuted());
+ }
+}
+
+/**
+ * Mutes / unmutes audio for the local participant.
+ */
+function toggleAudio() {
+ setAudioMuted(!RTC.localAudio.isMuted());
+}
+
+/**
+ * Sets muted audio state for the local participant.
+ */
+function setAudioMuted(mute) {
+ if (!(connection && RTC.localAudio)) {
+ preMuted = mute;
+ // We still click the button.
+ buttonClick("#mute", "icon-microphone icon-mic-disabled");
+ return;
+ }
+
+ if (forceMuted && !mute) {
+ console.info("Asking focus for unmute");
+ connection.moderate.setMute(connection.emuc.myroomjid, mute);
+ // FIXME: wait for result before resetting muted status
+ forceMuted = false;
+ }
+
+ if (mute == RTC.localAudio.isMuted()) {
+ // Nothing to do
+ return;
+ }
+
+ // It is not clear what is the right way to handle multiple tracks.
+ // So at least make sure that they are all muted or all unmuted and
+ // that we send presence just once.
+ RTC.localAudio.mute();
+ // isMuted is the opposite of audioEnabled
+ connection.emuc.addAudioInfoToPresence(mute);
+ connection.emuc.sendPresence();
+ UI.showLocalAudioIndicator(mute);
+
+ buttonClick("#mute", "icon-microphone icon-mic-disabled");
+>>>>>>> ed78c0053c52d49035c4d506016fc799f7ea6511
}
diff --git a/doc/debian/jitsi-meet/jitsi-meet.example b/doc/debian/jitsi-meet/jitsi-meet.example
index 896912b80..f69499fb6 100644
--- a/doc/debian/jitsi-meet/jitsi-meet.example
+++ b/doc/debian/jitsi-meet/jitsi-meet.example
@@ -17,7 +17,7 @@ server {
alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
}
- location ~ ^/([a-zA-Z0-9]+)$ {
+ location ~ ^/([a-zA-Z0-9=\?]+)$ {
rewrite ^/(.*)$ / break;
}
diff --git a/doc/example-config-files/jitsi.example.com.example b/doc/example-config-files/jitsi.example.com.example
index 68dc464de..96ae864f9 100755
--- a/doc/example-config-files/jitsi.example.com.example
+++ b/doc/example-config-files/jitsi.example.com.example
@@ -6,7 +6,7 @@ server {
root /srv/jitsi.example.com;
index index.html;
- location ~ ^/([a-zA-Z0-9]+)$ {
+ location ~ ^/([a-zA-Z0-9=\?]+)$ {
rewrite ^/(.*)$ / break;
}
diff --git a/modules/xmpp/moderator.js b/modules/xmpp/moderator.js
index 439d70311..780370350 100644
--- a/modules/xmpp/moderator.js
+++ b/modules/xmpp/moderator.js
@@ -163,6 +163,7 @@ var Moderator = {
Moderator.setFocusUserJid(config.focusUserJid);
// Send create conference IQ
var iq = Moderator.createConferenceIq(roomName);
+ var self = this;
connection.sendIQ(
iq,
function (result) {
@@ -190,9 +191,21 @@ var Moderator = {
// Not authorized to create new room
if ($(error).find('>error>not-authorized').length) {
console.warn("Unauthorized to start the conference");
- UI.onAuthenticationRequired(function () {
- Moderator.allocateConferenceFocus(roomName, callback);
- });
+ var toDomain
+ = Strophe.getDomainFromJid(error.getAttribute('to'));
+ if (toDomain === config.hosts.anonymousdomain) {
+ // we are connected with anonymous domain and
+ // only non anonymous users can create rooms
+ // we must authorize the user
+
+ self.xmppService.promptLogin();
+ } else {
+ // External authentication mode
+ UI.onAuthenticationRequired(function () {
+ Moderator.allocateConferenceFocus(
+ roomName, callback);
+ });
+ }
return;
}
var waitMs = getNextErrorTimeout();
diff --git a/modules/xmpp/strophe.emuc.js b/modules/xmpp/strophe.emuc.js
index 63bf14713..e2ada347f 100644
--- a/modules/xmpp/strophe.emuc.js
+++ b/modules/xmpp/strophe.emuc.js
@@ -262,9 +262,16 @@ module.exports = function(XMPP, eventEmitter) {
'>error[type="cancel"]>not-allowed[xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"]').length) {
var toDomain = Strophe.getDomainFromJid(pres.getAttribute('to'));
if (toDomain === config.hosts.anonymousdomain) {
- // we are connected with anonymous domain and only non anonymous users can create rooms
- // we must authorize the user
- XMPP.promptLogin();
+ // enter the room by replying with 'not-authorized'. This would
+ // result in reconnection from authorized domain.
+ // We're either missing Jicofo/Prosody config for anonymous
+ // domains or something is wrong.
+// XMPP.promptLogin();
+ UI.messageHandler.openReportDialog(null,
+ 'Oops ! We couldn`t join the conference.' +
+ ' There might be some problem with security' +
+ ' configuration. Please contact service' +
+ ' administrator.', pres);
} else {
console.warn('onPresError ', pres);
UI.messageHandler.openReportDialog(null,
diff --git a/modules/xmpp/strophe.jingle.js b/modules/xmpp/strophe.jingle.js
index 4878d587c..1f9534a02 100644
--- a/modules/xmpp/strophe.jingle.js
+++ b/modules/xmpp/strophe.jingle.js
@@ -42,6 +42,7 @@ module.exports = function(XMPP)
this.connection.disco.addFeature('urn:xmpp:jingle:1');
this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:1');
this.connection.disco.addFeature('urn:xmpp:jingle:transports:ice-udp:1');
+ this.connection.disco.addFeature('urn:xmpp:jingle:transports:dtls-sctp:1');
this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:audio');
this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:video');
diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js
index d7ad4d2dc..fed7cddae 100644
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -147,10 +147,13 @@ var XMPP = {
initStrophePlugins();
registerListeners();
Moderator.init();
- var jid = uiCredentials.jid ||
- 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 = uiCredentials.jid || configDomain || window.location.hostname;
connect(jid, null, uiCredentials);
},
promptLogin: function () {
@@ -356,7 +359,7 @@ var XMPP = {
var deflate = true;
- var content = JSON.stringify(dataYes);
+ var content = JSON.stringify(data);
if (deflate) {
content = String.fromCharCode.apply(null, Pako.deflateRaw(content));
}