diff options
| -rw-r--r-- | apps/files_sharing/src/public-file-request.ts | 9 | ||||
| -rw-r--r-- | core/src/views/PublicPageUserMenu.vue | 11 |
2 files changed, 7 insertions, 13 deletions
diff --git a/apps/files_sharing/src/public-file-request.ts b/apps/files_sharing/src/public-file-request.ts index 5293a03d08b..1f5969cf72d 100644 --- a/apps/files_sharing/src/public-file-request.ts +++ b/apps/files_sharing/src/public-file-request.ts @@ -3,12 +3,11 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -import { defineAsyncComponent } from 'vue' import { getBuilder } from '@nextcloud/browser-storage' import { getGuestNickname } from '@nextcloud/auth' import { getUploader } from '@nextcloud/upload' import { loadState } from '@nextcloud/initial-state' -import { spawnDialog } from '@nextcloud/dialogs' +import { showGuestUserPrompt } from '@nextcloud/dialogs' import { t } from '@nextcloud/l10n' import logger from './services/logger' @@ -67,11 +66,7 @@ window.addEventListener('DOMContentLoaded', () => { // If we don't have a nickname or the public auth prompt hasn't been shown yet, show it // We still show the prompt if the user has a nickname to double check if (!nickname || !dialogShown) { - spawnDialog( - defineAsyncComponent(() => import('./views/PublicAuthPrompt.vue')), - options, - onSetNickname as (...rest: unknown[]) => void, - ) + showGuestUserPrompt(options) } else { logger.debug('Public auth prompt already shown.', { nickname }) registerFileRequestHeader(nickname) diff --git a/core/src/views/PublicPageUserMenu.vue b/core/src/views/PublicPageUserMenu.vue index 340b720d686..9b5a4212e3a 100644 --- a/core/src/views/PublicPageUserMenu.vue +++ b/core/src/views/PublicPageUserMenu.vue @@ -23,7 +23,7 @@ <!-- Nickname dialog --> <AccountMenuEntry id="set-nickname" - :name="!currentUser ? t('core', 'Set public name') : t('core', 'Change public name')" + :name="!displayName ? t('core', 'Set public name') : t('core', 'Change public name')" href="#" @click.prevent.stop="setNickname"> <template #icon> @@ -36,7 +36,9 @@ <script lang="ts"> import { defineComponent } from 'vue' -import { getGuestUser, showGuestUserPrompt } from '@nextcloud/auth' +import { getGuestUser } from '@nextcloud/auth' +import { showGuestUserPrompt } from '@nextcloud/dialogs' +import { subscribe } from '@nextcloud/event-bus' import { t } from '@nextcloud/l10n' import NcAvatar from '@nextcloud/vue/components/NcAvatar' @@ -64,7 +66,6 @@ export default defineComponent({ data() { return { - currentUser: getGuestUser(), displayName: getGuestUser().displayName, } }, @@ -82,9 +83,7 @@ export default defineComponent({ }, mounted() { - this.currentUser.addEventListener('updateDisplayName', () => { - this.displayName = getGuestUser().displayName || '' - }) + subscribe('user:info:changed', () => { this.displayName = getGuestUser().displayName || '' }) }, methods: { |