From 6c519e1720f43f9c7324c7a39cda7c18e4418a33 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Tue, 3 Dec 2024 11:24:21 +0530
Subject: [PATCH 01/35] Initial cool admin setting iframe setup

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 src/components/AdminSettings.vue | 13 ++++++
 src/components/CoolFrame.vue     | 78 ++++++++++++++++++++++++++++++++
 src/helpers/url.js               | 10 ++++
 3 files changed, 101 insertions(+)
 create mode 100644 src/components/CoolFrame.vue

diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 18b8167167..a3a7f741f5 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -14,6 +14,15 @@
 				{{ t('richdocuments', 'Collabora Online is a powerful LibreOffice-based online office suite with collaborative editing, which supports all major documents, spreadsheet and presentation file formats and works together with all modern browsers.') }}
 			</p>
 
+			<!-- New Collabora Admin Settings Section -->
+			<div id="admin-cool-frame-section" class="section">
+				<h2>{{ t('richdocuments', 'Collabora Admin Settings') }}</h2>
+				<CoolFrame :endpoint="'/cool/admin-settings'"
+					:public-wopi-url="settings.public_wopi_url"
+					access-token="accessToken"
+					access-token-t-t-l="accessTokenTTL" />
+			</div>
+
 			<div v-if="settings.wopi_url && settings.wopi_url !== ''">
 				<NcNoteCard v-if="serverError == 2" type="error">
 					<p>{{ t('richdocuments', 'Could not establish connection to the Collabora Online server.') }}</p>
@@ -427,6 +436,7 @@ import GlobalTemplates from './AdminSettings/GlobalTemplates.vue'
 import '@nextcloud/dialogs/style.css'
 import { getCallbackBaseUrl } from '../helpers/url.js'
 import { getCapabilities } from '../services/capabilities.ts'
+import CoolFrame from './CoolFrame.vue'
 
 const SERVER_STATE_OK = 0
 const SERVER_STATE_LOADING = 1
@@ -456,6 +466,7 @@ export default {
 		GlobalTemplates,
 		NcModal,
 		NcNoteCard,
+		CoolFrame,
 	},
 	props: {
 		initial: {
@@ -512,6 +523,8 @@ export default {
 				},
 				fonts: [],
 			},
+			accessToken: '',
+			accessTokenTTL: '',
 		}
 	},
 	computed: {
diff --git a/src/components/CoolFrame.vue b/src/components/CoolFrame.vue
new file mode 100644
index 0000000000..456521b23f
--- /dev/null
+++ b/src/components/CoolFrame.vue
@@ -0,0 +1,78 @@
+<!-- CoolFrame.vue -->
+<template>
+	<div>
+		<form ref="form"
+			:action="formAction"
+			method="post"
+			:target="iframeName">
+			<input type="hidden" name="access_token" :value="accessToken">
+			<input type="hidden" name="access_token_ttl" :value="accessTokenTTL">
+			<!-- TODO: Include any other necessary hidden inputs -->
+		</form>
+		<iframe :id="iframeName"
+			:name="iframeName"
+			class="cool-frame-iframe"
+			:src="'about:blank'"
+			frameborder="0"
+			allowfullscreen />
+	</div>
+</template>
+
+<script>
+
+import { getCoolServerUrl } from '../helpers/url.js'
+
+export default {
+	name: 'CoolFrame',
+	props: {
+		endpoint: {
+			type: String,
+			required: true,
+		},
+		publicWopiUrl: {
+			type: String,
+			required: true,
+		},
+		accessToken: {
+			type: String,
+			required: true,
+		},
+		accessTokenTTL: {
+			type: [String, Number],
+			required: true,
+		},
+	},
+	data() {
+		return {
+			iframeName: 'coolFrameIframe',
+			formAction: '',
+		}
+	},
+	mounted() {
+		// Ensure publicWopiUrl is used to construct formAction
+		if (this.publicWopiUrl) {
+			this.formAction = getCoolServerUrl(this.publicWopiUrl)
+			console.debug('Form action URL generated:', this.formAction)
+		} else {
+			console.error('wopiUrl prop is missing')
+		}
+		console.debug('Form action URL generated')
+		// Submit the form to load the iframe content
+		this.$nextTick(() => {
+			if (this.$refs.form) {
+				this.$refs.form.submit()
+			} else {
+				console.error('Form reference not found')
+			}
+		})
+	},
+}
+</script>
+
+  <style scoped>
+  .cool-frame-iframe {
+    width: 100%;
+    height: 600px;
+    border: none;
+  }
+  </style>
diff --git a/src/helpers/url.js b/src/helpers/url.js
index d485e8958a..fe9c25be1d 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -85,6 +85,16 @@ const getNextcloudUrl = () => {
 	return window.location.host
 }
 
+export const getCoolServerUrl = (collaboraBaseUrl) => {
+	// todo fix wopi Url
+	const wopiurl = getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/admin-settings'
+
+	const AdminSettingsUrl = collaboraBaseUrl + '/browser/admin-settings.html?'
+
+	return AdminSettingsUrl
+		+ 'WOPISrc=' + encodeURIComponent(wopiurl)
+}
+
 export {
 	getSearchParam,
 	getWopiUrl,

From 0a1dccf131411b9f353bc1898dec7c50e2b03483 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 18 Dec 2024 12:54:53 +0530
Subject: [PATCH 02/35] WIP auth

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/DocumentController.php | 20 ++++++++++++
 lib/Controller/SettingsController.php |  3 +-
 lib/TokenManager.php                  | 24 +++++++++++++++
 src/components/AdminSettings.vue      | 44 +++++++++++++++++++++++++--
 src/helpers/url.js                    |  2 +-
 5 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 55d0c91fae..822f6ed3fe 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -385,6 +385,26 @@ public function editOnlineTarget(int $fileId, ?string $target = null): RedirectR
 	#[PublicPage]
 	public function token(int $fileId, ?string $shareToken = null, ?string $path = null, ?string $guestName = null): DataResponse {
 		try {
+			// if ($fileId === -1 && $path !== null && str_starts_with($path, 'admin-settings/')) {
+			// 	$parts = explode('/', $path);
+			// 	$adminUserId = $parts[1] ?? $this->userId; // fallback if needed
+	
+			// 	$docKey = $fileId . '_' . $this->config->getSystemValue('instanceid');
+	
+			// 	$wopi = $this->tokenManager->generateWopiToken($fileId, null, $adminUserId);
+	
+			// 	$coolBaseUrl = $this->appConfig->getCollaboraUrlPublic();
+			// 	$adminSettingsWopiSrc = $coolBaseUrl . '/browser/admin-settings.html?' 
+			// 		. 'WOPISrc=' . urlencode($this->urlGenerator->getAbsoluteURL('/index.php/apps/richdocuments/wopi/admin-settings'));
+	
+			// 	return new DataResponse([
+			// 		'urlSrc' => $adminSettingsWopiSrc,
+			// 		'token' => $wopi->getToken(),
+			// 		'token_ttl' => $wopi->getExpiry(),
+			// 	]);
+			// }
+	
+			// Normal file handling (unchanged)
 			$share = $shareToken ? $this->shareManager->getShareByToken($shareToken) : null;
 			$file = $shareToken ? $this->getFileForShare($share, $fileId, $path) : $this->getFileForUser($fileId, $path);
 
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 6dee13062f..8ee46baef8 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -96,7 +96,7 @@ public function demoServers(): DataResponse {
 	public function getSettings(): JSONResponse {
 		return new JSONResponse($this->getSettingsData());
 	}
-
+	// TODO : Provide Auth tokens here :)
 	private function getSettingsData(): array {
 		return [
 			'wopi_url' => $this->appConfig->getCollaboraUrlInternal(),
@@ -113,6 +113,7 @@ private function getSettingsData(): array {
 			'esignature_base_url' => $this->appConfig->getAppValue('esignature_base_url'),
 			'esignature_client_id' => $this->appConfig->getAppValue('esignature_client_id'),
 			'esignature_secret' => $this->appConfig->getAppValue('esignature_secret'),
+			'userId' => $this->userId
 		];
 	}
 
diff --git a/lib/TokenManager.php b/lib/TokenManager.php
index c4a8636354..85f0b574bc 100644
--- a/lib/TokenManager.php
+++ b/lib/TokenManager.php
@@ -53,6 +53,30 @@ public function generateWopiToken(string $fileId, ?string $shareToken = null, ?s
 		$hideDownload = false;
 		$rootFolder = $this->rootFolder;
 
+		    // // // Parse docKey to extract fileId
+			// // // Usually docKey is something like "<fileId>_<instanceid>[_version]"
+			// $parts = explode('_', $docKey);
+			// $fileId = (int)$parts[0];
+
+			// // If fileId is -1, this is the admin-settings scenario
+			// // Skip any file node lookup here and just proceed to generate a token
+			// if ($fileId === -1) {
+			// 	// Create a token without referencing a file node
+			// 	// Set fields as needed. No file-related constraints
+			// 	return $this->createToken([
+			// 		'fileid' => $fileId,
+			// 		'editor' => $editorUid,
+			// 		'canwrite' => true, // or false, depending on your needs
+			// 		'hideDownload' => false,
+			// 		'direct' => $direct,
+			// 		'templateId' => null,
+			// 		'version' => 0,
+			// 		'server_host' => '', // fill as needed
+			// 		'ownerUid' => $editorUid,
+			// 	]);
+			// }
+
+
 		// if the user is not logged-in do use the sharers storage
 		if ($shareToken !== null) {
 			/** @var File $file */
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index a3a7f741f5..dcafedbf50 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -19,8 +19,8 @@
 				<h2>{{ t('richdocuments', 'Collabora Admin Settings') }}</h2>
 				<CoolFrame :endpoint="'/cool/admin-settings'"
 					:public-wopi-url="settings.public_wopi_url"
-					access-token="accessToken"
-					access-token-t-t-l="accessTokenTTL" />
+					:access-token="accessToken"
+					:access-token-t-t-l="accessTokenTTL" />
 			</div>
 
 			<div v-if="settings.wopi_url && settings.wopi_url !== ''">
@@ -432,6 +432,12 @@ import SettingsExternalApps from './SettingsExternalApps.vue'
 import SettingsInputFile from './SettingsInputFile.vue'
 import SettingsFontList from './SettingsFontList.vue'
 import GlobalTemplates from './AdminSettings/GlobalTemplates.vue'
+import {
+	getCurrentUser,
+	getGuestNickname,
+} from '@nextcloud/auth'
+
+import { isPublicShare, getSharingToken } from '@nextcloud/sharing/public'
 
 import '@nextcloud/dialogs/style.css'
 import { getCallbackBaseUrl } from '../helpers/url.js'
@@ -525,6 +531,7 @@ export default {
 			},
 			accessToken: '',
 			accessTokenTTL: '',
+			userId: '',
 		}
 	},
 	computed: {
@@ -545,6 +552,9 @@ export default {
 				{ url: this.fontHintUrl },
 			)
 		},
+		shareToken() {
+			return getSharingToken()
+		},
 		fontXmlHint() {
 			return `
 <remote_font_config>
@@ -566,6 +576,15 @@ export default {
 			}
 		},
 	},
+	async mounted() {
+		const currentUser = getCurrentUser()
+		if (currentUser && currentUser.uid) {
+			this.userId = currentUser.uid
+			await this.generateAccessToken()
+		} else {
+			console.error('User not authenticated')
+		}
+	},
 	beforeMount() {
 		for (const key in this.initial.settings) {
 			if (!Object.prototype.hasOwnProperty.call(this.initial.settings, key)) {
@@ -612,6 +631,27 @@ export default {
 		this.checkSettings()
 	},
 	methods: {
+		async generateAccessToken() {
+			const fileId = -1
+			const path = `admin-settings/${this.userId}`
+			const guestName = this.userId
+
+			const { data } = await axios.post(generateUrl('/apps/richdocuments/token'), {
+				fileId,
+				path,
+				guestName,
+			})
+
+			if (data.token) {
+				this.accessToken = data.token
+				this.accessTokenTTL = data.token_ttl
+				console.debug('Admin settings WOPI token generated:', this.accessToken, this.accessTokenTTL)
+			} else if (data.federatedUrl) {
+				console.error('Federated URL returned, not expected for admin settings.')
+			} else {
+				console.error('Failed to generate token for admin settings')
+			}
+		},
 		async checkSettings() {
 			this.errorMessage = null
 			this.updating = true
diff --git a/src/helpers/url.js b/src/helpers/url.js
index fe9c25be1d..815ee88fb8 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -89,7 +89,7 @@ export const getCoolServerUrl = (collaboraBaseUrl) => {
 	// todo fix wopi Url
 	const wopiurl = getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/admin-settings'
 
-	const AdminSettingsUrl = collaboraBaseUrl + '/browser/admin-settings.html?'
+	const AdminSettingsUrl = collaboraBaseUrl + '/browser/dist/admin-settings.html?'
 
 	return AdminSettingsUrl
 		+ 'WOPISrc=' + encodeURIComponent(wopiurl)

From 62c41a0db1c70d2c4043eb373a80f048b97aefe0 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Tue, 7 Jan 2025 18:48:29 +0530
Subject: [PATCH 03/35] Temp: Auth handling stuff

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 appinfo/routes.php                    |  1 +
 lib/Controller/DocumentController.php | 27 +++++++++++++-------------
 lib/Controller/WopiController.php     | 13 ++++++++++++-
 lib/Db/Wopi.php                       |  5 +++++
 lib/Db/WopiMapper.php                 | 28 +++++++++++++++++++++++++++
 lib/TokenManager.php                  | 11 ++++++++++-
 src/components/AdminSettings.vue      |  5 ++++-
 src/helpers/url.js                    |  2 +-
 8 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index b86087a2d4..bfa9ed141c 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -31,6 +31,7 @@
 		['name' => 'settings#checkSettings', 'url' => 'settings/check', 'verb' => 'GET'],
 		['name' => 'settings#demoServers', 'url' => 'settings/demo', 'verb' => 'GET'],
 		['name' => 'settings#getFontNames', 'url' => 'settings/fonts', 'verb' => 'GET'],
+		// We want to create new routes like this to store files...
 		['name' => 'settings#getJsonFontList', 'url' => 'settings/fonts.json', 'verb' => 'GET'],
 		['name' => 'settings#getFontFile', 'url' => 'settings/fonts/{name}', 'verb' => 'GET'],
 		['name' => 'settings#getFontFileOverview', 'url' => 'settings/fonts/{name}/overview', 'verb' => 'GET'],
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 822f6ed3fe..4141fe8289 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -385,24 +385,23 @@ public function editOnlineTarget(int $fileId, ?string $target = null): RedirectR
 	#[PublicPage]
 	public function token(int $fileId, ?string $shareToken = null, ?string $path = null, ?string $guestName = null): DataResponse {
 		try {
-			// if ($fileId === -1 && $path !== null && str_starts_with($path, 'admin-settings/')) {
-			// 	$parts = explode('/', $path);
-			// 	$adminUserId = $parts[1] ?? $this->userId; // fallback if needed
+			if ($fileId === -1 && $path !== null && str_starts_with($path, 'admin-settings/')) {
+				$parts = explode('/', $path);
+				$adminUserId = $parts[1] ?? $this->userId; // fallback if needed
 	
-			// 	$docKey = $fileId . '_' . $this->config->getSystemValue('instanceid');
+				$docKey = $fileId . '_' . $this->config->getSystemValue('instanceid');
 	
-			// 	$wopi = $this->tokenManager->generateWopiToken($fileId, null, $adminUserId);
+				$wopi = $this->tokenManager->generateWopiToken($fileId, null, $adminUserId);
 	
-			// 	$coolBaseUrl = $this->appConfig->getCollaboraUrlPublic();
-			// 	$adminSettingsWopiSrc = $coolBaseUrl . '/browser/admin-settings.html?' 
-			// 		. 'WOPISrc=' . urlencode($this->urlGenerator->getAbsoluteURL('/index.php/apps/richdocuments/wopi/admin-settings'));
+				$coolBaseUrl = $this->appConfig->getCollaboraUrlPublic();
+				$adminSettingsWopiSrc = $coolBaseUrl . '/browser/admin-settings.html?';
 	
-			// 	return new DataResponse([
-			// 		'urlSrc' => $adminSettingsWopiSrc,
-			// 		'token' => $wopi->getToken(),
-			// 		'token_ttl' => $wopi->getExpiry(),
-			// 	]);
-			// }
+				return new DataResponse([
+					'urlSrc' => $adminSettingsWopiSrc,
+					'token' => $wopi->getToken(),
+					'token_ttl' => $wopi->getExpiry(),
+				]);
+			}
 	
 			// Normal file handling (unchanged)
 			$share = $shareToken ? $this->shareManager->getShareByToken($shareToken) : null;
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 43b5c3bcd7..e8a04eedf6 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -99,9 +99,20 @@ public function __construct(
 	#[FrontpageRoute(verb: 'GET', url: 'wopi/files/{fileId}')]
 	public function checkFileInfo(string $fileId, string $access_token): JSONResponse {
 		try {
+			$wopi = $this->wopiMapper->getWopiForToken($access_token);
+
+			// TODO: condition for $wopi not found?
+
+			if ($fileId == "-1" && $wopi->getTokenType() == WOPI::TOKEN_TYPE_SETTING_AUTH) {
+				$response = [
+					"usersettings" => 'DONE',
+				];
+
+				return new JSONResponse($response);
+			}
+
 			[$fileId, , $version] = Helper::parseFileId($fileId);
 
-			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 			$file = $this->getFileForWopiToken($wopi);
 			if (!($file instanceof File)) {
 				throw new NotFoundException('No valid file found for ' . $fileId);
diff --git a/lib/Db/Wopi.php b/lib/Db/Wopi.php
index 729c8a8cf3..82aaf25ef9 100644
--- a/lib/Db/Wopi.php
+++ b/lib/Db/Wopi.php
@@ -68,6 +68,11 @@ class Wopi extends Entity implements \JsonSerializable {
 	 */
 	public const TOKEN_TYPE_INITIATOR = 4;
 
+	/*
+	 * Temporary token that is used for authentication while communication between cool iframe and user/admin settings
+	 */
+	public const TOKEN_TYPE_SETTING_AUTH = 5;
+
 	/** @var string */
 	protected $ownerUid;
 
diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
index ebb472206c..005ffaa746 100644
--- a/lib/Db/WopiMapper.php
+++ b/lib/Db/WopiMapper.php
@@ -66,6 +66,34 @@ public function generateFileToken($fileId, $owner, $editor, $version, $updatable
 		return $wopi;
 	}
 
+	public function generateUserSettingsToken($fileId, $owner, $editor, $version, $updatable, $serverHost, ?string $guestDisplayname = null, $hideDownload = false, $direct = false, $templateId = 0, $share = null) {
+		$token = $this->random->generate(32, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+
+		$wopi = Wopi::fromParams([
+			'fileid' => $fileId,
+			'ownerUid' => $owner,
+			'editorUid' => $editor,
+			'version' => $version,
+			'canwrite' => $updatable,
+			'serverHost' => $serverHost,
+			'token' => $token,
+			'expiry' => $this->calculateNewTokenExpiry(),
+			'guestDisplayname' => $guestDisplayname,
+			'hideDownload' => $hideDownload,
+			'direct' => $direct,
+			'templateId' => $templateId,
+			'remoteServer' => '',
+			'remoteServerToken' => '',
+			'share' => $share,
+			'tokenType' => Wopi::TOKEN_TYPE_SETTING_AUTH
+		]);
+
+		/** @var Wopi $wopi */
+		$wopi = $this->insert($wopi);
+
+		return $wopi;
+	}
+
 	public function generateInitiatorToken($uid, $remoteServer) {
 		$token = $this->random->generate(32, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
 
diff --git a/lib/TokenManager.php b/lib/TokenManager.php
index 85f0b574bc..a83862743c 100644
--- a/lib/TokenManager.php
+++ b/lib/TokenManager.php
@@ -48,11 +48,20 @@ public function __construct(
 	 * @throws Exception
 	 */
 	public function generateWopiToken(string $fileId, ?string $shareToken = null, ?string $editoruid = null, bool $direct = false): Wopi {
-		[$fileId, , $version] = Helper::parseFileId($fileId);
+		
 		$owneruid = null;
 		$hideDownload = false;
 		$rootFolder = $this->rootFolder;
 
+		if ($fileId == "-1") 
+		{
+			$editoruid = $this->userId;
+			$serverHost = $this->urlGenerator->getAbsoluteURL('/');
+			return $this->wopiMapper->generateUserSettingsToken($fileId, $owneruid, $editoruid, 0, true, $serverHost, "", $hideDownload, $direct, 0, $shareToken);
+		}
+
+		[$fileId, , $version] = Helper::parseFileId($fileId);
+
 		    // // // Parse docKey to extract fileId
 			// // // Usually docKey is something like "<fileId>_<instanceid>[_version]"
 			// $parts = explode('_', $docKey);
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index dcafedbf50..77d952922f 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -17,7 +17,8 @@
 			<!-- New Collabora Admin Settings Section -->
 			<div id="admin-cool-frame-section" class="section">
 				<h2>{{ t('richdocuments', 'Collabora Admin Settings') }}</h2>
-				<CoolFrame :endpoint="'/cool/admin-settings'"
+				<CoolFrame v-if="tokenGenerated"
+					:endpoint="'/cool/admin-settings'"
 					:public-wopi-url="settings.public_wopi_url"
 					:access-token="accessToken"
 					:access-token-t-t-l="accessTokenTTL" />
@@ -532,6 +533,7 @@ export default {
 			accessToken: '',
 			accessTokenTTL: '',
 			userId: '',
+			tokenGenerated: false,
 		}
 	},
 	computed: {
@@ -645,6 +647,7 @@ export default {
 			if (data.token) {
 				this.accessToken = data.token
 				this.accessTokenTTL = data.token_ttl
+				this.tokenGenerated = true 
 				console.debug('Admin settings WOPI token generated:', this.accessToken, this.accessTokenTTL)
 			} else if (data.federatedUrl) {
 				console.error('Federated URL returned, not expected for admin settings.')
diff --git a/src/helpers/url.js b/src/helpers/url.js
index 815ee88fb8..bd2aaf8849 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -87,7 +87,7 @@ const getNextcloudUrl = () => {
 
 export const getCoolServerUrl = (collaboraBaseUrl) => {
 	// todo fix wopi Url
-	const wopiurl = getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/admin-settings'
+	const wopiurl = getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/files/-1'
 
 	const AdminSettingsUrl = collaboraBaseUrl + '/browser/dist/admin-settings.html?'
 

From 58f567b7419b1657e1eabf76055ef3fa3c8d5b6e Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Tue, 7 Jan 2025 22:15:52 +0530
Subject: [PATCH 04/35] WIP: wopi setting upload

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 44 +++++++++++++++++++++++++++++++
 lib/TokenManager.php              | 24 -----------------
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index e8a04eedf6..082de378d1 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -392,6 +392,50 @@ public function getFile(string $fileId, string $access_token): JSONResponse|Stre
 		}
 	}
 
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[PublicPage]
+	#[FrontpageRoute(verb: 'POST', url: 'wopi/settings')]
+	public function handleSettingsFile(string $access_token): JSONResponse {
+		try {
+			$wopi = $this->wopiMapper->getWopiForToken($access_token);
+
+			if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_SETTING_AUTH) {
+				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_FORBIDDEN);
+			}
+
+			$content = fopen('php://input', 'rb');
+			if (!$content) {
+				throw new \Exception("Failed to read input stream.");
+			}
+
+			$fileContent = stream_get_contents($content);
+			fclose($content);
+
+			if (empty($fileContent)) {
+				throw new \Exception("No file content received.");
+			}
+
+			$jsonContent = json_decode($fileContent, true);
+			if (json_last_error() !== JSON_ERROR_NONE) {
+				throw new \Exception("Invalid JSON content: " . json_last_error_msg());
+			}
+
+			return new JSONResponse($jsonContent, Http::STATUS_OK);
+
+		} catch (UnknownTokenException $e) {
+			$this->logger->debug($e->getMessage(), ['exception' => $e]);
+			return new JSONResponse(['error' => 'Invalid token'], Http::STATUS_FORBIDDEN);
+		} catch (ExpiredTokenException $e) {
+			$this->logger->debug($e->getMessage(), ['exception' => $e]);
+			return new JSONResponse(['error' => 'Token expired'], Http::STATUS_UNAUTHORIZED);
+		} catch (\Exception $e) {
+			$this->logger->error($e->getMessage(), ['exception' => $e]);
+			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
+	}
+
+
 	/**
 	 * Given an access token and a fileId, replaces the files with the request body.
 	 * Expects a valid token in access_token parameter.
diff --git a/lib/TokenManager.php b/lib/TokenManager.php
index a83862743c..b381e7f3f0 100644
--- a/lib/TokenManager.php
+++ b/lib/TokenManager.php
@@ -62,30 +62,6 @@ public function generateWopiToken(string $fileId, ?string $shareToken = null, ?s
 
 		[$fileId, , $version] = Helper::parseFileId($fileId);
 
-		    // // // Parse docKey to extract fileId
-			// // // Usually docKey is something like "<fileId>_<instanceid>[_version]"
-			// $parts = explode('_', $docKey);
-			// $fileId = (int)$parts[0];
-
-			// // If fileId is -1, this is the admin-settings scenario
-			// // Skip any file node lookup here and just proceed to generate a token
-			// if ($fileId === -1) {
-			// 	// Create a token without referencing a file node
-			// 	// Set fields as needed. No file-related constraints
-			// 	return $this->createToken([
-			// 		'fileid' => $fileId,
-			// 		'editor' => $editorUid,
-			// 		'canwrite' => true, // or false, depending on your needs
-			// 		'hideDownload' => false,
-			// 		'direct' => $direct,
-			// 		'templateId' => null,
-			// 		'version' => 0,
-			// 		'server_host' => '', // fill as needed
-			// 		'ownerUid' => $editorUid,
-			// 	]);
-			// }
-
-
 		// if the user is not logged-in do use the sharers storage
 		if ($shareToken !== null) {
 			/** @var File $file */

From 73e2f70e254a26579edaf41677ae82fcac31903d Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 8 Jan 2025 23:35:06 +0530
Subject: [PATCH 05/35] Created an AppData-based directory for system settings
 and user settings

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Service/SettingsService.php | 304 ++++++++++++++++++++++++++++++++
 1 file changed, 304 insertions(+)
 create mode 100644 lib/Service/SettingsService.php

diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
new file mode 100644
index 0000000000..828189cbe9
--- /dev/null
+++ b/lib/Service/SettingsService.php
@@ -0,0 +1,304 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Richdocuments\Service;
+
+use Exception;
+use OCA\Richdocuments\AppInfo\Application;
+use OCP\Files\IAppData;
+use OCP\Files\NotFoundException;
+use OCP\Files\SimpleFS\ISimpleFile;
+use OCP\Files\SimpleFS\ISimpleFolder;
+use OCP\ICacheFactory;
+use OCP\IConfig;
+use OCP\IURLGenerator;
+
+/**
+ * A generic service to manage "system-wide" files
+ * and "user-specific" files stored via IAppData.
+ */
+class SettingsService {
+	private const INVALIDATE_FILE_LIST_CACHE_AFTER_SECONDS = 3600;
+
+	/**
+	 * @var \OCP\ICache
+	 */
+	private $cache;
+
+	public function __construct(
+		private IAppData $appData,
+		ICacheFactory $cacheFactory,
+		private IURLGenerator $urlGenerator,
+		private IConfig $config,
+	) {
+		// Create a distributed cache for caching file lists
+		$this->cache = $cacheFactory->createDistributed(Application::APPNAME);
+	}
+
+	/**
+	 * Get or create the system-wide folder in app data.
+	 *
+	 * @return ISimpleFolder
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	private function getSystemDataDir(): ISimpleFolder {
+		try {
+			return $this->appData->getFolder('system-settings');
+		} catch (NotFoundException) {
+			// Folder not found, create it
+			return $this->appData->newFolder('system-settings');
+		}
+	}
+
+	/**
+	 * Get or create the user-specific folder in app data.
+	 *
+	 * Typically you'd pass the user ID, e.g. $this->userSession->getUser()->getUID().
+	 *
+	 * @param string $userId
+	 * @return ISimpleFolder
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	private function getUserDataDir(string $userId): ISimpleFolder {
+		try {
+			return $this->appData->getFolder('user-settings-' . $userId);
+		} catch (NotFoundException) {
+			return $this->appData->newFolder('user-settings-' . $userId);
+		}
+	}
+
+	/**
+	 * Return a list of file objects from the system-wide directory.
+	 *
+	 * @return ISimpleFile[]
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function getSystemFiles(): array {
+		$dir = $this->getSystemDataDir();
+		return $dir->getDirectoryListing();
+	}
+
+	/**
+	 * Return a list of file objects from the user-specific directory.
+	 *
+	 * @param string $userId
+	 * @return ISimpleFile[]
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function getUserFiles(string $userId): array {
+		$dir = $this->getUserDataDir($userId);
+		return $dir->getDirectoryListing();
+	}
+
+	/**
+	 * Return a cached list of file names for the system-wide directory.
+	 *
+	 * @return string[]
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function getSystemFileNames(): array {
+		$cacheKey = 'systemFileNames';
+		$cachedNames = $this->cache->get($cacheKey);
+
+		if ($cachedNames === null) {
+			$files = $this->getSystemFiles();
+			$cachedNames = array_map(
+				static fn (ISimpleFile $f) => $f->getName(),
+				$files
+			);
+			$this->cache->set($cacheKey, $cachedNames, self::INVALIDATE_FILE_LIST_CACHE_AFTER_SECONDS);
+		}
+
+		return $cachedNames;
+	}
+
+	/**
+	 * Return a cached list of file names for a specific user directory.
+	 *
+	 * @param string $userId
+	 * @return string[]
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function getUserFileNames(string $userId): array {
+		$cacheKey = 'userFileNames_' . $userId;
+		$cachedNames = $this->cache->get($cacheKey);
+
+		if ($cachedNames === null) {
+			$files = $this->getUserFiles($userId);
+			$cachedNames = array_map(
+				static fn (ISimpleFile $f) => $f->getName(),
+				$files
+			);
+			$this->cache->set($cacheKey, $cachedNames, self::INVALIDATE_FILE_LIST_CACHE_AFTER_SECONDS);
+		}
+
+		return $cachedNames;
+	}
+
+	/**
+	 * Upload or overwrite a file in the system-wide directory.
+	 *
+	 * @param string $fileName
+	 * @param resource|string $fileData  If you have a resource handle or raw string data.
+	 * @return array  e.g. ['size' => 1234]
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function uploadSystemFile(string $fileName, $fileData): array {
+		$dir = $this->getSystemDataDir();
+		$newFile = $dir->newFile($fileName, $fileData);
+
+		// Remove cache so it is rebuilt next time
+		$this->cache->remove('systemFileNames');
+
+		return [
+			'size' => $newFile->getSize(),
+		];
+	}
+
+	/**
+	 * Upload or overwrite a file in the user-specific directory.
+	 *
+	 * @param string $userId
+	 * @param string $fileName
+	 * @param resource|string $fileData
+	 * @return array
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function uploadUserFile(string $userId, string $fileName, $fileData): array {
+		$dir = $this->getUserDataDir($userId);
+		$newFile = $dir->newFile($fileName, $fileData);
+
+		// Invalidate cache
+		$this->cache->remove('userFileNames_' . $userId);
+
+		return [
+			'size' => $newFile->getSize(),
+		];
+	}
+
+	/**
+	 * Get a single file (system-wide).
+	 *
+	 * @param string $fileName
+	 * @return ISimpleFile
+	 * @throws NotFoundException
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function getSystemFile(string $fileName): ISimpleFile {
+		$dir = $this->getSystemDataDir();
+		return $dir->getFile($fileName);
+	}
+
+	/**
+	 * Get a single file (user-specific).
+	 *
+	 * @param string $userId
+	 * @param string $fileName
+	 * @return ISimpleFile
+	 * @throws NotFoundException
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function getUserFile(string $userId, string $fileName): ISimpleFile {
+		$dir = $this->getUserDataDir($userId);
+		return $dir->getFile($fileName);
+	}
+
+	/**
+	 * TODO: need to modify - Return the contents of a system-wide file, for example if it's JSON.
+	 *
+	 * @param string $fileName
+	 * @return string
+	 * @throws NotFoundException
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function getSystemFileContents(string $fileName): string {
+		$file = $this->getSystemFile($fileName);
+		return $file->getContent();
+	}
+
+	/**
+	 * TODO: need to modify 
+	 * Return the contents of a user-specific file.
+	 *
+	 * @param string $userId
+	 * @param string $fileName
+	 * @return string
+	 * @throws NotFoundException
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function getUserFileContents(string $userId, string $fileName): string {
+		$file = $this->getUserFile($userId, $fileName);
+		return $file->getContent();
+	}
+
+	/**
+	 * Delete a file in the system-wide directory.
+	 *
+	 * @param string $fileName
+	 * @return void
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function deleteSystemFile(string $fileName): void {
+		$dir = $this->getSystemDataDir();
+		if ($dir->fileExists($fileName)) {
+			$dir->getFile($fileName)->delete();
+		}
+		$this->cache->remove('systemFileNames');
+	}
+
+	/**
+	 * Delete a file in the user-specific directory.
+	 *
+	 * @param string $userId
+	 * @param string $fileName
+	 * @return void
+	 * @throws \OCP\Files\NotPermittedException
+	 */
+	public function deleteUserFile(string $userId, string $fileName): void {
+		$dir = $this->getUserDataDir($userId);
+		if ($dir->fileExists($fileName)) {
+			$dir->getFile($fileName)->delete();
+		}
+		$this->cache->remove('userFileNames_' . $userId);
+	}
+
+	/**
+	 * Example of a method to bulk-install default files, similar to "installDefaultFonts" in FontService.
+	 * This reads from a local assets folder, but adapt as needed.
+	 *
+	 * @throws Exception
+	 */
+	public function installDefaultSystemFiles(): void {
+		$dirPath = __DIR__ . '/../../assets/system-data'; // example location
+
+		if (!is_dir($dirPath)) {
+			throw new Exception("Directory \"$dirPath\" does not exist!");
+		}
+
+		$handle = opendir($dirPath);
+		if (!$handle) {
+			throw new Exception("Failed opening directory \"$dirPath\"!");
+		}
+
+		while (false !== ($fileName = readdir($handle))) {
+			// skip dot-files or any irrelevant files
+			if (str_starts_with($fileName, '.') || str_ends_with($fileName, '.txt')) {
+				continue;
+			}
+
+			$filePath = $dirPath . '/' . $fileName;
+			if (!is_file($filePath)) {
+				continue;
+			}
+
+			// Read file from disk (example)
+			$fileHandle = fopen($filePath, 'r');
+			if (!$fileHandle) {
+				continue;
+			}
+
+			$this->uploadSystemFile($fileName, $fileHandle);
+		}
+	}
+}

From f5320d22a22dbbd36bb59e1dd6597c74a6c87232 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 8 Jan 2025 23:40:04 +0530
Subject: [PATCH 06/35] Create a Settings controller API endpoint for handling
 AppData-based directories

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 appinfo/routes.php                    |   6 +
 lib/Controller/SettingsController.php | 165 ++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index bfa9ed141c..fbe3540f91 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -37,6 +37,12 @@
 		['name' => 'settings#getFontFileOverview', 'url' => 'settings/fonts/{name}/overview', 'verb' => 'GET'],
 		['name' => 'settings#deleteFontFile', 'url' => 'settings/fonts/{name}', 'verb' => 'DELETE'],
 		['name' => 'settings#uploadFontFile', 'url' => 'settings/fonts', 'verb' => 'POST'],
+		['name' => 'settings#uploadSystemFile', 'url' => 'settings/system-files', 'verb' => 'POST'],
+		['name' => 'settings#getSystemFileList', 'url' => 'settings/system-files.json', 'verb' => 'GET' ],
+		['name' => 'settings#getSystemFile', 'url' => 'settings/system-files/{fileName}', 'verb' => 'GET'],
+		['name' => 'settings#uploadUserFile', 'url' => 'settings/user-files', 'verb' => 'POST'],
+		['name' => 'settings#getUserFileList', 'url' => 'settings/user-files.json', 'verb' => 'GET'],
+		['name' => 'settings#downloadUserFile', 'url' => 'settings/user-files/{fileName}', 'verb' => 'GET'],
 
 		// Direct Editing: Webview
 		['name' => 'directView#show', 'url' => '/direct/{token}', 'verb' => 'GET'],
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 8ee46baef8..210fbe83a2 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -7,6 +7,7 @@
 
 use OCA\Richdocuments\AppConfig;
 use OCA\Richdocuments\Capabilities;
+use OCA\Richdocuments\Service\SettingsService;
 use OCA\Richdocuments\Service\CapabilitiesService;
 use OCA\Richdocuments\Service\ConnectivityService;
 use OCA\Richdocuments\Service\DemoService;
@@ -54,6 +55,7 @@ public function __construct(
 		private CapabilitiesService $capabilitiesService,
 		private DemoService $demoService,
 		private FontService $fontService,
+		private SettingsService $settingsService,
 		private LoggerInterface $logger,
 		private ?string $userId,
 	) {
@@ -451,6 +453,169 @@ public function uploadFontFile(): JSONResponse {
 		}
 	}
 
+	/**
+	 * @return JSONResponse
+	 * @throws UploadException
+	 * @throws NotPermittedException
+	 * @throws Exception
+	 */
+	public function uploadSystemFile(): JSONResponse {
+		try {
+			$file = $this->getUploadedFile('systemfile');
+			if (!isset($file['tmp_name'], $file['name'])) {
+				return new JSONResponse(['error' => 'No uploaded file'], 400);
+			}
+
+			$newFileResource = fopen($file['tmp_name'], 'rb');
+			if ($newFileResource === false) {
+				throw new UploadException('Could not open file resource');
+			}
+
+			$result = $this->settingsService->uploadSystemFile($file['name'], $newFileResource);
+			return new JSONResponse($result);
+		} catch (NotPermittedException $e) {
+			$this->logger->error('Not permitted', ['exception' => $e]);
+			return new JSONResponse(['error' => 'Not permitted'], 403);
+		} catch (UploadException $e) {
+			$this->logger->error('UploadException', ['exception' => $e]);
+			return new JSONResponse(['error' => $e->getMessage()], 400);
+		} catch (\Exception $e) {
+			$this->logger->error('General error', ['exception' => $e]);
+			return new JSONResponse(['error' => $e->getMessage()], 500);
+		}
+	}
+
+	/**
+	* @return JSONResponse
+	*/
+	public function getSystemFileList(): JSONResponse {
+		try {
+			$fileNames = $this->settingsService->getSystemFileNames();
+			return new JSONResponse($fileNames); 
+		} catch (NotPermittedException $e) {
+			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
+		}
+	}
+
+	/**
+	 * @param string $fileName
+	 * @return DataResponse
+	 * 
+ 	 * @NoAdminRequired
+ 	 * @NoCSRFRequired
+ 	 * @PublicPage
+	 *
+	 */
+	public function getSystemFile(string $fileName) {
+		try {
+			$systemFile = $this->settingsService->getSystemFile($fileName);
+			$mimeType = $systemFile->getMimeType() ?: 'application/octet-stream';
+			$fileContents = $systemFile->getContent();
+	
+			return new DataDisplayResponse(
+				$fileContents,
+				Http::STATUS_OK,
+				[
+					'Content-Type' => $mimeType,
+					'Content-Disposition' => 'attachment; filename="' . $fileName . '"',
+				]
+			);
+		} catch (NotFoundException $e) {
+			return new JSONResponse(['error' => 'File not found'], Http::STATUS_NOT_FOUND);
+		} catch (NotPermittedException $e) {
+			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
+		}
+	}
+	
+	/**
+	 * @return JSONResponse
+	 */
+	public function uploadUserFile(): JSONResponse {
+		// Make sure we know who is uploading
+		if ($this->userId === null) {
+			return new JSONResponse(['error' => 'User not logged in'], 401);
+		}
+
+		try {
+			// The key "userfile" must match the FormData append() key in Vue
+			$file = $this->getUploadedFile('userfile');
+			if (!isset($file['tmp_name'], $file['name'])) {
+				return new JSONResponse(['error' => 'No uploaded file'], 400);
+			}
+
+			$newFileResource = fopen($file['tmp_name'], 'rb');
+			if ($newFileResource === false) {
+				throw new UploadException('Could not open file resource');
+			}
+
+			$result = $this->settingsService->uploadUserFile($this->userId, $file['name'], $newFileResource);
+			return new JSONResponse($result);  // e.g. { "size": 1234 }
+		} catch (NotPermittedException $e) {
+			$this->logger->error('Not permitted', ['exception' => $e]);
+			return new JSONResponse(['error' => 'Not permitted'], 403);
+		} catch (UploadException $e) {
+			$this->logger->error('UploadException', ['exception' => $e]);
+			return new JSONResponse(['error' => $e->getMessage()], 400);
+		} catch (\Exception $e) {
+			$this->logger->error('General error', ['exception' => $e]);
+			return new JSONResponse(['error' => $e->getMessage()], 500);
+		}
+	}
+
+	/**
+	 * @return JSONResponse
+	 */
+	public function getUserFileList(): JSONResponse {
+		if ($this->userId === null) {
+			return new JSONResponse(['error' => 'User not logged in'], Http::STATUS_UNAUTHORIZED);
+		}
+
+		try {
+			$fileNames = $this->settingsService->getUserFileNames($this->userId);
+			return new JSONResponse($fileNames); 
+		} catch (NotPermittedException $e) {
+			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
+		} catch (\Exception $e) {
+			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
+	}
+
+	/**
+	 * @param string $fileName
+	 *
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function downloadUserFile(string $fileName) {
+		if ($this->userId === null) {
+			return new JSONResponse(['error' => 'User not logged in'], Http::STATUS_UNAUTHORIZED);
+		}
+	
+		try {
+			$userFile = $this->settingsService->getUserFile($this->userId, $fileName);
+			$mimeType = $userFile->getMimeType() ?: 'application/octet-stream';
+			$content = $userFile->getContent();  // get file bytes
+	
+			// Return as DataDisplayResponse
+			$response = new DataDisplayResponse(
+				$content,
+				Http::STATUS_OK,
+				[
+					'Content-Type' => $mimeType,
+					'Content-Disposition' => 'attachment; filename="' . $fileName . '"',
+				]
+			);
+	
+			return $response;
+		} catch (NotFoundException $e) {
+			return new JSONResponse(['error' => 'File not found'], Http::STATUS_NOT_FOUND);
+		} catch (NotPermittedException $e) {
+			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
+		} catch (\Exception $e) {
+			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
+	}
+
 	/**
 	 * @param string $key
 	 * @return array

From e993dded8c44c0c761292ef212c231ab010fa345 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 8 Jan 2025 23:43:02 +0530
Subject: [PATCH 07/35] Temporary Commit: Created a temporary UI to validate
 the functionality of user and system settings.

Note: We will delete this commit/code after the entire prototype is ready. Reviewers can ignore this commit during the review process.
Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 src/components/AdminSettings.vue | 160 ++++++++++++++++++++++++++++++-
 1 file changed, 159 insertions(+), 1 deletion(-)

diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 77d952922f..5fb3072061 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -24,6 +24,63 @@
 					:access-token-t-t-l="accessTokenTTL" />
 			</div>
 
+			<div v-if="isSetup" id="system-upload-settings" class="section">
+				<h2>{{ t('richdocuments', 'Upload System File (Minimal Example)') }}</h2>
+				<p>{{ t('richdocuments', 'Pick a file to upload into the system-settings folder:') }}</p>
+
+				<input type="file"
+					:disabled="uploadingSystemFile"
+					@change="uploadSystemFile">
+			</div>
+
+			<div id="system-file-list" class="section">
+				<h2>System Files</h2>
+				<button @click="getSystemFiles">
+					{{ t('richdocuments', 'Load System Files') }}
+				</button>
+
+				<ul>
+					<li v-for="fileName in systemFiles" :key="fileName">
+						{{ fileName }}
+						<a :href="downloadUrl(fileName)"
+							target="_blank"
+							rel="noopener"
+							class="button">
+							{{ t('richdocuments', 'Download') }}
+						</a>
+					</li>
+				</ul>
+			</div>
+
+			<div v-if="isSetup" id="user-upload-settings" class="section">
+				<h2>Upload File to User Settings (Minimal Example)</h2>
+				<p>Select a file to store in "user-settings-{{ userId }}" folder:</p>
+
+				<input type="file"
+					:disabled="uploadingUserFile"
+					@change="uploadUserFile">
+			</div>
+
+			<div v-if="isSetup" id="user-files-section" class="section">
+				<h2>User Files</h2>
+				<p>Load and see your user-specific files stored in <strong>user-settings-{{ userId }}</strong>.</p>
+
+				<button :disabled="loadingUserFiles" @click="getUserFiles">
+					{{ loadingUserFiles ? 'Loading...' : 'Show my files' }}
+				</button>
+
+				<ul>
+					<li v-for="filename in userFiles" :key="filename">
+						{{ filename }}
+						<a :href="downloadUserFileUrl(filename)"
+							target="_blank"
+							rel="noopener">
+							Download
+						</a>
+					</li>
+				</ul>
+			</div>
+
 			<div v-if="settings.wopi_url && settings.wopi_url !== ''">
 				<NcNoteCard v-if="serverError == 2" type="error">
 					<p>{{ t('richdocuments', 'Could not establish connection to the Collabora Online server.') }}</p>
@@ -486,6 +543,12 @@ export default {
 			productName: loadState('richdocuments', 'productName', 'Nextcloud Office'),
 			hasNextcloudBranding: loadState('richdocuments', 'hasNextcloudBranding', true),
 
+			uploadingSystemFile: false,
+			systemFiles: [],
+			uploadingUserFile: false,
+			userFiles: [],
+			loadingUserFiles: false,
+
 			serverMode: '',
 			serverError: SERVER_STATE_LOADING,
 			errorMessage: null,
@@ -586,6 +649,13 @@ export default {
 		} else {
 			console.error('User not authenticated')
 		}
+		if (this.isSetup) {
+			this.getSystemFiles()
+		}
+
+		if (this.isSetup) {
+			this.getUserFiles()
+		}
 	},
 	beforeMount() {
 		for (const key in this.initial.settings) {
@@ -647,7 +717,7 @@ export default {
 			if (data.token) {
 				this.accessToken = data.token
 				this.accessTokenTTL = data.token_ttl
-				this.tokenGenerated = true 
+				this.tokenGenerated = true
 				console.debug('Admin settings WOPI token generated:', this.accessToken, this.accessTokenTTL)
 			} else if (data.federatedUrl) {
 				console.error('Federated URL returned, not expected for admin settings.')
@@ -712,6 +782,94 @@ export default {
 				console.error(error)
 			})
 		},
+		uploadSystemFile(event) {
+			const file = event.target.files[0]
+			if (!file) {
+				return
+			}
+			this.uploadingSystemFile = true
+
+			const formData = new FormData()
+			formData.append('systemfile', file)
+
+			const url = this.$options.methods.generateSystemFilesUrl()
+
+			axios.post(url, formData, {
+				headers: { 'Content-Type': 'multipart/form-data' },
+			}).then((response) => {
+			}).catch((error) => {
+				console.error('System file upload error:', error)
+				showError(error?.response?.data?.error ?? 'Unknown error')
+			}).finally(() => {
+				this.uploadingSystemFile = false
+				event.target.value = ''
+			})
+		},
+
+		generateSystemFilesUrl() {
+			return generateUrl('/apps/richdocuments/settings/system-files')
+		},
+
+		getSystemFiles() {
+			const url = generateUrl('/apps/richdocuments/settings/system-files.json')
+			axios.get(url)
+				.then((response) => {
+					this.systemFiles = response.data
+				})
+				.catch((error) => {
+					console.error('Failed to load system files:', error)
+				})
+		},
+
+		downloadUrl(fileName) {
+			return generateUrl('/apps/richdocuments/settings/system-files/' + encodeURIComponent(fileName))
+		},
+
+		uploadUserFile(event) {
+			const file = event.target.files[0]
+			if (!file) {
+				return
+			}
+			this.uploadingUserFile = true
+
+			const formData = new FormData()
+			formData.append('userfile', file)
+
+			const url = generateUrl('/apps/richdocuments/settings/user-files')
+			axios.post(url, formData, {
+				headers: { 'Content-Type': 'multipart/form-data' },
+			})
+				.then((response) => {
+				})
+				.catch((error) => {
+					console.error('User file upload error:', error)
+				})
+				.finally(() => {
+					this.uploadingUserFile = false
+					event.target.value = ''
+				})
+		},
+
+		getUserFiles() {
+			this.loadingUserFiles = true
+			const url = generateUrl('/apps/richdocuments/settings/user-files.json')
+			axios.get(url)
+				.then((response) => {
+					this.userFiles = response.data
+				})
+				.catch((error) => {
+					console.error('Failed to load user files:', error)
+					showError('Could not load your user files')
+				})
+				.finally(() => {
+					this.loadingUserFiles = false
+				})
+		},
+
+		downloadUserFileUrl(fileName) {
+			return generateUrl('/apps/richdocuments/settings/user-files/' + encodeURIComponent(fileName))
+		},
+
 		async updateUseGroups(enabled) {
 			if (typeof enabled === 'boolean') {
 				this.settings.use_groups = (enabled) ? [] : null

From 35f45ba9f253b6711d0c78e1415bc4a526f64306 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Fri, 10 Jan 2025 00:37:43 +0530
Subject: [PATCH 08/35] Change the admin settings iframe URL to
 adminIntegratorSettings.

TODO: We should try to centralize the path everywhere so that a change in one place updates it everywhere!
Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/DocumentController.php | 4 ++--
 src/components/AdminSettings.vue      | 4 ++--
 src/helpers/url.js                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 4141fe8289..27b2efae6b 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -385,7 +385,7 @@ public function editOnlineTarget(int $fileId, ?string $target = null): RedirectR
 	#[PublicPage]
 	public function token(int $fileId, ?string $shareToken = null, ?string $path = null, ?string $guestName = null): DataResponse {
 		try {
-			if ($fileId === -1 && $path !== null && str_starts_with($path, 'admin-settings/')) {
+			if ($fileId === -1 && $path !== null && str_starts_with($path, 'adminIntegratorSettings/')) {
 				$parts = explode('/', $path);
 				$adminUserId = $parts[1] ?? $this->userId; // fallback if needed
 	
@@ -394,7 +394,7 @@ public function token(int $fileId, ?string $shareToken = null, ?string $path = n
 				$wopi = $this->tokenManager->generateWopiToken($fileId, null, $adminUserId);
 	
 				$coolBaseUrl = $this->appConfig->getCollaboraUrlPublic();
-				$adminSettingsWopiSrc = $coolBaseUrl . '/browser/admin-settings.html?';
+				$adminSettingsWopiSrc = $coolBaseUrl . '/browser/adminIntegratorSettings.html?';
 	
 				return new DataResponse([
 					'urlSrc' => $adminSettingsWopiSrc,
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 5fb3072061..b7280815c0 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -18,7 +18,7 @@
 			<div id="admin-cool-frame-section" class="section">
 				<h2>{{ t('richdocuments', 'Collabora Admin Settings') }}</h2>
 				<CoolFrame v-if="tokenGenerated"
-					:endpoint="'/cool/admin-settings'"
+					:endpoint="'/cool/adminIntegratorSettings'"
 					:public-wopi-url="settings.public_wopi_url"
 					:access-token="accessToken"
 					:access-token-t-t-l="accessTokenTTL" />
@@ -705,7 +705,7 @@ export default {
 	methods: {
 		async generateAccessToken() {
 			const fileId = -1
-			const path = `admin-settings/${this.userId}`
+			const path = `adminIntegratorSettings/${this.userId}`
 			const guestName = this.userId
 
 			const { data } = await axios.post(generateUrl('/apps/richdocuments/token'), {
diff --git a/src/helpers/url.js b/src/helpers/url.js
index bd2aaf8849..d74c13b1a8 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -89,7 +89,7 @@ export const getCoolServerUrl = (collaboraBaseUrl) => {
 	// todo fix wopi Url
 	const wopiurl = getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/files/-1'
 
-	const AdminSettingsUrl = collaboraBaseUrl + '/browser/dist/admin-settings.html?'
+	const AdminSettingsUrl = collaboraBaseUrl + '/browser/dist/admin/adminIntegratorSettings.html?'
 
 	return AdminSettingsUrl
 		+ 'WOPISrc=' + encodeURIComponent(wopiurl)

From 3a390753648b5275c19914628372cdcacea8f1b9 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Fri, 10 Jan 2025 00:40:35 +0530
Subject: [PATCH 09/35] WOPI: Update the wopi setting upload route to accept a
 file and store it to system-settings dir

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 082de378d1..0dfa5ce9cf 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -57,6 +57,7 @@
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Log\LoggerInterface;
+use OCA\Richdocuments\Service\SettingsService;
 
 #[RestrictToWopiServer]
 class WopiController extends Controller {
@@ -86,6 +87,7 @@ public function __construct(
 		private ILockManager $lockManager,
 		private IEventDispatcher $eventDispatcher,
 		private TaskProcessingManager $taskProcessingManager,
+		private SettingsService $settingsService,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -395,7 +397,7 @@ public function getFile(string $fileId, string $access_token): JSONResponse|Stre
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[PublicPage]
-	#[FrontpageRoute(verb: 'POST', url: 'wopi/settings')]
+	#[FrontpageRoute(verb: 'POST', url: 'wopi/settings/upload')]
 	public function handleSettingsFile(string $access_token): JSONResponse {
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
@@ -408,34 +410,31 @@ public function handleSettingsFile(string $access_token): JSONResponse {
 			if (!$content) {
 				throw new \Exception("Failed to read input stream.");
 			}
-
+	
 			$fileContent = stream_get_contents($content);
 			fclose($content);
 
-			if (empty($fileContent)) {
-				throw new \Exception("No file content received.");
-			}
 
-			$jsonContent = json_decode($fileContent, true);
-			if (json_last_error() !== JSON_ERROR_NONE) {
-				throw new \Exception("Invalid JSON content: " . json_last_error_msg());
-			}
+			$newFileName = 'settings-' . uniqid() . '.json';
+
+			$result = $this->settingsService->uploadSystemFile($newFileName, $fileContent);
 
-			return new JSONResponse($jsonContent, Http::STATUS_OK);
+			return new JSONResponse([
+				'status' => 'success',
+				'filename' => $newFileName,
+				'details' => $result,
+			], Http::STATUS_OK);
 
 		} catch (UnknownTokenException $e) {
 			$this->logger->debug($e->getMessage(), ['exception' => $e]);
 			return new JSONResponse(['error' => 'Invalid token'], Http::STATUS_FORBIDDEN);
-		} catch (ExpiredTokenException $e) {
-			$this->logger->debug($e->getMessage(), ['exception' => $e]);
-			return new JSONResponse(['error' => 'Token expired'], Http::STATUS_UNAUTHORIZED);
 		} catch (\Exception $e) {
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
 			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
 	}
 
-
+	
 	/**
 	 * Given an access token and a fileId, replaces the files with the request body.
 	 * Expects a valid token in access_token parameter.

From c80020587ce3515b94fd35bddcb4f8c0fa50253f Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Sat, 11 Jan 2025 12:39:22 +0530
Subject: [PATCH 10/35] add delete button and create wopi/setting route to
 handle wopi file request

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 appinfo/routes.php                    |  1 +
 lib/Controller/SettingsController.php | 25 ++++++++++++
 lib/Controller/WopiController.php     | 55 ++++++++++++++++++++++++---
 lib/Service/SettingsService.php       | 30 +++++++++++++++
 src/components/AdminSettings.vue      | 22 +++++++++++
 5 files changed, 127 insertions(+), 6 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index fbe3540f91..feb6e06696 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -43,6 +43,7 @@
 		['name' => 'settings#uploadUserFile', 'url' => 'settings/user-files', 'verb' => 'POST'],
 		['name' => 'settings#getUserFileList', 'url' => 'settings/user-files.json', 'verb' => 'GET'],
 		['name' => 'settings#downloadUserFile', 'url' => 'settings/user-files/{fileName}', 'verb' => 'GET'],
+		['name' => 'settings#deleteSystemFile', 'url' => 'settings/system-files/{fileName}', 'verb' => 'DELETE'],
 
 		// Direct Editing: Webview
 		['name' => 'directView#show', 'url' => '/direct/{token}', 'verb' => 'GET'],
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 210fbe83a2..a44ed6e9b0 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -526,6 +526,31 @@ public function getSystemFile(string $fileName) {
 			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
 		}
 	}
+
+	/**
+	 * Delete a file by name from the "system-settings" directory.
+	 *
+	 * @NoAdminRequired
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @param string $fileName Name of the file to delete (URL-encoded)
+	 * @return JSONResponse A simple JSON indicating success or error
+	 */
+	public function deleteSystemFile(string $fileName): JSONResponse {
+		try {
+			$this->settingsService->deleteSystemFile($fileName);
+			return new JSONResponse(['status' => 'success'], Http::STATUS_OK);
+		} catch (NotFoundException $e) {
+			return new JSONResponse(['error' => 'File not found'], Http::STATUS_NOT_FOUND);
+		} catch (NotPermittedException $e) {
+			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
+		} catch (\Exception $e) {
+			$this->logger->error($e->getMessage(), ['exception' => $e]);
+			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
+	}
+
 	
 	/**
 	 * @return JSONResponse
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 0dfa5ce9cf..b34080ba4f 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -105,9 +105,11 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 
 			// TODO: condition for $wopi not found?
 
+			$userSettingsUri = $this->generateUserSettingsUri($wopi);
+
 			if ($fileId == "-1" && $wopi->getTokenType() == WOPI::TOKEN_TYPE_SETTING_AUTH) {
 				$response = [
-					"usersettings" => 'DONE',
+					"UserSettingsUri" => $userSettingsUri,
 				];
 
 				return new JSONResponse($response);
@@ -178,6 +180,7 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 			'EnableRemoteAIContent' => $isTaskProcessingEnabled,
 			'HasContentRange' => true,
 			'ServerPrivateInfo' => [],
+			"UserSettingsUri" => $userSettingsUri,
 		];
 
 		$enableZotero = $this->config->getAppValue(Application::APPNAME, 'zoteroEnabled', 'yes') === 'yes';
@@ -394,11 +397,48 @@ public function getFile(string $fileId, string $access_token): JSONResponse|Stre
 		}
 	}
 
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[PublicPage]
+	#[FrontpageRoute(verb: 'GET', url: 'wopi/settings')]
+	public function getSettings(string $type, string $access_token): JSONResponse {
+		if ($type !== 'UserSettingsUri') {
+			return new JSONResponse(['error' => 'Invalid type parameter'], Http::STATUS_BAD_REQUEST);
+		}
+	
+		try {
+			$wopi = $this->wopiMapper->getWopiForToken($access_token);
+	
+			if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_SETTING_AUTH) {
+				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_FORBIDDEN);
+			}
+	
+			// user admin check
+			$user = $this->userManager->get($wopi->getEditorUid());
+			if (!$user || !$this->groupManager->isAdmin($user->getUID())) {
+				return new JSONResponse(['error' => 'Access denied'], Http::STATUS_FORBIDDEN);
+			}
+	
+			$systemFiles = $this->settingsService->getSystemFiles();
+			$formattedList = $this->settingsService->getSystemFileList($systemFiles);
+	
+			$response = new JSONResponse($formattedList);
+	
+			return $response;
+		} catch (UnknownTokenException|ExpiredTokenException $e) {
+			$this->logger->debug($e->getMessage(), ['exception' => $e]);
+			return new JSONResponse(['error' => 'Unauthorized'], Http::STATUS_UNAUTHORIZED);
+		} catch (\Exception $e) {
+			$this->logger->error($e->getMessage(), ['exception' => $e]);
+			return new JSONResponse(['error' => 'Internal Server Error'], Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
+	}
+	
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[PublicPage]
 	#[FrontpageRoute(verb: 'POST', url: 'wopi/settings/upload')]
-	public function handleSettingsFile(string $access_token): JSONResponse {
+	public function handleSettingsFile(string $fileId, string $access_token): JSONResponse {
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 
@@ -414,10 +454,8 @@ public function handleSettingsFile(string $access_token): JSONResponse {
 			$fileContent = stream_get_contents($content);
 			fclose($content);
 
-
-			$newFileName = 'settings-' . uniqid() . '.json';
-
-			$result = $this->settingsService->uploadSystemFile($newFileName, $fileContent);
+			// TODO: JSON based upload
+			$result = $this->settingsService->uploadSystemFile($fileId, $fileContent);
 
 			return new JSONResponse([
 				'status' => 'success',
@@ -917,4 +955,9 @@ private function getWopiUrlForTemplate(Wopi $wopi): string {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
 		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/template/' . $wopi->getTemplateId() . '?access_token=' . $wopi->getToken();
 	}
+	// todo extract nextcloud url from everything
+	private function generateUserSettingsUri(Wopi $wopi): string {
+		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
+		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=UserSettingsUri' . '&access_token=' . $wopi->getToken();
+	}
 }
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 828189cbe9..35a7fd78dc 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -79,6 +79,36 @@ public function getSystemFiles(): array {
 		return $dir->getDirectoryListing();
 	}
 
+	/**
+     * Get the formatted list of system-settings files.
+     *
+     * @param array $systemFiles Array of ISimpleFile objects
+     * @return array
+     */
+    public function getSystemFileList(array $systemFiles): array {
+        $urlGenerator = $this->urlGenerator;
+        $list = array_map(
+            function (ISimpleFile $f) use ($urlGenerator) {
+                return [
+                    'uri' => $urlGenerator->linkToRouteAbsolute(
+                        Application::APPNAME . '.settings.getSystemFile',
+                        ['fileName' => $f->getName()]
+                    ),
+                    'stamp' => $f->getETag(),
+                ];
+            },
+            $systemFiles
+        );
+
+        // Combine all ETags into a single ETag for the entire list
+        $combinedEtag = md5(implode(',', array_map(fn(ISimpleFile $f) => $f->getETag(), $systemFiles)));
+
+        return [
+            'files' => $list,
+            'etag' => $combinedEtag,
+        ];
+    }
+
 	/**
 	 * Return a list of file objects from the user-specific directory.
 	 *
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index b7280815c0..988bb6f38d 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -48,6 +48,11 @@
 							class="button">
 							{{ t('richdocuments', 'Download') }}
 						</a>
+
+						<button class="button"
+							@click="deleteSystemFile(fileName)">
+							{{ t('richdocuments', 'Delete') }}
+						</button>
 					</li>
 				</ul>
 			</div>
@@ -821,6 +826,23 @@ export default {
 				})
 		},
 
+		deleteSystemFile(fileName) {
+			if (!window.confirm(`Are you sure you want to delete "${fileName}"?`)) {
+				return
+			}
+
+			const url = generateUrl('/apps/richdocuments/settings/system-files/' + encodeURIComponent(fileName))
+
+			axios.delete(url)
+				.then((response) => {
+					this.getSystemFiles()
+				})
+				.catch((error) => {
+					console.error('Delete error', error.response?.data || error)
+					showError(t('richdocuments', 'Could not delete file') + ': ' + fileName)
+				})
+		},
+
 		downloadUrl(fileName) {
 			return generateUrl('/apps/richdocuments/settings/system-files/' + encodeURIComponent(fileName))
 		},

From c0e65e45ad68d46720038acb18af4b59d98f2ac6 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Sat, 11 Jan 2025 23:49:59 +0530
Subject: [PATCH 11/35] Manage setting configs files with dynamic routes

- Implement dynamic routing for settings files, enabling URLs structured as /settings/{type}/{category}/{filename}.
- Support various setting types (e.g. userconfigs, sharedconfigs) and categories (e.g. autotext, wordbook) so that multiple files can be stored for each category.
- Ensure proper URL parsing and directory handling for uploading and retrieving files via the WOPI interface.

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 appinfo/routes.php                    |  10 ++
 lib/Controller/SettingsController.php |  30 +++++
 lib/Controller/WopiController.php     |  28 ++---
 lib/Service/SettingsService.php       | 165 ++++++++++++++++++++++++++
 lib/WOPI/SettingsUrl.php              |  99 ++++++++++++++++
 tests/psalm-baseline.xml              |   5 +
 6 files changed, 321 insertions(+), 16 deletions(-)
 create mode 100644 lib/WOPI/SettingsUrl.php

diff --git a/appinfo/routes.php b/appinfo/routes.php
index feb6e06696..43e1337495 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -44,6 +44,16 @@
 		['name' => 'settings#getUserFileList', 'url' => 'settings/user-files.json', 'verb' => 'GET'],
 		['name' => 'settings#downloadUserFile', 'url' => 'settings/user-files/{fileName}', 'verb' => 'GET'],
 		['name' => 'settings#deleteSystemFile', 'url' => 'settings/system-files/{fileName}', 'verb' => 'DELETE'],
+		[
+			'name' => 'settings#getSettingsFile',
+			'url' => 'settings/{type}/{category}/{name}',
+			'verb' => 'GET',
+			'requirements' => [
+				'type' => '[a-zA-Z0-9_\-]+',
+				'category' => '[a-zA-Z0-9_\-]+',
+				'name' => '.+',
+			],
+		],
 
 		// Direct Editing: Webview
 		['name' => 'directView#show', 'url' => '/direct/{token}', 'verb' => 'GET'],
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index a44ed6e9b0..7ba4478a95 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -30,6 +30,7 @@
 use OCP\IURLGenerator;
 use OCP\PreConditionNotMetException;
 use OCP\Util;
+use OCA\Richdocuments\WOPI\SettingsUrl;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Output\NullOutput;
 
@@ -641,6 +642,35 @@ public function downloadUserFile(string $fileName) {
 		}
 	}
 
+	/**
+	 *  @param string $type 
+	 *  @param string $category 
+	 *  @param string $name 
+	 * 
+	 *  @return DataDisplayResponse
+	 * 
+	 * @NoAdminRequired
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 **/
+	public function getSettingsFile(string $type, string $category, string $name) {
+		try {
+			$systemFile = $this->settingsService->getSettingsFile($type, $category, $name);
+			return new DataDisplayResponse(
+				$systemFile->getContent(),
+				200,
+				[
+					'Content-Type' => $systemFile->getMimeType() ?: 'application/octet-stream'
+				]
+			);
+		} catch (NotFoundException $e) {
+			return new DataDisplayResponse('File not found.', 404);
+		} catch (\Exception $e) {
+			return new DataDisplayResponse('Something went wrong', 500);
+		}
+	}
+	
+
 	/**
 	 * @param string $key
 	 * @return array
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index b34080ba4f..a699a722c7 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -58,6 +58,7 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Log\LoggerInterface;
 use OCA\Richdocuments\Service\SettingsService;
+use \OCA\Richdocuments\WOPI\SettingsUrl;
 
 #[RestrictToWopiServer]
 class WopiController extends Controller {
@@ -402,30 +403,24 @@ public function getFile(string $fileId, string $access_token): JSONResponse|Stre
 	#[PublicPage]
 	#[FrontpageRoute(verb: 'GET', url: 'wopi/settings')]
 	public function getSettings(string $type, string $access_token): JSONResponse {
-		if ($type !== 'UserSettingsUri') {
+		if (empty($type)) {
 			return new JSONResponse(['error' => 'Invalid type parameter'], Http::STATUS_BAD_REQUEST);
 		}
 	
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
-	
 			if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_SETTING_AUTH) {
 				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_FORBIDDEN);
 			}
 	
-			// user admin check
 			$user = $this->userManager->get($wopi->getEditorUid());
 			if (!$user || !$this->groupManager->isAdmin($user->getUID())) {
 				return new JSONResponse(['error' => 'Access denied'], Http::STATUS_FORBIDDEN);
 			}
 	
-			$systemFiles = $this->settingsService->getSystemFiles();
-			$formattedList = $this->settingsService->getSystemFileList($systemFiles);
-	
-			$response = new JSONResponse($formattedList);
-	
-			return $response;
-		} catch (UnknownTokenException|ExpiredTokenException $e) {
+			$userConfig = $this->settingsService->generateSettingsConfig($type);
+			return new JSONResponse($userConfig, Http::STATUS_OK);
+		} catch (UnknownTokenException | ExpiredTokenException $e) {
 			$this->logger->debug($e->getMessage(), ['exception' => $e]);
 			return new JSONResponse(['error' => 'Unauthorized'], Http::STATUS_UNAUTHORIZED);
 		} catch (\Exception $e) {
@@ -450,16 +445,17 @@ public function handleSettingsFile(string $fileId, string $access_token): JSONRe
 			if (!$content) {
 				throw new \Exception("Failed to read input stream.");
 			}
-	
+
 			$fileContent = stream_get_contents($content);
 			fclose($content);
-
-			// TODO: JSON based upload
-			$result = $this->settingsService->uploadSystemFile($fileId, $fileContent);
-
+			
+			// Use the fileId as a file path URL (e.g., "/settings/systemconfig/wordbook/en_US%20(1).dic")
+			$settingsUrl = new SettingsUrl($fileId);
+			$result = $this->settingsService->uploadFile($settingsUrl, $fileContent);
+			
 			return new JSONResponse([
 				'status' => 'success',
-				'filename' => $newFileName,
+				'filename' => $settingsUrl->getFileName(),
 				'details' => $result,
 			], Http::STATUS_OK);
 
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 35a7fd78dc..5c237e56df 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -10,6 +10,7 @@
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Files\SimpleFS\ISimpleFolder;
+use OCA\Richdocuments\WOPI\SettingsUrl;
 use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\IURLGenerator;
@@ -36,6 +37,170 @@ public function __construct(
 		$this->cache = $cacheFactory->createDistributed(Application::APPNAME);
 	}
 
+	// TODO: Implement file caching...
+
+	/**
+	 * Ensure the settings directory exists, if it doesn't exist then create it.
+	 *
+	 * @param SettingsUrl $settingsUrl
+	 * @return ISimpleFolder
+	 */
+
+	public function ensureDirectory(SettingsUrl $settingsUrl): ISimpleFolder {
+        $type = $settingsUrl->getType();
+        $category = $settingsUrl->getCategory();
+
+        try {
+            $baseFolder = $this->appData->getFolder($type);
+        } catch (NotFoundException $e) {
+            $baseFolder = $this->appData->newFolder($type);
+        }
+
+        try {
+            $categoryFolder = $baseFolder->getFolder($category);
+        } catch (NotFoundException $e) {
+            $categoryFolder = $baseFolder->newFolder($category);
+        }
+
+        return $categoryFolder;
+    }
+
+	/**
+	 * Upload a file to the settings directory.
+	 * ex. $type/$category/$filename
+	 *
+	 * @param SettingsUrl $settingsUrl
+	 * @param resource $fileData
+	 * @return array ['stamp' => string, 'uri' => string]
+	 */
+
+	public function uploadFile(SettingsUrl $settingsUrl, $fileData): array {
+        $categoryFolder = $this->ensureDirectory($settingsUrl);
+		$fileName = $settingsUrl->getFileName();
+        $newFile = $categoryFolder->newFile($fileName, $fileData);
+        $fileUri = $this->generateFileUri($settingsUrl->getType(), $settingsUrl->getCategory(), $fileName);
+
+        return [
+            'stamp' => $newFile->getETag(),
+            'uri' => $fileUri,
+        ];
+    }
+
+	/**
+	 * Get list of files in a setting category.
+	 *
+	 * @param string $type
+	 * @param string $category
+	 * @return array Each item has 'stamp' and 'uri'.
+	 */
+	public function getCategoryFileList(string $type, string $category): array {
+        try {
+            $categoryFolder = $this->appData->getFolder($type . '/' . $category);
+        } catch (NotFoundException $e) {
+            return [];
+        }
+
+        $files = $categoryFolder->getDirectoryListing();
+
+        return array_map(function(ISimpleFile $file) use ($type, $category) {
+            return [
+                'stamp' => $file->getETag(),
+                'uri' => $this->generateFileUri($type, $category, $file->getName()),
+            ];
+        }, $files);
+    }
+
+	/**
+	 * generate setting config
+	 *
+	 * @param string $type
+	 * @return array
+	 */
+	public function generateSettingsConfig(string $type): array {
+		$kind = $type === 'userconfig' ? 'user' : 'shared';
+
+        $config = [
+            'kind' => $kind,
+        ];
+
+        $categories = $this->getAllCategories($type);
+
+        foreach ($categories as $category) {
+            $files = $this->getCategoryFileList($type, $category);
+			$config[$category] = $files;
+        }
+
+        return $config;
+    }
+
+	/**
+	 * Get all setting categories for a setting type.
+	 *
+	 * @param string $type
+	 * @return string[]
+	 */
+    private function getAllCategories(string $type): array {
+        try {
+            $categories = [];
+            $directories = $this->appData->getFolder($type)->getFullDirectoryListing();
+            foreach ($directories as $dir) {
+                if ($dir instanceof ISimpleFolder) {
+                    $categories[] = $dir->getName();
+                }
+            }
+            return $categories;
+        } catch (NotFoundException $e) {
+            return [];
+        }
+    }
+
+	/**
+	 * Generate file URL.
+	 *
+	 * @param string $type
+	 * @param string $category
+	 * @param string $fileName
+	 * @return string
+	 */
+	private function generateFileUri(string $type, string $category, string $fileName): string {
+		return $this->urlGenerator->linkToRouteAbsolute(
+			'richdocuments.settings.getSettingsFile',
+			[
+				'type' => $type,
+				'category' => $category,
+				'name' => $fileName,
+			]
+		);
+	}
+
+	/**
+	 * Get a specific settings file.
+	 *
+	 * @param string $type
+	 * @param string $category
+	 * @param string $name
+	 * @return ISimpleFile
+	 */
+	public function getSettingsFile(string $type, string $category, string $name): ISimpleFile {
+		try {
+			$baseFolder = $this->appData->getFolder($type);
+		} catch (NotFoundException $e) {
+			throw new NotFoundException("Type folder '{$type}' not found.");
+		}
+		
+		try {
+			$categoryFolder = $baseFolder->getFolder($category);
+		} catch (NotFoundException $e) {
+			throw new NotFoundException("Category folder '{$category}' not found in type '{$type}'.");
+		}
+		
+		try {
+			return $categoryFolder->getFile($name);
+		} catch (NotFoundException $e) {
+			throw new NotFoundException("File '{$name}' not found in category '{$category}' for type '{$type}'.");
+		}
+	}
+	
 	/**
 	 * Get or create the system-wide folder in app data.
 	 *
diff --git a/lib/WOPI/SettingsUrl.php b/lib/WOPI/SettingsUrl.php
new file mode 100644
index 0000000000..c130b5a488
--- /dev/null
+++ b/lib/WOPI/SettingsUrl.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace OCA\Richdocuments\WOPI;
+
+use InvalidArgumentException;
+
+/*
+* SettingsUrl is used to handle setting type, category and filename.
+*/
+
+class SettingsUrl {
+    private string $type;
+    private string $category;
+    private string $fileName;
+    private string $rawUrl;
+
+    public function __construct(string $url) {
+        $this->rawUrl = $url;
+        $this->parseUrl($url);
+    }
+
+    /**
+     * Factory method to create a SettingsUrl instance based on individual parameters.
+     */
+    public static function fromComponents(string $type, string $category, string $fileName): self {
+        $rawUrl = "settings/$type/$category/$fileName";
+        return new self($rawUrl);
+    }
+
+    /**
+     * Parses the settings URL and extracts type, category, and filename.
+     *
+     * @param string
+     * @throws InvalidArgumentException
+     */
+    private function parseUrl(string $url): void {
+        $decodedUrl = urldecode($url);
+        
+        $parsedUrl = parse_url($decodedUrl);
+        if (!isset($parsedUrl['path'])) {
+            throw new InvalidArgumentException("Invalid URL: Path not found.");
+        }
+
+        $path = $parsedUrl['path'];
+
+        $settingsIndex = strpos($path, '/settings/');
+        if ($settingsIndex === false) {
+            throw new InvalidArgumentException("Invalid settings URL format: '/settings/' segment missing.");
+        }
+
+        $relevantPath = substr($path, $settingsIndex + strlen('/settings/'));
+
+        $pathParts = explode('/', $relevantPath);
+
+        if (count($pathParts) < 3) {
+            throw new InvalidArgumentException("Invalid settings URL format: Expected 'type/category/fileName'.");
+        }
+
+        $this->type = $pathParts[0];
+        $this->category = $pathParts[1];
+        $this->fileName = implode('/', array_slice($pathParts, 2));
+    }
+
+    /**
+     * Get the setting type from the URL.
+     *
+     * @return string
+     */
+    public function getType(): string {
+        return $this->type;
+    }
+
+    /**
+     * Get the setting category from the URL.
+     *
+     * @return string
+     */
+    public function getCategory(): string {
+        return $this->category;
+    }
+
+    /**
+     * Get the original filename from the URL.
+     *
+     * @return string
+     */
+    public function getFileName(): string {
+        return $this->fileName;
+    }
+
+    /**
+     * Get the raw URL.
+     *
+     * @return string
+     */
+    public function getRawUrl(): string {
+        return $this->rawUrl;
+    }
+}
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 81a432d72c..b91cb8f1ba 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -125,4 +125,9 @@
       <code><![CDATA[$result && count($result) > 0]]></code>
     </RedundantCondition>
   </file>
+  <file src="lib/WOPI/SettingsUrl.php">
+    <RedundantCondition>
+      <code><![CDATA[$result && count($result) > 0]]></code>
+    </RedundantCondition>
+  </file>
 </files>

From 1660bca2171bf4ab73a1c500a626aa5dcd558ba4 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Sun, 12 Jan 2025 00:28:47 +0530
Subject: [PATCH 12/35] Code cleanup: Remove POC helper functions

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 appinfo/routes.php                    |   8 -
 lib/Controller/SettingsController.php | 188 ----------------
 lib/Controller/WopiController.php     |   2 +-
 lib/Service/SettingsService.php       | 295 +-------------------------
 src/components/AdminSettings.vue      | 179 ----------------
 5 files changed, 3 insertions(+), 669 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 43e1337495..a94c020dc4 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -31,19 +31,11 @@
 		['name' => 'settings#checkSettings', 'url' => 'settings/check', 'verb' => 'GET'],
 		['name' => 'settings#demoServers', 'url' => 'settings/demo', 'verb' => 'GET'],
 		['name' => 'settings#getFontNames', 'url' => 'settings/fonts', 'verb' => 'GET'],
-		// We want to create new routes like this to store files...
 		['name' => 'settings#getJsonFontList', 'url' => 'settings/fonts.json', 'verb' => 'GET'],
 		['name' => 'settings#getFontFile', 'url' => 'settings/fonts/{name}', 'verb' => 'GET'],
 		['name' => 'settings#getFontFileOverview', 'url' => 'settings/fonts/{name}/overview', 'verb' => 'GET'],
 		['name' => 'settings#deleteFontFile', 'url' => 'settings/fonts/{name}', 'verb' => 'DELETE'],
 		['name' => 'settings#uploadFontFile', 'url' => 'settings/fonts', 'verb' => 'POST'],
-		['name' => 'settings#uploadSystemFile', 'url' => 'settings/system-files', 'verb' => 'POST'],
-		['name' => 'settings#getSystemFileList', 'url' => 'settings/system-files.json', 'verb' => 'GET' ],
-		['name' => 'settings#getSystemFile', 'url' => 'settings/system-files/{fileName}', 'verb' => 'GET'],
-		['name' => 'settings#uploadUserFile', 'url' => 'settings/user-files', 'verb' => 'POST'],
-		['name' => 'settings#getUserFileList', 'url' => 'settings/user-files.json', 'verb' => 'GET'],
-		['name' => 'settings#downloadUserFile', 'url' => 'settings/user-files/{fileName}', 'verb' => 'GET'],
-		['name' => 'settings#deleteSystemFile', 'url' => 'settings/system-files/{fileName}', 'verb' => 'DELETE'],
 		[
 			'name' => 'settings#getSettingsFile',
 			'url' => 'settings/{type}/{category}/{name}',
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 7ba4478a95..93237a91ca 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -454,194 +454,6 @@ public function uploadFontFile(): JSONResponse {
 		}
 	}
 
-	/**
-	 * @return JSONResponse
-	 * @throws UploadException
-	 * @throws NotPermittedException
-	 * @throws Exception
-	 */
-	public function uploadSystemFile(): JSONResponse {
-		try {
-			$file = $this->getUploadedFile('systemfile');
-			if (!isset($file['tmp_name'], $file['name'])) {
-				return new JSONResponse(['error' => 'No uploaded file'], 400);
-			}
-
-			$newFileResource = fopen($file['tmp_name'], 'rb');
-			if ($newFileResource === false) {
-				throw new UploadException('Could not open file resource');
-			}
-
-			$result = $this->settingsService->uploadSystemFile($file['name'], $newFileResource);
-			return new JSONResponse($result);
-		} catch (NotPermittedException $e) {
-			$this->logger->error('Not permitted', ['exception' => $e]);
-			return new JSONResponse(['error' => 'Not permitted'], 403);
-		} catch (UploadException $e) {
-			$this->logger->error('UploadException', ['exception' => $e]);
-			return new JSONResponse(['error' => $e->getMessage()], 400);
-		} catch (\Exception $e) {
-			$this->logger->error('General error', ['exception' => $e]);
-			return new JSONResponse(['error' => $e->getMessage()], 500);
-		}
-	}
-
-	/**
-	* @return JSONResponse
-	*/
-	public function getSystemFileList(): JSONResponse {
-		try {
-			$fileNames = $this->settingsService->getSystemFileNames();
-			return new JSONResponse($fileNames); 
-		} catch (NotPermittedException $e) {
-			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
-		}
-	}
-
-	/**
-	 * @param string $fileName
-	 * @return DataResponse
-	 * 
- 	 * @NoAdminRequired
- 	 * @NoCSRFRequired
- 	 * @PublicPage
-	 *
-	 */
-	public function getSystemFile(string $fileName) {
-		try {
-			$systemFile = $this->settingsService->getSystemFile($fileName);
-			$mimeType = $systemFile->getMimeType() ?: 'application/octet-stream';
-			$fileContents = $systemFile->getContent();
-	
-			return new DataDisplayResponse(
-				$fileContents,
-				Http::STATUS_OK,
-				[
-					'Content-Type' => $mimeType,
-					'Content-Disposition' => 'attachment; filename="' . $fileName . '"',
-				]
-			);
-		} catch (NotFoundException $e) {
-			return new JSONResponse(['error' => 'File not found'], Http::STATUS_NOT_FOUND);
-		} catch (NotPermittedException $e) {
-			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
-		}
-	}
-
-	/**
-	 * Delete a file by name from the "system-settings" directory.
-	 *
-	 * @NoAdminRequired
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $fileName Name of the file to delete (URL-encoded)
-	 * @return JSONResponse A simple JSON indicating success or error
-	 */
-	public function deleteSystemFile(string $fileName): JSONResponse {
-		try {
-			$this->settingsService->deleteSystemFile($fileName);
-			return new JSONResponse(['status' => 'success'], Http::STATUS_OK);
-		} catch (NotFoundException $e) {
-			return new JSONResponse(['error' => 'File not found'], Http::STATUS_NOT_FOUND);
-		} catch (NotPermittedException $e) {
-			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e]);
-			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
-
-	
-	/**
-	 * @return JSONResponse
-	 */
-	public function uploadUserFile(): JSONResponse {
-		// Make sure we know who is uploading
-		if ($this->userId === null) {
-			return new JSONResponse(['error' => 'User not logged in'], 401);
-		}
-
-		try {
-			// The key "userfile" must match the FormData append() key in Vue
-			$file = $this->getUploadedFile('userfile');
-			if (!isset($file['tmp_name'], $file['name'])) {
-				return new JSONResponse(['error' => 'No uploaded file'], 400);
-			}
-
-			$newFileResource = fopen($file['tmp_name'], 'rb');
-			if ($newFileResource === false) {
-				throw new UploadException('Could not open file resource');
-			}
-
-			$result = $this->settingsService->uploadUserFile($this->userId, $file['name'], $newFileResource);
-			return new JSONResponse($result);  // e.g. { "size": 1234 }
-		} catch (NotPermittedException $e) {
-			$this->logger->error('Not permitted', ['exception' => $e]);
-			return new JSONResponse(['error' => 'Not permitted'], 403);
-		} catch (UploadException $e) {
-			$this->logger->error('UploadException', ['exception' => $e]);
-			return new JSONResponse(['error' => $e->getMessage()], 400);
-		} catch (\Exception $e) {
-			$this->logger->error('General error', ['exception' => $e]);
-			return new JSONResponse(['error' => $e->getMessage()], 500);
-		}
-	}
-
-	/**
-	 * @return JSONResponse
-	 */
-	public function getUserFileList(): JSONResponse {
-		if ($this->userId === null) {
-			return new JSONResponse(['error' => 'User not logged in'], Http::STATUS_UNAUTHORIZED);
-		}
-
-		try {
-			$fileNames = $this->settingsService->getUserFileNames($this->userId);
-			return new JSONResponse($fileNames); 
-		} catch (NotPermittedException $e) {
-			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
-		} catch (\Exception $e) {
-			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
-
-	/**
-	 * @param string $fileName
-	 *
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function downloadUserFile(string $fileName) {
-		if ($this->userId === null) {
-			return new JSONResponse(['error' => 'User not logged in'], Http::STATUS_UNAUTHORIZED);
-		}
-	
-		try {
-			$userFile = $this->settingsService->getUserFile($this->userId, $fileName);
-			$mimeType = $userFile->getMimeType() ?: 'application/octet-stream';
-			$content = $userFile->getContent();  // get file bytes
-	
-			// Return as DataDisplayResponse
-			$response = new DataDisplayResponse(
-				$content,
-				Http::STATUS_OK,
-				[
-					'Content-Type' => $mimeType,
-					'Content-Disposition' => 'attachment; filename="' . $fileName . '"',
-				]
-			);
-	
-			return $response;
-		} catch (NotFoundException $e) {
-			return new JSONResponse(['error' => 'File not found'], Http::STATUS_NOT_FOUND);
-		} catch (NotPermittedException $e) {
-			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
-		} catch (\Exception $e) {
-			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
-
 	/**
 	 *  @param string $type 
 	 *  @param string $category 
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index a699a722c7..2928ca53c0 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -433,7 +433,7 @@ public function getSettings(string $type, string $access_token): JSONResponse {
 	#[NoCSRFRequired]
 	#[PublicPage]
 	#[FrontpageRoute(verb: 'POST', url: 'wopi/settings/upload')]
-	public function handleSettingsFile(string $fileId, string $access_token): JSONResponse {
+	public function uploadSettingsFile(string $fileId, string $access_token): JSONResponse {
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 5c237e56df..c6f2babcbe 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -201,299 +201,8 @@ public function getSettingsFile(string $type, string $category, string $name): I
 		}
 	}
 	
-	/**
-	 * Get or create the system-wide folder in app data.
-	 *
-	 * @return ISimpleFolder
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	private function getSystemDataDir(): ISimpleFolder {
-		try {
-			return $this->appData->getFolder('system-settings');
-		} catch (NotFoundException) {
-			// Folder not found, create it
-			return $this->appData->newFolder('system-settings');
-		}
-	}
-
-	/**
-	 * Get or create the user-specific folder in app data.
-	 *
-	 * Typically you'd pass the user ID, e.g. $this->userSession->getUser()->getUID().
-	 *
-	 * @param string $userId
-	 * @return ISimpleFolder
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	private function getUserDataDir(string $userId): ISimpleFolder {
-		try {
-			return $this->appData->getFolder('user-settings-' . $userId);
-		} catch (NotFoundException) {
-			return $this->appData->newFolder('user-settings-' . $userId);
-		}
-	}
-
-	/**
-	 * Return a list of file objects from the system-wide directory.
-	 *
-	 * @return ISimpleFile[]
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function getSystemFiles(): array {
-		$dir = $this->getSystemDataDir();
-		return $dir->getDirectoryListing();
-	}
-
-	/**
-     * Get the formatted list of system-settings files.
-     *
-     * @param array $systemFiles Array of ISimpleFile objects
-     * @return array
-     */
-    public function getSystemFileList(array $systemFiles): array {
-        $urlGenerator = $this->urlGenerator;
-        $list = array_map(
-            function (ISimpleFile $f) use ($urlGenerator) {
-                return [
-                    'uri' => $urlGenerator->linkToRouteAbsolute(
-                        Application::APPNAME . '.settings.getSystemFile',
-                        ['fileName' => $f->getName()]
-                    ),
-                    'stamp' => $f->getETag(),
-                ];
-            },
-            $systemFiles
-        );
-
-        // Combine all ETags into a single ETag for the entire list
-        $combinedEtag = md5(implode(',', array_map(fn(ISimpleFile $f) => $f->getETag(), $systemFiles)));
-
-        return [
-            'files' => $list,
-            'etag' => $combinedEtag,
-        ];
-    }
-
-	/**
-	 * Return a list of file objects from the user-specific directory.
-	 *
-	 * @param string $userId
-	 * @return ISimpleFile[]
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function getUserFiles(string $userId): array {
-		$dir = $this->getUserDataDir($userId);
-		return $dir->getDirectoryListing();
-	}
-
-	/**
-	 * Return a cached list of file names for the system-wide directory.
-	 *
-	 * @return string[]
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function getSystemFileNames(): array {
-		$cacheKey = 'systemFileNames';
-		$cachedNames = $this->cache->get($cacheKey);
-
-		if ($cachedNames === null) {
-			$files = $this->getSystemFiles();
-			$cachedNames = array_map(
-				static fn (ISimpleFile $f) => $f->getName(),
-				$files
-			);
-			$this->cache->set($cacheKey, $cachedNames, self::INVALIDATE_FILE_LIST_CACHE_AFTER_SECONDS);
-		}
-
-		return $cachedNames;
-	}
-
-	/**
-	 * Return a cached list of file names for a specific user directory.
-	 *
-	 * @param string $userId
-	 * @return string[]
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function getUserFileNames(string $userId): array {
-		$cacheKey = 'userFileNames_' . $userId;
-		$cachedNames = $this->cache->get($cacheKey);
-
-		if ($cachedNames === null) {
-			$files = $this->getUserFiles($userId);
-			$cachedNames = array_map(
-				static fn (ISimpleFile $f) => $f->getName(),
-				$files
-			);
-			$this->cache->set($cacheKey, $cachedNames, self::INVALIDATE_FILE_LIST_CACHE_AFTER_SECONDS);
-		}
-
-		return $cachedNames;
-	}
-
-	/**
-	 * Upload or overwrite a file in the system-wide directory.
-	 *
-	 * @param string $fileName
-	 * @param resource|string $fileData  If you have a resource handle or raw string data.
-	 * @return array  e.g. ['size' => 1234]
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function uploadSystemFile(string $fileName, $fileData): array {
-		$dir = $this->getSystemDataDir();
-		$newFile = $dir->newFile($fileName, $fileData);
-
-		// Remove cache so it is rebuilt next time
-		$this->cache->remove('systemFileNames');
-
-		return [
-			'size' => $newFile->getSize(),
-		];
-	}
-
-	/**
-	 * Upload or overwrite a file in the user-specific directory.
-	 *
-	 * @param string $userId
-	 * @param string $fileName
-	 * @param resource|string $fileData
-	 * @return array
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function uploadUserFile(string $userId, string $fileName, $fileData): array {
-		$dir = $this->getUserDataDir($userId);
-		$newFile = $dir->newFile($fileName, $fileData);
+	// TODO: add route for delete setting config file? 
 
-		// Invalidate cache
-		$this->cache->remove('userFileNames_' . $userId);
-
-		return [
-			'size' => $newFile->getSize(),
-		];
-	}
-
-	/**
-	 * Get a single file (system-wide).
-	 *
-	 * @param string $fileName
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function getSystemFile(string $fileName): ISimpleFile {
-		$dir = $this->getSystemDataDir();
-		return $dir->getFile($fileName);
-	}
+	// TODO: Handle installDefaultSystemFiles setting	
 
-	/**
-	 * Get a single file (user-specific).
-	 *
-	 * @param string $userId
-	 * @param string $fileName
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function getUserFile(string $userId, string $fileName): ISimpleFile {
-		$dir = $this->getUserDataDir($userId);
-		return $dir->getFile($fileName);
-	}
-
-	/**
-	 * TODO: need to modify - Return the contents of a system-wide file, for example if it's JSON.
-	 *
-	 * @param string $fileName
-	 * @return string
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function getSystemFileContents(string $fileName): string {
-		$file = $this->getSystemFile($fileName);
-		return $file->getContent();
-	}
-
-	/**
-	 * TODO: need to modify 
-	 * Return the contents of a user-specific file.
-	 *
-	 * @param string $userId
-	 * @param string $fileName
-	 * @return string
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function getUserFileContents(string $userId, string $fileName): string {
-		$file = $this->getUserFile($userId, $fileName);
-		return $file->getContent();
-	}
-
-	/**
-	 * Delete a file in the system-wide directory.
-	 *
-	 * @param string $fileName
-	 * @return void
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function deleteSystemFile(string $fileName): void {
-		$dir = $this->getSystemDataDir();
-		if ($dir->fileExists($fileName)) {
-			$dir->getFile($fileName)->delete();
-		}
-		$this->cache->remove('systemFileNames');
-	}
-
-	/**
-	 * Delete a file in the user-specific directory.
-	 *
-	 * @param string $userId
-	 * @param string $fileName
-	 * @return void
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function deleteUserFile(string $userId, string $fileName): void {
-		$dir = $this->getUserDataDir($userId);
-		if ($dir->fileExists($fileName)) {
-			$dir->getFile($fileName)->delete();
-		}
-		$this->cache->remove('userFileNames_' . $userId);
-	}
-
-	/**
-	 * Example of a method to bulk-install default files, similar to "installDefaultFonts" in FontService.
-	 * This reads from a local assets folder, but adapt as needed.
-	 *
-	 * @throws Exception
-	 */
-	public function installDefaultSystemFiles(): void {
-		$dirPath = __DIR__ . '/../../assets/system-data'; // example location
-
-		if (!is_dir($dirPath)) {
-			throw new Exception("Directory \"$dirPath\" does not exist!");
-		}
-
-		$handle = opendir($dirPath);
-		if (!$handle) {
-			throw new Exception("Failed opening directory \"$dirPath\"!");
-		}
-
-		while (false !== ($fileName = readdir($handle))) {
-			// skip dot-files or any irrelevant files
-			if (str_starts_with($fileName, '.') || str_ends_with($fileName, '.txt')) {
-				continue;
-			}
-
-			$filePath = $dirPath . '/' . $fileName;
-			if (!is_file($filePath)) {
-				continue;
-			}
-
-			// Read file from disk (example)
-			$fileHandle = fopen($filePath, 'r');
-			if (!$fileHandle) {
-				continue;
-			}
-
-			$this->uploadSystemFile($fileName, $fileHandle);
-		}
-	}
 }
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 988bb6f38d..3ac7b45718 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -24,68 +24,6 @@
 					:access-token-t-t-l="accessTokenTTL" />
 			</div>
 
-			<div v-if="isSetup" id="system-upload-settings" class="section">
-				<h2>{{ t('richdocuments', 'Upload System File (Minimal Example)') }}</h2>
-				<p>{{ t('richdocuments', 'Pick a file to upload into the system-settings folder:') }}</p>
-
-				<input type="file"
-					:disabled="uploadingSystemFile"
-					@change="uploadSystemFile">
-			</div>
-
-			<div id="system-file-list" class="section">
-				<h2>System Files</h2>
-				<button @click="getSystemFiles">
-					{{ t('richdocuments', 'Load System Files') }}
-				</button>
-
-				<ul>
-					<li v-for="fileName in systemFiles" :key="fileName">
-						{{ fileName }}
-						<a :href="downloadUrl(fileName)"
-							target="_blank"
-							rel="noopener"
-							class="button">
-							{{ t('richdocuments', 'Download') }}
-						</a>
-
-						<button class="button"
-							@click="deleteSystemFile(fileName)">
-							{{ t('richdocuments', 'Delete') }}
-						</button>
-					</li>
-				</ul>
-			</div>
-
-			<div v-if="isSetup" id="user-upload-settings" class="section">
-				<h2>Upload File to User Settings (Minimal Example)</h2>
-				<p>Select a file to store in "user-settings-{{ userId }}" folder:</p>
-
-				<input type="file"
-					:disabled="uploadingUserFile"
-					@change="uploadUserFile">
-			</div>
-
-			<div v-if="isSetup" id="user-files-section" class="section">
-				<h2>User Files</h2>
-				<p>Load and see your user-specific files stored in <strong>user-settings-{{ userId }}</strong>.</p>
-
-				<button :disabled="loadingUserFiles" @click="getUserFiles">
-					{{ loadingUserFiles ? 'Loading...' : 'Show my files' }}
-				</button>
-
-				<ul>
-					<li v-for="filename in userFiles" :key="filename">
-						{{ filename }}
-						<a :href="downloadUserFileUrl(filename)"
-							target="_blank"
-							rel="noopener">
-							Download
-						</a>
-					</li>
-				</ul>
-			</div>
-
 			<div v-if="settings.wopi_url && settings.wopi_url !== ''">
 				<NcNoteCard v-if="serverError == 2" type="error">
 					<p>{{ t('richdocuments', 'Could not establish connection to the Collabora Online server.') }}</p>
@@ -548,12 +486,6 @@ export default {
 			productName: loadState('richdocuments', 'productName', 'Nextcloud Office'),
 			hasNextcloudBranding: loadState('richdocuments', 'hasNextcloudBranding', true),
 
-			uploadingSystemFile: false,
-			systemFiles: [],
-			uploadingUserFile: false,
-			userFiles: [],
-			loadingUserFiles: false,
-
 			serverMode: '',
 			serverError: SERVER_STATE_LOADING,
 			errorMessage: null,
@@ -654,13 +586,6 @@ export default {
 		} else {
 			console.error('User not authenticated')
 		}
-		if (this.isSetup) {
-			this.getSystemFiles()
-		}
-
-		if (this.isSetup) {
-			this.getUserFiles()
-		}
 	},
 	beforeMount() {
 		for (const key in this.initial.settings) {
@@ -787,110 +712,6 @@ export default {
 				console.error(error)
 			})
 		},
-		uploadSystemFile(event) {
-			const file = event.target.files[0]
-			if (!file) {
-				return
-			}
-			this.uploadingSystemFile = true
-
-			const formData = new FormData()
-			formData.append('systemfile', file)
-
-			const url = this.$options.methods.generateSystemFilesUrl()
-
-			axios.post(url, formData, {
-				headers: { 'Content-Type': 'multipart/form-data' },
-			}).then((response) => {
-			}).catch((error) => {
-				console.error('System file upload error:', error)
-				showError(error?.response?.data?.error ?? 'Unknown error')
-			}).finally(() => {
-				this.uploadingSystemFile = false
-				event.target.value = ''
-			})
-		},
-
-		generateSystemFilesUrl() {
-			return generateUrl('/apps/richdocuments/settings/system-files')
-		},
-
-		getSystemFiles() {
-			const url = generateUrl('/apps/richdocuments/settings/system-files.json')
-			axios.get(url)
-				.then((response) => {
-					this.systemFiles = response.data
-				})
-				.catch((error) => {
-					console.error('Failed to load system files:', error)
-				})
-		},
-
-		deleteSystemFile(fileName) {
-			if (!window.confirm(`Are you sure you want to delete "${fileName}"?`)) {
-				return
-			}
-
-			const url = generateUrl('/apps/richdocuments/settings/system-files/' + encodeURIComponent(fileName))
-
-			axios.delete(url)
-				.then((response) => {
-					this.getSystemFiles()
-				})
-				.catch((error) => {
-					console.error('Delete error', error.response?.data || error)
-					showError(t('richdocuments', 'Could not delete file') + ': ' + fileName)
-				})
-		},
-
-		downloadUrl(fileName) {
-			return generateUrl('/apps/richdocuments/settings/system-files/' + encodeURIComponent(fileName))
-		},
-
-		uploadUserFile(event) {
-			const file = event.target.files[0]
-			if (!file) {
-				return
-			}
-			this.uploadingUserFile = true
-
-			const formData = new FormData()
-			formData.append('userfile', file)
-
-			const url = generateUrl('/apps/richdocuments/settings/user-files')
-			axios.post(url, formData, {
-				headers: { 'Content-Type': 'multipart/form-data' },
-			})
-				.then((response) => {
-				})
-				.catch((error) => {
-					console.error('User file upload error:', error)
-				})
-				.finally(() => {
-					this.uploadingUserFile = false
-					event.target.value = ''
-				})
-		},
-
-		getUserFiles() {
-			this.loadingUserFiles = true
-			const url = generateUrl('/apps/richdocuments/settings/user-files.json')
-			axios.get(url)
-				.then((response) => {
-					this.userFiles = response.data
-				})
-				.catch((error) => {
-					console.error('Failed to load user files:', error)
-					showError('Could not load your user files')
-				})
-				.finally(() => {
-					this.loadingUserFiles = false
-				})
-		},
-
-		downloadUserFileUrl(fileName) {
-			return generateUrl('/apps/richdocuments/settings/user-files/' + encodeURIComponent(fileName))
-		},
 
 		async updateUseGroups(enabled) {
 			if (typeof enabled === 'boolean') {

From dce7f65b93af6339fb94ca284d7cfa98e9e71535 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Mon, 13 Jan 2025 13:00:49 +0530
Subject: [PATCH 13/35] Send WOPI setting base URL to integrator

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php |  2 +-
 src/components/AdminSettings.vue  | 12 +++++++++---
 src/components/CoolFrame.vue      |  5 +++++
 src/helpers/url.js                |  4 ++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 2928ca53c0..cf90f61b46 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -954,6 +954,6 @@ private function getWopiUrlForTemplate(Wopi $wopi): string {
 	// todo extract nextcloud url from everything
 	private function generateUserSettingsUri(Wopi $wopi): string {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
-		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=UserSettingsUri' . '&access_token=' . $wopi->getToken();
+		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=userconfig' . '&access_token=' . $wopi->getToken();
 	}
 }
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 3ac7b45718..3c5be1613d 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -21,7 +21,8 @@
 					:endpoint="'/cool/adminIntegratorSettings'"
 					:public-wopi-url="settings.public_wopi_url"
 					:access-token="accessToken"
-					:access-token-t-t-l="accessTokenTTL" />
+					:access-token-t-t-l="accessTokenTTL"
+					:wopi-setting-base-url="wopiSettingBaseUrl" />
 			</div>
 
 			<div v-if="settings.wopi_url && settings.wopi_url !== ''">
@@ -441,7 +442,7 @@ import {
 import { isPublicShare, getSharingToken } from '@nextcloud/sharing/public'
 
 import '@nextcloud/dialogs/style.css'
-import { getCallbackBaseUrl } from '../helpers/url.js'
+import { getCallbackBaseUrl, getConfigFileUrl } from '../helpers/url.js'
 import { getCapabilities } from '../services/capabilities.ts'
 import CoolFrame from './CoolFrame.vue'
 
@@ -534,6 +535,7 @@ export default {
 			accessTokenTTL: '',
 			userId: '',
 			tokenGenerated: false,
+			wopiSettingBaseUrl: '',
 		}
 	},
 	computed: {
@@ -583,6 +585,11 @@ export default {
 		if (currentUser && currentUser.uid) {
 			this.userId = currentUser.uid
 			await this.generateAccessToken()
+			if (this.accessToken) {
+				this.wopiSettingBaseUrl = getConfigFileUrl()
+				console.debug('wopiSettingBaseUrl', this.wopiSettingBaseUrl)
+				this.tokenGenerated = true
+			}
 		} else {
 			console.error('User not authenticated')
 		}
@@ -647,7 +654,6 @@ export default {
 			if (data.token) {
 				this.accessToken = data.token
 				this.accessTokenTTL = data.token_ttl
-				this.tokenGenerated = true
 				console.debug('Admin settings WOPI token generated:', this.accessToken, this.accessTokenTTL)
 			} else if (data.federatedUrl) {
 				console.error('Federated URL returned, not expected for admin settings.')
diff --git a/src/components/CoolFrame.vue b/src/components/CoolFrame.vue
index 456521b23f..fd8a7f2c89 100644
--- a/src/components/CoolFrame.vue
+++ b/src/components/CoolFrame.vue
@@ -7,6 +7,7 @@
 			:target="iframeName">
 			<input type="hidden" name="access_token" :value="accessToken">
 			<input type="hidden" name="access_token_ttl" :value="accessTokenTTL">
+			<input type="hidden" name="wopi_setting_base_url" :value="wopiSettingBaseUrl">
 			<!-- TODO: Include any other necessary hidden inputs -->
 		</form>
 		<iframe :id="iframeName"
@@ -41,6 +42,10 @@ export default {
 			type: [String, Number],
 			required: true,
 		},
+		wopiSettingBaseUrl: {
+			type: String,
+			required: true,
+		},
 	},
 	data() {
 		return {
diff --git a/src/helpers/url.js b/src/helpers/url.js
index d74c13b1a8..fc54ea892f 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -81,6 +81,10 @@ const getDocumentUrlForFile = (fileDir, fileId) => {
 		})
 }
 
+export const getConfigFileUrl = () => {
+	return getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/settings'
+}
+
 const getNextcloudUrl = () => {
 	return window.location.host
 }

From 786f1cb8feecc2f2164c36dcaf34c85fa6fb6d24 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 15 Jan 2025 12:16:55 +0530
Subject: [PATCH 14/35] fix: fetch config url

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index cf90f61b46..47b5a3ce21 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -954,6 +954,6 @@ private function getWopiUrlForTemplate(Wopi $wopi): string {
 	// todo extract nextcloud url from everything
 	private function generateUserSettingsUri(Wopi $wopi): string {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
-		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=userconfig' . '&access_token=' . $wopi->getToken();
+		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=userconfig' . '&access_token=' . $wopi->getToken() . '&fileId=' .  '-1';
 	}
 }

From 388b2b9be35761ce1dd2e38a37189ae5df95c927 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Thu, 16 Jan 2025 23:41:55 +0530
Subject: [PATCH 15/35] wopi: add delete setting file route

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 36 +++++++++++++++++++++++++++++++
 lib/Service/SettingsService.php   | 35 ++++++++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 47b5a3ce21..6db530a8bc 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -468,6 +468,42 @@ public function uploadSettingsFile(string $fileId, string $access_token): JSONRe
 		}
 	}
 
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[PublicPage]
+	#[FrontpageRoute(verb: 'DELETE', url: 'wopi/settings')]
+	public function deleteSettingsFile(string $fileId, string $access_token): JSONResponse {
+		try {
+			$wopi = $this->wopiMapper->getWopiForToken($access_token);
+			if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_SETTING_AUTH) {
+				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_FORBIDDEN);
+			}
+
+			// Parse the dynamic file path from `fileId`, e.g. "/settings/systemconfig/wordbook/en_US (1).dic"
+			$settingsUrl = new SettingsUrl($fileId);
+			$type = $settingsUrl->getType();
+			$category = $settingsUrl->getCategory();
+			$fileName = $settingsUrl->getFileName();
+
+			$this->settingsService->deleteSettingsFile($type, $category, $fileName);
+
+			return new JSONResponse([
+				'status' => 'success',
+				'message' => "File '$fileName' deleted from '$category' of type '$type'."
+			], Http::STATUS_OK);
+		} catch (UnknownTokenException $e) {
+			$this->logger->debug($e->getMessage(), ['exception' => $e]);
+			return new JSONResponse(['error' => 'Invalid token'], Http::STATUS_FORBIDDEN);
+		} catch (NotFoundException $e) {
+			return new JSONResponse(['error' => 'File not found'], Http::STATUS_NOT_FOUND);
+		} catch (NotPermittedException $e) {
+			return new JSONResponse(['error' => 'Not permitted'], Http::STATUS_FORBIDDEN);
+		} catch (\Exception $e) {
+			$this->logger->error($e->getMessage(), ['exception' => $e]);
+			return new JSONResponse(['error' => 'Internal Server Error'], Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
+	}
+
 	
 	/**
 	 * Given an access token and a fileId, replaces the files with the request body.
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index c6f2babcbe..97efd30aa3 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -14,6 +14,7 @@
 use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\IURLGenerator;
+use \OCP\Files\NotPermittedException;
 
 /**
  * A generic service to manage "system-wide" files
@@ -200,8 +201,38 @@ public function getSettingsFile(string $type, string $category, string $name): I
 			throw new NotFoundException("File '{$name}' not found in category '{$category}' for type '{$type}'.");
 		}
 	}
-	
-	// TODO: add route for delete setting config file? 
+
+	/**
+	 * Delete a specific settings file from the type/category directory.
+	 *
+	 * @param string $type
+	 * @param string $category
+	 * @param string $name
+	 */
+	public function deleteSettingsFile(string $type, string $category, string $name): void {
+		try {
+			$baseFolder = $this->appData->getFolder($type);
+		} catch (NotFoundException $e) {
+			throw new NotFoundException("Type folder '{$type}' not found.");
+		}
+		
+		try {
+			$categoryFolder = $baseFolder->getFolder($category);
+		} catch (NotFoundException $e) {
+			throw new NotFoundException("Category folder '{$category}' not found in type '{$type}'.");
+		}
+
+		try {
+			if (!$categoryFolder->fileExists($name)) {
+				throw new NotFoundException("File '{$name}' not found in category '{$category}' for type '{$type}'.");
+			}
+			$categoryFolder->getFile($name)->delete();
+		} catch (NotFoundException $e) {
+			throw $e;
+		} catch (NotPermittedException $e) {
+			throw $e;
+		}
+	}
 
 	// TODO: Handle installDefaultSystemFiles setting	
 

From 5704fdc3a3cb483c522a3fc48086de83c5e2d280 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Sun, 19 Jan 2025 11:41:46 +0530
Subject: [PATCH 16/35] refactor: token generation for iframe

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 appinfo/routes.php                    |  1 +
 lib/Controller/DocumentController.php | 18 ----------------
 lib/Controller/SettingsController.php | 31 +++++++++++++++++++++++++++
 lib/Controller/WopiController.php     |  6 ++++--
 lib/Db/WopiMapper.php                 | 17 +++++----------
 lib/TokenManager.php                  |  7 ------
 src/components/AdminSettings.vue      | 11 +---------
 7 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index a94c020dc4..105e1dab69 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -46,6 +46,7 @@
 				'name' => '.+',
 			],
 		],
+		['name' => 'settings#generateIframeToken', 'url' => 'settings/generateToken/{type}', 'verb' => 'GET'],
 
 		// Direct Editing: Webview
 		['name' => 'directView#show', 'url' => '/direct/{token}', 'verb' => 'GET'],
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 27b2efae6b..3e5c26ac66 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -385,24 +385,6 @@ public function editOnlineTarget(int $fileId, ?string $target = null): RedirectR
 	#[PublicPage]
 	public function token(int $fileId, ?string $shareToken = null, ?string $path = null, ?string $guestName = null): DataResponse {
 		try {
-			if ($fileId === -1 && $path !== null && str_starts_with($path, 'adminIntegratorSettings/')) {
-				$parts = explode('/', $path);
-				$adminUserId = $parts[1] ?? $this->userId; // fallback if needed
-	
-				$docKey = $fileId . '_' . $this->config->getSystemValue('instanceid');
-	
-				$wopi = $this->tokenManager->generateWopiToken($fileId, null, $adminUserId);
-	
-				$coolBaseUrl = $this->appConfig->getCollaboraUrlPublic();
-				$adminSettingsWopiSrc = $coolBaseUrl . '/browser/adminIntegratorSettings.html?';
-	
-				return new DataResponse([
-					'urlSrc' => $adminSettingsWopiSrc,
-					'token' => $wopi->getToken(),
-					'token_ttl' => $wopi->getExpiry(),
-				]);
-			}
-	
 			// Normal file handling (unchanged)
 			$share = $shareToken ? $this->shareManager->getShareByToken($shareToken) : null;
 			$file = $shareToken ? $this->getFileForShare($share, $fileId, $path) : $this->getFileForUser($fileId, $path);
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 93237a91ca..2a7fd5cc14 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -14,7 +14,9 @@
 use OCA\Richdocuments\Service\DiscoveryService;
 use OCA\Richdocuments\Service\FontService;
 use OCA\Richdocuments\UploadException;
+use OCA\Richdocuments\Db\WopiMapper;
 use OCP\App\IAppManager;
+use OCP\IGroupManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
@@ -58,6 +60,9 @@ public function __construct(
 		private FontService $fontService,
 		private SettingsService $settingsService,
 		private LoggerInterface $logger,
+		private IGroupManager $groupManager,
+		private IURLGenerator $urlGenerator,
+		private WopiMapper $wopiMapper,
 		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
@@ -411,6 +416,32 @@ public function getFontFileOverview(string $name): DataDisplayResponse {
 		}
 	}
 
+	/**
+	 * @NoAdminRequired
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @param string $type - Type is 'admin' or 'user'
+	 * @return DataDisplayResponse
+	 */
+	public function generateIframeToken(string $type) : DataResponse {
+		$userId = $this->userId;
+		if ($type === 'admin' && !$this->groupManager->isAdmin($userId)) {
+			return new DataResponse([
+				'message' => 'Permission denied'
+			], Http::STATUS_FORBIDDEN);
+		}
+		$serverHost = $this->urlGenerator->getAbsoluteURL('/');
+		$version = $this->capabilitiesService->getProductVersion();
+
+		$wopi = $this->wopiMapper->generateUserSettingsToken(-1, $userId, $version, $serverHost);
+
+		return new DataResponse([
+			'token' => $wopi->getToken(),
+			'token_ttl' => $wopi->getExpiry(),
+		]);
+	}
+
 	/**
 	 * @param string $name
 	 * @return DataResponse
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 6db530a8bc..6654d3f943 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -104,7 +104,7 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 
-			// TODO: condition for $wopi not found?
+			// TODO: condition for $wopi not found? -auth???
 
 			$userSettingsUri = $this->generateUserSettingsUri($wopi);
 
@@ -413,7 +413,7 @@ public function getSettings(string $type, string $access_token): JSONResponse {
 				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_FORBIDDEN);
 			}
 	
-			$user = $this->userManager->get($wopi->getEditorUid());
+			$user = $this->userManager->get($wopi->getOwnerUid());
 			if (!$user || !$this->groupManager->isAdmin($user->getUID())) {
 				return new JSONResponse(['error' => 'Access denied'], Http::STATUS_FORBIDDEN);
 			}
@@ -441,6 +441,8 @@ public function uploadSettingsFile(string $fileId, string $access_token): JSONRe
 				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_FORBIDDEN);
 			}
 
+			// auth - for admin??
+
 			$content = fopen('php://input', 'rb');
 			if (!$content) {
 				throw new \Exception("Failed to read input stream.");
diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
index 005ffaa746..97f9e26bd4 100644
--- a/lib/Db/WopiMapper.php
+++ b/lib/Db/WopiMapper.php
@@ -66,26 +66,19 @@ public function generateFileToken($fileId, $owner, $editor, $version, $updatable
 		return $wopi;
 	}
 
-	public function generateUserSettingsToken($fileId, $owner, $editor, $version, $updatable, $serverHost, ?string $guestDisplayname = null, $hideDownload = false, $direct = false, $templateId = 0, $share = null) {
+	public function generateUserSettingsToken($fileId, $userId, $version, $serverHost) {
 		$token = $this->random->generate(32, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
 
 		$wopi = Wopi::fromParams([
 			'fileid' => $fileId,
-			'ownerUid' => $owner,
-			'editorUid' => $editor,
+			'ownerUid' => $userId,
 			'version' => $version,
-			'canwrite' => $updatable,
+			'canwrite' => true,
 			'serverHost' => $serverHost,
 			'token' => $token,
 			'expiry' => $this->calculateNewTokenExpiry(),
-			'guestDisplayname' => $guestDisplayname,
-			'hideDownload' => $hideDownload,
-			'direct' => $direct,
-			'templateId' => $templateId,
-			'remoteServer' => '',
-			'remoteServerToken' => '',
-			'share' => $share,
-			'tokenType' => Wopi::TOKEN_TYPE_SETTING_AUTH
+			'templateId' => "0",
+			'tokenType' => Wopi::TOKEN_TYPE_SETTING_AUTH,
 		]);
 
 		/** @var Wopi $wopi */
diff --git a/lib/TokenManager.php b/lib/TokenManager.php
index b381e7f3f0..d2f8ba5b45 100644
--- a/lib/TokenManager.php
+++ b/lib/TokenManager.php
@@ -53,13 +53,6 @@ public function generateWopiToken(string $fileId, ?string $shareToken = null, ?s
 		$hideDownload = false;
 		$rootFolder = $this->rootFolder;
 
-		if ($fileId == "-1") 
-		{
-			$editoruid = $this->userId;
-			$serverHost = $this->urlGenerator->getAbsoluteURL('/');
-			return $this->wopiMapper->generateUserSettingsToken($fileId, $owneruid, $editoruid, 0, true, $serverHost, "", $hideDownload, $direct, 0, $shareToken);
-		}
-
 		[$fileId, , $version] = Helper::parseFileId($fileId);
 
 		// if the user is not logged-in do use the sharers storage
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 3c5be1613d..e3de795622 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -641,16 +641,7 @@ export default {
 	},
 	methods: {
 		async generateAccessToken() {
-			const fileId = -1
-			const path = `adminIntegratorSettings/${this.userId}`
-			const guestName = this.userId
-
-			const { data } = await axios.post(generateUrl('/apps/richdocuments/token'), {
-				fileId,
-				path,
-				guestName,
-			})
-
+			const { data } = await axios.get(generateUrl('/apps/richdocuments/settings/generateToken/admin'))
 			if (data.token) {
 				this.accessToken = data.token
 				this.accessTokenTTL = data.token_ttl

From fc0915a372c29fc70c4e2a6b57fe0b9a8ead9c10 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Sun, 19 Jan 2025 11:45:45 +0530
Subject: [PATCH 17/35] feat(user-settings): introduce iframe for user settings

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Settings/Personal.php           |  5 ++-
 src/components/AdminSettings.vue    |  2 +-
 src/components/CoolFrame.vue        |  9 +++--
 src/components/PersonalSettings.vue | 58 ++++++++++++++++++++++++++++-
 src/helpers/url.js                  |  5 +--
 5 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
index a6e45228d2..6fd7c46570 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/Personal.php
@@ -6,6 +6,7 @@
 
 namespace OCA\Richdocuments\Settings;
 
+use OCA\Richdocuments\AppConfig;
 use OCA\Richdocuments\Service\CapabilitiesService;
 use OCA\Richdocuments\Service\InitialStateService;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -15,6 +16,7 @@
 class Personal implements ISettings {
 	public function __construct(
 		private IConfig $config,
+		private AppConfig $appConfig,
 		private CapabilitiesService $capabilitiesService,
 		private InitialStateService $initialState,
 		private ?string $userId,
@@ -39,7 +41,8 @@ public function getForm() {
 				'documentSigningKey' => $this->config->getUserValue($this->userId, 'richdocuments', 'documentSigningKey', ''),
 				'documentSigningCa' => $this->config->getUserValue($this->userId, 'richdocuments', 'documentSigningCa', ''),
 				'hasZoteroSupport' => $this->capabilitiesService->hasZoteroSupport(),
-				'zoteroAPIKey' => $this->config->getUserValue($this->userId, 'richdocuments', 'zoteroAPIKey', '')
+				'zoteroAPIKey' => $this->config->getUserValue($this->userId, 'richdocuments', 'zoteroAPIKey', ''),
+				'publicWopiUrl' => $this->appConfig->getCollaboraUrlPublic(),
 			],
 			'blank'
 		);
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index e3de795622..540011e92c 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -18,7 +18,7 @@
 			<div id="admin-cool-frame-section" class="section">
 				<h2>{{ t('richdocuments', 'Collabora Admin Settings') }}</h2>
 				<CoolFrame v-if="tokenGenerated"
-					:endpoint="'/cool/adminIntegratorSettings'"
+					:iframe-type="'admin'"
 					:public-wopi-url="settings.public_wopi_url"
 					:access-token="accessToken"
 					:access-token-t-t-l="accessTokenTTL"
diff --git a/src/components/CoolFrame.vue b/src/components/CoolFrame.vue
index fd8a7f2c89..442b5a3b82 100644
--- a/src/components/CoolFrame.vue
+++ b/src/components/CoolFrame.vue
@@ -8,6 +8,7 @@
 			<input type="hidden" name="access_token" :value="accessToken">
 			<input type="hidden" name="access_token_ttl" :value="accessTokenTTL">
 			<input type="hidden" name="wopi_setting_base_url" :value="wopiSettingBaseUrl">
+			<input type="hidden" name="iframe_type" :value="iframeType">
 			<!-- TODO: Include any other necessary hidden inputs -->
 		</form>
 		<iframe :id="iframeName"
@@ -26,10 +27,6 @@ import { getCoolServerUrl } from '../helpers/url.js'
 export default {
 	name: 'CoolFrame',
 	props: {
-		endpoint: {
-			type: String,
-			required: true,
-		},
 		publicWopiUrl: {
 			type: String,
 			required: true,
@@ -46,6 +43,10 @@ export default {
 			type: String,
 			required: true,
 		},
+		iframeType: {
+			type: String,
+			required: true,
+		},
 	},
 	data() {
 		return {
diff --git a/src/components/PersonalSettings.vue b/src/components/PersonalSettings.vue
index 64ebe9be77..245ef46dc1 100644
--- a/src/components/PersonalSettings.vue
+++ b/src/components/PersonalSettings.vue
@@ -34,6 +34,17 @@
 			</em>
 		</p>
 
+		<!-- user settings iframe  -->
+		<div id="user-cool-frame-section" class="section">
+			<h2>{{ t('richdocuments', 'Collabora User Settings') }}</h2>
+			<CoolFrame v-if="tokenGenerated"
+				:iframe-type="'user'"
+				:public-wopi-url="public_wopi_url"
+				:access-token="accessToken"
+				:access-token-t-t-l="accessTokenTTL"
+				:wopi-setting-base-url="wopiSettingBaseUrl" />
+		</div>
+
 		<!-- Zotero -->
 		<div class="zotero-section">
 			<p><strong>{{ t('richdocuments', 'Zotero') }}</strong></p>
@@ -114,7 +125,7 @@
 </template>
 
 <script>
-import { generateFilePath } from '@nextcloud/router'
+import { generateFilePath, generateUrl } from '@nextcloud/router'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
@@ -122,6 +133,13 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import DocSigningField from './DocSigningField.vue'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 import axios from '@nextcloud/axios'
+import {
+	getCurrentUser,
+} from '@nextcloud/auth'
+
+import { isPublicShare, getSharingToken } from '@nextcloud/sharing/public'
+import { getConfigFileUrl } from '../helpers/url.js'
+import CoolFrame from './CoolFrame.vue'
 
 export default {
 	name: 'PersonalSettings',
@@ -131,6 +149,7 @@ export default {
 		NcButton,
 		DocSigningField,
 		DeleteIcon,
+		CoolFrame,
 	},
 	props: {
 		initial: {
@@ -147,9 +166,46 @@ export default {
 			documentSigningCert: this.initial.documentSigningCert || '',
 			documentSigningKey: this.initial.documentSigningKey || '',
 			documentSigningCa: this.initial.documentSigningCa || '',
+			tokenGenerated: false,
+			accessToken: '',
+			accessTokenTTL: '',
+			userId: '',
+			wopiSettingBaseUrl: '',
+			public_wopi_url: this.initial.publicWopiUrl || '',
+		}
+	},
+	computed: {
+		shareToken() {
+			return getSharingToken()
+		},
+	},
+	async mounted() {
+		const currentUser = getCurrentUser()
+		if (currentUser && currentUser.uid) {
+			this.userId = currentUser.uid
+			await this.generateAccessToken()
+			if (this.accessToken) {
+				this.wopiSettingBaseUrl = getConfigFileUrl()
+				console.debug('wopiSettingBaseUrl', this.wopiSettingBaseUrl)
+				this.tokenGenerated = true
+			}
+		} else {
+			console.error('User not authenticated')
 		}
 	},
 	methods: {
+		async generateAccessToken() {
+			const { data } = await axios.get(generateUrl('/apps/richdocuments/settings/generateToken/user'))
+			if (data.token) {
+				this.accessToken = data.token
+				this.accessTokenTTL = data.token_ttl
+				console.debug('Admin settings WOPI token generated:', this.accessToken, this.accessTokenTTL)
+			} else if (data.federatedUrl) {
+				console.error('Federated URL returned, not expected for admin settings.')
+			} else {
+				console.error('Failed to generate token for admin settings')
+			}
+		},
 		setZoteroAPIKey(newVal) {
 			this.zoteroAPIKey = newVal
 		},
diff --git a/src/helpers/url.js b/src/helpers/url.js
index fc54ea892f..f540174207 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -93,9 +93,8 @@ export const getCoolServerUrl = (collaboraBaseUrl) => {
 	// todo fix wopi Url
 	const wopiurl = getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/files/-1'
 
-	const AdminSettingsUrl = collaboraBaseUrl + '/browser/dist/admin/adminIntegratorSettings.html?'
-
-	return AdminSettingsUrl
+	return collaboraBaseUrl
+		+ '/browser/dist/admin/adminIntegratorSettings.html?'
 		+ 'WOPISrc=' + encodeURIComponent(wopiurl)
 }
 

From bdfa8b9ba8f7ec52e01ffddfc3eafea95dd7f88d Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Thu, 23 Jan 2025 11:57:21 +0530
Subject: [PATCH 18/35] fix: linting issue for CI

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/SettingsController.php |  21 ++-
 lib/Controller/WopiController.php     |  17 +--
 lib/Db/WopiMapper.php                 |   2 +-
 lib/Service/SettingsService.php       | 136 ++++++++++----------
 lib/WOPI/SettingsUrl.php              | 178 +++++++++++++-------------
 src/components/CoolFrame.vue          |   5 +-
 6 files changed, 185 insertions(+), 174 deletions(-)

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 2a7fd5cc14..1c77181223 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -7,16 +7,15 @@
 
 use OCA\Richdocuments\AppConfig;
 use OCA\Richdocuments\Capabilities;
-use OCA\Richdocuments\Service\SettingsService;
+use OCA\Richdocuments\Db\WopiMapper;
 use OCA\Richdocuments\Service\CapabilitiesService;
 use OCA\Richdocuments\Service\ConnectivityService;
 use OCA\Richdocuments\Service\DemoService;
 use OCA\Richdocuments\Service\DiscoveryService;
 use OCA\Richdocuments\Service\FontService;
+use OCA\Richdocuments\Service\SettingsService;
 use OCA\Richdocuments\UploadException;
-use OCA\Richdocuments\Db\WopiMapper;
 use OCP\App\IAppManager;
-use OCP\IGroupManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
@@ -27,12 +26,12 @@
 use OCP\Files\NotPermittedException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IConfig;
+use OCP\IGroupManager;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\PreConditionNotMetException;
 use OCP\Util;
-use OCA\Richdocuments\WOPI\SettingsUrl;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Output\NullOutput;
 
@@ -422,7 +421,7 @@ public function getFontFileOverview(string $name): DataDisplayResponse {
 	 * @NoCSRFRequired
 	 *
 	 * @param string $type - Type is 'admin' or 'user'
-	 * @return DataDisplayResponse
+	 * @return DataResponse
 	 */
 	public function generateIframeToken(string $type) : DataResponse {
 		$userId = $this->userId;
@@ -486,12 +485,12 @@ public function uploadFontFile(): JSONResponse {
 	}
 
 	/**
-	 *  @param string $type 
-	 *  @param string $category 
-	 *  @param string $name 
-	 * 
-	 *  @return DataDisplayResponse
-	 * 
+	 * @param string $type
+	 * @param string $category
+	 * @param string $name
+	 *
+	 * @return DataDisplayResponse
+	 *
 	 * @NoAdminRequired
 	 * @PublicPage
 	 * @NoCSRFRequired
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 6654d3f943..4d6a3f26ce 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -17,10 +17,12 @@
 use OCA\Richdocuments\Helper;
 use OCA\Richdocuments\PermissionManager;
 use OCA\Richdocuments\Service\FederationService;
+use OCA\Richdocuments\Service\SettingsService;
 use OCA\Richdocuments\Service\UserScopeService;
 use OCA\Richdocuments\TaskProcessingManager;
 use OCA\Richdocuments\TemplateManager;
 use OCA\Richdocuments\TokenManager;
+use OCA\Richdocuments\WOPI\SettingsUrl;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\FrontpageRoute;
@@ -44,6 +46,7 @@
 use OCP\Files\Lock\OwnerLockedException;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IRequest;
@@ -57,8 +60,6 @@
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Log\LoggerInterface;
-use OCA\Richdocuments\Service\SettingsService;
-use \OCA\Richdocuments\WOPI\SettingsUrl;
 
 #[RestrictToWopiServer]
 class WopiController extends Controller {
@@ -108,9 +109,9 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 
 			$userSettingsUri = $this->generateUserSettingsUri($wopi);
 
-			if ($fileId == "-1" && $wopi->getTokenType() == WOPI::TOKEN_TYPE_SETTING_AUTH) {
+			if ($fileId == '-1' && $wopi->getTokenType() == WOPI::TOKEN_TYPE_SETTING_AUTH) {
 				$response = [
-					"UserSettingsUri" => $userSettingsUri,
+					'UserSettingsUri' => $userSettingsUri,
 				];
 
 				return new JSONResponse($response);
@@ -181,7 +182,7 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 			'EnableRemoteAIContent' => $isTaskProcessingEnabled,
 			'HasContentRange' => true,
 			'ServerPrivateInfo' => [],
-			"UserSettingsUri" => $userSettingsUri,
+			'UserSettingsUri' => $userSettingsUri,
 		];
 
 		$enableZotero = $this->config->getAppValue(Application::APPNAME, 'zoteroEnabled', 'yes') === 'yes';
@@ -420,7 +421,7 @@ public function getSettings(string $type, string $access_token): JSONResponse {
 	
 			$userConfig = $this->settingsService->generateSettingsConfig($type);
 			return new JSONResponse($userConfig, Http::STATUS_OK);
-		} catch (UnknownTokenException | ExpiredTokenException $e) {
+		} catch (UnknownTokenException|ExpiredTokenException $e) {
 			$this->logger->debug($e->getMessage(), ['exception' => $e]);
 			return new JSONResponse(['error' => 'Unauthorized'], Http::STATUS_UNAUTHORIZED);
 		} catch (\Exception $e) {
@@ -445,7 +446,7 @@ public function uploadSettingsFile(string $fileId, string $access_token): JSONRe
 
 			$content = fopen('php://input', 'rb');
 			if (!$content) {
-				throw new \Exception("Failed to read input stream.");
+				throw new \Exception('Failed to read input stream.');
 			}
 
 			$fileContent = stream_get_contents($content);
@@ -992,6 +993,6 @@ private function getWopiUrlForTemplate(Wopi $wopi): string {
 	// todo extract nextcloud url from everything
 	private function generateUserSettingsUri(Wopi $wopi): string {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
-		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=userconfig' . '&access_token=' . $wopi->getToken() . '&fileId=' .  '-1';
+		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=userconfig' . '&access_token=' . $wopi->getToken() . '&fileId=' . '-1';
 	}
 }
diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
index 97f9e26bd4..5bd3cc5cbf 100644
--- a/lib/Db/WopiMapper.php
+++ b/lib/Db/WopiMapper.php
@@ -77,7 +77,7 @@ public function generateUserSettingsToken($fileId, $userId, $version, $serverHos
 			'serverHost' => $serverHost,
 			'token' => $token,
 			'expiry' => $this->calculateNewTokenExpiry(),
-			'templateId' => "0",
+			'templateId' => '0',
 			'tokenType' => Wopi::TOKEN_TYPE_SETTING_AUTH,
 		]);
 
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 97efd30aa3..1c09508b71 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -1,20 +1,23 @@
 <?php
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
 declare(strict_types=1);
 
 namespace OCA\Richdocuments\Service;
 
-use Exception;
 use OCA\Richdocuments\AppInfo\Application;
+use OCA\Richdocuments\WOPI\SettingsUrl;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Files\SimpleFS\ISimpleFolder;
-use OCA\Richdocuments\WOPI\SettingsUrl;
 use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\IURLGenerator;
-use \OCP\Files\NotPermittedException;
 
 /**
  * A generic service to manage "system-wide" files
@@ -48,44 +51,44 @@ public function __construct(
 	 */
 
 	public function ensureDirectory(SettingsUrl $settingsUrl): ISimpleFolder {
-        $type = $settingsUrl->getType();
-        $category = $settingsUrl->getCategory();
+		$type = $settingsUrl->getType();
+		$category = $settingsUrl->getCategory();
 
-        try {
-            $baseFolder = $this->appData->getFolder($type);
-        } catch (NotFoundException $e) {
-            $baseFolder = $this->appData->newFolder($type);
-        }
+		try {
+			$baseFolder = $this->appData->getFolder($type);
+		} catch (NotFoundException $e) {
+			$baseFolder = $this->appData->newFolder($type);
+		}
 
-        try {
-            $categoryFolder = $baseFolder->getFolder($category);
-        } catch (NotFoundException $e) {
-            $categoryFolder = $baseFolder->newFolder($category);
-        }
+		try {
+			$categoryFolder = $baseFolder->getFolder($category);
+		} catch (NotFoundException $e) {
+			$categoryFolder = $baseFolder->newFolder($category);
+		}
 
-        return $categoryFolder;
-    }
+		return $categoryFolder;
+	}
 
 	/**
 	 * Upload a file to the settings directory.
 	 * ex. $type/$category/$filename
 	 *
 	 * @param SettingsUrl $settingsUrl
-	 * @param resource $fileData
+	 * @param string $fileData
 	 * @return array ['stamp' => string, 'uri' => string]
 	 */
 
-	public function uploadFile(SettingsUrl $settingsUrl, $fileData): array {
-        $categoryFolder = $this->ensureDirectory($settingsUrl);
+	public function uploadFile(SettingsUrl $settingsUrl, string $fileData): array {
+		$categoryFolder = $this->ensureDirectory($settingsUrl);
 		$fileName = $settingsUrl->getFileName();
-        $newFile = $categoryFolder->newFile($fileName, $fileData);
-        $fileUri = $this->generateFileUri($settingsUrl->getType(), $settingsUrl->getCategory(), $fileName);
+		$newFile = $categoryFolder->newFile($fileName, $fileData);
+		$fileUri = $this->generateFileUri($settingsUrl->getType(), $settingsUrl->getCategory(), $fileName);
 
-        return [
-            'stamp' => $newFile->getETag(),
-            'uri' => $fileUri,
-        ];
-    }
+		return [
+			'stamp' => $newFile->getETag(),
+			'uri' => $fileUri,
+		];
+	}
 
 	/**
 	 * Get list of files in a setting category.
@@ -95,21 +98,21 @@ public function uploadFile(SettingsUrl $settingsUrl, $fileData): array {
 	 * @return array Each item has 'stamp' and 'uri'.
 	 */
 	public function getCategoryFileList(string $type, string $category): array {
-        try {
-            $categoryFolder = $this->appData->getFolder($type . '/' . $category);
-        } catch (NotFoundException $e) {
-            return [];
-        }
-
-        $files = $categoryFolder->getDirectoryListing();
-
-        return array_map(function(ISimpleFile $file) use ($type, $category) {
-            return [
-                'stamp' => $file->getETag(),
-                'uri' => $this->generateFileUri($type, $category, $file->getName()),
-            ];
-        }, $files);
-    }
+		try {
+			$categoryFolder = $this->appData->getFolder($type . '/' . $category);
+		} catch (NotFoundException $e) {
+			return [];
+		}
+
+		$files = $categoryFolder->getDirectoryListing();
+
+		return array_map(function (ISimpleFile $file) use ($type, $category) {
+			return [
+				'stamp' => $file->getETag(),
+				'uri' => $this->generateFileUri($type, $category, $file->getName()),
+			];
+		}, $files);
+	}
 
 	/**
 	 * generate setting config
@@ -120,19 +123,19 @@ public function getCategoryFileList(string $type, string $category): array {
 	public function generateSettingsConfig(string $type): array {
 		$kind = $type === 'userconfig' ? 'user' : 'shared';
 
-        $config = [
-            'kind' => $kind,
-        ];
+		$config = [
+			'kind' => $kind,
+		];
 
-        $categories = $this->getAllCategories($type);
+		$categories = $this->getAllCategories($type);
 
-        foreach ($categories as $category) {
-            $files = $this->getCategoryFileList($type, $category);
+		foreach ($categories as $category) {
+			$files = $this->getCategoryFileList($type, $category);
 			$config[$category] = $files;
-        }
+		}
 
-        return $config;
-    }
+		return $config;
+	}
 
 	/**
 	 * Get all setting categories for a setting type.
@@ -140,20 +143,21 @@ public function generateSettingsConfig(string $type): array {
 	 * @param string $type
 	 * @return string[]
 	 */
-    private function getAllCategories(string $type): array {
-        try {
-            $categories = [];
-            $directories = $this->appData->getFolder($type)->getFullDirectoryListing();
-            foreach ($directories as $dir) {
-                if ($dir instanceof ISimpleFolder) {
-                    $categories[] = $dir->getName();
-                }
-            }
-            return $categories;
-        } catch (NotFoundException $e) {
-            return [];
-        }
-    }
+	private function getAllCategories(string $type): array {
+		try {
+			$categories = [];
+			$folder = $this->appData->getFolder($type);
+			$directories = $folder->getFullDirectoryListing();
+			foreach ($directories as $dir) {
+				if ($dir instanceof ISimpleFolder) {
+					$categories[] = $dir->getName();
+				}
+			}
+			return $categories;
+		} catch (NotFoundException $e) {
+			return [];
+		}
+	}
 
 	/**
 	 * Generate file URL.
@@ -234,6 +238,6 @@ public function deleteSettingsFile(string $type, string $category, string $name)
 		}
 	}
 
-	// TODO: Handle installDefaultSystemFiles setting	
+	// TODO: Handle installDefaultSystemFiles setting
 
 }
diff --git a/lib/WOPI/SettingsUrl.php b/lib/WOPI/SettingsUrl.php
index c130b5a488..1f941b1c9a 100644
--- a/lib/WOPI/SettingsUrl.php
+++ b/lib/WOPI/SettingsUrl.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
 namespace OCA\Richdocuments\WOPI;
 
@@ -9,91 +13,91 @@
 */
 
 class SettingsUrl {
-    private string $type;
-    private string $category;
-    private string $fileName;
-    private string $rawUrl;
-
-    public function __construct(string $url) {
-        $this->rawUrl = $url;
-        $this->parseUrl($url);
-    }
-
-    /**
-     * Factory method to create a SettingsUrl instance based on individual parameters.
-     */
-    public static function fromComponents(string $type, string $category, string $fileName): self {
-        $rawUrl = "settings/$type/$category/$fileName";
-        return new self($rawUrl);
-    }
-
-    /**
-     * Parses the settings URL and extracts type, category, and filename.
-     *
-     * @param string
-     * @throws InvalidArgumentException
-     */
-    private function parseUrl(string $url): void {
-        $decodedUrl = urldecode($url);
-        
-        $parsedUrl = parse_url($decodedUrl);
-        if (!isset($parsedUrl['path'])) {
-            throw new InvalidArgumentException("Invalid URL: Path not found.");
-        }
-
-        $path = $parsedUrl['path'];
-
-        $settingsIndex = strpos($path, '/settings/');
-        if ($settingsIndex === false) {
-            throw new InvalidArgumentException("Invalid settings URL format: '/settings/' segment missing.");
-        }
-
-        $relevantPath = substr($path, $settingsIndex + strlen('/settings/'));
-
-        $pathParts = explode('/', $relevantPath);
-
-        if (count($pathParts) < 3) {
-            throw new InvalidArgumentException("Invalid settings URL format: Expected 'type/category/fileName'.");
-        }
-
-        $this->type = $pathParts[0];
-        $this->category = $pathParts[1];
-        $this->fileName = implode('/', array_slice($pathParts, 2));
-    }
-
-    /**
-     * Get the setting type from the URL.
-     *
-     * @return string
-     */
-    public function getType(): string {
-        return $this->type;
-    }
-
-    /**
-     * Get the setting category from the URL.
-     *
-     * @return string
-     */
-    public function getCategory(): string {
-        return $this->category;
-    }
-
-    /**
-     * Get the original filename from the URL.
-     *
-     * @return string
-     */
-    public function getFileName(): string {
-        return $this->fileName;
-    }
-
-    /**
-     * Get the raw URL.
-     *
-     * @return string
-     */
-    public function getRawUrl(): string {
-        return $this->rawUrl;
-    }
+	private string $type;
+	private string $category;
+	private string $fileName;
+	private string $rawUrl;
+
+	public function __construct(string $url) {
+		$this->rawUrl = $url;
+		$this->parseUrl($url);
+	}
+
+	/**
+	 * Factory method to create a SettingsUrl instance based on individual parameters.
+	 */
+	public static function fromComponents(string $type, string $category, string $fileName): self {
+		$rawUrl = "settings/$type/$category/$fileName";
+		return new self($rawUrl);
+	}
+
+	/**
+	 * Parses the settings URL and extracts type, category, and filename.
+	 *
+	 * @param string $url The settings URL to parse.
+	 * @throws InvalidArgumentException If the URL is invalid or incorrectly formatted.
+	 */
+	private function parseUrl(string $url): void {
+		$decodedUrl = urldecode($url);
+		
+		$parsedUrl = parse_url($decodedUrl);
+		if (!isset($parsedUrl['path'])) {
+			throw new InvalidArgumentException('Invalid URL: Path not found.');
+		}
+
+		$path = $parsedUrl['path'];
+
+		$settingsIndex = strpos($path, '/settings/');
+		if ($settingsIndex === false) {
+			throw new InvalidArgumentException("Invalid settings URL format: '/settings/' segment missing.");
+		}
+
+		$relevantPath = substr($path, $settingsIndex + strlen('/settings/'));
+
+		$pathParts = explode('/', $relevantPath);
+
+		if (count($pathParts) < 3) {
+			throw new InvalidArgumentException("Invalid settings URL format: Expected 'type/category/fileName'.");
+		}
+
+		$this->type = $pathParts[0];
+		$this->category = $pathParts[1];
+		$this->fileName = implode('/', array_slice($pathParts, 2));
+	}
+
+	/**
+	 * Get the setting type from the URL.
+	 *
+	 * @return string
+	 */
+	public function getType(): string {
+		return $this->type;
+	}
+
+	/**
+	 * Get the setting category from the URL.
+	 *
+	 * @return string
+	 */
+	public function getCategory(): string {
+		return $this->category;
+	}
+
+	/**
+	 * Get the original filename from the URL.
+	 *
+	 * @return string
+	 */
+	public function getFileName(): string {
+		return $this->fileName;
+	}
+
+	/**
+	 * Get the raw URL.
+	 *
+	 * @return string
+	 */
+	public function getRawUrl(): string {
+		return $this->rawUrl;
+	}
 }
diff --git a/src/components/CoolFrame.vue b/src/components/CoolFrame.vue
index 442b5a3b82..1e01737623 100644
--- a/src/components/CoolFrame.vue
+++ b/src/components/CoolFrame.vue
@@ -1,4 +1,7 @@
-<!-- CoolFrame.vue -->
+<!--
+  - SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <template>
 	<div>
 		<form ref="form"

From 66863158515315d9e7a79c7b45674b1522fa1155 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Thu, 23 Jan 2025 15:30:38 +0530
Subject: [PATCH 19/35] fix: generate token for user shared config url

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/SettingsController.php | 25 ++++++---------------
 lib/Controller/WopiController.php     | 11 ++++++---
 lib/Service/SettingsService.php       | 32 +++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 1c77181223..f11bc8ac06 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -7,7 +7,6 @@
 
 use OCA\Richdocuments\AppConfig;
 use OCA\Richdocuments\Capabilities;
-use OCA\Richdocuments\Db\WopiMapper;
 use OCA\Richdocuments\Service\CapabilitiesService;
 use OCA\Richdocuments\Service\ConnectivityService;
 use OCA\Richdocuments\Service\DemoService;
@@ -26,7 +25,6 @@
 use OCP\Files\NotPermittedException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IConfig;
-use OCP\IGroupManager;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IURLGenerator;
@@ -59,9 +57,7 @@ public function __construct(
 		private FontService $fontService,
 		private SettingsService $settingsService,
 		private LoggerInterface $logger,
-		private IGroupManager $groupManager,
 		private IURLGenerator $urlGenerator,
-		private WopiMapper $wopiMapper,
 		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
@@ -423,22 +419,15 @@ public function getFontFileOverview(string $name): DataDisplayResponse {
 	 * @param string $type - Type is 'admin' or 'user'
 	 * @return DataResponse
 	 */
-	public function generateIframeToken(string $type) : DataResponse {
-		$userId = $this->userId;
-		if ($type === 'admin' && !$this->groupManager->isAdmin($userId)) {
+	public function generateIframeToken(string $type): DataResponse {
+		try {
+			$response = $this->settingsService->generateIframeToken($type, $this->userId);
+			return new DataResponse($response);
+		} catch (\Exception $e) {
 			return new DataResponse([
-				'message' => 'Permission denied'
-			], Http::STATUS_FORBIDDEN);
+				'message' => 'Settings token not generated.'
+			], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
-		$serverHost = $this->urlGenerator->getAbsoluteURL('/');
-		$version = $this->capabilitiesService->getProductVersion();
-
-		$wopi = $this->wopiMapper->generateUserSettingsToken(-1, $userId, $version, $serverHost);
-
-		return new DataResponse([
-			'token' => $wopi->getToken(),
-			'token_ttl' => $wopi->getExpiry(),
-		]);
 	}
 
 	/**
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 4d6a3f26ce..5dbf010258 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -411,12 +411,12 @@ public function getSettings(string $type, string $access_token): JSONResponse {
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 			if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_SETTING_AUTH) {
-				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_FORBIDDEN);
+				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_BAD_REQUEST);
 			}
 	
 			$user = $this->userManager->get($wopi->getOwnerUid());
 			if (!$user || !$this->groupManager->isAdmin($user->getUID())) {
-				return new JSONResponse(['error' => 'Access denied'], Http::STATUS_FORBIDDEN);
+				return new JSONResponse(['error' => 'Access denied'], Http::STATUS_BAD_REQUEST);
 			}
 	
 			$userConfig = $this->settingsService->generateSettingsConfig($type);
@@ -990,9 +990,14 @@ private function getWopiUrlForTemplate(Wopi $wopi): string {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
 		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/template/' . $wopi->getTemplateId() . '?access_token=' . $wopi->getToken();
 	}
+	private function generateSettingToken(Wopi $wopi): string {
+		$userId = $wopi->getEditorUid();
+		$res = $this->settingsService->generateIframeToken('user', $userId);
+		return $res['token'];
+	}
 	// todo extract nextcloud url from everything
 	private function generateUserSettingsUri(Wopi $wopi): string {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
-		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=userconfig' . '&access_token=' . $wopi->getToken() . '&fileId=' . '-1';
+		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=userconfig' . '&access_token=' . $this->generateSettingToken($wopi) . '&fileId=' . '-1';
 	}
 }
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 1c09508b71..fe9c2542d4 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -9,6 +9,7 @@
 namespace OCA\Richdocuments\Service;
 
 use OCA\Richdocuments\AppInfo\Application;
+use OCA\Richdocuments\Db\WopiMapper;
 use OCA\Richdocuments\WOPI\SettingsUrl;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
@@ -17,6 +18,7 @@
 use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\ICacheFactory;
 use OCP\IConfig;
+use OCP\IGroupManager;
 use OCP\IURLGenerator;
 
 /**
@@ -36,6 +38,9 @@ public function __construct(
 		ICacheFactory $cacheFactory,
 		private IURLGenerator $urlGenerator,
 		private IConfig $config,
+		private CapabilitiesService $capabilitiesService,
+		private WopiMapper $wopiMapper,
+		private IGroupManager $groupManager,
 	) {
 		// Create a distributed cache for caching file lists
 		$this->cache = $cacheFactory->createDistributed(Application::APPNAME);
@@ -114,6 +119,33 @@ public function getCategoryFileList(string $type, string $category): array {
 		}, $files);
 	}
 
+	/**
+	 * Get list of files in a setting category.
+	 *
+	 * @param string $type
+	 * @param string $userId
+	 */
+
+	public function generateIframeToken(string $type, string $userId): array {
+		try {
+			if ($type === 'admin' && !$this->groupManager->isAdmin($userId)) {
+				throw new NotPermittedException('Permission denied');
+			}
+	
+			$serverHost = $this->urlGenerator->getAbsoluteURL('/');
+			$version = $this->capabilitiesService->getProductVersion();
+	
+			$wopi = $this->wopiMapper->generateUserSettingsToken(-1, $userId, $version, $serverHost);
+	
+			return [
+				'token' => $wopi->getToken(),
+				'token_ttl' => $wopi->getExpiry(),
+			];
+		} catch (NotPermittedException $e) {
+			throw $e;
+		}
+	}
+	
 	/**
 	 * generate setting config
 	 *

From dbf9d3aea27b2257a27e7cbc2ad379d7e2ea22da Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Thu, 23 Jan 2025 16:46:05 +0530
Subject: [PATCH 20/35] fix: accept document and setting url token for file
 upload

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 5dbf010258..fd06edebf8 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -438,12 +438,7 @@ public function uploadSettingsFile(string $fileId, string $access_token): JSONRe
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 
-			if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_SETTING_AUTH) {
-				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_FORBIDDEN);
-			}
-
-			// auth - for admin??
-
+			// TODO: auth - for admin??
 			$content = fopen('php://input', 'rb');
 			if (!$content) {
 				throw new \Exception('Failed to read input stream.');

From 82bb7a890b697f064518bf7d048225beed25975a Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Thu, 23 Jan 2025 18:10:22 +0530
Subject: [PATCH 21/35] fix: set proper WOPI response and remove unnecessary
 WOPI callback from iframe

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 27 +++++++++++----------------
 src/helpers/url.js                |  6 +-----
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index fd06edebf8..e288642ff3 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -105,20 +105,7 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 
-			// TODO: condition for $wopi not found? -auth???
-
-			$userSettingsUri = $this->generateUserSettingsUri($wopi);
-
-			if ($fileId == '-1' && $wopi->getTokenType() == WOPI::TOKEN_TYPE_SETTING_AUTH) {
-				$response = [
-					'UserSettingsUri' => $userSettingsUri,
-				];
-
-				return new JSONResponse($response);
-			}
-
 			[$fileId, , $version] = Helper::parseFileId($fileId);
-
 			$file = $this->getFileForWopiToken($wopi);
 			if (!($file instanceof File)) {
 				throw new NotFoundException('No valid file found for ' . $fileId);
@@ -142,6 +129,9 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 		$isSmartPickerEnabled = (bool)$wopi->getCanwrite() && !$isPublic && !$wopi->getDirect();
 		$isTaskProcessingEnabled = $isSmartPickerEnabled && $this->taskProcessingManager->isTaskProcessingEnabled();
 
+		$userSettings = $this->generateSettings($wopi, 'userconfig');
+		$sharedSettings = $this->generateSettings($wopi, 'systemconfig');
+
 		// If the file is locked manually by a user we want to open it read only for all others
 		$canWriteThroughLock = true;
 		try {
@@ -182,7 +172,8 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 			'EnableRemoteAIContent' => $isTaskProcessingEnabled,
 			'HasContentRange' => true,
 			'ServerPrivateInfo' => [],
-			'UserSettingsUri' => $userSettingsUri,
+			'UserSettings' => $userSettings,
+			// 'SharedSettings' => $sharedSettings,
 		];
 
 		$enableZotero = $this->config->getAppValue(Application::APPNAME, 'zoteroEnabled', 'yes') === 'yes';
@@ -991,8 +982,12 @@ private function generateSettingToken(Wopi $wopi): string {
 		return $res['token'];
 	}
 	// todo extract nextcloud url from everything
-	private function generateUserSettingsUri(Wopi $wopi): string {
+	private function generateSettings(Wopi $wopi, string $type): array {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
-		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=userconfig' . '&access_token=' . $this->generateSettingToken($wopi) . '&fileId=' . '-1';
+		$uri = $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=' . $type . '&access_token=' . $this->generateSettingToken($wopi) . '&fileId=' . '-1';
+		return [
+			'uri' => $uri,
+			'stamp' => time()
+		];
 	}
 }
diff --git a/src/helpers/url.js b/src/helpers/url.js
index f540174207..c9bcae104c 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -90,12 +90,8 @@ const getNextcloudUrl = () => {
 }
 
 export const getCoolServerUrl = (collaboraBaseUrl) => {
-	// todo fix wopi Url
-	const wopiurl = getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/files/-1'
-
 	return collaboraBaseUrl
-		+ '/browser/dist/admin/adminIntegratorSettings.html?'
-		+ 'WOPISrc=' + encodeURIComponent(wopiurl)
+		+ '/browser/dist/admin/adminIntegratorSettings.html'
 }
 
 export {

From 0e79c206f2dba487f77002627f24fbf479e586ea Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Fri, 24 Jan 2025 17:24:58 +0530
Subject: [PATCH 22/35] fix(settings): remove iframe title and section

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 src/components/AdminSettings.vue    | 3 +--
 src/components/CoolFrame.vue        | 8 ++++++--
 src/components/PersonalSettings.vue | 3 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 540011e92c..3c4f2e16b2 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -15,8 +15,7 @@
 			</p>
 
 			<!-- New Collabora Admin Settings Section -->
-			<div id="admin-cool-frame-section" class="section">
-				<h2>{{ t('richdocuments', 'Collabora Admin Settings') }}</h2>
+			<div id="admin-cool-frame-section">
 				<CoolFrame v-if="tokenGenerated"
 					:iframe-type="'admin'"
 					:public-wopi-url="settings.public_wopi_url"
diff --git a/src/components/CoolFrame.vue b/src/components/CoolFrame.vue
index 1e01737623..4338984103 100644
--- a/src/components/CoolFrame.vue
+++ b/src/components/CoolFrame.vue
@@ -12,7 +12,8 @@
 			<input type="hidden" name="access_token_ttl" :value="accessTokenTTL">
 			<input type="hidden" name="wopi_setting_base_url" :value="wopiSettingBaseUrl">
 			<input type="hidden" name="iframe_type" :value="iframeType">
-			<!-- TODO: Include any other necessary hidden inputs -->
+			<input type="hidden" name="css_variables" :value="cssVariables">
+			<!-- TODO: Include any other necessary hidden inputs - send css variables -->
 		</form>
 		<iframe :id="iframeName"
 			:name="iframeName"
@@ -25,6 +26,7 @@
 
 <script>
 
+import { generateCSSVarTokens } from '../helpers/coolParameters.js'
 import { getCoolServerUrl } from '../helpers/url.js'
 
 export default {
@@ -55,6 +57,7 @@ export default {
 		return {
 			iframeName: 'coolFrameIframe',
 			formAction: '',
+			cssVariables: generateCSSVarTokens(),
 		}
 	},
 	mounted() {
@@ -81,7 +84,8 @@ export default {
   <style scoped>
   .cool-frame-iframe {
     width: 100%;
-    height: 600px;
     border: none;
+	height: 60vh;
+	overflow-y: auto;
   }
   </style>
diff --git a/src/components/PersonalSettings.vue b/src/components/PersonalSettings.vue
index 245ef46dc1..df5be2649b 100644
--- a/src/components/PersonalSettings.vue
+++ b/src/components/PersonalSettings.vue
@@ -35,8 +35,7 @@
 		</p>
 
 		<!-- user settings iframe  -->
-		<div id="user-cool-frame-section" class="section">
-			<h2>{{ t('richdocuments', 'Collabora User Settings') }}</h2>
+		<div id="user-cool-frame-section">
 			<CoolFrame v-if="tokenGenerated"
 				:iframe-type="'user'"
 				:public-wopi-url="public_wopi_url"

From 59a2192e82e3a7d92ee64cef38f01b6c04d907d1 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Mon, 27 Jan 2025 17:57:58 +0530
Subject: [PATCH 23/35] fix(settings): fetch directory from root folder

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Service/SettingsService.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index fe9c2542d4..6bbf074f24 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -8,10 +8,12 @@
 
 namespace OCA\Richdocuments\Service;
 
+use OC\Files\Node\Folder;
 use OCA\Richdocuments\AppInfo\Application;
 use OCA\Richdocuments\Db\WopiMapper;
 use OCA\Richdocuments\WOPI\SettingsUrl;
 use OCP\Files\IAppData;
+use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\Files\SimpleFS\ISimpleFile;
@@ -41,6 +43,7 @@ public function __construct(
 		private CapabilitiesService $capabilitiesService,
 		private WopiMapper $wopiMapper,
 		private IGroupManager $groupManager,
+		private IRootFolder $rootFolder,
 	) {
 		// Create a distributed cache for caching file lists
 		$this->cache = $cacheFactory->createDistributed(Application::APPNAME);
@@ -178,10 +181,9 @@ public function generateSettingsConfig(string $type): array {
 	private function getAllCategories(string $type): array {
 		try {
 			$categories = [];
-			$folder = $this->appData->getFolder($type);
-			$directories = $folder->getFullDirectoryListing();
+			$directories = $this->getCategoryDirFolderList($type);
 			foreach ($directories as $dir) {
-				if ($dir instanceof ISimpleFolder) {
+				if ($dir instanceof Folder) {
 					$categories[] = $dir->getName();
 				}
 			}
@@ -191,6 +193,25 @@ private function getAllCategories(string $type): array {
 		}
 	}
 
+	/**
+	 *
+	 * @param string $type
+	 * @return Folder[]
+	 */
+	private function getCategoryDirFolderList(string $type) : array {
+		try {
+			$instanceId = $this->config->getSystemValue('instanceid', null);
+			if ($instanceId === null) {
+				throw new NotFoundException('Instance ID not found');
+			}
+			$rootFolder = $this->rootFolder;
+			$folder = $rootFolder->get('appdata_' . $instanceId . '/richdocuments' . '/' . $type);
+			return $folder->getDirectoryListing();
+		} catch (NotFoundException $e) {
+			return [];
+		}
+	}
+
 	/**
 	 * Generate file URL.
 	 *

From 747c52846d66817d4184f4833bc1dd6760fb62c1 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Tue, 28 Jan 2025 11:31:33 +0530
Subject: [PATCH 24/35] fix(wopi): share SharedSettings to wopi checkfileInfo

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index e288642ff3..d10cc4a237 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -173,7 +173,7 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 			'HasContentRange' => true,
 			'ServerPrivateInfo' => [],
 			'UserSettings' => $userSettings,
-			// 'SharedSettings' => $sharedSettings,
+			'SharedSettings' => $sharedSettings,
 		];
 
 		$enableZotero = $this->config->getAppValue(Application::APPNAME, 'zoteroEnabled', 'yes') === 'yes';

From 5defde2c0b7e74ec3da18f22396fac0368d9b3de Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Tue, 28 Jan 2025 18:19:29 +0530
Subject: [PATCH 25/35] fix(wopi): Generating setting token for guest users

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index d10cc4a237..80b7486ae6 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -129,9 +129,6 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 		$isSmartPickerEnabled = (bool)$wopi->getCanwrite() && !$isPublic && !$wopi->getDirect();
 		$isTaskProcessingEnabled = $isSmartPickerEnabled && $this->taskProcessingManager->isTaskProcessingEnabled();
 
-		$userSettings = $this->generateSettings($wopi, 'userconfig');
-		$sharedSettings = $this->generateSettings($wopi, 'systemconfig');
-
 		// If the file is locked manually by a user we want to open it read only for all others
 		$canWriteThroughLock = true;
 		try {
@@ -140,11 +137,16 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 		} catch (NoLockProviderException|PreConditionNotMetException) {
 		}
 
+		$userId = !$isPublic ? $wopi->getEditorUid() : $guestUserId;
+
+		$userSettings = $this->generateSettings($userId, 'userconfig');
+		$sharedSettings = $this->generateSettings($userId, 'systemconfig');
+
 		$response = [
 			'BaseFileName' => $file->getName(),
 			'Size' => $file->getSize(),
 			'Version' => $version,
-			'UserId' => !$isPublic ? $wopi->getEditorUid() : $guestUserId,
+			'UserId' => $userId,
 			'OwnerId' => $wopi->getOwnerUid(),
 			'UserFriendlyName' => $userDisplayName,
 			'UserExtraInfo' => [],
@@ -976,15 +978,13 @@ private function getWopiUrlForTemplate(Wopi $wopi): string {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
 		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/template/' . $wopi->getTemplateId() . '?access_token=' . $wopi->getToken();
 	}
-	private function generateSettingToken(Wopi $wopi): string {
-		$userId = $wopi->getEditorUid();
-		$res = $this->settingsService->generateIframeToken('user', $userId);
-		return $res['token'];
+	private function generateSettingToken(string $userId): string {
+		return $this->settingsService->generateIframeToken('user', $userId)['token'];
 	}
 	// todo extract nextcloud url from everything
-	private function generateSettings(Wopi $wopi, string $type): array {
+	private function generateSettings(string $userId, string $type): array {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
-		$uri = $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=' . $type . '&access_token=' . $this->generateSettingToken($wopi) . '&fileId=' . '-1';
+		$uri = $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=' . $type . '&access_token=' . $this->generateSettingToken($userId) . '&fileId=' . '-1';
 		return [
 			'uri' => $uri,
 			'stamp' => time()

From 969a4f90a83d95cbbde3ddfa599bcd015daaf5b4 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 29 Jan 2025 15:00:01 +0530
Subject: [PATCH 26/35] fix(settings): generate user config per userId & handle
 guest users

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 appinfo/routes.php                    |  2 +-
 lib/Controller/SettingsController.php |  9 ++++-
 lib/Controller/WopiController.php     | 26 ++++++++------
 lib/Db/WopiMapper.php                 |  1 +
 lib/Service/SettingsService.php       | 51 +++++++++++++++++++++------
 5 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 105e1dab69..ba06093291 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -38,7 +38,7 @@
 		['name' => 'settings#uploadFontFile', 'url' => 'settings/fonts', 'verb' => 'POST'],
 		[
 			'name' => 'settings#getSettingsFile',
-			'url' => 'settings/{type}/{category}/{name}',
+			'url' => 'settings/{type}/{token}/{category}/{name}',
 			'verb' => 'GET',
 			'requirements' => [
 				'type' => '[a-zA-Z0-9_\-]+',
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index f11bc8ac06..b21a9beeca 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -7,6 +7,7 @@
 
 use OCA\Richdocuments\AppConfig;
 use OCA\Richdocuments\Capabilities;
+use OCA\Richdocuments\Db\WopiMapper;
 use OCA\Richdocuments\Service\CapabilitiesService;
 use OCA\Richdocuments\Service\ConnectivityService;
 use OCA\Richdocuments\Service\DemoService;
@@ -58,6 +59,7 @@ public function __construct(
 		private SettingsService $settingsService,
 		private LoggerInterface $logger,
 		private IURLGenerator $urlGenerator,
+		private WopiMapper $wopiMapper,
 		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
@@ -484,8 +486,13 @@ public function uploadFontFile(): JSONResponse {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 **/
-	public function getSettingsFile(string $type, string $category, string $name) {
+	public function getSettingsFile(string $type, string $token, string $category, string $name) {
 		try {
+			$wopi = $this->wopiMapper->getWopiForToken($token);
+			if ($type === 'userconfig') {
+				$userId = $wopi->getEditorUid() ?: $wopi->getOwnerUid();
+				$type = $type . '/' . $userId;
+			}
 			$systemFile = $this->settingsService->getSettingsFile($type, $category, $name);
 			return new DataDisplayResponse(
 				$systemFile->getContent(),
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 80b7486ae6..979ed8c71e 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -139,7 +139,9 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 
 		$userId = !$isPublic ? $wopi->getEditorUid() : $guestUserId;
 
-		$userSettings = $this->generateSettings($userId, 'userconfig');
+		if (!$isPublic) {
+			$userSettings = $this->generateSettings($userId, 'userconfig');
+		}
 		$sharedSettings = $this->generateSettings($userId, 'systemconfig');
 
 		$response = [
@@ -174,10 +176,13 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 			'EnableRemoteAIContent' => $isTaskProcessingEnabled,
 			'HasContentRange' => true,
 			'ServerPrivateInfo' => [],
-			'UserSettings' => $userSettings,
 			'SharedSettings' => $sharedSettings,
 		];
 
+		if (!$isPublic) {
+			$response['UserSettings'] = $userSettings;
+		}
+
 		$enableZotero = $this->config->getAppValue(Application::APPNAME, 'zoteroEnabled', 'yes') === 'yes';
 		if (!$isPublic && $enableZotero) {
 			$zoteroAPIKey = $this->config->getUserValue($wopi->getEditorUid(), 'richdocuments', 'zoteroAPIKey', '');
@@ -406,13 +411,12 @@ public function getSettings(string $type, string $access_token): JSONResponse {
 			if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_SETTING_AUTH) {
 				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_BAD_REQUEST);
 			}
+
+			$isPublic = empty($wopi->getEditorUid());
+			$guestUserId = 'Guest-' . \OC::$server->getSecureRandom()->generate(8);
+			$userId = !$isPublic ? $wopi->getEditorUid() : $guestUserId;
 	
-			$user = $this->userManager->get($wopi->getOwnerUid());
-			if (!$user || !$this->groupManager->isAdmin($user->getUID())) {
-				return new JSONResponse(['error' => 'Access denied'], Http::STATUS_BAD_REQUEST);
-			}
-	
-			$userConfig = $this->settingsService->generateSettingsConfig($type);
+			$userConfig = $this->settingsService->generateSettingsConfig($type, $userId);
 			return new JSONResponse($userConfig, Http::STATUS_OK);
 		} catch (UnknownTokenException|ExpiredTokenException $e) {
 			$this->logger->debug($e->getMessage(), ['exception' => $e]);
@@ -431,6 +435,7 @@ public function uploadSettingsFile(string $fileId, string $access_token): JSONRe
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 
+			$userId = $wopi->getEditorUid();
 			// TODO: auth - for admin??
 			$content = fopen('php://input', 'rb');
 			if (!$content) {
@@ -442,7 +447,7 @@ public function uploadSettingsFile(string $fileId, string $access_token): JSONRe
 			
 			// Use the fileId as a file path URL (e.g., "/settings/systemconfig/wordbook/en_US%20(1).dic")
 			$settingsUrl = new SettingsUrl($fileId);
-			$result = $this->settingsService->uploadFile($settingsUrl, $fileContent);
+			$result = $this->settingsService->uploadFile($settingsUrl, $fileContent, $userId);
 			
 			return new JSONResponse([
 				'status' => 'success',
@@ -475,8 +480,9 @@ public function deleteSettingsFile(string $fileId, string $access_token): JSONRe
 			$type = $settingsUrl->getType();
 			$category = $settingsUrl->getCategory();
 			$fileName = $settingsUrl->getFileName();
+			$userId = $wopi->getEditorUid();
 
-			$this->settingsService->deleteSettingsFile($type, $category, $fileName);
+			$this->settingsService->deleteSettingsFile($type, $category, $fileName, $userId);
 
 			return new JSONResponse([
 				'status' => 'success',
diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
index 5bd3cc5cbf..0ed77392a0 100644
--- a/lib/Db/WopiMapper.php
+++ b/lib/Db/WopiMapper.php
@@ -72,6 +72,7 @@ public function generateUserSettingsToken($fileId, $userId, $version, $serverHos
 		$wopi = Wopi::fromParams([
 			'fileid' => $fileId,
 			'ownerUid' => $userId,
+			'editorUid' => $userId,
 			'version' => $version,
 			'canwrite' => true,
 			'serverHost' => $serverHost,
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 6bbf074f24..8c1231974c 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -58,7 +58,7 @@ public function __construct(
 	 * @return ISimpleFolder
 	 */
 
-	public function ensureDirectory(SettingsUrl $settingsUrl): ISimpleFolder {
+	public function ensureDirectory(SettingsUrl $settingsUrl, string $userId): ISimpleFolder {
 		$type = $settingsUrl->getType();
 		$category = $settingsUrl->getCategory();
 
@@ -68,6 +68,14 @@ public function ensureDirectory(SettingsUrl $settingsUrl): ISimpleFolder {
 			$baseFolder = $this->appData->newFolder($type);
 		}
 
+		if ($type === 'userconfig') {
+			try {
+				$baseFolder = $baseFolder->getFolder($userId);
+			} catch (NotFoundException $e) {
+				$baseFolder = $baseFolder->newFolder($userId);
+			}
+		}
+
 		try {
 			$categoryFolder = $baseFolder->getFolder($category);
 		} catch (NotFoundException $e) {
@@ -86,11 +94,11 @@ public function ensureDirectory(SettingsUrl $settingsUrl): ISimpleFolder {
 	 * @return array ['stamp' => string, 'uri' => string]
 	 */
 
-	public function uploadFile(SettingsUrl $settingsUrl, string $fileData): array {
-		$categoryFolder = $this->ensureDirectory($settingsUrl);
+	public function uploadFile(SettingsUrl $settingsUrl, string $fileData, string $userId): array {
+		$categoryFolder = $this->ensureDirectory($settingsUrl, $userId);
 		$fileName = $settingsUrl->getFileName();
 		$newFile = $categoryFolder->newFile($fileName, $fileData);
-		$fileUri = $this->generateFileUri($settingsUrl->getType(), $settingsUrl->getCategory(), $fileName);
+		$fileUri = $this->generateFileUri($settingsUrl->getType(), $settingsUrl->getCategory(), $fileName, $userId);
 
 		return [
 			'stamp' => $newFile->getETag(),
@@ -105,7 +113,7 @@ public function uploadFile(SettingsUrl $settingsUrl, string $fileData): array {
 	 * @param string $category
 	 * @return array Each item has 'stamp' and 'uri'.
 	 */
-	public function getCategoryFileList(string $type, string $category): array {
+	public function getCategoryFileList(string $type, string $category, string $userId): array {
 		try {
 			$categoryFolder = $this->appData->getFolder($type . '/' . $category);
 		} catch (NotFoundException $e) {
@@ -114,10 +122,10 @@ public function getCategoryFileList(string $type, string $category): array {
 
 		$files = $categoryFolder->getDirectoryListing();
 
-		return array_map(function (ISimpleFile $file) use ($type, $category) {
+		return array_map(function (ISimpleFile $file) use ($type, $category, $userId) {
 			return [
 				'stamp' => $file->getETag(),
-				'uri' => $this->generateFileUri($type, $category, $file->getName()),
+				'uri' => $this->generateFileUri($type, $category, $file->getName(), $userId),
 			];
 		}, $files);
 	}
@@ -155,17 +163,21 @@ public function generateIframeToken(string $type, string $userId): array {
 	 * @param string $type
 	 * @return array
 	 */
-	public function generateSettingsConfig(string $type): array {
+	public function generateSettingsConfig(string $type, string $userId): array {
 		$kind = $type === 'userconfig' ? 'user' : 'shared';
 
 		$config = [
 			'kind' => $kind,
 		];
 
+		if ($type === 'userconfig') {
+			$type = $type . '/' . $userId;
+		}
+
 		$categories = $this->getAllCategories($type);
 
 		foreach ($categories as $category) {
-			$files = $this->getCategoryFileList($type, $category);
+			$files = $this->getCategoryFileList($type, $category, $userId);
 			$config[$category] = $files;
 		}
 
@@ -220,11 +232,20 @@ private function getCategoryDirFolderList(string $type) : array {
 	 * @param string $fileName
 	 * @return string
 	 */
-	private function generateFileUri(string $type, string $category, string $fileName): string {
+	private function generateFileUri(string $type, string $category, string $fileName, string $userId): string {
+		
+		// Passing userId is dangerous so we have to trim from url...
+		if (strpos($type, '/') !== false) {
+			$type = explode('/', $type)[0];
+		}
+
+		$token = $this->generateIframeToken($type, $userId);
+		
 		return $this->urlGenerator->linkToRouteAbsolute(
 			'richdocuments.settings.getSettingsFile',
 			[
 				'type' => $type,
+				'token' => $token['token'],
 				'category' => $category,
 				'name' => $fileName,
 			]
@@ -266,12 +287,20 @@ public function getSettingsFile(string $type, string $category, string $name): I
 	 * @param string $category
 	 * @param string $name
 	 */
-	public function deleteSettingsFile(string $type, string $category, string $name): void {
+	public function deleteSettingsFile(string $type, string $category, string $name, string $userId): void {
 		try {
 			$baseFolder = $this->appData->getFolder($type);
 		} catch (NotFoundException $e) {
 			throw new NotFoundException("Type folder '{$type}' not found.");
 		}
+
+		if ($type === 'userconfig') {
+			try {
+				$baseFolder = $baseFolder->getFolder($userId);
+			} catch (NotFoundException $e) {
+				throw new NotFoundException("User folder '{$userId}' not found.");
+			}
+		}
 		
 		try {
 			$categoryFolder = $baseFolder->getFolder($category);

From 495a02cbf873edb72323ebb3b7e1eda74f82491e Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 29 Jan 2025 15:25:16 +0530
Subject: [PATCH 27/35] fix: composer psalm error via pointing correct folder

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Service/SettingsService.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 8c1231974c..e318c79ba1 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -8,10 +8,10 @@
 
 namespace OCA\Richdocuments\Service;
 
-use OC\Files\Node\Folder;
 use OCA\Richdocuments\AppInfo\Application;
 use OCA\Richdocuments\Db\WopiMapper;
 use OCA\Richdocuments\WOPI\SettingsUrl;
+use OCP\Files\Folder;
 use OCP\Files\IAppData;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
@@ -218,6 +218,9 @@ private function getCategoryDirFolderList(string $type) : array {
 			}
 			$rootFolder = $this->rootFolder;
 			$folder = $rootFolder->get('appdata_' . $instanceId . '/richdocuments' . '/' . $type);
+			if (!$folder instanceof Folder) {
+				return [];
+			}
 			return $folder->getDirectoryListing();
 		} catch (NotFoundException $e) {
 			return [];

From 9554d4f6f9537f3288d03ea6dad75515eea395bd Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 29 Jan 2025 16:02:07 +0530
Subject: [PATCH 28/35] fix: code cleanups

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/DocumentController.php | 1 -
 lib/Controller/SettingsController.php | 1 -
 lib/Controller/WopiController.php     | 4 ++--
 lib/TokenManager.php                  | 4 +---
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 3e5c26ac66..55d0c91fae 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -385,7 +385,6 @@ public function editOnlineTarget(int $fileId, ?string $target = null): RedirectR
 	#[PublicPage]
 	public function token(int $fileId, ?string $shareToken = null, ?string $path = null, ?string $guestName = null): DataResponse {
 		try {
-			// Normal file handling (unchanged)
 			$share = $shareToken ? $this->shareManager->getShareByToken($shareToken) : null;
 			$file = $shareToken ? $this->getFileForShare($share, $fileId, $path) : $this->getFileForUser($fileId, $path);
 
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index b21a9beeca..0db8d555dc 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -101,7 +101,6 @@ public function demoServers(): DataResponse {
 	public function getSettings(): JSONResponse {
 		return new JSONResponse($this->getSettingsData());
 	}
-	// TODO : Provide Auth tokens here :)
 	private function getSettingsData(): array {
 		return [
 			'wopi_url' => $this->appConfig->getCollaboraUrlInternal(),
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 979ed8c71e..1a2aa1edb5 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -103,9 +103,9 @@ public function __construct(
 	#[FrontpageRoute(verb: 'GET', url: 'wopi/files/{fileId}')]
 	public function checkFileInfo(string $fileId, string $access_token): JSONResponse {
 		try {
-			$wopi = $this->wopiMapper->getWopiForToken($access_token);
-
 			[$fileId, , $version] = Helper::parseFileId($fileId);
+			
+			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 			$file = $this->getFileForWopiToken($wopi);
 			if (!($file instanceof File)) {
 				throw new NotFoundException('No valid file found for ' . $fileId);
diff --git a/lib/TokenManager.php b/lib/TokenManager.php
index d2f8ba5b45..c4a8636354 100644
--- a/lib/TokenManager.php
+++ b/lib/TokenManager.php
@@ -48,13 +48,11 @@ public function __construct(
 	 * @throws Exception
 	 */
 	public function generateWopiToken(string $fileId, ?string $shareToken = null, ?string $editoruid = null, bool $direct = false): Wopi {
-		
+		[$fileId, , $version] = Helper::parseFileId($fileId);
 		$owneruid = null;
 		$hideDownload = false;
 		$rootFolder = $this->rootFolder;
 
-		[$fileId, , $version] = Helper::parseFileId($fileId);
-
 		// if the user is not logged-in do use the sharers storage
 		if ($shareToken !== null) {
 			/** @var File $file */

From 7c7c779a8c9b2fcd575f196b892f4e4494ab0e47 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Sun, 2 Feb 2025 21:08:55 +0530
Subject: [PATCH 29/35] fix: move admin setting iframe below server-config

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 src/components/AdminSettings.vue | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 3c4f2e16b2..09d916dbce 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -14,16 +14,6 @@
 				{{ t('richdocuments', 'Collabora Online is a powerful LibreOffice-based online office suite with collaborative editing, which supports all major documents, spreadsheet and presentation file formats and works together with all modern browsers.') }}
 			</p>
 
-			<!-- New Collabora Admin Settings Section -->
-			<div id="admin-cool-frame-section">
-				<CoolFrame v-if="tokenGenerated"
-					:iframe-type="'admin'"
-					:public-wopi-url="settings.public_wopi_url"
-					:access-token="accessToken"
-					:access-token-t-t-l="accessTokenTTL"
-					:wopi-setting-base-url="wopiSettingBaseUrl" />
-			</div>
-
 			<div v-if="settings.wopi_url && settings.wopi_url !== ''">
 				<NcNoteCard v-if="serverError == 2" type="error">
 					<p>{{ t('richdocuments', 'Could not establish connection to the Collabora Online server.') }}</p>
@@ -227,6 +217,15 @@
 			</div>
 		</NcModal>
 
+		<div id="admin-cool-frame-section" class="section">
+			<CoolFrame v-if="tokenGenerated"
+				:iframe-type="'admin'"
+				:public-wopi-url="settings.public_wopi_url"
+				:access-token="accessToken"
+				:access-token-t-t-l="accessTokenTTL"
+				:wopi-setting-base-url="wopiSettingBaseUrl" />
+		</div>
+
 		<div v-if="isSetup" id="advanced-settings" class="section">
 			<h2>{{ t('richdocuments', 'Advanced settings') }}</h2>
 			<SettingsCheckbox :value="isOoxml"

From bf699669bd3272b249fb67d0cb5a81e7f23f71a8 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Tue, 4 Feb 2025 13:38:33 +0530
Subject: [PATCH 30/35] refactor: some code cleanups

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/SettingsController.php |  2 --
 src/components/AdminSettings.vue      | 28 ++++++++++-----------------
 src/components/PersonalSettings.vue   | 22 ++++++++-------------
 src/helpers/url.js                    |  2 +-
 tests/psalm-baseline.xml              |  5 -----
 5 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 0db8d555dc..bd3a22346d 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -414,8 +414,6 @@ public function getFontFileOverview(string $name): DataDisplayResponse {
 
 	/**
 	 * @NoAdminRequired
-	 * @PublicPage
-	 * @NoCSRFRequired
 	 *
 	 * @param string $type - Type is 'admin' or 'user'
 	 * @return DataResponse
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 09d916dbce..30fa65ce32 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -217,14 +217,13 @@
 			</div>
 		</NcModal>
 
-		<div id="admin-cool-frame-section" class="section">
-			<CoolFrame v-if="tokenGenerated"
-				:iframe-type="'admin'"
-				:public-wopi-url="settings.public_wopi_url"
-				:access-token="accessToken"
-				:access-token-t-t-l="accessTokenTTL"
-				:wopi-setting-base-url="wopiSettingBaseUrl" />
-		</div>
+		<CoolFrame v-if="tokenGenerated"
+			class="section"
+			:iframe-type="'admin'"
+			:public-wopi-url="settings.public_wopi_url"
+			:access-token="accessToken"
+			:access-token-t-t-l="accessTokenTTL"
+			:wopi-setting-base-url="wopiSettingBaseUrl" />
 
 		<div v-if="isSetup" id="advanced-settings" class="section">
 			<h2>{{ t('richdocuments', 'Advanced settings') }}</h2>
@@ -432,10 +431,7 @@ import SettingsExternalApps from './SettingsExternalApps.vue'
 import SettingsInputFile from './SettingsInputFile.vue'
 import SettingsFontList from './SettingsFontList.vue'
 import GlobalTemplates from './AdminSettings/GlobalTemplates.vue'
-import {
-	getCurrentUser,
-	getGuestNickname,
-} from '@nextcloud/auth'
+import { getCurrentUser } from '@nextcloud/auth'
 
 import { isPublicShare, getSharingToken } from '@nextcloud/sharing/public'
 
@@ -531,7 +527,7 @@ export default {
 			},
 			accessToken: '',
 			accessTokenTTL: '',
-			userId: '',
+			userId: getCurrentUser()?.uid,
 			tokenGenerated: false,
 			wopiSettingBaseUrl: '',
 		}
@@ -579,9 +575,7 @@ export default {
 		},
 	},
 	async mounted() {
-		const currentUser = getCurrentUser()
-		if (currentUser && currentUser.uid) {
-			this.userId = currentUser.uid
+		if (this.userId && this.userId.length > 0) {
 			await this.generateAccessToken()
 			if (this.accessToken) {
 				this.wopiSettingBaseUrl = getConfigFileUrl()
@@ -644,8 +638,6 @@ export default {
 				this.accessToken = data.token
 				this.accessTokenTTL = data.token_ttl
 				console.debug('Admin settings WOPI token generated:', this.accessToken, this.accessTokenTTL)
-			} else if (data.federatedUrl) {
-				console.error('Federated URL returned, not expected for admin settings.')
 			} else {
 				console.error('Failed to generate token for admin settings')
 			}
diff --git a/src/components/PersonalSettings.vue b/src/components/PersonalSettings.vue
index df5be2649b..4638ea2867 100644
--- a/src/components/PersonalSettings.vue
+++ b/src/components/PersonalSettings.vue
@@ -35,14 +35,12 @@
 		</p>
 
 		<!-- user settings iframe  -->
-		<div id="user-cool-frame-section">
-			<CoolFrame v-if="tokenGenerated"
-				:iframe-type="'user'"
-				:public-wopi-url="public_wopi_url"
-				:access-token="accessToken"
-				:access-token-t-t-l="accessTokenTTL"
-				:wopi-setting-base-url="wopiSettingBaseUrl" />
-		</div>
+		<CoolFrame v-if="tokenGenerated"
+			:iframe-type="'user'"
+			:public-wopi-url="public_wopi_url"
+			:access-token="accessToken"
+			:access-token-t-t-l="accessTokenTTL"
+			:wopi-setting-base-url="wopiSettingBaseUrl" />
 
 		<!-- Zotero -->
 		<div class="zotero-section">
@@ -168,7 +166,7 @@ export default {
 			tokenGenerated: false,
 			accessToken: '',
 			accessTokenTTL: '',
-			userId: '',
+			userId: getCurrentUser()?.uid,
 			wopiSettingBaseUrl: '',
 			public_wopi_url: this.initial.publicWopiUrl || '',
 		}
@@ -179,9 +177,7 @@ export default {
 		},
 	},
 	async mounted() {
-		const currentUser = getCurrentUser()
-		if (currentUser && currentUser.uid) {
-			this.userId = currentUser.uid
+		if (this.userId && this.userId.length > 0) {
 			await this.generateAccessToken()
 			if (this.accessToken) {
 				this.wopiSettingBaseUrl = getConfigFileUrl()
@@ -199,8 +195,6 @@ export default {
 				this.accessToken = data.token
 				this.accessTokenTTL = data.token_ttl
 				console.debug('Admin settings WOPI token generated:', this.accessToken, this.accessTokenTTL)
-			} else if (data.federatedUrl) {
-				console.error('Federated URL returned, not expected for admin settings.')
 			} else {
 				console.error('Failed to generate token for admin settings')
 			}
diff --git a/src/helpers/url.js b/src/helpers/url.js
index c9bcae104c..40b77cfaa8 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -82,7 +82,7 @@ const getDocumentUrlForFile = (fileDir, fileId) => {
 }
 
 export const getConfigFileUrl = () => {
-	return getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/settings'
+	return getCallbackBaseUrl() + generateUrl('apps/richdocuments/wopi/settings')
 }
 
 const getNextcloudUrl = () => {
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index b91cb8f1ba..81a432d72c 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -125,9 +125,4 @@
       <code><![CDATA[$result && count($result) > 0]]></code>
     </RedundantCondition>
   </file>
-  <file src="lib/WOPI/SettingsUrl.php">
-    <RedundantCondition>
-      <code><![CDATA[$result && count($result) > 0]]></code>
-    </RedundantCondition>
-  </file>
 </files>

From 149e43faf67960bf493026a98af5e406b9692a81 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 5 Feb 2025 16:49:32 +0530
Subject: [PATCH 31/35] config: support hasSettingIframeSupport capability

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Service/CapabilitiesService.php | 4 ++++
 lib/Settings/Admin.php              | 1 +
 lib/Settings/Personal.php           | 1 +
 src/components/AdminSettings.vue    | 6 ++++--
 src/components/PersonalSettings.vue | 5 +++--
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/Service/CapabilitiesService.php b/lib/Service/CapabilitiesService.php
index a97c7a234b..5667e3e493 100644
--- a/lib/Service/CapabilitiesService.php
+++ b/lib/Service/CapabilitiesService.php
@@ -81,6 +81,10 @@ public function hasZoteroSupport(): bool {
 		return $this->getCapabilities()['hasZoteroSupport'] ?? false;
 	}
 
+	public function hasSettingIframeSupport(): bool {
+		return $this->getCapabilities()['hasSettingIframeSupport'] ?? false;
+	}
+
 	public function hasWASMSupport(): bool {
 		return $this->getCapabilities()['hasWASMSupport'] ?? false;
 	}
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index 7dc7158bb6..708bfa7746 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -56,6 +56,7 @@ public function getForm(): TemplateResponse {
 					'esignature_base_url' => $this->config->getAppValue('richdocuments', 'esignature_base_url'),
 					'esignature_client_id' => $this->config->getAppValue('richdocuments', 'esignature_client_id'),
 					'esignature_secret' => $this->config->getAppValue('richdocuments', 'esignature_secret'),
+					'hasSettingIframeSupport' => $this->capabilitiesService->hasSettingIframeSupport(),
 				],
 			],
 			'blank'
diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
index 6fd7c46570..341b12df0b 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/Personal.php
@@ -41,6 +41,7 @@ public function getForm() {
 				'documentSigningKey' => $this->config->getUserValue($this->userId, 'richdocuments', 'documentSigningKey', ''),
 				'documentSigningCa' => $this->config->getUserValue($this->userId, 'richdocuments', 'documentSigningCa', ''),
 				'hasZoteroSupport' => $this->capabilitiesService->hasZoteroSupport(),
+				'hasSettingIframeSupport' => $this->capabilitiesService->hasSettingIframeSupport(),
 				'zoteroAPIKey' => $this->config->getUserValue($this->userId, 'richdocuments', 'zoteroAPIKey', ''),
 				'publicWopiUrl' => $this->appConfig->getCollaboraUrlPublic(),
 			],
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 30fa65ce32..bdea4bf9be 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -524,6 +524,7 @@ export default {
 					text: '',
 				},
 				fonts: [],
+				hasSettingIframeSupport: false,
 			},
 			accessToken: '',
 			accessTokenTTL: '',
@@ -575,7 +576,7 @@ export default {
 		},
 	},
 	async mounted() {
-		if (this.userId && this.userId.length > 0) {
+		if (this.hasSettingIframeSupport && this.userId && this.userId.length > 0) {
 			await this.generateAccessToken()
 			if (this.accessToken) {
 				this.wopiSettingBaseUrl = getConfigFileUrl()
@@ -583,7 +584,7 @@ export default {
 				this.tokenGenerated = true
 			}
 		} else {
-			console.error('User not authenticated')
+			console.error('Setting Iframe not supported')
 		}
 	},
 	beforeMount() {
@@ -607,6 +608,7 @@ export default {
 		Vue.set(this.settings, 'edit_groups', this.settings.edit_groups ? this.settings.edit_groups.split('|') : null)
 		Vue.set(this.settings, 'use_groups', this.settings.use_groups ? this.settings.use_groups.split('|') : null)
 		Vue.set(this.settings, 'fonts', this.initial.fonts ? this.initial.fonts : [])
+		Vue.set(this.settings, 'hasSettingIframeSupport', this.initial.hasSettingIframeSupport ?? false)
 
 		this.uiVisible.canonical_webroot = !!(this.settings.canonical_webroot && this.settings.canonical_webroot !== '')
 		this.uiVisible.external_apps = !!(this.settings.external_apps && this.settings.external_apps !== '')
diff --git a/src/components/PersonalSettings.vue b/src/components/PersonalSettings.vue
index 4638ea2867..1601354920 100644
--- a/src/components/PersonalSettings.vue
+++ b/src/components/PersonalSettings.vue
@@ -158,6 +158,7 @@ export default {
 		return {
 			templateFolder: this.initial.templateFolder || '',
 			hasZoteroSupport: this.initial.hasZoteroSupport || false,
+			hasSettingIframeSupport: this.initial.hasSettingIframeSupport || false,
 			zoteroAPIKey: this.initial.zoteroAPIKey || '',
 			hasDocumentSigningSupport: this.initial.hasDocumentSigningSupport || false,
 			documentSigningCert: this.initial.documentSigningCert || '',
@@ -177,7 +178,7 @@ export default {
 		},
 	},
 	async mounted() {
-		if (this.userId && this.userId.length > 0) {
+		if (this.hasSettingIframeSupport && this.userId && this.userId.length > 0) {
 			await this.generateAccessToken()
 			if (this.accessToken) {
 				this.wopiSettingBaseUrl = getConfigFileUrl()
@@ -185,7 +186,7 @@ export default {
 				this.tokenGenerated = true
 			}
 		} else {
-			console.error('User not authenticated')
+			console.error('Setting Iframe not supported')
 		}
 	},
 	methods: {

From e170b53b8202bc7f89b0784bff2b383638907943 Mon Sep 17 00:00:00 2001
From: Julius Knorr <jus@bitgrid.net>
Date: Wed, 5 Feb 2025 13:14:55 +0100
Subject: [PATCH 32/35] fix: Avoid warning on file id explode

Signed-off-by: Julius Knorr <jus@bitgrid.net>
---
 lib/Helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Helper.php b/lib/Helper.php
index 76272faa86..3e9825a14d 100644
--- a/lib/Helper.php
+++ b/lib/Helper.php
@@ -40,7 +40,7 @@ public static function parseFileId(string $fileId) {
 		}
 
 		if (str_contains($fileId, '-')) {
-			[$fileId, $templateId] = explode('/', $fileId);
+			[$fileId, $templateId] = array_pad(explode('/', $fileId), 2, null);
 		}
 
 		return [

From 3fbe5e2c7c582d07561165f0d1ac2d49994428b1 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 5 Feb 2025 23:21:05 +0530
Subject: [PATCH 33/35] feat(wopi): pass WOPI settings if iframe capability is
 allowed

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 1a2aa1edb5..8520783051 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -16,6 +16,7 @@
 use OCA\Richdocuments\Exceptions\UnknownTokenException;
 use OCA\Richdocuments\Helper;
 use OCA\Richdocuments\PermissionManager;
+use OCA\Richdocuments\Service\CapabilitiesService;
 use OCA\Richdocuments\Service\FederationService;
 use OCA\Richdocuments\Service\SettingsService;
 use OCA\Richdocuments\Service\UserScopeService;
@@ -90,6 +91,7 @@ public function __construct(
 		private IEventDispatcher $eventDispatcher,
 		private TaskProcessingManager $taskProcessingManager,
 		private SettingsService $settingsService,
+		private CapabilitiesService $capabilitiesService,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -104,7 +106,7 @@ public function __construct(
 	public function checkFileInfo(string $fileId, string $access_token): JSONResponse {
 		try {
 			[$fileId, , $version] = Helper::parseFileId($fileId);
-			
+
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 			$file = $this->getFileForWopiToken($wopi);
 			if (!($file instanceof File)) {
@@ -139,10 +141,6 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 
 		$userId = !$isPublic ? $wopi->getEditorUid() : $guestUserId;
 
-		if (!$isPublic) {
-			$userSettings = $this->generateSettings($userId, 'userconfig');
-		}
-		$sharedSettings = $this->generateSettings($userId, 'systemconfig');
 
 		$response = [
 			'BaseFileName' => $file->getName(),
@@ -176,11 +174,14 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 			'EnableRemoteAIContent' => $isTaskProcessingEnabled,
 			'HasContentRange' => true,
 			'ServerPrivateInfo' => [],
-			'SharedSettings' => $sharedSettings,
 		];
 
-		if (!$isPublic) {
-			$response['UserSettings'] = $userSettings;
+		if ($this->capabilitiesService->hasSettingIframeSupport()) {
+
+			if (!$isPublic) {
+				$response['UserSettings'] = $this->generateSettings($userId, 'userconfig');
+			}
+			$response['SharedSettings'] = $this->generateSettings($userId, 'systemconfig');
 		}
 
 		$enableZotero = $this->config->getAppValue(Application::APPNAME, 'zoteroEnabled', 'yes') === 'yes';

From 85483d6a237942d2e69318a04d916fd4d8c5e27d Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 5 Feb 2025 23:25:15 +0530
Subject: [PATCH 34/35] fix: admin iframe load issue

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 src/components/AdminSettings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index bdea4bf9be..fd997336c8 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -576,7 +576,7 @@ export default {
 		},
 	},
 	async mounted() {
-		if (this.hasSettingIframeSupport && this.userId && this.userId.length > 0) {
+		if (this.settings.hasSettingIframeSupport && this.userId && this.userId.length > 0) {
 			await this.generateAccessToken()
 			if (this.accessToken) {
 				this.wopiSettingBaseUrl = getConfigFileUrl()

From fdb020097c53b16725a1349d593cc91baeea968b Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Wed, 5 Feb 2025 23:34:44 +0530
Subject: [PATCH 35/35] fix(cosmetic): remove unnecessary comments

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
---
 lib/Controller/WopiController.php | 5 +++--
 lib/Service/SettingsService.php   | 5 -----
 src/components/CoolFrame.vue      | 1 -
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 8520783051..4ee52e29fb 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -437,7 +437,7 @@ public function uploadSettingsFile(string $fileId, string $access_token): JSONRe
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
 
 			$userId = $wopi->getEditorUid();
-			// TODO: auth - for admin??
+
 			$content = fopen('php://input', 'rb');
 			if (!$content) {
 				throw new \Exception('Failed to read input stream.');
@@ -985,10 +985,11 @@ private function getWopiUrlForTemplate(Wopi $wopi): string {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
 		return $nextcloudUrl . '/index.php/apps/richdocuments/wopi/template/' . $wopi->getTemplateId() . '?access_token=' . $wopi->getToken();
 	}
+	
 	private function generateSettingToken(string $userId): string {
 		return $this->settingsService->generateIframeToken('user', $userId)['token'];
 	}
-	// todo extract nextcloud url from everything
+
 	private function generateSettings(string $userId, string $type): array {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
 		$uri = $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=' . $type . '&access_token=' . $this->generateSettingToken($userId) . '&fileId=' . '-1';
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index e318c79ba1..6bff30f31e 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -49,8 +49,6 @@ public function __construct(
 		$this->cache = $cacheFactory->createDistributed(Application::APPNAME);
 	}
 
-	// TODO: Implement file caching...
-
 	/**
 	 * Ensure the settings directory exists, if it doesn't exist then create it.
 	 *
@@ -322,7 +320,4 @@ public function deleteSettingsFile(string $type, string $category, string $name,
 			throw $e;
 		}
 	}
-
-	// TODO: Handle installDefaultSystemFiles setting
-
 }
diff --git a/src/components/CoolFrame.vue b/src/components/CoolFrame.vue
index 4338984103..2ef6781e27 100644
--- a/src/components/CoolFrame.vue
+++ b/src/components/CoolFrame.vue
@@ -13,7 +13,6 @@
 			<input type="hidden" name="wopi_setting_base_url" :value="wopiSettingBaseUrl">
 			<input type="hidden" name="iframe_type" :value="iframeType">
 			<input type="hidden" name="css_variables" :value="cssVariables">
-			<!-- TODO: Include any other necessary hidden inputs - send css variables -->
 		</form>
 		<iframe :id="iframeName"
 			:name="iframeName"