link api from web interface, make single note fetching work, redo note storage username

[grauphel.git] / appinfo / application.php

diff --git a/appinfo/application.php b/appinfo/application.php
index 7a1691de9eed2f4b7317ca7005dfd9a9bfe3f05e..cc39ceb9d0f5837a746dc7db7237573076242746 100644 (file)
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -28,30 +28,31 @@ class Application extends App
                     = $c->query('ServerContainer')->getURLGenerator();
                 return new \OCA\Grauphel\Controller\ApiController(
                     $c->query('AppName'),
-                    $c->query('Request')
+                    $c->query('Request'),
+                    $c->query('Session')->getUser()
                 );
             }
         );
         $container->registerService(
-            'AccessController',
+            'OauthController',
             function($c) {
                 Dependencies::get()->urlGen
                     = $c->query('ServerContainer')->getURLGenerator();
-                 return new \OCA\Grauphel\Controller\AccessController(
+                return new \OCA\Grauphel\Controller\OauthController(
                     $c->query('AppName'),
-                    $c->query('Request')
+                    $c->query('Request'),
+                    $c->query('Session')->getUser()
                 );
             }
         );
         $container->registerService(
-            'OauthController',
+            'GuiController',
             function($c) {
-                Dependencies::get()->urlGen
-                    = $c->query('ServerContainer')->getURLGenerator();
-                return new \OCA\Grauphel\Controller\OauthController(
+                return new \OCA\Grauphel\Controller\GuiController(
                     $c->query('AppName'),
                     $c->query('Request'),
-                    $c->query('Session')->getUser()
+                    $c->query('Session')->getUser(),
+                    $c->query('ServerContainer')->getURLGenerator()
                 );
             }
         );