Capabilities manager #15093

rullzer · 2015-03-21T19:29:06Z

Implementation of proposal in #14805

The first commit adds the capabilities manager. There now is a capabilities manager where apps can register them self. The capabilities are then all collected in 1 place by iterating over all the apps that have registered a capabilities manager.

The second commit moves the files app to the shiny new capabilities manager.

Comments and suggestions are very welcome. As this would help to get #13964 in. Which would greatly improve the client UX.

Unit tests will of course follow once I have addressed the comments.

CC: @DeepDiver1975 @PVince81 @Raydiation @LukasReschke

RobinMcCorkell · 2015-03-21T19:39:13Z

Capabilitie -> Capability (found in multiple places)

rullzer · 2015-03-21T20:06:16Z

Capabilitie -> Capability (found in multiple places)

Thanks, fixed.

PVince81 · 2015-03-23T15:52:04Z

apps/files/appinfo/application.php

+		/**
+		 * Register capabilities
+		 */
+		$server->getCapabilitiesManager()->registerCapability(function() use ($container) {


What is this block for ?

Ah ok, got it... I mixed up CapabilitiesController and CapabilitiesManager.

To register the capabilities with the manager. Else how would it know where to look?

remove the use, you dont use it anymore

PVince81 · 2015-03-23T15:57:35Z

Great stuff!

You might want to adapt the other apps next (files_sharing, files_versions, files_trashbin) to also use this.

rullzer · 2015-03-23T15:59:36Z

@PVince81 thanks.

Yeah those are on my list to adapt. But wanted feedback first.

I also plan to print a warning to the log if somebody tries to register a capabilities route instead of the capabilities manager.

PVince81 · 2015-03-26T22:27:22Z

Please rebase.

Is this ready for test/review ? If yes, please remove the WIP 😄

PVince81 · 2015-03-27T11:43:08Z

I guess this is not yet compatible with the old OCS URLs, isn't it ?
Would be good to make it so that the old OCS capabilities URL uses the capabilities manager.

PVince81 · 2015-03-27T11:43:16Z

(I haven't tested yet)

rullzer · 2015-03-27T11:45:56Z

lib/private/ocs/cloud.php

+		);
+
+
+		$result['capabilities'] = array_merge_recursive($result['capabilities'], \OC::$server->getCapabilitiesManager()->getCapabilities());


@PVince81 that is actually what happens here. since we do yet have OCS routes in the appframework.

Move the existing capa... also in a Class:
'pollinterval' => OC_Config::getValue('pollinterval', 60)
so people will stop hard coding it

MorrisJobke · 2015-03-27T16:20:09Z

12:12:45 There was 1 error:
12:12:45 
12:12:45 1) Test_Files_Sharing_Api::testUpdateShareExpireDate
12:12:45 Doctrine\DBAL\Exception\UniqueConstraintViolationException: An exception occurred while executing 'INSERT INTO oc_appconfig (appid, configkey, configvalue) VALUES (?, ?, ?)' with params ["core", "shareapi_default_expire_date", "yes"]:
12:12:45 
12:12:45 SQLSTATE[23000]: Integrity constraint violation: 19 UNIQUE constraint failed: oc_appconfig.appid, oc_appconfig.configkey
12:12:45 
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php:48
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/DBALException.php:116
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php:996
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/lib/private/db/connection.php:149
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php:696
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/lib/private/appconfig.php:191
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/lib/private/allconfig.php:165
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/apps/files_sharing/tests/api.php:1036
12:12:45 
12:12:45 Caused by
12:12:45 Doctrine\DBAL\Driver\PDOException: SQLSTATE[23000]: Integrity constraint violation: 19 UNIQUE constraint failed: oc_appconfig.appid, oc_appconfig.configkey
12:12:45 
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOStatement.php:93
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php:989
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/lib/private/db/connection.php:149
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php:696
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/lib/private/appconfig.php:191
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/lib/private/allconfig.php:165
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/apps/files_sharing/tests/api.php:1036
12:12:45 
12:12:45 Caused by
12:12:45 PDOException: SQLSTATE[23000]: Integrity constraint violation: 19 UNIQUE constraint failed: oc_appconfig.appid, oc_appconfig.configkey
12:12:45 
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOStatement.php:91
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php:989
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/lib/private/db/connection.php:149
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php:696
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/lib/private/appconfig.php:191
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/lib/private/allconfig.php:165
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/apps/files_sharing/tests/api.php:1036
12:12:45 
12:12:45 --
12:12:45 
12:12:45 There was 1 failure:
12:12:45 
12:12:45 1) Test_Share::testClearExpireDateWhileEnforced
12:12:45 Failed asserting that false is true.
12:12:45 
12:12:45 /var/jenkins/workspace/pull-request-analyser-ng-simple/label/SLAVE/tests/lib/share/share.php:1085

rullzer · 2015-03-28T21:08:58Z

Jenkins is happy #15278
Commits squashed. And rebased.
Please review!

MorrisJobke · 2015-03-30T06:13:52Z

cc @LukasReschke @schiesbn

rullzer · 2015-07-23T06:49:58Z

@nickvergessen thanks! Fixed your comments.
Throwing the exception makes sense.

nickvergessen · 2015-07-23T08:40:17Z

lib/private/capabilitiesmanager.php

+			if ($c instanceof ICapability) {
+				$capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
+			} else {
+				throw new NotACapabilityException();


Just throw \InvalidArgumentException
http://php.net/manual/de/class.invalidargumentexception.php

throw new \InvalidArgumentException('The given Capability does not implement the ICapability interface');

makes more sense. thanks.
Fixed

rullzer · 2015-07-23T09:57:09Z

Hopefully the final jenkins PR at #15093

jospoortvliet · 2015-07-23T10:14:31Z

That bot isn't easy to satisfy, is it ;-)

rullzer · 2015-07-23T11:22:20Z

Jenkins is happy #15093
Review and lets get this in!

rullzer · 2015-07-27T19:30:44Z

Call for (final) reviews: @Raydiation @PVince81 @DeepDiver1975 @LukasReschke @MorrisJobke @nickvergessen

ghost · 2015-08-10T08:20:01Z

💣 Test FAILed. 💣

* This should allow the capabilities to be intergrated into the appframework * Unit tests * Throw exception if closure does not return ICapability instance

* Files * Files_Sharing * Files_Trashbin * Files_Versions

* Register OCP\Capability\IManager at DIContainer * Add register capabilities to appframework * Register capabilities in DI way * Make unit test pass again * Remove CapabiltiesManager from OCP

ghost · 2015-08-10T08:59:37Z

💣 Test FAILed. 💣

scrutinizer-notifier · 2015-08-10T09:00:02Z

A new inspection was created.

rullzer · 2015-08-10T09:00:16Z

@owncloud-bot retest this please

ghost · 2015-08-10T10:24:59Z

🚀 Test PASSed.🚀

PVince81 · 2015-08-10T10:35:25Z

  % curl http://root:admin@localhost/owncloud/ocs/v1.php/cloud/capabilities\?format\=json | jsonlint -p -
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100   455  100   455    0     0   1813      0 --:--:-- --:--:-- --:--:--  1820
{
  "ocs": {
    "meta": {
      "status": "ok",
      "statuscode": 100,
      "message": null
    },
    "data": {
      "version": {
        "major": 8,
        "minor": 2,
        "micro": 0,
        "string": "8.2 pre alpha",
        "edition": ""
      },
      "capabilities": {
        "core": {
          "pollinterval": 60
        },
        "files": {
          "bigfilechunking": true,
          "undelete": true,
          "versioning": true
        },
        "files_sharing": {
          "public": {
            "enabled": true,
            "password": {
              "enforced": true
            },
            "expire_date": {
              "enabled": true,
              "days": "7",
              "enforced": true
            },
            "send_mail": true
          },
          "user": {
            "send_mail": true
          },
          "resharing": true
        }
      }
    }
  }
}

Looks good to me 👍

ghost · 2015-08-10T10:54:22Z

🚀 Test PASSed.🚀

rullzer · 2015-08-10T11:00:35Z

@Raydiation can I assume your 👍 is still valid?

BernhardPosselt · 2015-08-10T17:09:14Z

yes

Capabilities manager

rullzer added enhancement 2 - Developing Engineering labels Mar 21, 2015

rullzer added this to the 8.1-current milestone Mar 21, 2015

rullzer changed the title ~~Capabilities manager~~ [WIP] Capabilities manager Mar 21, 2015

PVince81 reviewed Mar 23, 2015
View reviewed changes

rullzer mentioned this pull request Mar 24, 2015

Add OCS sharing info to capabilities - take 2 #13964

Merged

rullzer added 3 - To Review and removed 2 - Developing labels Mar 24, 2015

nickvergessen added 2 - Developing and removed 3 - To Review labels Mar 24, 2015

rullzer changed the title ~~[WIP] Capabilities manager~~ Capabilities manager Mar 27, 2015

rullzer added 3 - To Review and removed 2 - Developing labels Mar 27, 2015

rullzer reviewed Mar 27, 2015
View reviewed changes

rullzer mentioned this pull request Mar 27, 2015

[Jenkins] Capabilities manaer #15093 #15278

Closed

nickvergessen reviewed Jul 23, 2015
View reviewed changes

rullzer mentioned this pull request Jul 23, 2015

[JENKINS] Capabilities manager #15093 #17834

Closed

rullzer added 3 - To Review and removed 2 - Developing labels Jul 23, 2015

rullzer added 4 commits August 10, 2015 10:45

Added Capabilities Manager

7e6a2b7

* This should allow the capabilities to be intergrated into the appframework * Unit tests * Throw exception if closure does not return ICapability instance

Moved core apps to the capabilities manager

e84cffc

* Files * Files_Sharing * Files_Trashbin * Files_Versions

Move core capabilities to new class

c80c981

Use DI

f0b617b

* Register OCP\Capability\IManager at DIContainer * Add register capabilities to appframework * Register capabilities in DI way * Make unit test pass again * Remove CapabiltiesManager from OCP

rullzer added a commit that referenced this pull request Aug 10, 2015

Merge pull request #15093 from rullzer/capabilities_manager

c2856c0

Capabilities manager

rullzer merged commit c2856c0 into owncloud:master Aug 10, 2015

rullzer deleted the capabilities_manager branch August 10, 2015 18:33

rullzer mentioned this pull request Aug 14, 2015

OCS routes should be unique #18319

Closed

rullzer mentioned this pull request Sep 3, 2015

Add CapabilitiesManager to allow (easier) migration to the AppFramework #14805

Closed

oparoz mentioned this pull request Oct 4, 2015

Add the API to the capability manager owncloud/gallery#403

Closed

oparoz mentioned this pull request Sep 4, 2016

Add the API to the capability manager nextcloud/gallery#92

Open

lock bot locked as resolved and limited conversation to collaborators Aug 11, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Capabilities manager #15093

Capabilities manager #15093

rullzer commented Mar 21, 2015

RobinMcCorkell commented Mar 21, 2015

rullzer commented Mar 21, 2015

PVince81 Mar 23, 2015

PVince81 Mar 23, 2015

rullzer Mar 23, 2015

nickvergessen Jul 21, 2015

PVince81 commented Mar 23, 2015

rullzer commented Mar 23, 2015

PVince81 commented Mar 26, 2015

PVince81 commented Mar 27, 2015

PVince81 commented Mar 27, 2015

rullzer Mar 27, 2015

nickvergessen Jul 21, 2015

MorrisJobke commented Mar 27, 2015

rullzer commented Mar 28, 2015

MorrisJobke commented Mar 30, 2015

rullzer commented Jul 23, 2015

nickvergessen Jul 23, 2015

rullzer Jul 23, 2015

rullzer commented Jul 23, 2015

jospoortvliet commented Jul 23, 2015

rullzer commented Jul 23, 2015

rullzer commented Jul 27, 2015

ghost commented Aug 10, 2015

ghost commented Aug 10, 2015

scrutinizer-notifier commented Aug 10, 2015

rullzer commented Aug 10, 2015

ghost commented Aug 10, 2015

PVince81 commented Aug 10, 2015

ghost commented Aug 10, 2015

rullzer commented Aug 10, 2015

BernhardPosselt commented Aug 10, 2015

		);


		$result['capabilities'] = array_merge_recursive($result['capabilities'], \OC::$server->getCapabilitiesManager()->getCapabilities());

Capabilities manager #15093

Capabilities manager #15093

Conversation

rullzer commented Mar 21, 2015

RobinMcCorkell commented Mar 21, 2015

rullzer commented Mar 21, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PVince81 commented Mar 23, 2015

rullzer commented Mar 23, 2015

PVince81 commented Mar 26, 2015

PVince81 commented Mar 27, 2015

PVince81 commented Mar 27, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MorrisJobke commented Mar 27, 2015

rullzer commented Mar 28, 2015

MorrisJobke commented Mar 30, 2015

rullzer commented Jul 23, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rullzer commented Jul 23, 2015

jospoortvliet commented Jul 23, 2015

rullzer commented Jul 23, 2015

rullzer commented Jul 27, 2015

ghost commented Aug 10, 2015

ghost commented Aug 10, 2015

scrutinizer-notifier commented Aug 10, 2015

rullzer commented Aug 10, 2015

ghost commented Aug 10, 2015

PVince81 commented Aug 10, 2015

ghost commented Aug 10, 2015

rullzer commented Aug 10, 2015

BernhardPosselt commented Aug 10, 2015