refactor: adjust code to ESLint rules

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

lib/csp-nonce.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { getRequestToken } from './requesttoken'
+import { getRequestToken } from './requesttoken.ts'
 
 /**
  * Get the CSP nonce for script loading

lib/eventbus.d.ts

@@ -2,7 +2,8 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-import { NextcloudUser } from './user'
+
+import type { NextcloudUser } from './user.ts'
 
 declare module '@nextcloud/event-bus' {
 	export interface NextcloudEvents {

lib/globals.d.ts

@@ -0,0 +1,12 @@
+/*!
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+declare global {
+	interface Window {
+		_oc_isadmin?: boolean
+	}
+}
+
+export {}

lib/guest.ts

@@ -1,15 +1,16 @@
-/**
+/*!
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
+
+import type { NextcloudUser } from './user.ts'
+
 import { getBuilder } from '@nextcloud/browser-storage'
-import { NextcloudUser } from './user'
 import { emit, subscribe } from '@nextcloud/event-bus'
 
 const browserStorage = getBuilder('public').persist().build()
 
 class GuestUser implements NextcloudUser {
-
 	private _displayName: string | null
 	readonly uid: string
 	readonly isAdmin: boolean
@@ -27,7 +28,6 @@ class GuestUser implements NextcloudUser {
 			this._displayName = guest.displayName
 			browserStorage.setItem('guestNickname', guest.displayName || '')
 		})
-
 	}
 
 	get displayName(): string | null {
@@ -39,7 +39,6 @@ class GuestUser implements NextcloudUser {
 		browserStorage.setItem('guestNickname', displayName)
 		emit('user:info:changed', this)
 	}
-
 }
 
 let currentUser: NextcloudUser | undefined
@@ -64,7 +63,8 @@ export function getGuestNickname(): string | null {
 
 /**
  * Set the guest nickname for public pages
- * @param nickname The nickname to set
+ *
+ * @param nickname - The nickname to set
  */
 export function setGuestNickname(nickname: string): void {
 	if (!nickname || nickname.trim().length === 0) {

lib/index.ts

@@ -2,10 +2,11 @@
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-export type { CsrfTokenObserver } from './requesttoken'
-export type { NextcloudUser } from './user'
 
-export { getCSPNonce } from './csp-nonce'
-export { getGuestUser, getGuestNickname, setGuestNickname } from './guest'
-export { getRequestToken, onRequestTokenUpdate } from './requesttoken'
-export { getCurrentUser } from './user'
+export type { CsrfTokenObserver } from './requesttoken.ts'
+export type { NextcloudUser } from './user.ts'
+
+export { getCSPNonce } from './csp-nonce.ts'
+export { getGuestNickname, getGuestUser, setGuestNickname } from './guest.ts'
+export { getRequestToken, onRequestTokenUpdate } from './requesttoken.ts'
+export { getCurrentUser } from './user.ts'

lib/requesttoken.ts

@@ -2,10 +2,11 @@
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
+
 import { subscribe } from '@nextcloud/event-bus'
 
 export interface CsrfTokenObserver {
-	(token: string): void;
+	(token: string): void
 }
 
 let token: string | null | undefined
@@ -14,7 +15,7 @@ const observers: CsrfTokenObserver[] = []
 /**
  * Get current request token
  *
- * @return {string|null} Current request token or null if not set
+ * @return Current request token or null if not set
  */
 export function getRequestToken(): string | null {
 	if (token === undefined) {
@@ -40,8 +41,10 @@ subscribe('csrf-token-update', (e: unknown) => {
 	observers.forEach((observer) => {
 		try {
 			observer(token!)
-		} catch (e) {
-			console.error('Error updating CSRF token observer', e)
+		} catch (error) {
+			// we cannot use the logger as the logger uses this library = circular dependency
+			// eslint-disable-next-line no-console
+			console.error('Error updating CSRF token observer', error)
 		}
 	})
 })

lib/user.ts

@@ -2,21 +2,20 @@
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-declare global {
-	interface Window {
-		_oc_isadmin?: boolean
-	}
-}
 
 export interface NextcloudUser {
-	uid: string,
-	displayName: string | null,
-	isAdmin: boolean,
+	uid: string
+	displayName: string | null
+	isAdmin: boolean
 }
 
 let currentUser: NextcloudUser | null | undefined
 
-const getAttribute = (el: HTMLHeadElement | undefined, attribute: string): string | null => {
+/**
+ * @param el - The element
+ * @param attribute - The attribute to fetch
+ */
+function getAttribute(el: HTMLHeadElement | undefined, attribute: string): string | null {
 	if (el) {
 		return el.getAttribute(attribute)
 	}

test/guest.test.ts

@@ -1,10 +1,11 @@
-/**
+/*!
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+
 import { getBuilder } from '@nextcloud/browser-storage'
 import { emit } from '@nextcloud/event-bus'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 // Mock dependencies
 vi.mock('@nextcloud/browser-storage')
@@ -20,7 +21,7 @@ const mockBrowserStorage = {
 }
 
 // Mock crypto for UUID generation
-const originalCrypto = global.crypto
+const originalCrypto = globalThis.crypto
 const mockCrypto = {
 	randomUUID: vi.fn(() => 'mock-uuid-' + Math.random().toString(36).slice(2, 10)),
 }
@@ -42,16 +43,16 @@ describe('Guest User Module', () => {
 			}),
 		})
 
-		// Replace global crypto with mock
-		Object.defineProperty(global, 'crypto', {
+		// Replace globalThis crypto with mock
+		Object.defineProperty(globalThis, 'crypto', {
 			value: mockCrypto,
 			writable: true,
 		})
 	})
 
 	afterEach(() => {
 		// Restore original crypto
-		Object.defineProperty(global, 'crypto', {
+		Object.defineProperty(globalThis, 'crypto', {
 			value: originalCrypto,
 			writable: true,
 		})
@@ -122,12 +123,8 @@ describe('Guest User Module', () => {
 	describe('setGuestNickname', () => {
 		it('should throw an error if nickname is empty', async () => {
 			const { setGuestNickname } = await import('../lib')
-			expect(() => setGuestNickname('')).toThrow(
-				'Nickname cannot be empty',
-			)
-			expect(() => setGuestNickname('   ')).toThrow(
-				'Nickname cannot be empty',
-			)
+			expect(() => setGuestNickname('')).toThrow('Nickname cannot be empty')
+			expect(() => setGuestNickname('   ')).toThrow('Nickname cannot be empty')
 		})
 
 		it('should set the nickname and store it in browser storage', async () => {
@@ -162,7 +159,6 @@ describe('Guest User Module', () => {
 
 	describe('GuestUser class', () => {
 		it('should update displayName when set through property', async () => {
-
 			const { getGuestUser } = await import('../lib')
 			const guestUser = getGuestUser()
 			const newName = 'Property Test User'

test/request-token.test.ts

@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
+
 import { emit } from '@nextcloud/event-bus'
 import { beforeEach, describe, expect, test, vi } from 'vitest'
 
@@ -48,7 +49,9 @@ describe('request token', () => {
 	test('handle exception in observer', async () => {
 		const spy = vi.spyOn(window.console, 'error')
 		const { onRequestTokenUpdate } = await import('../lib')
-		const observer = vi.fn(() => { throw new Error('!Error!') })
+		const observer = vi.fn(() => {
+			throw new Error('!Error!')
+		})
 		// silence the console
 		spy.mockImplementationOnce(() => {})
 

vitest.config.ts

@@ -2,13 +2,13 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
+
 import type { UserConfig } from 'vite'
+
 import viteConfig from './vite.config'
 
 export default async (env) => {
 	const config = typeof viteConfig === 'function' ? await viteConfig(env) : viteConfig
-	// node-externals conflicts with vitest
-	config.plugins = config.plugins!.filter((plugin) => plugin && (!('name' in plugin) || plugin?.name !== 'node-externals'))
 
 	return {
 		...config,