fix: don't ask logged in user for guest username

Signed-off-by: Elizabeth Danzberger <[email protected]>

src/helpers/getLoggedInUser.js

@@ -0,0 +1,30 @@
+import axios from '@nextcloud/axios'
+import { generateUrl } from '@nextcloud/router'
+
+/**
+ * Gets the current user's display name if logged in.
+ *
+ * @return null | string
+ */
+async function getLoggedInUser() {
+	try {
+		const res = await axios.get(generateUrl('apps/files/public'))
+
+		if (res.status !== 200) {
+			return null
+		}
+
+		const el = document.createElement('html')
+		el.innerHTML = res.data
+
+		const userAttributes = el.querySelector('head[data-user]').attributes
+
+		return userAttributes.getNamedItem('data-user-displayname').textContent
+	} catch (err) {
+		if (err.status === 401) {
+			console.error(err.statusText)
+		}
+	}
+}
+
+export default getLoggedInUser

src/helpers/guestName.js

@@ -21,6 +21,7 @@
  */
 
 import { getCurrentUser } from '@nextcloud/auth'
+import getLoggedInUser from '../helpers/getLoggedInUser.js'
 
 const cookieAlreadySet = (cookieName) => {
 	return document.cookie
@@ -36,11 +37,12 @@ const setGuestName = function(username) {
 	}
 }
 
-const shouldAskForGuestName = () => {
+const shouldAskForGuestName = async () => {
+	const loggedInUser = Boolean(await getLoggedInUser())
 	const noGuestCookie = !cookieAlreadySet('guestUser')
 	const noCurrentUser = !getCurrentUser() || getCurrentUser()?.uid === ''
 
-	return noCurrentUser && noGuestCookie
+	return !loggedInUser && noGuestCookie && noCurrentUser
 }
 
 export {

src/view/Office.vue

@@ -282,7 +282,7 @@ export default {
 		}
 		this.postMessage.registerPostMessageHandler(this.postMessageHandler)
 
-		if (shouldAskForGuestName()) {
+		if (await shouldAskForGuestName()) {
 			const { default: GuestNamePicker } = await import(
 				/* webpackChunkName: 'GuestNamePicker' */
 				'../components/GuestNamePicker.vue')