Skip to content

[stable19] Fix forced reconnections for guests when the HPB is used #4029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Aug 21, 2020
Merged

[stable19] Fix forced reconnections for guests when the HPB is used #4029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/utils/signaling.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ Signaling.Standalone.prototype.connect = function() {
this.pendingMessages = []
this.connected = false
this._forceReconnect = false
this._isRejoiningConversationWithNewSession = false
this.socket = new WebSocket(this.url)
window.signalingSocket = this.socket
this.socket.onopen = function(event) {
Expand Down Expand Up @@ -725,6 +726,8 @@ Signaling.Standalone.prototype.forceReconnect = function(newSession, flags) {
this.leaveCall(this.currentCallToken, true)
}

this._isRejoiningConversationWithNewSession = true

rejoinConversation(this.currentRoomToken)
.then(response => {
this.nextcloudSessionId = response.data.ocs.data.sessionId
Expand Down Expand Up @@ -1123,6 +1126,10 @@ Signaling.Standalone.prototype.processRoomListEvent = function(data) {
switch (data.event.type) {
case 'disinvite':
if (data.event.disinvite.roomid === this.currentRoomToken) {
if (this._isRejoiningConversationWithNewSession) {
console.debug('Rejoining conversation with new session, "disinvite" message ignored')
return
}
console.error('User or session was removed from the conversation, redirecting')
EventBus.$emit('duplicateSessionDetected')
break
Expand Down