Kh/dev/import v31 into v32

.gitmodules

@@ -40,3 +40,6 @@
 [submodule "IONOS"]
 	path = IONOS
 	url = git@github.com:IONOS-Productivity/nc-config.git
+[submodule "apps-external/notify_push"]
+	path = apps-external/notify_push
+	url = git@github.com:nextcloud/notify_push.git

__tests__/FixJSDOMEnvironment.ts

@@ -0,0 +1,18 @@
+/**
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+import JSDOMEnvironment from 'jest-environment-jsdom'
+
+// https://github.com/facebook/jest/blob/v29.4.3/website/versioned_docs/version-29.4/Configuration.md#testenvironment-string
+export default class FixJSDOMEnvironment extends JSDOMEnvironment {
+
+	constructor(...args: ConstructorParameters<typeof JSDOMEnvironment>) {
+		super(...args)
+
+		// https://github.com/jsdom/jsdom/issues/3363
+		// 31 ad above switched to vitest and don't have that issue
+		this.global.structuredClone = structuredClone
+	}
+
+}

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -396,7 +396,7 @@ public function getCalendarsForUser($principalUri) {
 			$subSelect->select('resourceid')
 				->from('dav_shares', 'd')
 				->where($subSelect->expr()->eq('d.access', $select->createNamedParameter(Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT))
-				->andWhere($subSelect->expr()->in('d.principaluri', $select->createNamedParameter($principals, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY));
+				->andWhere($subSelect->expr()->eq('d.principaluri', $select->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR), IQueryBuilder::PARAM_STR));
 
 			$select->select($fields)
 				->from('dav_shares', 's')
@@ -1543,6 +1543,7 @@ public function moveCalendarObject(string $sourcePrincipalUri, int $sourceObject
 				$targetShares = $this->getShares($targetCalendarId);
 				$sourceCalendarRow = $this->getCalendarById($sourceCalendarId);
 				$this->dispatcher->dispatchTyped(new CalendarObjectMovedEvent($sourceCalendarId, $sourceCalendarRow, $targetCalendarId, $targetCalendarRow, $sourceShares, $targetShares, $object));
+				$this->dispatcher->dispatchTyped(new LegacyCalendarObjectMovedEvent($sourceCalendarId, $sourceCalendarRow, $targetCalendarId, $targetCalendarRow, $sourceShares, $targetShares, $object));
 			}
 			return true;
 		}, $this->db);
@@ -1582,6 +1583,7 @@ public function deleteCalendarObject($calendarId, $objectUri, $calendarType = se
 					$shares = $this->getShares($calendarId);
 
 					$this->dispatcher->dispatchTyped(new CalendarObjectDeletedEvent($calendarId, $calendarRow, $shares, $data));
+					$this->dispatcher->dispatchTyped(new LegacyCalendarObjectDeletedEvent($calendarId, $calendarRow, $shares, $data));
 				} else {
 					$subscriptionRow = $this->getSubscriptionById($calendarId);
 
@@ -1631,6 +1633,14 @@ public function deleteCalendarObject($calendarId, $objectUri, $calendarType = se
 							$data
 						)
 					);
+					$this->dispatcher->dispatchTyped(
+						new LegacyCalendarObjectMovedToTrashEvent(
+							$calendarId,
+							$calendarData,
+							$this->getShares($calendarId),
+							$data
+						)
+					);
 				}
 			}
 
@@ -1690,6 +1700,14 @@ public function restoreCalendarObject(array $objectData): void {
 					$row
 				)
 			);
+			$this->dispatcher->dispatchTyped(
+				new LegacyCalendarObjectRestoredEvent(
+					(int)$objectData['calendarid'],
+					$calendarRow,
+					$this->getShares((int)$row['calendarid']),
+					$row
+				)
+			);
 		}, $this->db);
 	}
 

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -138,7 +138,7 @@ public function getAddressBooksForUser($principalUri) {
 			$subSelect->select('id')
 				->from('dav_shares', 'd')
 				->where($subSelect->expr()->eq('d.access', $select->createNamedParameter(\OCA\DAV\CardDAV\Sharing\Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT))
-				->andWhere($subSelect->expr()->in('d.principaluri', $select->createNamedParameter($principals, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY));
+				->andWhere($subSelect->expr()->eq('d.principaluri', $select->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR), IQueryBuilder::PARAM_STR));
 
 
 			$select->select(['a.id', 'a.uri', 'a.displayname', 'a.principaluri', 'a.description', 'a.synctoken', 's.access'])

apps/dav/lib/Connector/Sabre/PublicAuth.php

@@ -92,6 +92,15 @@ public function check(RequestInterface $request, ResponseInterface $response): a
 				),
 			);
 			throw $e;
+		} catch (PreconditionFailed $e) {
+			$response->setHeader(
+				'Location',
+				$this->urlGenerator->linkToRoute(
+					'files_sharing.share.showShare',
+					[ 'token' => $this->getToken() ],
+				),
+			);
+			throw $e;
 		} catch (\Exception $e) {
 			$class = get_class($e);
 			$msg = $e->getMessage();

apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php

@@ -30,6 +30,8 @@ class BearerAuthTest extends TestCase {
 
 	private IConfig&MockObject $config;
 
+	private IConfig&MockObject $config;
+
 	protected function setUp(): void {
 		parent::setUp();
 

apps/files/openapi.json

@@ -1496,6 +1496,80 @@
                 }
             }
         },
+        "/ocs/v2.php/apps/files/api/v1/templates/fields/{fileId}": {
+            "get": {
+                "operationId": "template-list-template-fields",
+                "summary": "List the fields for the template specified by the given file ID",
+                "tags": [
+                    "template"
+                ],
+                "security": [
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "parameters": [
+                    {
+                        "name": "fileId",
+                        "in": "path",
+                        "description": "File ID of the template",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Fields returned",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "additionalProperties": {
+                                                        "$ref": "#/components/schemas/TemplateField"
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "/ocs/v2.php/apps/files/api/v1/templates/create": {
             "post": {
                 "operationId": "template-create",

apps/files/src/views/DialogConfirmFileExtension.cy.ts

@@ -0,0 +1,161 @@
+/*!
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+import { createTestingPinia } from '@pinia/testing'
+import DialogConfirmFileExtension from './DialogConfirmFileExtension.vue'
+import { useUserConfigStore } from '../store/userconfig'
+
+describe('DialogConfirmFileExtension', () => {
+	it('renders with both extensions', () => {
+		cy.mount(DialogConfirmFileExtension, {
+			propsData: {
+				oldExtension: '.old',
+				newExtension: '.new',
+			},
+			global: {
+				plugins: [createTestingPinia({
+					createSpy: cy.spy,
+				})],
+			},
+		})
+
+		cy.findByRole('dialog')
+			.as('dialog')
+			.should('be.visible')
+		cy.get('@dialog')
+			.findByRole('heading')
+			.should('contain.text', 'Change file extension')
+		cy.get('@dialog')
+			.findByRole('checkbox', { name: /Do not show this dialog again/i })
+			.should('exist')
+			.and('not.be.checked')
+		cy.get('@dialog')
+			.findByRole('button', { name: 'Keep .old' })
+			.should('be.visible')
+		cy.get('@dialog')
+			.findByRole('button', { name: 'Use .new' })
+			.should('be.visible')
+	})
+
+	it('renders without old extension', () => {
+		cy.mount(DialogConfirmFileExtension, {
+			propsData: {
+				newExtension: '.new',
+			},
+			global: {
+				plugins: [createTestingPinia({
+					createSpy: cy.spy,
+				})],
+			},
+		})
+
+		cy.findByRole('dialog')
+			.as('dialog')
+			.should('be.visible')
+		cy.get('@dialog')
+			.findByRole('button', { name: 'Keep without extension' })
+			.should('be.visible')
+		cy.get('@dialog')
+			.findByRole('button', { name: 'Use .new' })
+			.should('be.visible')
+	})
+
+	it('renders without new extension', () => {
+		cy.mount(DialogConfirmFileExtension, {
+			propsData: {
+				oldExtension: '.old',
+			},
+			global: {
+				plugins: [createTestingPinia({
+					createSpy: cy.spy,
+				})],
+			},
+		})
+
+		cy.findByRole('dialog')
+			.as('dialog')
+			.should('be.visible')
+		cy.get('@dialog')
+			.findByRole('button', { name: 'Keep .old' })
+			.should('be.visible')
+		cy.get('@dialog')
+			.findByRole('button', { name: 'Remove extension' })
+			.should('be.visible')
+	})
+
+	it('emits correct value on keep old', () => {
+		cy.mount(DialogConfirmFileExtension, {
+			propsData: {
+				oldExtension: '.old',
+				newExtension: '.new',
+			},
+			global: {
+				plugins: [createTestingPinia({
+					createSpy: cy.spy,
+				})],
+			},
+		}).as('component')
+
+		cy.findByRole('dialog')
+			.as('dialog')
+			.should('be.visible')
+		cy.get('@dialog')
+			.findByRole('button', { name: 'Keep .old' })
+			.click()
+		cy.get('@component')
+			.its('wrapper')
+			.should((wrapper) => expect(wrapper.emitted('close')).to.eql([[false]]))
+	})
+
+	it('emits correct value on use new', () => {
+		cy.mount(DialogConfirmFileExtension, {
+			propsData: {
+				oldExtension: '.old',
+				newExtension: '.new',
+			},
+			global: {
+				plugins: [createTestingPinia({
+					createSpy: cy.spy,
+				})],
+			},
+		}).as('component')
+
+		cy.findByRole('dialog')
+			.as('dialog')
+			.should('be.visible')
+		cy.get('@dialog')
+			.findByRole('button', { name: 'Use .new' })
+			.click()
+		cy.get('@component')
+			.its('wrapper')
+			.should((wrapper) => expect(wrapper.emitted('close')).to.eql([[true]]))
+	})
+
+	it('updates user config when checking the checkbox', () => {
+		const pinia = createTestingPinia({
+			createSpy: cy.spy,
+		})
+
+		cy.mount(DialogConfirmFileExtension, {
+			propsData: {
+				oldExtension: '.old',
+				newExtension: '.new',
+			},
+			global: {
+				plugins: [pinia],
+			},
+		}).as('component')
+
+		cy.findByRole('dialog')
+			.as('dialog')
+			.should('be.visible')
+		cy.get('@dialog')
+			.findByRole('checkbox', { name: /Do not show this dialog again/i })
+			.check({ force: true })
+
+		cy.wrap(useUserConfigStore())
+			.its('update')
+			.should('have.been.calledWith', 'show_dialog_file_extension', false)
+	})
+})