Merge pull request #100 from juliushaertl/fix-container

Fix app container building and IProvider injection for NC11

appinfo/app.php

@@ -17,8 +17,3 @@ namespace OCA\Registration\AppInfo;
 ]);
 
 \OCP\App::registerAdmin('registration', 'admin');
-
-if(interface_exists('\OCP\Capabilities\IPublicCapability')) {
-	$app = new \OCP\AppFramework\App('registration');
-	$app->getContainer()->registerCapability(\OCA\Registration\Capabilities::class);
-}

appinfo/application.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @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 OCA\Registration\AppInfo;
+
+use OCP\AppFramework\App;
+
+class Application extends App {
+
+	public function __construct(array $urlParams = array()) {
+		parent::__construct('registration', $urlParams);
+
+		$container = $this->getContainer();
+		$container->registerService('OC\Authentication\Token\IProvider', function ($c) {
+			return \OC::$server->query('OC\Authentication\Token\IProvider');
+		});
+
+		if (interface_exists('\OCP\Capabilities\IPublicCapability')) {
+			$container->registerCapability(\OCA\Registration\Capabilities::class);
+		}
+	}
+
+}

appinfo/routes.php

@@ -10,6 +10,8 @@
  * @copyright Pellaeon Lin 2014
  */
 
+$app = new \OCA\Registration\AppInfo\Application();
+
 return [
 	'routes' => [
 		['name' => 'settings#admin', 'url' => '/settings', 'verb' => 'POST'],