mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-07-19 20:14:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

add query params to the log (#7493) (#7399)

Browse Source 
Co-authored-by: Sawjan Gurung <saw.jan.grg3e@gmail.com>
This commit is contained in:
nirajacharya2
2023-10-31 12:17:50 +05:45
committed by GitHub
parent cc1f93eef1
commit cbfd894243
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/TestHelpers/GraphHelper.php
View File

@@ -172,6 +172,7 @@ class GraphHelper {
* @param string $adminUser
* @param string $adminPassword
* @param string $userId
* @param string $method
* @param string|null $userName
* @param string|null $password
* @param string|null $email
@@ -187,6 +188,7 @@ class GraphHelper {
string $adminUser,
string $adminPassword,
string $userId,
?string $method = "PATCH",
?string $userName = null,
?string $password = null,
?string $email = null,
@@ -204,7 +206,7 @@ class GraphHelper {
return HttpRequestHelper::sendRequest(
$url,
$xRequestId,
"PATCH",
$method,
$adminUser,
$adminPassword,
self::getRequestHeaders(),

6
tests/acceptance/features/bootstrap/FeatureContext.php
View File

@@ -1444,13 +1444,13 @@ class FeatureContext extends BehatVariablesContext {
* @Then the JSON data of the response should match
*
* @param PyStringNode $schemaString
* @param ResponseInterface|null $response
*
* @return void
*
* @throws Exception
*/
public function theDataOfTheResponseShouldMatch(PyStringNode $schemaString): void {
$responseBody = $this->getJsonDecodedResponseBodyContent();
public function theDataOfTheResponseShouldMatch(PyStringNode $schemaString, ResponseInterface $response=null): void {
$responseBody = $this->getJsonDecodedResponseBodyContent($response);
$this->assertJsonDocumentMatchesSchema(
$responseBody,
$this->getJSONSchema($schemaString)

29
tests/acceptance/features/bootstrap/GraphContext.php
View File

@@ -205,8 +205,8 @@ class GraphContext implements Context {
* @throws JsonException
*/
public function theUserInformationShouldMatchTheJSON(string $user, PyStringNode $schemaString): void {
$this->adminHasRetrievedUserUsingTheGraphApi($user);
$this->featureContext->theDataOfTheResponseShouldMatch($schemaString);
$response = $this->adminHasRetrievedUserUsingTheGraphApi($user);
$this->featureContext->theDataOfTheResponseShouldMatch($schemaString, $response);
}
/**
@@ -219,11 +219,12 @@ class GraphContext implements Context {
* @param string|null $email
* @param string|null $displayName
* @param bool|true $accountEnabled
* @param string $method
*
* @return void
* @throws GuzzleException
*/
public function editUserUsingTheGraphApi(string $byUser, string $user, string $userName = null, string $password = null, string $email = null, string $displayName = null, bool $accountEnabled = true): ResponseInterface {
public function editUserUsingTheGraphApi(string $byUser, string $user, string $userName = null, string $password = null, string $email = null, string $displayName = null, bool $accountEnabled = true, string $method="PATCH"): ResponseInterface {
$user = $this->featureContext->getActualUsername($user);
$userId = $this->featureContext->getAttributeOfCreatedUser($user, 'id');
$userId = $userId ?? $user;
@@ -233,6 +234,7 @@ class GraphContext implements Context {
$byUser,
$this->featureContext->getPasswordForUser($byUser),
$userId,
$method,
$userName,
$password,
$email,
@@ -244,23 +246,21 @@ class GraphContext implements Context {
/**
* @param string $user
*
* @return void
* @return ResponseInterface
* @throws JsonException
* @throws GuzzleException
*/
public function adminHasRetrievedUserUsingTheGraphApi(string $user): void {
public function adminHasRetrievedUserUsingTheGraphApi(string $user): ResponseInterface {
$user = $this->featureContext->getActualUsername($user);
$userId = $this->featureContext->getAttributeOfCreatedUser($user, "id");
$userId = $userId ?: $user;
$result = GraphHelper::getUser(
return GraphHelper::getUser(
$this->featureContext->getBaseUrl(),
$this->featureContext->getStepLineRef(),
$this->featureContext->getAdminUsername(),
$this->featureContext->getAdminPassword(),
$userId
);
$this->featureContext->setResponse($result);
$this->featureContext->thenTheHTTPStatusCodeShouldBe(200);
}
/**
@@ -523,21 +523,21 @@ class GraphContext implements Context {
string $user,
string $password,
?string $byUser = null
): void {
): ResponseInterface {
$credentials = $this->getAdminOrUserCredentials($byUser);
$user = $this->featureContext->getActualUsername($user);
$userId = $this->featureContext->getAttributeOfCreatedUser($user, "id");
$userId = $userId ?? $user;
$response = GraphHelper::editUser(
return GraphHelper::editUser(
$this->featureContext->getBaseUrl(),
$this->featureContext->getStepLineRef(),
$credentials["username"],
$credentials["password"],
$userId,
null,
"PATCH",
$user,
$password
);
$this->featureContext->setResponse($response);
}
/**
@@ -551,7 +551,8 @@ class GraphContext implements Context {
* @throws Exception
*/
public function theUserResetsThePasswordOfUserToUsingTheGraphApi(string $byUser, string $user, string $password) {
$this->adminChangesPasswordOfUserToUsingTheGraphApi($user, $password, $byUser);
$response = $this->adminChangesPasswordOfUserToUsingTheGraphApi($user, $password, $byUser);
$this->featureContext->setResponse($response);
}
/**
@@ -1415,7 +1416,7 @@ class GraphContext implements Context {
* @param array $userIds
* @param string $groupId
*
* @return void
* @return ResponseInterface
* @throws GuzzleException
* @throws Exception
*/

4
tests/acceptance/features/bootstrap/Provisioning.php
View File

@@ -870,8 +870,8 @@ trait Provisioning {
if (!$this->isTestingWithLdap()) {
// for graph api, we need to save the user id to be able to add it in some group
// can be fetched with the "onPremisesSamAccountName" i.e. userid
$this->graphContext->adminHasRetrievedUserUsingTheGraphApi($userAttributes['userid']);
$userAttributes['id'] = $this->getJsonDecodedResponse()['id'];
$response = $this->graphContext->adminHasRetrievedUserUsingTheGraphApi($userAttributes['userid']);
$userAttributes['id'] = $this->getJsonDecodedResponse($response)['id'];
} else {
$userAttributes['id'] = null;
}