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

Merge pull request #374 from spellauge/authdomain2 

authdomain2
This commit is contained in:
bgrozev 2015-10-14 11:25:19 -05:00
parent b2f94783fa 277f340063
commit bbbe1fe5c7
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.js
View File

@ -4,6 +4,7 @@ var config = {
hosts: { hosts: {
domain: 'jitsi-meet.example.com', domain: 'jitsi-meet.example.com',
//anonymousdomain: 'guest.example.com', //anonymousdomain: 'guest.example.com',
// authdomain: 'jitsi-meet.example.com', // defaults to <domain>
muc: 'conference.jitsi-meet.example.com', // FIXME: use XEP-0030 muc: 'conference.jitsi-meet.example.com', // FIXME: use XEP-0030
bridge: 'jitsi-videobridge.jitsi-meet.example.com', // FIXME: use XEP-0030 bridge: 'jitsi-videobridge.jitsi-meet.example.com', // FIXME: use XEP-0030
//jirecon: 'jirecon.jitsi-meet.example.com', //jirecon: 'jirecon.jitsi-meet.example.com',

22
modules/UI/authentication/LoginDialog.js
View File

@ -24,12 +24,18 @@ function Dialog(callback, obtainSession) {
var message = '<h2 data-i18n="dialog.passwordRequired">'; var message = '<h2 data-i18n="dialog.passwordRequired">';
message += APP.translation.translateString("dialog.passwordRequired"); message += APP.translation.translateString("dialog.passwordRequired");
// ++__authdomain__
message += '</h2>' + message += '</h2>' +
'<input name="username" type="text" ' + '<input name="username" type="text" ';
'placeholder="user@domain.net" autofocus>' + if (config.hosts.authdomain) {
'<input name="password" ' + message += 'placeholder="user identity" autofocus>';
} else {
message += 'placeholder="user@domain.net" autofocus>';
}
message += '<input name="password" ' +
'type="password" data-i18n="[placeholder]dialog.userPassword"' + 'type="password" data-i18n="[placeholder]dialog.userPassword"' +
' placeholder="user password">'; ' placeholder="user password">';
// --__authdomain__
var okButton = APP.translation.generateTranslationHTML("dialog.Ok"); var okButton = APP.translation.generateTranslationHTML("dialog.Ok");
@ -50,6 +56,16 @@ function Dialog(callback, obtainSession) {
var password = f.password; var password = f.password;
if (jid && password) { if (jid && password) {
stop = false; stop = false;
//++__authdomain__ complete jid by appending @<domain> if no @ was found in jid
if (jid.indexOf("@") < 0) {
jid = jid.concat('@');
if (config.hosts.authdomain) {
jid += config.hosts.authdomain;
} else {
jid += config.hosts.domain;
}
}
// --__authdomain__
connection.reset(); connection.reset();
connDialog.goToState('connecting'); connDialog.goToState('connecting');
connection.connect(jid, password, stateHandler); connection.connect(jid, password, stateHandler);