test: store setting id per user

Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com>

Author: saw-jan

tests/acceptance/TestHelpers/GraphHelper.php

@@ -2009,7 +2009,6 @@ public static function hideOrUnhideShare(
 	 * @param string $user
 	 * @param string $password
 	 * @param string $itemId
-	 * @param string $shareSpaceId
 	 *
 	 * @return ResponseInterface
 	 * @throws GuzzleException
@@ -2019,14 +2018,13 @@ public static function enableShareSync(
 		string $user,
 		string $password,
 		string $itemId,
-		string $shareSpaceId,
 	): ResponseInterface {
 		$body = [
 			"remoteItem" => [
 				"id" => $itemId,
 			],
 		];
-		$url = self::getBetaFullUrl($baseUrl, "drives/$shareSpaceId/root/children");
+		$url = self::getBetaFullUrl($baseUrl, "drives/" . GraphHelper::SHARES_SPACE_ID . "/root/children");
 		return HttpRequestHelper::post(
 			$url,
 			$user,

tests/acceptance/bootstrap/SettingsContext.php

@@ -26,8 +26,7 @@
  */
 class SettingsContext implements Context {
 	private FeatureContext $featureContext;
-	private string $settingsUrl = '/api/v0/settings/';
-	private string $autoAcceptSharesSettingId = '';
+	private array $autoAcceptSharesSettingIds = [];
 
 	/**
 	 * This will run before EVERY scenario.
@@ -46,6 +45,29 @@ public function before(BeforeScenarioScope $scope): void {
 		$this->featureContext = BehatHelper::getContext($scope, $environment, 'FeatureContext');
 	}
 
+	/**
+	 * @param string $user
+	 *
+	 * @return string
+	 */
+	public function getAutoAcceptShareSettingId(string $user): string {
+		if (!empty($this->autoAcceptSharesSettingIds) && \array_key_exists($user, $this->autoAcceptSharesSettingIds)) {
+			return $this->autoAcceptSharesSettingIds[$user];
+
+		}
+		return '';
+	}
+
+	/**
+	 * @param string $user
+	 * @param string $id
+	 *
+	 * @return void
+	 */
+	public function setAutoAcceptShareSettingId(string $user, string $id): void {
+		$this->autoAcceptSharesSettingIds[$user] = $id;
+	}
+
 	/**
 	 * @param string $user
 	 *
@@ -499,9 +521,10 @@ public function toggleAutoAcceptSharesSetting(string $user, bool $status): Respo
 				"boolValue" => $status,
 			],
 		];
-		if ($this->autoAcceptSharesSettingId) {
+		$autoAcceptSharesSettingId = $this->getAutoAcceptShareSettingId($user);
+		if ($autoAcceptSharesSettingId) {
 			// use existing id if available
-			$body["value"]["id"] = $this->autoAcceptSharesSettingId;
+			$body["value"]["id"] = $autoAcceptSharesSettingId;
 		}
 		$body = json_encode($body, JSON_THROW_ON_ERROR);
 
@@ -511,11 +534,11 @@ public function toggleAutoAcceptSharesSetting(string $user, bool $status): Respo
 			$this->featureContext->getPasswordForUser($user),
 			$body,
 		);
-		if (empty($this->autoAcceptSharesSettingId) && $response->getStatusCode() === 201) {
+		if (!$autoAcceptSharesSettingId && $response->getStatusCode() === 201) {
 			// save id for future use
 			// updating the setting without id will create a new setting entry
 			$data = $this->featureContext->getJsonDecodedResponseBodyContent($response);
-			$this->autoAcceptSharesSettingId = $data->value->value->id;
+			$this->setAutoAcceptShareSettingId($user, $data->value->value->id);
 		}
 		$response->getBody()->rewind();
 		return $response;

tests/acceptance/bootstrap/SharingNgContext.php

@@ -1512,13 +1512,11 @@ public function userEnablesSyncOfShareUsingTheGraphApi(
 	): void {
 		$share = ltrim($share, '/');
 		$itemId = $this->spacesContext->getResourceId($offeredBy, $space, $share);
-		$shareSpaceId = GraphHelper::SHARES_SPACE_ID;
 		$response = GraphHelper::enableShareSync(
 			$this->featureContext->getBaseUrl(),
 			$this->featureContext->getActualUsername($user),
 			$this->featureContext->getPasswordForUser($user),
 			$itemId,
-			$shareSpaceId,
 		);
 		$this->featureContext->setResponse($response);
 	}
@@ -1542,7 +1540,6 @@ public function userEnablesSyncOfFederatedShareUsingTheGraphApi(
 			$this->featureContext->getActualUsername($user),
 			$this->featureContext->getPasswordForUser($user),
 			$remoteItemId,
-			GraphHelper::SHARES_SPACE_ID,
 		);
 		$this->featureContext->setResponse($response);
 	}
@@ -1560,15 +1557,13 @@ public function userEnablesSyncOfFederatedShareUsingTheGraphApi(
 	 * @throws Exception|GuzzleException
 	 */
 	public function userTriesToEnableShareSyncOfResourceUsingTheGraphApi(string $user, string $resource): void {
-		$shareSpaceId = GraphHelper::SHARES_SPACE_ID;
 		$itemId = ($resource === 'nonexistent') ? WebDavHelper::generateUUIDv4() : $resource;
 
 		$response = GraphHelper::enableShareSync(
 			$this->featureContext->getBaseUrl(),
 			$this->featureContext->getActualUsername($user),
 			$this->featureContext->getPasswordForUser($user),
 			$itemId,
-			$shareSpaceId,
 		);
 		$this->featureContext->setResponse($response);
 	}