refactor: reorganize some code

Signed-off-by: Elizabeth Danzberger <lizzy7128@tutanota.de>

lib/Listener/ShareLinkListener.php

@@ -61,7 +61,7 @@ public function handle(Event $event): void {
 			$this->initialStateService->provideCapabilities();
 			Util::addScript('richdocuments', 'richdocuments-files');
 			Util::addScript('richdocuments', 'richdocuments-viewer', 'viewer');
-			Util::addScript('richdocuments', 'richdocuments-public');
+			Util::addScript('richdocuments', 'richdocuments-public', 'viewer');
 		}
 	}
 }

src/helpers/guestName.js

@@ -22,24 +22,12 @@
 
 import { getCurrentUser } from '@nextcloud/auth'
 
-let guestName = ''
-
-const getGuestNameCookie = function() {
-	if (guestName === '') {
-		const name = 'guestUser='
-		const matchedCookie = document.cookie.split(';')
-			.map((cookie) => {
-				try {
-					return decodeURIComponent(cookie.trim())
-				} catch (e) {
-					return cookie.trim()
-				}
-			}).find((cookie) => {
-				return cookie.indexOf(name) === 0
-			})
-		guestName = matchedCookie ? matchedCookie.substring(name.length) : ''
-	}
-	return guestName
+const cookieAlreadySet = (cookieName) => {
+	return document.cookie
+		.split(';')
+		.some(cookie => {
+			return cookie.trim().startsWith(`${cookieName}=`)
+		})
 }
 
 const setGuestName = function(username) {
@@ -49,20 +37,13 @@ const setGuestName = function(username) {
 }
 
 const shouldAskForGuestName = () => {
+	const noGuestCookie = !cookieAlreadySet('guestUser')
 	const noCurrentUser = !getCurrentUser() || getCurrentUser()?.uid === ''
-	const cookieAlreadySet = () => {
-		return document.cookie
-			.split(';')
-			.some(cookie => {
-				return cookie.trim().startsWith('guestUser=')
-			})
-	}
 
-	return noCurrentUser && !cookieAlreadySet()
+	return noCurrentUser && noGuestCookie
 }
 
 export {
-	getGuestNameCookie,
 	setGuestName,
 	shouldAskForGuestName,
 }