mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-02 08:49:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove ocs endpoint (#7864)

Browse Source
This commit is contained in:
Nalem7
2023-12-19 14:25:56 +05:45
committed by GitHub
parent 43c64e6a8e
commit 8ce0417d4d
2 changed files with 6 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/features/bootstrap/GraphContext.php
-18
View File
@@ -943,24 +943,6 @@ class GraphContext implements Context {
}
}
/**
* create group with provided data
*
* @param string $group
*
* @return array
* @throws Exception
* @throws GuzzleException
*/
public function adminHasCreatedGroupUsingTheGraphApi(string $group): array {
$result = $this->createGroup($group);
if ($result->getStatusCode() === 201) {
return $this->featureContext->getJsonDecodedResponse($result);
} else {
$this->throwHttpException($result, "Could not create group '$group'.");
}
}
/**
* @param ResponseInterface $response
* @param string $errorMsg
tests/acceptance/features/bootstrap/Provisioning.php
+6 -27
View File
@@ -3123,10 +3123,8 @@ trait Provisioning {
if ($method === null) {
if ($this->isTestingWithLdap()) {
$method = "ldap";
} elseif (OcisHelper::isTestingWithGraphApi()) {
$method = "graph";
} else {
$method = "api";
$method = "graph";
}
}
$group = \trim($group);
@@ -3134,23 +3132,6 @@ trait Provisioning {
$groupCanBeDeleted = false;
$groupId = null;
switch ($method) {
case "api":
$result = UserHelper::createGroup(
$this->getBaseUrl(),
$group,
$this->getAdminUsername(),
$this->getAdminPassword(),
$this->getStepLineRef()
);
if ($result->getStatusCode() === 200) {
$groupCanBeDeleted = true;
} else {
throw new Exception(
"could not create group '$group'. "
. $result->getStatusCode() . " " . $result->getBody()
);
}
break;
case "ldap":
try {
$this->createLdapGroup($group);
@@ -3161,7 +3142,10 @@ trait Provisioning {
}
break;
case "graph":
$newGroup = $this->graphContext->adminHasCreatedGroupUsingTheGraphApi($group);
$newGroup = $this->graphContext->createGroup($group);
if ($newGroup->getStatusCode() === 201) {
$newGroup = $this->getJsonDecodedResponse($newGroup);
}
$groupCanBeDeleted = true;
$groupId = $newGroup["id"];
break;
@@ -3616,13 +3600,8 @@ trait Provisioning {
}
return false;
}
if (OcisHelper::isTestingWithGraphApi()) {
$base = '/graph/v1.0';
} else {
$base = '/ocs/v2.php/cloud';
}
$group = \rawurlencode($group);
$fullUrl = $this->getBaseUrl() . "$base/groups/$group";
$fullUrl = $this->getBaseUrl() . "/graph/v1.0/groups/$group";
$this->response = HttpRequestHelper::get(
$fullUrl,
$this->getStepLineRef(),