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

Redirect to JWT login service

This commit is contained in:
paweldomas 2016-06-27 15:30:03 +02:00
parent f39f8d14fd
commit 1db3b83743
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
connection.js
View File

@ -1,6 +1,7 @@
/* global APP, JitsiMeetJS, config */
//FIXME:
import LoginDialog from './modules/UI/authentication/LoginDialog';
import UIUtil from './modules/UI/util/UIUtil';
const ConnectionEvents = JitsiMeetJS.events.connection;
const ConnectionErrors = JitsiMeetJS.errors.connection;
@ -50,13 +51,7 @@ function checkForAttachParametersAndConnect(id, password, connection) {
* @returns {Promise<JitsiConnection>} connection if
* everything is ok, else error.
*/
function connect(id, password, roomName) {
let connectionConfig = Object.assign({}, config);
connectionConfig.bosh += '?room=' + roomName;
let connection
= new JitsiMeetJS.JitsiConnection(null, config.token, connectionConfig);
function connect(id, password, roomName, connection) {
return new Promise(function (resolve, reject) {
connection.addEventListener(
@ -147,7 +142,13 @@ export function openConnection({id, password, retry, roomName}) {
password = passwordOverride;
}
return connect(id, password, roomName).catch(function (err) {
let connectionConfig = Object.assign({}, config);
connectionConfig.bosh += '?room=' + roomName;
let connection
= new JitsiMeetJS.JitsiConnection(null, config.token, connectionConfig);
return connect(id, password, roomName, connection).catch(function (err) {
if (!retry) {
throw err;
}
@ -156,6 +157,10 @@ export function openConnection({id, password, retry, roomName}) {
// do not retry if token is not valid
if (config.token) {
throw err;
} else if (config.tokenAuthUrl) {
var tokenAuthUrl = connection.getTokenAuthUrl(roomName);
console.info("Will redirect to: " + tokenAuthUrl);
UIUtil.redirect(tokenAuthUrl);
} else {
return requestAuth(roomName);
}