fix(settings): Fix config handling

Signed-off-by: provokateurin <kate@provokateurin.de>
nextcloud · Sep 27, 2024 · 41cb91b · 41cb91b
1 parent ba9e1e4
commit 41cb91b
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 7 deletions.
diff --git a/lib/Controller/FolderController.php b/lib/Controller/FolderController.php
@@ -27,6 +27,7 @@
 use OCA\GroupFolders\Service\DelegationService;
 use OCA\GroupFolders\Service\FoldersFilter;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\Files\IRootFolder;
@@ -160,6 +161,7 @@ private function getRootFolderStorageId(): ?int {
 	 * @RequireGroupFolderAdmin
 	 * @NoAdminRequired
 	 */
+	#[PasswordConfirmationRequired]
 	public function addFolder(string $mountpoint): DataResponse {
 		$id = $this->manager->createFolder(trim($mountpoint));
 		return new DataResponse(['id' => $id]);
@@ -169,6 +171,7 @@ public function addFolder(string $mountpoint): DataResponse {
 	 * @NoAdminRequired
 	 * @RequireGroupFolderAdmin
 	 */
+	#[PasswordConfirmationRequired]
 	public function removeFolder(int $id): DataResponse {
 		$response = $this->checkFolderExists($id);
 		if ($response) {
@@ -184,6 +187,7 @@ public function removeFolder(int $id): DataResponse {
 	 * @NoAdminRequired
 	 * @RequireGroupFolderAdmin
 	 */
+	#[PasswordConfirmationRequired]
 	public function setMountPoint(int $id, string $mountPoint): DataResponse {
 		$this->manager->renameFolder($id, trim($mountPoint));
 		return new DataResponse(['success' => true]);
@@ -193,6 +197,7 @@ public function setMountPoint(int $id, string $mountPoint): DataResponse {
 	 * @NoAdminRequired
 	 * @RequireGroupFolderAdmin
 	 */
+	#[PasswordConfirmationRequired]
 	public function addGroup(int $id, string $group): DataResponse {
 		$response = $this->checkFolderExists($id);
 		if ($response) {
@@ -206,6 +211,7 @@ public function addGroup(int $id, string $group): DataResponse {
 	 * @NoAdminRequired
 	 * @RequireGroupFolderAdmin
 	 */
+	#[PasswordConfirmationRequired]
 	public function removeGroup(int $id, string $group): DataResponse {
 		$response = $this->checkFolderExists($id);
 		if ($response) {
@@ -219,6 +225,7 @@ public function removeGroup(int $id, string $group): DataResponse {
 	 * @NoAdminRequired
 	 * @RequireGroupFolderAdmin
 	 */
+	#[PasswordConfirmationRequired]
 	public function setPermissions(int $id, string $group, int $permissions): DataResponse {
 		$response = $this->checkFolderExists($id);
 		if ($response) {
@@ -233,6 +240,7 @@ public function setPermissions(int $id, string $group, int $permissions): DataRe
 	 * @RequireGroupFolderAdmin
 	 * @throws \OCP\DB\Exception
 	 */
+	#[PasswordConfirmationRequired]
 	public function setManageACL(int $id, string $mappingType, string $mappingId, bool $manageAcl): DataResponse {
 		$response = $this->checkFolderExists($id);
 		if ($response) {
@@ -246,6 +254,7 @@ public function setManageACL(int $id, string $mappingType, string $mappingId, bo
 	 * @NoAdminRequired
 	 * @RequireGroupFolderAdmin
 	 */
+	#[PasswordConfirmationRequired]
 	public function setQuota(int $id, int $quota): DataResponse {
 		$response = $this->checkFolderExists($id);
 		if ($response) {
@@ -259,6 +268,7 @@ public function setQuota(int $id, int $quota): DataResponse {
 	 * @NoAdminRequired
 	 * @RequireGroupFolderAdmin
 	 */
+	#[PasswordConfirmationRequired]
 	public function setACL(int $id, bool $acl): DataResponse {
 		$response = $this->checkFolderExists($id);
 		if ($response) {
@@ -272,6 +282,7 @@ public function setACL(int $id, bool $acl): DataResponse {
 	 * @NoAdminRequired
 	 * @RequireGroupFolderAdmin
 	 */
+	#[PasswordConfirmationRequired]
 	public function renameFolder(int $id, string $mountpoint): DataResponse {
 		$response = $this->checkFolderExists($id);
 		if ($response) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "@nextcloud/files": "^3.1.0",
     "@nextcloud/initial-state": "^2.1.0",
     "@nextcloud/l10n": "^2.2.0",
+    "@nextcloud/password-confirmation": "^5.1.1",
     "@nextcloud/router": "^2.2.0",
     "@nextcloud/vue": "^8.4.0",
     "nextcloud-server": "^0.15.10",

diff --git a/src/settings/Api.ts b/src/settings/Api.ts
@@ -1,5 +1,6 @@
 import { generateUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
+import { confirmPassword } from '@nextcloud/password-confirmation'
 // eslint-disable-next-line n/no-unpublished-import
 import type { OCSResponse } from '@nextcloud/typings/lib/ocs'
 
@@ -70,34 +71,48 @@ export class Api {
 
 	// Updates the list of groups that have been granted delegated admin or subadmin rights on groupfolders
 	async updateDelegatedGroups(newGroups: Group[], classname: string): Promise<void> {
+		await confirmPassword()
+
 		await axios.post(generateUrl('/apps/settings/') + '/settings/authorizedgroups/saveSettings', {
 			newGroups,
 			class: classname,
 		})
 	}
 
 	async createFolder(mountPoint: string): Promise<number> {
+		await confirmPassword()
+
 		const response = await axios.post<OCSResponse<number>>(this.getUrl('folders'), { mountpoint: mountPoint })
 		return response.data.ocs.data
 	}
 
 	async deleteFolder(id: number): Promise<void> {
+		await confirmPassword()
+
 		await axios.delete(this.getUrl(`folders/${id}`))
 	}
 
 	async addGroup(folderId: number, group: string): Promise<void> {
+		await confirmPassword()
+
 		await axios.post(this.getUrl(`folders/${folderId}/groups`), { group })
 	}
 
 	async removeGroup(folderId: number, group: string): Promise<void> {
+		await confirmPassword()
+
 		await axios.delete(this.getUrl(`folders/${folderId}/groups/${group}`))
 	}
 
 	async setPermissions(folderId: number, group: string, permissions: number): Promise<void> {
+		await confirmPassword()
+
 		await axios.post(this.getUrl(`folders/${folderId}/groups/${group}`), { permissions })
 	}
 
 	async setManageACL(folderId: number, type: string, id: string, manageACL: boolean): Promise<void> {
+		await confirmPassword()
+
 		await axios.post(this.getUrl(`folders/${folderId}/manageACL`), {
 			mappingType: type,
 			mappingId: id,
@@ -106,14 +121,20 @@ export class Api {
 	}
 
 	async setQuota(folderId: number, quota: number): Promise<void> {
+		await confirmPassword()
+
 		await axios.post(this.getUrl(`folders/${folderId}/quota`), { quota })
 	}
 
 	async setACL(folderId: number, acl: boolean): Promise<void> {
+		await confirmPassword()
+
 		await axios.post(this.getUrl(`folders/${folderId}/acl`), { acl: acl ? 1 : 0 })
 	}
 
 	async renameFolder(folderId: number, mountpoint: string): Promise<void> {
+		await confirmPassword()
+
 		await axios.post(this.getUrl(`folders/${folderId}/mountpoint`), { mountpoint })
 	}