haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes authentication issues.

This commit is contained in:
hristoterezov 2015-01-29 11:43:40 +02:00
parent 8d0ee3ded9
commit 4bb555e4b2
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/app.bundle.js
View File

@ -15676,20 +15676,23 @@ var authenticatedUser = false;
function connect(jid, password, uiCredentials) { function connect(jid, password, uiCredentials) {
var bosh var bosh
= uiCredentials.bosh || config.bosh || '/http-bind'; = (uiCredentials && uiCredentials.bosh? uiCredentials.bosh : null)
|| config.bosh || '/http-bind';
connection = new Strophe.Connection(bosh); connection = new Strophe.Connection(bosh);
Moderator.setConnection(connection); Moderator.setConnection(connection);
if(uiCredentials) {
var email = uiCredentials.email; var email = uiCredentials.email;
var displayName = uiCredentials.displayName; var displayName = uiCredentials.displayName;
if(email) { if (email) {
connection.emuc.addEmailToPresence(email); connection.emuc.addEmailToPresence(email);
} else { } else {
connection.emuc.addUserIdToPresence(uiCredentials.uid); connection.emuc.addUserIdToPresence(uiCredentials.uid);
} }
if(displayName) { if (displayName) {
connection.emuc.addDisplayNameToPresence(displayName); connection.emuc.addDisplayNameToPresence(displayName);
} }
}
if (connection.disco) { if (connection.disco) {
// for chrome, add multistream cap // for chrome, add multistream cap

9
modules/xmpp/xmpp.js
View File

@ -13,20 +13,23 @@ var authenticatedUser = false;
function connect(jid, password, uiCredentials) { function connect(jid, password, uiCredentials) {
var bosh var bosh
= uiCredentials.bosh || config.bosh || '/http-bind'; = (uiCredentials && uiCredentials.bosh? uiCredentials.bosh : null)
|| config.bosh || '/http-bind';
connection = new Strophe.Connection(bosh); connection = new Strophe.Connection(bosh);
Moderator.setConnection(connection); Moderator.setConnection(connection);
if(uiCredentials) {
var email = uiCredentials.email; var email = uiCredentials.email;
var displayName = uiCredentials.displayName; var displayName = uiCredentials.displayName;
if(email) { if (email) {
connection.emuc.addEmailToPresence(email); connection.emuc.addEmailToPresence(email);
} else { } else {
connection.emuc.addUserIdToPresence(uiCredentials.uid); connection.emuc.addUserIdToPresence(uiCredentials.uid);
} }
if(displayName) { if (displayName) {
connection.emuc.addDisplayNameToPresence(displayName); connection.emuc.addDisplayNameToPresence(displayName);
} }
}
if (connection.disco) { if (connection.disco) {
// for chrome, add multistream cap // for chrome, add multistream cap