wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move getCapabilities over to Core

Browse source
This commit is contained in:
Roeland Jago Douma 2016-08-09 10:21:51 +02:00
parent 575875e8d0
commit 02449c8336
No known key found for this signature in database
GPG key ID: 1E152838F164D13B
5 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/Application.php
View file

@ -186,6 +186,9 @@ class Application extends App {
$container->registerService('TwoFactorAuthManager', function(SimpleContainer $c) {
return $c->query('ServerContainer')->getTwoFactorAuthManager();
});
$container->registerService('OC\CapabilitiesManager', function(SimpleContainer $c) {
return $c->query('ServerContainer')->getCapabilitiesManager();
});
}
}

27
core/Controller/OCSController.php
View file

@ -1,5 +1,24 @@
<?php
/**
*
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OC\Core\Controller;
use OC\CapabilitiesManager;
@ -26,6 +45,10 @@ class OCSController extends \OCP\AppFramework\OCSController {
$this->capabilitiesManager = $capabilitiesManager;
}
/**
* @NoAdminRequired
* @return DataResponse
*/
public function getCapabilities() {
$result = [];
list($major, $minor, $micro) = \OCP\Util::getVersion();
@ -41,4 +64,4 @@ class OCSController extends \OCP\AppFramework\OCSController {
return new DataResponse(['data' => $result]);
}
}
}

3
core/routes.php
View file

@ -53,6 +53,9 @@ $application->registerRoutes($this, [
['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
],
'ocs' => [
['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
],
]);
// Post installation check

16
lib/private/OCS/Cloud.php
View file

@ -27,22 +27,6 @@ namespace OC\OCS;
class Cloud {
public static function getCapabilities() {
$result = array();
list($major, $minor, $micro) = \OCP\Util::getVersion();
$result['version'] = array(
'major' => $major,
'minor' => $minor,
'micro' => $micro,
'string' => \OC_Util::getVersionString(),
'edition' => \OC_Util::getEditionString(),
);
$result['capabilities'] = \OC::$server->getCapabilitiesManager()->getCapabilities();
return new Result($result);
}
public static function getCurrentUser() {
$userObject = \OC::$server->getUserManager()->get(\OC_User::getUser());
$data = array(

7
ocs/routes.php
View file

@ -84,13 +84,6 @@ API::register(
API::USER_AUTH
);
// cloud
API::register(
'get',
'/cloud/capabilities',
array('OC_OCS_Cloud', 'getCapabilities'),
'core',
API::USER_AUTH
);
API::register(
'get',
'/cloud/user',