|
@@ -82,7 +82,7 @@ function checkForAttachParametersAndConnect(id, password, connection) {
|
82
|
82
|
*/
|
83
|
83
|
function connect(id, password, roomName) {
|
84
|
84
|
const connectionConfig = Object.assign({}, config);
|
85
|
|
- const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
|
|
85
|
+ const { jwt } = APP.store.getState()['features/base/jwt'];
|
86
|
86
|
|
87
|
87
|
// Use Websocket URL for the web app if configured. Note that there is no 'isWeb' check, because there's assumption
|
88
|
88
|
// that this code executes only on web browsers/electron. This needs to be changed when mobile and web are unified.
|
|
@@ -94,11 +94,7 @@ function connect(id, password, roomName) {
|
94
|
94
|
// in future). It's included for the time being for Jitsi Meet and lib-jitsi-meet versions interoperability.
|
95
|
95
|
connectionConfig.serviceUrl = connectionConfig.bosh = serviceUrl;
|
96
|
96
|
|
97
|
|
- const connection
|
98
|
|
- = new JitsiMeetJS.JitsiConnection(
|
99
|
|
- null,
|
100
|
|
- jwt && issuer && issuer !== 'anonymous' ? jwt : undefined,
|
101
|
|
- connectionConfig);
|
|
97
|
+ const connection = new JitsiMeetJS.JitsiConnection(null, jwt, connectionConfig);
|
102
|
98
|
|
103
|
99
|
if (config.iAmRecorder) {
|
104
|
100
|
connection.addFeature(DISCO_JIBRI_FEATURE);
|
|
@@ -211,10 +207,9 @@ export function openConnection({ id, password, retry, roomName }) {
|
211
|
207
|
|
212
|
208
|
return connect(id, password, roomName).catch(err => {
|
213
|
209
|
if (retry) {
|
214
|
|
- const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
|
|
210
|
+ const { jwt } = APP.store.getState()['features/base/jwt'];
|
215
|
211
|
|
216
|
|
- if (err === JitsiConnectionErrors.PASSWORD_REQUIRED
|
217
|
|
- && (!jwt || issuer === 'anonymous')) {
|
|
212
|
+ if (err === JitsiConnectionErrors.PASSWORD_REQUIRED && !jwt) {
|
218
|
213
|
return AuthHandler.requestAuth(roomName, connect);
|
219
|
214
|
}
|
220
|
215
|
}
|