Merge pull request #4115 from LibreSign/chore/stable29/bump-dependencies

[stable29] chore: bump depdendencies
LibreSign · Dec 9, 2024 · 2979ea7 · 2979ea7
2 parents 835b1ac + ab4e205
commit 2979ea7
Show file tree

Hide file tree

Showing 15 changed files with 214 additions and 209 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/tests/Api/ApiTestCase.php b/tests/Api/ApiTestCase.php
@@ -38,7 +38,7 @@ class ApiTestCase extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 		$data = json_decode(file_get_contents('openapi-full.json'), true);
-		$data['servers'][] = ['url' => '/ocs/v2.php/ocsapp/apps/libresign/api/v1'];
+		$data['servers'][] = ['url' => '/ocs/v2.php/ocsapp/apps/libresign'];
 		$data = $this->removeBasePath($data);
 		/** @var OpenApiSchema */
 		$schema = \ByJG\ApiTools\Base\Schema::getInstance($data);
@@ -59,7 +59,7 @@ public function setUp(): void {
 	private function removeBasePath(array $data): array {
 		$cleaned = [];
 		foreach ($data['paths'] as $key => $value) {
-			$key = preg_replace('~^' . '/ocs/v2.php/apps/libresign/api/{apiVersion}' . '~', '', $key);
+			$key = preg_replace('~^/ocs/v2.php/apps/libresign~', '', $key);
 			$cleaned[$key] = $value;
 		}
 		$data['paths'] = $cleaned;

diff --git a/tests/Api/Controller/AccountControllerTest.php b/tests/Api/Controller/AccountControllerTest.php
@@ -27,7 +27,7 @@ public function testAccountCreateWithInvalidUuid() {
 				'password' => 'secret',
 				'signPassword' => 'secretToSign'
 			])
-			->withPath('/account/create/1234564789')
+			->withPath('/api/v1/account/create/1234564789')
 			->assertResponseCode(422);
 
 		$response = $this->assertRequest();
@@ -80,7 +80,7 @@ public function testAccountCreateWithSuccess() {
 				'password' => 'secret',
 				'signPassword' => 'secretToSign'
 			])
-			->withPath('/account/create/' . $signers[0]->getUuid());
+			->withPath('/api/v1/account/create/' . $signers[0]->getUuid());
 		$this->markUserExists('[email protected]');
 
 		$this->assertRequest();
@@ -108,7 +108,7 @@ public function testPostProfileFilesWithInvalidData() {
 					]
 				]
 			])
-			->withPath('/account/files')
+			->withPath('/api/v1/account/files')
 			->assertResponseCode(401);
 
 		$this->assertRequest();
@@ -136,7 +136,7 @@ public function testPostAccountAddFilesWithSuccess() {
 					]
 				]
 			])
-			->withPath('/account/files');
+			->withPath('/api/v1/account/files');
 
 		$this->assertRequest();
 	}
@@ -146,7 +146,7 @@ public function testPostAccountAddFilesWithSuccess() {
 	 */
 	public function testMeWithoutAuthenticatedUser() {
 		$this->request
-			->withPath('/account/me')
+			->withPath('/api/v1/account/me')
 			->assertResponseCode(404);
 
 		$this->assertRequest();
@@ -158,7 +158,7 @@ public function testMeWithoutAuthenticatedUser() {
 	public function testMeWithAuthenticatedUser() {
 		$this->createAccount('username', 'password');
 		$this->request
-			->withPath('/account/me')
+			->withPath('/api/v1/account/me')
 			->withRequestHeader([
 				'Authorization' => 'Basic ' . base64_encode('username:password')
 			]);
@@ -177,7 +177,7 @@ public function testApprovalListWithSuccess() {
 		]);
 
 		$this->request
-			->withPath('/account/files/approval/list')
+			->withPath('/api/v1/account/files/approval/list')
 			->withRequestHeader([
 				'Authorization' => 'Basic ' . base64_encode('allowapprove:password')
 			]);

diff --git a/tests/Api/Controller/AdminControllerTest.php b/tests/Api/Controller/AdminControllerTest.php
@@ -21,7 +21,7 @@ public function testLoadCertificate() {
 			->withRequestHeader([
 				'Authorization' => 'Basic ' . base64_encode('admintest:password')
 			])
-			->withPath('/admin/certificate');
+			->withPath('/api/v1/admin/certificate');
 
 		$this->assertRequest();
 	}
@@ -61,7 +61,7 @@ public function testGenerateCertificateWithSuccess() {
 				'Authorization' => 'Basic ' . base64_encode('admintest:password'),
 				'Content-Type' => 'application/json'
 			])
-			->withPath('/admin/certificate/cfssl')
+			->withPath('/api/v1/admin/certificate/cfssl')
 			->withRequestBody($cfsslConfig);
 
 		// Make and test request mach with schema
@@ -99,7 +99,7 @@ public function testGenerateCertificateWithFailure() {
 				'Authorization' => 'Basic ' . base64_encode('admintest:password'),
 				'Content-Type' => 'application/json'
 			])
-			->withPath('/admin/certificate/openssl')
+			->withPath('/api/v1/admin/certificate/openssl')
 			->withRequestBody([
 				'rootCert' => [
 					'commonName' => 'CommonName',

diff --git a/tests/Api/Controller/FileControllerTest.php b/tests/Api/Controller/FileControllerTest.php
@@ -18,7 +18,7 @@ public function testValidateUsignUuidWithInvalidData() {
 		$this->mockAppConfig([]);
 
 		$this->request
-			->withPath('/file/validate/uuid/invalid')
+			->withPath('/api/v1/file/validate/uuid/invalid')
 			->assertResponseCode(404);
 
 		$response = $this->assertRequest();
@@ -31,7 +31,7 @@ public function testValidateUsignUuidWithInvalidData() {
 	 */
 	public function testValidateUsignFileIdWithInvalidData() {
 		$this->request
-			->withPath('/file/validate/file_id/171')
+			->withPath('/api/v1/file/validate/file_id/171')
 			->assertResponseCode(404);
 
 		$response = $this->assertRequest();
@@ -60,7 +60,7 @@ public function testValidateWithSuccessUsingUnloggedUser() {
 		]);
 
 		$this->request
-			->withPath('/file/validate/uuid/' . $file->getUuid());
+			->withPath('/api/v1/file/validate/uuid/' . $file->getUuid());
 
 		$response = $this->assertRequest();
 		$body = json_decode($response->getBody()->getContents(), true);
@@ -102,7 +102,7 @@ public function testValidateWithSuccessUsingSigner() {
 			->withRequestHeader([
 				'Authorization' => 'Basic ' . base64_encode('username:password')
 			])
-			->withPath('/file/validate/uuid/' . $file->getUuid());
+			->withPath('/api/v1/file/validate/uuid/' . $file->getUuid());
 
 		$response = $this->assertRequest();
 		$body = json_decode($response->getBody()->getContents(), true);
@@ -120,7 +120,7 @@ public function testControllerListWithEmptyData() {
 			->withRequestHeader([
 				'Authorization' => 'Basic ' . base64_encode('username:password')
 			])
-			->withPath('/file/list');
+			->withPath('/api/v1/file/list');
 
 		$response = $this->assertRequest();
 		$body = json_decode($response->getBody()->getContents(), true);
@@ -140,7 +140,7 @@ public function testSendNewFile() {
 				'Authorization' => 'Basic ' . base64_encode('allowrequestsign:password'),
 				'Content-Type' => 'application/json',
 			])
-			->withPath('/file')
+			->withPath('/api/v1/file')
 			->withMethod('POST')
 			->withRequestBody([
 				'name' => 'test',

diff --git a/tests/Api/Controller/FileElementControllerTest.php b/tests/Api/Controller/FileElementControllerTest.php
@@ -34,7 +34,7 @@ public function testPostSuccess() {
 
 		$this->mockAppConfig([]);
 		$this->request
-			->withPath('/file-element/' . $file->getUuid())
+			->withPath('/api/v1/file-element/' . $file->getUuid())
 			->withMethod('POST')
 			->withRequestHeader([
 				'Authorization' => 'Basic ' . base64_encode('username:password'),
@@ -68,7 +68,7 @@ public function testPatchSuccess($params) {
 		extract($params);
 		$signers = $this->getSignersFromFileId($file->getId());
 		$this->request
-			->withPath('/file-element/' . $file->getUuid() . '/' . $fileElementId)
+			->withPath('/api/v1/file-element/' . $file->getUuid() . '/' . $fileElementId)
 			->withMethod('PATCH')
 			->withRequestHeader([
 				'Authorization' => 'Basic ' . base64_encode('username:password'),
@@ -102,7 +102,7 @@ public function testDeleteSuccess($params) {
 		$this->createAccount('username', 'password');
 		extract($params);
 		$this->request
-			->withPath('/file-element/' . $file->getUuid() . '/' . $fileElementId)
+			->withPath('/api/v1/file-element/' . $file->getUuid() . '/' . $fileElementId)
 			->withMethod('DELETE')
 			->withRequestHeader([
 				'Authorization' => 'Basic ' . base64_encode('username:password'),

diff --git a/tests/Api/Controller/NotifyControllerTest.php b/tests/Api/Controller/NotifyControllerTest.php
@@ -29,7 +29,7 @@ public function testNotifySignersWithError() {
 					]
 				]
 			])
-			->withPath('/notify/signers')
+			->withPath('/api/v1/notify/signers')
 			->assertResponseCode(401);
 
 		$this->assertRequest();
@@ -70,7 +70,7 @@ public function testNotifySignersWithSuccess() {
 					]
 				]
 			])
-			->withPath('/notify/signers');
+			->withPath('/api/v1/notify/signers');
 
 		$this->assertRequest();
 	}