Merge pull request #4564 from Rash419/template-preset

preset: fix: adding/removing global template not reflected in sidebar

Author: juliusknorr

lib/Controller/WopiController.php

@@ -179,7 +179,7 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 		if ($this->capabilitiesService->hasSettingIframeSupport()) {
 			$token = $this->generateSettingToken($userId);
 			if (!$isPublic) {
-				$response['UserSettings'] = $this->generateSettings($token, 'userconfig');
+				$response['UserSettings'] = $this->generateSettings($token, 'userconfig', $userId);
 			}
 			$response['SharedSettings'] = $this->generateSettings($token, 'systemconfig');
 		}
@@ -994,10 +994,10 @@ private function generateSettingToken(string $userId): string {
 		return $this->settingsService->generateIframeToken('user', $userId)['token'];
 	}
 
-	private function generateSettings(string $token, string $type): array {
+	private function generateSettings(string $token, string $type, string $userId = ''): array {
 		$nextcloudUrl = $this->appConfig->getNextcloudUrl() ?: trim($this->urlGenerator->getAbsoluteURL(''), '/');
 		$uri = $nextcloudUrl . '/index.php/apps/richdocuments/wopi/settings' . '?type=' . $type . '&access_token=' . $token . '&fileId=' . '-1';
-		$etag = $this->settingsService->getFolderEtag($type);
+		$etag = $this->settingsService->getFolderEtag($type) . $this->settingsService->getPresentationFolderEtag($type, $userId);
 		return [
 			'uri' => $uri,
 			'stamp' => $etag

lib/Service/SettingsService.php

@@ -169,6 +169,24 @@ public function getFolderEtag($type) : string {
 		return $this->getTypeFolder($type)->getEtag();
 	}
 
+	/**
+	 *
+	 * @param string $type
+	 * @param string $userId
+	 * @return string
+	 */
+	public function getPresentationFolderEtag(string $type, string $userId) : string {
+		if ($type === 'systemconfig') {
+			return $this->templateManager->getSystemTemplateDir()->getEtag();
+		}
+		try {
+			$this->templateManager->setUserId($userId);
+			return $this->templateManager->getUserTemplateDir()->getEtag();
+		} catch (\Exception $e) {
+			return '';
+		}
+	}
+
 	public const SUPPORTED_PRESENTATION_MIMES = [
 		'application/vnd.oasis.opendocument.presentation',
 		'application/vnd.oasis.opendocument.presentation-template',

lib/TemplateManager.php

@@ -316,7 +316,7 @@ public function add($templateName, $templateFile) {
 			$template = $folder->newFile($templateName);
 		}
 		$template->putContent($templateFile);
-
+		$folder->getStorage()->getCache()->update($folder->getId(), [ 'etag' => uniqid() ]);
 		return $this->formatNodeReturn($this->get($template->getId()));
 	}
 
@@ -327,11 +327,13 @@ public function add($templateName, $templateFile) {
 	 * @return boolean
 	 * @throws NotFoundException
 	 */
-	public function delete($fileId) {
-		$files = $this->getSystemTemplateDir()->getDirectoryListing();
+	public function delete($fileId): bool {
+		$folder = $this->getSystemTemplateDir();
+		$files = $folder->getDirectoryListing();
 		foreach ($files as $file) {
 			if ($file->getId() === $fileId) {
 				$file->delete();
+				$folder->getStorage()->getCache()->update($folder->getId(), [ 'etag' => uniqid() ]);
 				return true;
 			}
 		}
@@ -389,7 +391,7 @@ public function getUserTemplateDir() {
 	/**
 	 * @return Folder
 	 */
-	private function getSystemTemplateDir() {
+	public function getSystemTemplateDir() {
 		$this->ensureAppDataFolders();
 		$path = 'appdata_' . $this->config->getSystemValue('instanceid', null) . '/richdocuments/templates';
 		return $this->rootFolder->get($path);