fix(feedback): don't wait for feedback submission on leave meeting

This commit is contained in:
hmuresan 2021-06-02 12:27:15 +03:00 committed by Дамян Минков
parent 839f632af6
commit bb5f589fa1
2 changed files with 13 additions and 12 deletions

View File

@ -1972,7 +1972,12 @@ export default {
room.on( room.on(
JitsiConferenceEvents.CONFERENCE_UNIQUE_ID_SET, JitsiConferenceEvents.CONFERENCE_UNIQUE_ID_SET,
(...args) => APP.store.dispatch(conferenceUniqueIdSet(room, ...args))); (...args) => {
// Preserve the sessionId so that the value is accessible even after room
// is disconnected.
room.sessionId = room.getMeetingUniqueId();
APP.store.dispatch(conferenceUniqueIdSet(room, ...args));
});
room.on( room.on(
JitsiConferenceEvents.AUTH_STATUS_CHANGED, JitsiConferenceEvents.AUTH_STATUS_CHANGED,
@ -2792,15 +2797,11 @@ export default {
requestFeedbackPromise = Promise.resolve(true); requestFeedbackPromise = Promise.resolve(true);
} }
let feedbackResult; Promise.all([
requestFeedbackPromise,
requestFeedbackPromise this.leaveRoomAndDisconnect()
.then(res => { ])
feedbackResult = res; .then(values => {
return this.leaveRoomAndDisconnect();
})
.then(() => {
this._room = undefined; this._room = undefined;
room = undefined; room = undefined;
@ -2812,7 +2813,7 @@ export default {
if (!interfaceConfig.SHOW_PROMOTIONAL_CLOSE_PAGE) { if (!interfaceConfig.SHOW_PROMOTIONAL_CLOSE_PAGE) {
APP.API.notifyReadyToClose(); APP.API.notifyReadyToClose();
} }
APP.store.dispatch(maybeRedirectToWelcomePage(feedbackResult)); APP.store.dispatch(maybeRedirectToWelcomePage(values[0]));
}); });
}, },

View File

@ -134,7 +134,7 @@ export function sendJaasFeedbackMetadata(conference: Object, feedback: Object) {
const meetingFqn = extractFqnFromPath(state['features/base/connection'].locationURL.pathname); const meetingFqn = extractFqnFromPath(state['features/base/connection'].locationURL.pathname);
const feedbackData = { const feedbackData = {
...feedback, ...feedback,
sessionId: conference.getMeetingUniqueId(), sessionId: conference.sessionId,
userId: user.id, userId: user.id,
meetingFqn, meetingFqn,
jwt, jwt,