Skip to content

[stable21.1] Bring back redirect to not-found page #5601

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
May 11, 2021
Merged

[stable21.1] Bring back redirect to not-found page #5601

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
12 changes: 8 additions & 4 deletions src/mixins/sessionIssueHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const sessionIssueHandler = {
},

methods: {
duplicateSessionTriggered() {
redirectTo(url) {
this.isLeavingAfterSessionIssue = true
SessionStorage.removeItem('joined_conversation')
// Need to delay until next tick, otherwise the PreventUnload is still being triggered
Expand All @@ -51,13 +51,17 @@ const sessionIssueHandler = {
// FIXME: can't use router push as it somehow doesn't clean up
// fully and leads the other instance where "Join here" was clicked
// to redirect to "not found"
window.location = generateUrl('/apps/spreed/duplicate-session')
window.location = url
})
},

duplicateSessionTriggered() {
this.redirectTo(generateUrl('/apps/spreed/duplicate-session'))
},

deletedSessionTriggered() {
this.$router.push({ name: 'notfound', params: { skipLeaveWarning: true } })
this.$store.dispatch('updateToken', '')
// workaround: force page refresh to kill stray WebRTC connections
this.redirectTo(generateUrl('/apps/spreed/not-found'))
},
},
}
Expand Down