fixup! feat(files_sharing): show Account menu on public pages

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Author: skjnldsv

apps/files_sharing/lib/DefaultPublicShareTemplateProvider.php

@@ -104,13 +104,12 @@ public function renderPage(IShare $share, string $token, string $path): Template
 		Util::addInitScript(Application::APP_ID, 'init');
 		Util::addInitScript(Application::APP_ID, 'init-public');
 		Util::addScript('files', 'main');
+		Util::addScript(Application::APP_ID, 'public-file-request');
 
 		// Add file-request script if needed
 		$attributes = $share->getAttributes();
 		$isFileRequest = $attributes?->getAttribute('fileRequest', 'enabled') === true;
-		if ($isFileRequest) {
-			Util::addScript(Application::APP_ID, 'public-file-request');
-		}
+		$this->initialState->provideInitialState('isFileRequest', $isFileRequest);
 
 		// Load Viewer scripts
 		if (class_exists(LoadViewer::class)) {

apps/files_sharing/lib/Listener/LoadPublicFileRequestAuthListener.php

@@ -10,6 +10,7 @@
 use OCA\Files_Sharing\AppInfo\Application;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Share\IManager;
@@ -19,6 +20,7 @@
 class LoadPublicFileRequestAuthListener implements IEventListener {
 	public function __construct(
 		private IManager $shareManager,
+		private IInitialState $initialState,
 	) {
 	}
 
@@ -51,9 +53,10 @@ public function handle(Event $event): void {
 			// Ignore, this is not a file request or the share does not exist
 		}
 
-		if ($isFileRequest) {
-			// Add the script to the public page
-			Util::addScript(Application::APP_ID, 'public-file-request');
-		}
+		Util::addScript(Application::APP_ID, 'public-file-request');
+
+		// Add file-request script if needed
+		$attributes = $share->getAttributes();
+		$this->initialState->provideInitialState('isFileRequest', $isFileRequest);
 	}
 }

apps/files_sharing/src/public-file-request.ts

@@ -4,7 +4,7 @@
  */
 
 import { getBuilder } from '@nextcloud/browser-storage'
-import { getGuestNickname, getGuestUser } from '@nextcloud/auth'
+import { getGuestNickname, getGuestUser, type NextcloudUser } from '@nextcloud/auth'
 import { getUploader } from '@nextcloud/upload'
 import { loadState } from '@nextcloud/initial-state'
 import { showGuestUserPrompt } from '@nextcloud/dialogs'
@@ -15,29 +15,29 @@ import { subscribe } from '@nextcloud/event-bus'
 
 const storage = getBuilder('files_sharing').build()
 
-/**
- * Setup file-request nickname header for the uploader
- * @param nickname The nickname
- */
-function registerFileRequestHeader(nickname: string) {
+// Setup file-request nickname header for the uploader
+const registerFileRequestHeader = (nickname: string) => {
 	const uploader = getUploader()
 	uploader.setCustomHeader('X-NC-Nickname', encodeURIComponent(nickname))
 	logger.debug('Nickname header registered for uploader', { headers: uploader.customHeaders })
 }
 
-/**
- * Callback when a nickname was chosen
- */
-function onUpdatedNickname(): void {
-	// Register header for uploader
-	registerFileRequestHeader(getGuestUser().displayName ?? '')
+// Callback when a nickname was chosen
+const onUserInfoChanged = (guest: NextcloudUser) => {
+	logger.debug('User info changed', { guest })
+	registerFileRequestHeader(guest.displayName ?? '')
 }
-subscribe('user:info:changed', onUpdatedNickname)
+
+// Monitor nickname changes
+subscribe('user:info:changed', onUserInfoChanged)
 
 window.addEventListener('DOMContentLoaded', () => {
 	const nickname = getGuestNickname() ?? ''
 	const dialogShown = storage.getItem('public-auth-prompt-shown') !== null
 
+	// Check if a nickname is mandatory
+	const isFileRequest = loadState('files_sharing', 'isFileRequest', false)
+
 	const owner = loadState('files_sharing', 'owner', '')
 	const ownerDisplayName = loadState('files_sharing', 'ownerDisplayName', '')
 	const label = loadState('files_sharing', 'label', '')
@@ -64,12 +64,23 @@ window.addEventListener('DOMContentLoaded', () => {
 		options.subtitle = t('files_sharing', '{ownerDisplayName} shared a folder with you.', { ownerDisplayName })
 	}
 
-	// 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) {
-		showGuestUserPrompt(options)
-	} else {
-		logger.debug('Public auth prompt already shown.', { nickname })
-		registerFileRequestHeader(nickname)
+	// If this is a file request, then we need a nickname
+	if (isFileRequest) {
+		// 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) {
+			logger.debug('Showing public auth prompt.', { nickname })
+			showGuestUserPrompt(options)
+		}
+		return
+	}
+
+	if (!dialogShown && !nickname) {
+		logger.debug('Public auth prompt not shown yet but nickname is not mandatory.', { nickname })
+		return
 	}
+
+	// Else, we just register the nickname header if any.
+	logger.debug('Public auth prompt already shown.', { nickname })
+	registerFileRequestHeader(nickname)
 })

package-lock.json

@@ -43,7 +43,7 @@
     "@chenfengyuan/vue-qrcode": "^1.0.2",
     "@mdi/js": "^7.4.47",
     "@mdi/svg": "^7.4.47",
-    "@nextcloud/auth": "^2.5.0",
+    "@nextcloud/auth": "^2.5.1",
     "@nextcloud/axios": "^2.5.1",
     "@nextcloud/browser-storage": "^0.4.0",
     "@nextcloud/browserslist-config": "^3.0.1",