From 6d568f327972b229415f974f9cb0460ca0c09096 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 25 May 2023 09:35:11 +0200 Subject: [PATCH 1/2] fix(MediaSettings): Fix guests being prompted with login window when blurring background Signed-off-by: Joas Schilling --- src/components/MediaSettings/VideoBackgroundEditor.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/MediaSettings/VideoBackgroundEditor.vue b/src/components/MediaSettings/VideoBackgroundEditor.vue index f7b6e6fa7cf..8a4391f97cc 100644 --- a/src/components/MediaSettings/VideoBackgroundEditor.vue +++ b/src/components/MediaSettings/VideoBackgroundEditor.vue @@ -154,6 +154,11 @@ export default { async mounted() { this.loadBackground() + if (this.$store.getters.getUserId() === null) { + console.debug('Skip Talk backgrounds folder check and setup for participants that are not logged in') + return + } + const userRoot = '/files/' + this.$store.getters.getUserId() const relativeBackgroundsFolderPath = this.$store.getters.getAttachmentFolder() + '/Backgrounds' const absoluteBackgroundsFolderPath = userRoot + relativeBackgroundsFolderPath From 75e7216b721633b5f7ee4bd1dc8099b18891eb63 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 25 May 2023 09:35:47 +0200 Subject: [PATCH 2/2] fix(FilesTemplates): Fix unnecessary request for file templates when not logged in Signed-off-by: Joas Schilling --- src/store/fileUploadStore.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/store/fileUploadStore.js b/src/store/fileUploadStore.js index 6087304948e..57df9972bd9 100644 --- a/src/store/fileUploadStore.js +++ b/src/store/fileUploadStore.js @@ -203,6 +203,10 @@ const mutations = { state.fileTemplates.push(template) state.fileTemplatesInitialised = true }, + + markFileTemplatesInitialisedForGuests(state) { + state.fileTemplatesInitialised = true + }, } const actions = { @@ -427,7 +431,13 @@ const actions = { commit('removeFileFromSelection', temporaryMessageId) }, - async getFileTemplates({ commit }) { + async getFileTemplates({ commit, getters }) { + if (getters.getUserId() === null) { + console.debug('Skip file templates setup for participants that are not logged in') + commit('markFileTemplatesInitialisedForGuests') + return + } + try { const response = await getFileTemplates()