git.cweiske.de
/
grauphel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oauth dance works
[grauphel.git]
/
appinfo
/
application.php
diff --git
a/appinfo/application.php
b/appinfo/application.php
index ecee129f18be5e8c03fc01ceaf06c5b9473f1008..7a1691de9eed2f4b7317ca7005dfd9a9bfe3f05e 100644
(file)
--- a/
appinfo/application.php
+++ b/
appinfo/application.php
@@
-1,6
+1,7
@@
<?php
namespace OCA\Grauphel\AppInfo;
use \OCP\AppFramework\App;
<?php
namespace OCA\Grauphel\AppInfo;
use \OCP\AppFramework\App;
+use \OCA\Grauphel\Lib\Dependencies;
class Application extends App
{
class Application extends App
{
@@
-10,12
+11,21
@@
class Application extends App
$container = $this->getContainer();
$container = $this->getContainer();
+ $container->registerService(
+ 'Session',
+ function($c) {
+ return $c->query('ServerContainer')->getUserSession();
+ }
+ );
+
/**
* Controllers
*/
$container->registerService(
/**
* Controllers
*/
$container->registerService(
- 'ApiController',
+
'ApiController',
function($c) {
function($c) {
+ Dependencies::get()->urlGen
+ = $c->query('ServerContainer')->getURLGenerator();
return new \OCA\Grauphel\Controller\ApiController(
$c->query('AppName'),
$c->query('Request')
return new \OCA\Grauphel\Controller\ApiController(
$c->query('AppName'),
$c->query('Request')
@@
-23,8
+33,10
@@
class Application extends App
}
);
$container->registerService(
}
);
$container->registerService(
- 'AccessController',
+
'AccessController',
function($c) {
function($c) {
+ Dependencies::get()->urlGen
+ = $c->query('ServerContainer')->getURLGenerator();
return new \OCA\Grauphel\Controller\AccessController(
$c->query('AppName'),
$c->query('Request')
return new \OCA\Grauphel\Controller\AccessController(
$c->query('AppName'),
$c->query('Request')
@@
-32,11
+44,14
@@
class Application extends App
}
);
$container->registerService(
}
);
$container->registerService(
-
'OA
uthController',
+
'Oa
uthController',
function($c) {
function($c) {
- return new \OCA\Grauphel\Controller\OAuthController(
+ Dependencies::get()->urlGen
+ = $c->query('ServerContainer')->getURLGenerator();
+ return new \OCA\Grauphel\Controller\OauthController(
$c->query('AppName'),
$c->query('AppName'),
- $c->query('Request')
+ $c->query('Request'),
+ $c->query('Session')->getUser()
);
}
);
);
}
);