Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[tests-only] Add API tests to expand addUser tests #38356

Merged
merged 1 commit into from
Jan 28, 2021
Merged

[tests-only] Add API tests to expand addUser tests #38356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions tests/acceptance/features/apiProvisioning-v1/addUser.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,27 @@ Feature: add user
When unauthorized user "Alice" tries to create new user "brand-new-user" with password "%alt1%" using the provisioning API
Then the OCS status code should be "997"
And the HTTP status code should be "401"
And user "brand-new-user" should not exist

Scenario: subadmin should be able to create a new user into their group
Given user "brand-new-user" has been deleted
And user "subadmin" has been created with default attributes and without skeleton files
And group "group101" has been created
And user "subadmin" has been added to group "group101"
And user "subadmin" has been made a subadmin of group "group101"
When the groupadmin "subadmin" sends a user creation request for user "brand-new-user" password "%alt1%" group "group101" using the provisioning API
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And user "brand-new-user" should exist

Scenario: subadmin should not be able to create a new user into other group
Given user "brand-new-user" has been deleted
And user "subadmin" has been created with default attributes and without skeleton files
And group "group101" has been created
And group "group102" has been created
And user "subadmin" has been added to group "group101"
And user "subadmin" has been made a subadmin of group "group101"
When the groupadmin "subadmin" tries to create new user "brand-new-user" password "%alt1%" in other group "group102" using the provisioning API
Then the OCS status code should be "105"
And the HTTP status code should be "200"
And user "brand-new-user" should not exist
23 changes: 23 additions & 0 deletions tests/acceptance/features/apiProvisioning-v2/addUser.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,27 @@ Feature: add user
When unauthorized user "Alice" tries to create new user "brand-new-user" with password "%alt1%" using the provisioning API
Then the OCS status code should be "997"
And the HTTP status code should be "401"
And user "brand-new-user" should not exist

Scenario: subadmin should be able to create a new user into their group
Given user "brand-new-user" has been deleted
And user "subadmin" has been created with default attributes and without skeleton files
And group "group101" has been created
And user "subadmin" has been added to group "group101"
And user "subadmin" has been made a subadmin of group "group101"
When the groupadmin "subadmin" sends a user creation request for user "brand-new-user" password "%alt1%" group "group101" using the provisioning API
Then the OCS status code should be "200"
And the HTTP status code should be "200"
And user "brand-new-user" should exist

Scenario: subadmin should not be able to create a new user into other group
Given user "brand-new-user" has been deleted
And user "subadmin" has been created with default attributes and without skeleton files
And group "group101" has been created
And group "group102" has been created
And user "subadmin" has been added to group "group101"
And user "subadmin" has been made a subadmin of group "group101"
When the groupadmin "subadmin" tries to create new user "brand-new-user" password "%alt1%" in other group "group102" using the provisioning API
Then the OCS status code should be "400"
And the HTTP status code should be "400"
And user "brand-new-user" should not exist
106 changes: 106 additions & 0 deletions tests/acceptance/features/bootstrap/Provisioning.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,6 +1366,13 @@ public function userSendsUserCreationRequestUsingTheProvisioningApi($user, $user
"/cloud/users",
$bodyTable
);
$this->addUserToCreatedUsersList(
$userToCreate,
$password,
null,
$email,
$this->theHTTPStatusCodeWasSuccess()
);
}

/**
Expand Down Expand Up @@ -1418,6 +1425,105 @@ public function theAdministratorCreatesUserPasswordGroupUsingTheProvisioningApi(
}
}

/**
* @When /^the groupadmin "([^"]*)" sends a user creation request for user "([^"]*)" password "([^"]*)" group "([^"]*)" using the provisioning API$/
*
* @param string $groupadmin
* @param string $userToCreate
* @param string $password
* @param string $group
*
* @return void
* @throws Exception
*/
public function theGroupAdminCreatesUserPasswordGroupUsingTheProvisioningApi(
$groupadmin, $userToCreate, $password, $group
) {
$userToCreate = $this->getActualUsername($userToCreate);
$password = $this->getActualPassword($password);
if (OcisHelper::isTestingOnOcisOrReva()) {
$email = $userToCreate . '@owncloud.org';
$bodyTable = new TableNode(
[
['userid', $userToCreate],
['password', $userToCreate],
['username', $userToCreate],
['email', $email],
['groups[]', $group],
]
);
} else {
$email = null;
$bodyTable = new TableNode(
[['userid', $userToCreate], ['password', $password], ['groups[]', $group]]
);
}
$this->ocsContext->userSendsHTTPMethodToOcsApiEndpointWithBody(
$groupadmin,
"POST",
"/cloud/users",
$bodyTable
);
$this->addUserToCreatedUsersList(
$userToCreate,
$password,
null,
$email,
$this->theHTTPStatusCodeWasSuccess()
);
if (OcisHelper::isTestingOnOcisOrReva()) {
$this->manuallyAddSkeletonFilesForUser($userToCreate, $password);
}
}

/**
* @When /^the groupadmin "([^"]*)" tries to create new user "([^"]*)" password "([^"]*)" in other group "([^"]*)" using the provisioning API$/
*
* @param string $groupadmin
* @param string $userToCreate
* @param string $password
* @param string $group
*
* @return void
* @throws Exception
*/
public function theGroupAdminCreatesUserPasswordInOtherGroupUsingTheProvisioningApi(
$groupadmin, $userToCreate, $password, $group
) {
$userToCreate = $this->getActualUsername($userToCreate);
$password = $this->getActualPassword($password);
if (OcisHelper::isTestingOnOcisOrReva()) {
$email = $userToCreate . '@owncloud.org';
$bodyTable = new TableNode(
[
['userid', $userToCreate],
['password', $userToCreate],
['username', $userToCreate],
['email', $email],
['groups[]', $group],
]
);
} else {
$email = null;
$bodyTable = new TableNode(
[['userid', $userToCreate], ['password', $password], ['groups[]', $group]]
);
}
$this->ocsContext->userSendsHTTPMethodToOcsApiEndpointWithBody(
$groupadmin,
"POST",
"/cloud/users",
$bodyTable
);
$this->addUserToCreatedUsersList(
$userToCreate,
$password,
null,
$email,
$this->theHTTPStatusCodeWasSuccess()
);
}

/**
* @param string $username
* @param string $password
Expand Down