test(e2e): restore request access cleanup

Signed-off-by: Vitor Mattos <[email protected]>

Author: vitormattos

playwright/e2e/multi-signer-sequential.spec.ts

@@ -18,12 +18,6 @@ const FOOTER_DISABLED_VALUE = JSON.stringify({
 	validationSite: '',
 	customizeFooterTemplate: false,
 })
-const FOOTER_ENABLED_VALUE = JSON.stringify({
-	enabled: true,
-	writeQrcodeOnFooter: true,
-	validationSite: '',
-	customizeFooterTemplate: false,
-})
 
 type OriginalConfigSnapshot = {
 	identifyMethods: string | null
@@ -92,20 +86,6 @@ async function addEmailSigner(
 	await page.getByRole('button', { name: 'Save' }).click()
 }
 
-
-async function restoreAppConfig(
-	requestContext: APIRequestContext,
-	key: string,
-	value: string | null,
-): Promise<void> {
-	if (value === null) {
-		await deleteAppConfig(requestContext, 'libresign', key)
-		return
-	}
-
-	await setAppConfig(requestContext, 'libresign', key, value)
-}
-
 test('request signatures from two signers in sequential order', async ({ page, adminContext }) => {
 	await test.step('configure signing environment', async () => {
 		await login(
@@ -151,10 +131,11 @@ test('request signatures from two signers in sequential order', async ({ page, a
 	await addEmailSigner(page, '[email protected]', 'Signer 02')
 
 	// Enable sequential signing.
-	// The checkbox input is hidden by CSS; click the visible label text to toggle it.
-	await expect(page.getByLabel('Sign in order')).toBeVisible()
-	await page.getByLabel('Sign in order').check()
-	await expect(page.getByLabel('Sign in order')).toBeChecked()
+	// The hidden checkbox can be covered by the styled label in CI, so force the state change.
+	const signInOrderSwitch = page.getByLabel('Sign in order')
+	await expect(signInOrderSwitch).toBeVisible()
+	await signInOrderSwitch.check({ force: true })
+	await expect(signInOrderSwitch).toBeChecked()
 
 	// Send the signature request
 	await page.getByRole('button', { name: 'Request signatures' }).click()
@@ -229,3 +210,16 @@ test('request signatures from two signers in sequential order', async ({ page, a
 	await expect(page.getByText('Signer 02')).toBeVisible()
 	await expect(page.getByText('Not signed yet')).not.toBeVisible()
 })
+
+async function restoreAppConfig(
+	requestContext: APIRequestContext,
+	key: string,
+	value: string | null,
+): Promise<void> {
+	if (value === null) {
+		await deleteAppConfig(requestContext, 'libresign', key)
+		return
+	}
+
+	await setAppConfig(requestContext, 'libresign', key, value)
+}

playwright/e2e/policy-preferences-migrated-settings.spec.ts

@@ -22,6 +22,12 @@ import {
 	setSystemPolicyEntry,
 } from '../support/policy-api'
 
+type SystemPolicySnapshot = {
+	exists: boolean
+	value: unknown
+	allowChildOverride: boolean
+}
+
 const adminUser = 'admin'
 const adminPass = process.env.ADMIN_PASSWORD || 'admin'
 
@@ -33,6 +39,11 @@ test.describe('Policy preferences: migrated settings', () => {
 
 		const adminCtx = await createAuthenticatedRequestContext(adminUser, adminPass)
 		let endUserCtx: APIRequestContext | null = null
+		const originalGroupsRequestSign = await getSystemPolicySnapshot(adminCtx, 'groups_request_sign')
+		const originalCollectMetadata = await getSystemPolicySnapshot(adminCtx, 'collect_metadata')
+		const originalIdentificationDocuments = await getSystemPolicySnapshot(adminCtx, 'identification_documents')
+		const originalDocmdp = await getSystemPolicySnapshot(adminCtx, 'docmdp')
+		const originalSignatureText = await getSystemPolicySnapshot(adminCtx, 'signature_text')
 		const signatureTextSystemValue = JSON.stringify({
 			template: 'System template',
 			template_font_size: 9,
@@ -119,6 +130,12 @@ test.describe('Policy preferences: migrated settings', () => {
 				await endUserCtx.dispose()
 			}
 
+			await restoreSystemPolicySnapshot(adminCtx, 'groups_request_sign', originalGroupsRequestSign)
+			await restoreSystemPolicySnapshot(adminCtx, 'collect_metadata', originalCollectMetadata)
+			await restoreSystemPolicySnapshot(adminCtx, 'identification_documents', originalIdentificationDocuments)
+			await restoreSystemPolicySnapshot(adminCtx, 'docmdp', originalDocmdp)
+			await restoreSystemPolicySnapshot(adminCtx, 'signature_text', originalSignatureText)
+
 			await policyRequest(adminCtx, 'DELETE', `/cloud/users/${endUser}`)
 			await policyRequest(adminCtx, 'DELETE', `/cloud/groups/${groupId}`)
 			await adminCtx.dispose()
@@ -134,6 +151,45 @@ async function sectionByTitle(page: Page, title: string): Promise<Locator> {
 	return section
 }
 
+async function getSystemPolicySnapshot(
+	ctx: APIRequestContext,
+	policyKey: string,
+): Promise<SystemPolicySnapshot> {
+	const response = await policyRequest(ctx, 'GET', `/apps/libresign/api/v1/policies/system/${policyKey}`)
+	if (response.httpStatus === 404) {
+		return {
+			exists: false,
+			value: null,
+			allowChildOverride: true,
+		}
+	}
+
+	expect(response.httpStatus, `getSystemPolicySnapshot(${policyKey}): expected 200 or 404 but got ${response.httpStatus}`).toBe(200)
+
+	return {
+		exists: true,
+		value: response.data.value ?? null,
+		allowChildOverride: response.data.allowChildOverride === true,
+	}
+}
+
+async function restoreSystemPolicySnapshot(
+	ctx: APIRequestContext,
+	policyKey: string,
+	snapshot: SystemPolicySnapshot,
+): Promise<void> {
+	if (!snapshot.exists) {
+		await setSystemPolicyEntry(ctx, policyKey, null, true)
+		return
+	}
+
+	const response = await policyRequest(ctx, 'POST', `/apps/libresign/api/v1/policies/system/${policyKey}`, {
+		value: snapshot.value,
+		allowChildOverride: snapshot.allowChildOverride,
+	})
+	expect(response.httpStatus, `restoreSystemPolicySnapshot(${policyKey}): expected 200 but got ${response.httpStatus}`).toBe(200)
+}
+
 async function savePreferenceAsDisabled(page: Page, section: Locator, policyKey: string): Promise<void> {
 	const disabledOption = section.getByText('Disabled', { exact: true }).first()