diff --git a/lib/base.php b/lib/base.php
index 9068fe7698177fcd40f9902b5fb3a7f3ac9d86d1..7bebb5f93a0a18d2e58783336fcd8f4931e71d45 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -69,8 +69,9 @@ class OC {
* check if owncloud runs in cli mode
*/
public static $CLI = false;
- /*
- * OC router
+
+ /**
+ * @var OC_Router
*/
protected static $router = null;
@@ -343,6 +344,9 @@ class OC {
return OC_Config::getValue('session_lifetime', 60 * 60 * 24);
}
+ /**
+ * @return OC_Router
+ */
public static function getRouter() {
if (!isset(OC::$router)) {
OC::$router = new OC_Router();
diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php
index 7ff55bb809d1ddcfeef1142547878a8fcf3e1805..6d3effbf1fa026b7579c2ef48e6ba77800368469 100644
--- a/lib/private/appframework/app.php
+++ b/lib/private/appframework/app.php
@@ -42,12 +42,9 @@ class App {
* @param string $controllerName the name of the controller under which it is
* stored in the DI container
* @param string $methodName the method that you want to call
- * @param array $urlParams an array with variables extracted from the routes
* @param DIContainer $container an instance of a pimple container.
*/
- public static function main($controllerName, $methodName, array $urlParams,
- IAppContainer $container) {
- $container['urlParams'] = $urlParams;
+ public static function main($controllerName, $methodName, IAppContainer $container) {
$controller = $container[$controllerName];
// initialize the dispatcher and run all the middleware before the controller
diff --git a/lib/private/appframework/core/api.php b/lib/private/appframework/core/api.php
index 39522ee3dd5ce2e4ab6add7a8808206ee2faf5d7..e7269373bb01dc7bbe321018d556ed0fafec371c 100644
--- a/lib/private/appframework/core/api.php
+++ b/lib/private/appframework/core/api.php
@@ -99,89 +99,6 @@ class API implements IApi{
}
- /**
- * Returns the translation object
- * @return \OC_L10N the translation object
- */
- public function getTrans(){
- # TODO: use public api
- return \OC_L10N::get($this->appName);
- }
-
-
- /**
- * Returns the URL for a route
- * @param string $routeName the name of the route
- * @param array $arguments an array with arguments which will be filled into the url
- * @return string the url
- */
- public function linkToRoute($routeName, $arguments=array()){
- return \OCP\Util::linkToRoute($routeName, $arguments);
- }
-
-
- /**
- * Returns an URL for an image or file
- * @param string $file the name of the file
- * @param string $appName the name of the app, defaults to the current one
- */
- public function linkTo($file, $appName=null){
- if($appName === null){
- $appName = $this->appName;
- }
- return \OCP\Util::linkTo($appName, $file);
- }
-
-
- /**
- * Returns the link to an image, like link to but only with prepending img/
- * @param string $file the name of the file
- * @param string $appName the name of the app, defaults to the current one
- */
- public function imagePath($file, $appName=null){
- if($appName === null){
- $appName = $this->appName;
- }
- return \OCP\Util::imagePath($appName, $file);
- }
-
-
- /**
- * Makes an URL absolute
- * @param string $url the url
- * @return string the absolute url
- */
- public function getAbsoluteURL($url){
- # TODO: use public api
- return \OC_Helper::makeURLAbsolute($url);
- }
-
-
- /**
- * links to a file
- * @param string $file the name of the file
- * @param string $appName the name of the app, defaults to the current one
- * @deprecated replaced with linkToRoute()
- * @return string the url
- */
- public function linkToAbsolute($file, $appName=null){
- if($appName === null){
- $appName = $this->appName;
- }
- return \OCP\Util::linkToAbsolute($appName, $file);
- }
-
-
- /**
- * Checks if the CSRF check was correct
- * @return bool true if CSRF check passed
- */
- public function passesCSRFCheck(){
- # TODO: use public api
- return \OC_Util::isCallRegistered();
- }
-
-
/**
* Checks if an app is enabled
* @param string $appName the name of an app
@@ -192,44 +109,6 @@ class API implements IApi{
}
- /**
- * Writes a function into the error log
- * @param string $msg the error message to be logged
- * @param int $level the error level
- */
- public function log($msg, $level=null){
- switch($level){
- case 'debug':
- $level = \OCP\Util::DEBUG;
- break;
- case 'info':
- $level = \OCP\Util::INFO;
- break;
- case 'warn':
- $level = \OCP\Util::WARN;
- break;
- case 'fatal':
- $level = \OCP\Util::FATAL;
- break;
- default:
- $level = \OCP\Util::ERROR;
- break;
- }
- \OCP\Util::writeLog($this->appName, $msg, $level);
- }
-
-
- /**
- * turns an owncloud path into a path on the filesystem
- * @param string path the path to the file on the oc filesystem
- * @return string the filepath in the filesystem
- */
- public function getLocalFilePath($path){
- # TODO: use public api
- return \OC_Filesystem::getLocalFile($path);
- }
-
-
/**
* used to return and open a new eventsource
* @return \OC_EventSource a new open EventSource class
@@ -275,15 +154,6 @@ class API implements IApi{
}
}
- /**
- * Gets the content of an URL by using CURL or a fallback if it is not
- * installed
- * @param string $url the url that should be fetched
- * @return string the content of the webpage
- */
- public function getUrlContent($url) {
- return \OC_Util::getUrlContent($url);
- }
/**
* Register a backgroundjob task
@@ -295,25 +165,6 @@ class API implements IApi{
\OCP\Backgroundjob::addRegularTask($className, $methodName);
}
- /**
- * Returns a template
- * @param string $templateName the name of the template
- * @param string $renderAs how it should be rendered
- * @param string $appName the name of the app
- * @return \OCP\Template a new template
- */
- public function getTemplate($templateName, $renderAs='user', $appName=null){
- if($appName === null){
- $appName = $this->appName;
- }
-
- if($renderAs === 'blank'){
- return new \OCP\Template($appName, $templateName);
- } else {
- return new \OCP\Template($appName, $templateName, $renderAs);
- }
- }
-
/**
* Tells ownCloud to include a template in the admin overview
@@ -330,19 +181,4 @@ class API implements IApi{
}
- /**
- * get the filesystem info
- *
- * @param string $path
- * @return array with the following keys:
- * - size
- * - mtime
- * - mimetype
- * - encrypted
- * - versioned
- */
- public function getFileInfo($path) {
- return \OC\Files\Filesystem::getFileInfo($path);
- }
-
}
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index e62b72fd9734286c8ae1e07aa1e58f4819ca0010..81910df6990c5ae7d5bd9b59d85c17e21e78b0e0 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -35,6 +35,7 @@ use OC\AppFramework\Utility\TimeFactory;
use OCP\AppFramework\IApi;
use OCP\AppFramework\IAppContainer;
use OCP\AppFramework\IMiddleWare;
+use OCP\AppFramework\Middleware;
use OCP\IServerContainer;
@@ -49,9 +50,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{
* Put your class dependencies in here
* @param string $appName the name of the app
*/
- public function __construct($appName){
+ public function __construct($appName, $urlParams = array()){
$this['AppName'] = $appName;
+ $this['urlParams'] = $urlParams;
$this->registerParameter('ServerContainer', \OC::$server);
@@ -66,6 +68,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
/** @var $c SimpleContainer */
/** @var $server IServerContainer */
$server = $c->query('ServerContainer');
+ $server->registerParameter('urlParams', $c['urlParams']);
return $server->getRequest();
});
@@ -86,7 +89,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
* Middleware
*/
$this['SecurityMiddleware'] = $this->share(function($c){
- return new SecurityMiddleware($c['API'], $c['Request']);
+ return new SecurityMiddleware($this, $c['Request']);
});
$middleWares = $this->middleWares;
@@ -130,10 +133,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{
}
/**
- * @param IMiddleWare $middleWare
+ * @param Middleware $middleWare
* @return boolean
*/
- function registerMiddleWare(IMiddleWare $middleWare) {
+ function registerMiddleWare(Middleware $middleWare) {
array_push($this->middleWares, $middleWare);
}
@@ -144,4 +147,49 @@ class DIContainer extends SimpleContainer implements IAppContainer{
function getAppName() {
return $this->query('AppName');
}
+
+ /**
+ * @return boolean
+ */
+ function isLoggedIn() {
+ return \OC_User::isLoggedIn();
+ }
+
+ /**
+ * @return boolean
+ */
+ function isAdminUser() {
+ $uid = $this->getUserId();
+ return \OC_User::isAdminUser($uid);
+ }
+
+ private function getUserId() {
+ return \OC::$session->get('user_id');
+ }
+
+ /**
+ * @param $message
+ * @param $level
+ * @return mixed
+ */
+ function log($message, $level) {
+ switch($level){
+ case 'debug':
+ $level = \OCP\Util::DEBUG;
+ break;
+ case 'info':
+ $level = \OCP\Util::INFO;
+ break;
+ case 'warn':
+ $level = \OCP\Util::WARN;
+ break;
+ case 'fatal':
+ $level = \OCP\Util::FATAL;
+ break;
+ default:
+ $level = \OCP\Util::ERROR;
+ break;
+ }
+ \OCP\Util::writeLog($this->getAppName(), $message, $level);
+ }
}
diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php
index ea57a6860cc27ea4fa4b3c9c8f8ba0a8a8db7666..51283fd64e7cb73f2f91a522a85d5995e608df8f 100644
--- a/lib/private/appframework/http/dispatcher.php
+++ b/lib/private/appframework/http/dispatcher.php
@@ -24,8 +24,8 @@
namespace OC\AppFramework\Http;
-use \OC\AppFramework\Controller\Controller;
use \OC\AppFramework\Middleware\MiddlewareDispatcher;
+use OCP\AppFramework\Controller;
/**
diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php
index c2377b8844b2f62262deb38722c574e1d49440a6..681140c2242e2d5d402e8f34b3917334dee51527 100644
--- a/lib/private/appframework/middleware/middlewaredispatcher.php
+++ b/lib/private/appframework/middleware/middlewaredispatcher.php
@@ -24,7 +24,7 @@
namespace OC\AppFramework\Middleware;
-use OC\AppFramework\Controller\Controller;
+use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\MiddleWare;
diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
index d6daf737bb4f48a0125b49aec09a68ec1febf07f..f103a40ee7fcba718b89f9c5e1a4be3224949bca 100644
--- a/lib/private/appframework/middleware/security/securitymiddleware.php
+++ b/lib/private/appframework/middleware/security/securitymiddleware.php
@@ -24,15 +24,14 @@
namespace OC\AppFramework\Middleware\Security;
-use OC\AppFramework\Controller\Controller;
use OC\AppFramework\Http\Http;
-use OC\AppFramework\Http\Request;
use OC\AppFramework\Http\RedirectResponse;
use OC\AppFramework\Utility\MethodAnnotationReader;
-use OC\AppFramework\Core\API;
use OCP\AppFramework\Middleware;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\IAppContainer;
+use OCP\IRequest;
/**
@@ -43,18 +42,22 @@ use OCP\AppFramework\Http\JSONResponse;
*/
class SecurityMiddleware extends Middleware {
- private $api;
+ /**
+ * @var \OCP\AppFramework\IAppContainer
+ */
+ private $app;
/**
- * @var \OC\AppFramework\Http\Request
+ * @var \OCP\IRequest
*/
private $request;
/**
- * @param API $api an instance of the api
+ * @param IAppContainer $app
+ * @param IRequest $request
*/
- public function __construct(API $api, Request $request){
- $this->api = $api;
+ public function __construct(IAppContainer $app, IRequest $request){
+ $this->app = $app;
$this->request = $request;
}
@@ -74,24 +77,24 @@ class SecurityMiddleware extends Middleware {
// this will set the current navigation entry of the app, use this only
// for normal HTML requests and not for AJAX requests
- $this->api->activateNavigationEntry();
+ $this->app->getServer()->getNavigationManager()->setActiveEntry($this->app->getAppName());
// security checks
$isPublicPage = $annotationReader->hasAnnotation('PublicPage');
if(!$isPublicPage) {
- if(!$this->api->isLoggedIn()) {
+ if(!$this->app->isLoggedIn()) {
throw new SecurityException('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
}
if(!$annotationReader->hasAnnotation('NoAdminRequired')) {
- if(!$this->api->isAdminUser($this->api->getUserId())) {
+ if(!$this->app->isAdminUser()) {
throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN);
}
}
}
if(!$annotationReader->hasAnnotation('NoCSRFRequired')) {
- if(!$this->api->passesCSRFCheck()) {
+ if(!$this->request->passesCSRFCheck()) {
throw new SecurityException('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
}
}
@@ -118,12 +121,13 @@ class SecurityMiddleware extends Middleware {
array('message' => $exception->getMessage()),
$exception->getCode()
);
- $this->api->log($exception->getMessage(), 'debug');
+ $this->app->log($exception->getMessage(), 'debug');
} else {
- $url = $this->api->linkToAbsolute('index.php', ''); // TODO: replace with link to route
+ // TODO: replace with link to route
+ $url = $this->app->getServer()->getURLGenerator()->getAbsoluteURL('index.php');
$response = new RedirectResponse($url);
- $this->api->log($exception->getMessage(), 'debug');
+ $this->app->log($exception->getMessage(), 'debug');
}
return $response;
diff --git a/lib/apphelper.php b/lib/private/apphelper.php
similarity index 100%
rename from lib/apphelper.php
rename to lib/private/apphelper.php
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 1236e748256cf64780022bd1c5a64c8210df0f72..e9b129db0ca9dd40dc5043dcfef5ed1f6a08154a 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -81,7 +81,7 @@ class OC_Helper {
* Returns a absolute url to the given app and file.
*/
public static function makeURLAbsolute($url) {
- return OC::$server->getURLGenerator()->makeURLAbsolute($url);
+ return OC::$server->getURLGenerator()->getAbsoluteURL($url);
}
/**
diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php
index ba168872acdbf14acd97bb53892a11fbfade694c..8c65f3681718db28b7e3b74beefa9067adfa6a86 100644
--- a/lib/private/l10n/factory.php
+++ b/lib/private/l10n/factory.php
@@ -22,7 +22,7 @@ class Factory {
* get an L10N instance
* @param $app string
* @param $lang string|null
- * @return OC_L10N
+ * @return \OC_L10N
*/
public function get($app) {
if (!isset($this->instances[$app])) {
diff --git a/lib/private/server.php b/lib/private/server.php
index 7f86919f845f2f2a8bcf8484457a826af4862c12..d450907534beff0451fd7cf169ce3cfb4cf3d88b 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -34,7 +34,6 @@ class Server extends SimpleContainer implements IServerContainer {
$requesttoken = false;
}
-
return new Request(
array(
'get' => $_GET,
@@ -46,7 +45,6 @@ class Server extends SimpleContainer implements IServerContainer {
'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
? $_SERVER['REQUEST_METHOD']
: null,
- 'params' => $params,
'urlParams' => $urlParams,
'requesttoken' => $requesttoken,
)
diff --git a/lib/urlgenerator.php b/lib/private/urlgenerator.php
similarity index 91%
rename from lib/urlgenerator.php
rename to lib/private/urlgenerator.php
index 1db4c36cc58dbb559f075369446a8c6830b8bd98..5c1d9d825b62ef579cac53d8caa52f27c63b9d42 100644
--- a/lib/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -8,18 +8,20 @@
*/
namespace OC;
+use OCP\IURLGenerator;
+use RuntimeException;
/**
* Class to generate URLs
*/
-class URLGenerator {
+class URLGenerator implements IURLGenerator {
/**
* @brief Creates an url using a defined route
* @param $route
* @param array $parameters
* @return
* @internal param array $args with param=>value, will be appended to the returned url
- * @returns the url
+ * @returns string the url
*
* Returns a url to the given app and file.
*/
@@ -97,15 +99,13 @@ class URLGenerator {
}
}
+
/**
- * @brief Makes an $url absolute
- * @param string $url the url
- * @return string the absolute url
- *
- * Returns a absolute url to the given app and file.
+ * Makes an URL absolute
+ * @param string $url the url in the owncloud host
+ * @return string the absolute version of the url
*/
- public function makeURLAbsolute($url) {
+ public function getAbsoluteURL($url) {
return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $url;
}
-
}
diff --git a/lib/public/appframework/app.php b/lib/public/appframework/app.php
index d97c5c81848861b6b6aea43ea23bddfdcdc3f32b..6ac48bf102aa7c7b27296449dea9417b11704759 100644
--- a/lib/public/appframework/app.php
+++ b/lib/public/appframework/app.php
@@ -31,8 +31,11 @@ namespace OCP\AppFramework;
* to be registered using IContainer::registerService
*/
class App {
- public function __construct($appName) {
- $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName);
+ /**
+ * @param array $urlParams an array with variables extracted from the routes
+ */
+ public function __construct($appName, $urlParams = array()) {
+ $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams);
}
private $container;
@@ -50,8 +53,8 @@ class App {
* Example code in routes.php of the task app:
* $this->create('tasks_index', '/')->get()->action(
* function($params){
- * $app = new TaskApp();
- * $app->dispatch('PageController', 'index', $params);
+ * $app = new TaskApp($params);
+ * $app->dispatch('PageController', 'index');
* }
* );
*
@@ -59,8 +62,8 @@ class App {
* Example for for TaskApp implementation:
* class TaskApp extends \OCP\AppFramework\App {
*
- * public function __construct(){
- * parent::__construct('tasks');
+ * public function __construct($params){
+ * parent::__construct('tasks', $params);
*
* $this->getContainer()->registerService('PageController', function(IAppContainer $c){
* $a = $c->query('API');
@@ -73,9 +76,8 @@ class App {
* @param string $controllerName the name of the controller under which it is
* stored in the DI container
* @param string $methodName the method that you want to call
- * @param array $urlParams an array with variables extracted from the routes
*/
- public function dispatch($controllerName, $methodName, array $urlParams) {
- \OC\AppFramework\App::main($controllerName, $methodName, $urlParams, $this->container);
+ public function dispatch($controllerName, $methodName) {
+ \OC\AppFramework\App::main($controllerName, $methodName, $this->container);
}
}
diff --git a/lib/private/appframework/controller/controller.php b/lib/public/appframework/controller.php
similarity index 89%
rename from lib/private/appframework/controller/controller.php
rename to lib/public/appframework/controller.php
index 0ea0a38cc090e36906de3a9782edc603a8567481..1642b508572a235003d73d2d719c2cdc3e39988f 100644
--- a/lib/private/appframework/controller/controller.php
+++ b/lib/public/appframework/controller.php
@@ -22,11 +22,11 @@
*/
-namespace OC\AppFramework\Controller;
+namespace OCP\AppFramework;
-use OC\AppFramework\Http\Request;
-use OC\AppFramework\Core\API;
use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\IAppContainer;
+use OCP\IRequest;
/**
@@ -35,18 +35,21 @@ use OCP\AppFramework\Http\TemplateResponse;
abstract class Controller {
/**
- * @var API instance of the api layer
+ * @var \OCP\AppFramework\IAppContainer
*/
- protected $api;
+ protected $app;
+ /**
+ * @var \OCP\IRequest
+ */
protected $request;
/**
- * @param API $api an api wrapper instance
- * @param Request $request an instance of the request
+ * @param IAppContainer $app interface to the app
+ * @param IRequest $request an instance of the request
*/
- public function __construct(API $api, Request $request){
- $this->api = $api;
+ public function __construct(IAppContainer $app, IRequest $request){
+ $this->app = $app;
$this->request = $request;
}
@@ -127,7 +130,7 @@ abstract class Controller {
*/
public function render($templateName, array $params=array(),
$renderAs='user', array $headers=array()){
- $response = new TemplateResponse($this->api, $templateName);
+ $response = new TemplateResponse($this->app->getAppName(), $templateName);
$response->setParams($params);
$response->renderAs($renderAs);
diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php
index 97678c96cbaffb6cc592516fe6b3c2b0e3235350..594530651aa11ae658f74385e3eccd81794b88c0 100644
--- a/lib/public/appframework/http/templateresponse.php
+++ b/lib/public/appframework/http/templateresponse.php
@@ -24,8 +24,6 @@
namespace OCP\AppFramework\Http;
-use OC\AppFramework\Core\API;
-
/**
* Response for a normal template
@@ -34,20 +32,16 @@ class TemplateResponse extends Response {
protected $templateName;
protected $params;
- protected $api;
protected $renderAs;
protected $appName;
/**
- * @param API $api an API instance
* @param string $templateName the name of the template
- * @param string $appName optional if you want to include a template from
- * a different app
+ * @param string $appName the name of the app to load the template from
*/
- public function __construct(API $api, $templateName, $appName=null) {
+ public function __construct($appName, $templateName) {
$this->templateName = $templateName;
$this->appName = $appName;
- $this->api = $api;
$this->params = array();
$this->renderAs = 'user';
}
@@ -108,13 +102,7 @@ class TemplateResponse extends Response {
*/
public function render(){
- if($this->appName !== null){
- $appName = $this->appName;
- } else {
- $appName = $this->api->getAppName();
- }
-
- $template = $this->api->getTemplate($this->templateName, $this->renderAs, $appName);
+ $template = new \OCP\Template($this->appName, $this->templateName, $this->renderAs);
foreach($this->params as $key => $value){
$template->assign($key, $value);
diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
index fa6af5f596593c6ba1d6b3e42c20f89a063c9d92..3bde4c9d4e77cc836cc62f3b2ba3596964fa066f 100644
--- a/lib/public/appframework/iapi.php
+++ b/lib/public/appframework/iapi.php
@@ -67,59 +67,6 @@ interface IApi {
*/
function add3rdPartyStyle($name);
- /**
- * Returns the translation object
- * @return \OC_L10N the translation object
- *
- * FIXME: returns private object / should be retrieved from teh ServerContainer
- */
- function getTrans();
-
-
- /**
- * Returns the URL for a route
- * @param string $routeName the name of the route
- * @param array $arguments an array with arguments which will be filled into the url
- * @return string the url
- */
- function linkToRoute($routeName, $arguments=array());
-
-
- /**
- * Returns an URL for an image or file
- * @param string $file the name of the file
- * @param string $appName the name of the app, defaults to the current one
- */
- function linkTo($file, $appName=null);
-
-
- /**
- * Returns the link to an image, like link to but only with prepending img/
- * @param string $file the name of the file
- * @param string $appName the name of the app, defaults to the current one
- */
- function imagePath($file, $appName = null);
-
-
- /**
- * Makes an URL absolute
- * @param string $url the url
- * @return string the absolute url
- *
- * FIXME: function should live in Request / Response
- */
- function getAbsoluteURL($url);
-
-
- /**
- * links to a file
- * @param string $file the name of the file
- * @param string $appName the name of the app, defaults to the current one
- * @deprecated replaced with linkToRoute()
- * @return string the url
- */
- function linkToAbsolute($file, $appName = null);
-
/**
* Checks if an app is enabled
@@ -128,24 +75,4 @@ interface IApi {
*/
public function isAppEnabled($appName);
-
- /**
- * Writes a function into the error log
- * @param string $msg the error message to be logged
- * @param int $level the error level
- *
- * FIXME: add logger instance to ServerContainer
- */
- function log($msg, $level = null);
-
-
- /**
- * Returns a template
- * @param string $templateName the name of the template
- * @param string $renderAs how it should be rendered
- * @param string $appName the name of the app
- * @return \OCP\Template a new template
- */
- function getTemplate($templateName, $renderAs='user', $appName=null);
-
}
diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php
index 7d3b4b3bac7587331ff003322369f205830d6a20..7e6ec6016b770810378fce8f3f38b8d09f49b190 100644
--- a/lib/public/appframework/iappcontainer.php
+++ b/lib/public/appframework/iappcontainer.php
@@ -50,8 +50,26 @@ interface IAppContainer extends IContainer{
function getServer();
/**
- * @param IMiddleWare $middleWare
+ * @param Middleware $middleWare
* @return boolean
*/
- function registerMiddleWare(IMiddleWare $middleWare);
+ function registerMiddleWare(Middleware $middleWare);
+
+ /**
+ * @return boolean
+ */
+ function isLoggedIn();
+
+ /**
+ * @return boolean
+ */
+ function isAdminUser();
+
+ /**
+ * @param $message
+ * @param $level
+ * @return mixed
+ */
+ function log($message, $level);
+
}
diff --git a/lib/public/appframework/middleware.php b/lib/public/appframework/middleware.php
index 12776c119c0063e911f1e95b09ea539917968a9f..94f71ea8520ddbec62ac7ed4b5e0e1b762263337 100644
--- a/lib/public/appframework/middleware.php
+++ b/lib/public/appframework/middleware.php
@@ -24,6 +24,7 @@
namespace OCP\AppFramework;
+use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Response;
diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
index 80abaefc43b0a4e285a982facc079b61d6a1e6d5..3628e4ceab2023303fc72196539fb87baea74d64 100644
--- a/tests/lib/appframework/AppTest.php
+++ b/tests/lib/appframework/AppTest.php
@@ -38,9 +38,9 @@ class AppTest extends \PHPUnit_Framework_TestCase {
private $controllerMethod;
protected function setUp() {
- $this->container = new \OC\AppFramework\DependencyInjection\DIContainer('test');
+ $this->container = new \OC\AppFramework\DependencyInjection\DIContainer('test', array());
$this->controller = $this->getMockBuilder(
- 'OC\AppFramework\Controller\Controller')
+ 'OCP\AppFramework\Controller')
->disableOriginalConstructor()
->getMock();
$this->dispatcher = $this->getMockBuilder(
@@ -56,6 +56,7 @@ class AppTest extends \PHPUnit_Framework_TestCase {
$this->container[$this->controllerName] = $this->controller;
$this->container['Dispatcher'] = $this->dispatcher;
+ $this->container['urlParams'] = array();
}
@@ -69,7 +70,7 @@ class AppTest extends \PHPUnit_Framework_TestCase {
$this->expectOutputString('');
- App::main($this->controllerName, $this->controllerMethod, array(),
+ App::main($this->controllerName, $this->controllerMethod,
$this->container);
}
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
index 4441bddfca9f4685385744aafa29671592222843..f17d5f24aa523c0e4ee0a5309d9541f66e0d562d 100644
--- a/tests/lib/appframework/controller/ControllerTest.php
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -25,13 +25,10 @@
namespace Test\AppFramework\Controller;
use OC\AppFramework\Http\Request;
-use OC\AppFramework\Controller\Controller;
+use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse;
-//require_once __DIR__ . "/../classloader.php";
-
-
class ChildController extends Controller {};
class ControllerTest extends \PHPUnit_Framework_TestCase {
@@ -40,7 +37,7 @@ class ControllerTest extends \PHPUnit_Framework_TestCase {
* @var Controller
*/
private $controller;
- private $api;
+ private $app;
protected function setUp(){
$request = new Request(
@@ -55,13 +52,13 @@ class ControllerTest extends \PHPUnit_Framework_TestCase {
)
);
- $this->api = $this->getMock('OC\AppFramework\Core\API',
+ $this->app = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
array('getAppName'), array('test'));
- $this->api->expects($this->any())
+ $this->app->expects($this->any())
->method('getAppName')
->will($this->returnValue('apptemplate_advanced'));
- $this->controller = new ChildController($this->api, $request);
+ $this->controller = new ChildController($this->app, $request);
}
@@ -114,26 +111,6 @@ class ControllerTest extends \PHPUnit_Framework_TestCase {
}
- public function testRenderRenderAs(){
- $ocTpl = $this->getMock('Template', array('fetchPage'));
- $ocTpl->expects($this->once())
- ->method('fetchPage');
-
- $api = $this->getMock('OC\AppFramework\Core\API',
- array('getAppName', 'getTemplate'), array('app'));
- $api->expects($this->any())
- ->method('getAppName')
- ->will($this->returnValue('app'));
- $api->expects($this->once())
- ->method('getTemplate')
- ->with($this->equalTo('home'), $this->equalTo('admin'), $this->equalTo('app'))
- ->will($this->returnValue($ocTpl));
-
- $this->controller = new ChildController($api, new Request());
- $this->controller->render('home', array(), 'admin')->render();
- }
-
-
public function testRenderHeaders(){
$headers = array('one', 'two');
$response = $this->controller->render('', array(), '', $headers);
diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
index 25fdd202839340ad233dff21caff16b8bb01e3b8..f3ebff0207f38a9fda87495debed6ba3cba444de 100644
--- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php
+++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
@@ -29,23 +29,14 @@ namespace OC\AppFramework\DependencyInjection;
use \OC\AppFramework\Http\Request;
-//require_once(__DIR__ . "/../classloader.php");
-
-
class DIContainerTest extends \PHPUnit_Framework_TestCase {
private $container;
+ private $api;
protected function setUp(){
$this->container = new DIContainer('name');
- $this->api = $this->getMock('OC\AppFramework\Core\API', array('getTrans'), array('hi'));
- }
-
- private function exchangeAPI(){
- $this->api->expects($this->any())
- ->method('getTrans')
- ->will($this->returnValue('yo'));
- $this->container['API'] = $this->api;
+ $this->api = $this->getMock('OC\AppFramework\Core\API', array(), array('hi'));
}
public function testProvidesAPI(){
@@ -87,12 +78,4 @@ class DIContainerTest extends \PHPUnit_Framework_TestCase {
}
- public function testMiddlewareDispatcherDoesNotIncludeTwigWhenTplDirectoryNotSet(){
- $this->container['Request'] = new Request();
- $this->exchangeAPI();
- $dispatcher = $this->container['MiddlewareDispatcher'];
-
- $this->assertEquals(1, count($dispatcher->getMiddlewares()));
- }
-
}
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index 849b0ca97a68dcb1bb0456c0c87e1750427065cd..9052fe0781ac8929e27d2b7604ccd9a5afbafe99 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -44,8 +44,8 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
protected function setUp() {
$this->controllerMethod = 'test';
- $api = $this->getMockBuilder(
- '\OC\AppFramework\Core\API')
+ $app = $this->getMockBuilder(
+ 'OC\AppFramework\DependencyInjection\DIContainer')
->disableOriginalConstructor()
->getMock();
$request = $this->getMockBuilder(
@@ -62,8 +62,8 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
->disableOriginalConstructor()
->getMock();
$this->controller = $this->getMock(
- '\OC\AppFramework\Controller\Controller',
- array($this->controllerMethod), array($api, $request));
+ '\OCP\AppFramework\Controller',
+ array($this->controllerMethod), array($app, $request));
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher);
diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php
index 3c6d29cd3392bfcb1a7c9b07923a1578a7abe212..a583d9da14f538797557dc3a9034148e75b713a0 100644
--- a/tests/lib/appframework/http/TemplateResponseTest.php
+++ b/tests/lib/appframework/http/TemplateResponseTest.php
@@ -63,93 +63,33 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
}
- public function testRender(){
- $ocTpl = $this->getMock('Template', array('fetchPage'));
- $ocTpl->expects($this->once())
- ->method('fetchPage');
-
- $api = $this->getMock('OC\AppFramework\Core\API',
- array('getAppName', 'getTemplate'), array('app'));
- $api->expects($this->any())
- ->method('getAppName')
- ->will($this->returnValue('app'));
- $api->expects($this->once())
- ->method('getTemplate')
- ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app'))
- ->will($this->returnValue($ocTpl));
-
- $tpl = new TemplateResponse($api, 'home');
-
- $tpl->render();
- }
-
-
- public function testRenderAssignsParams(){
- $params = array('john' => 'doe');
-
- $ocTpl = $this->getMock('Template', array('assign', 'fetchPage'));
- $ocTpl->expects($this->once())
- ->method('assign')
- ->with($this->equalTo('john'), $this->equalTo('doe'));
-
- $api = $this->getMock('OC\AppFramework\Core\API',
- array('getAppName', 'getTemplate'), array('app'));
- $api->expects($this->any())
- ->method('getAppName')
- ->will($this->returnValue('app'));
- $api->expects($this->once())
- ->method('getTemplate')
- ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app'))
- ->will($this->returnValue($ocTpl));
-
- $tpl = new TemplateResponse($api, 'home');
- $tpl->setParams($params);
-
- $tpl->render();
- }
-
-
- public function testRenderDifferentApp(){
- $ocTpl = $this->getMock('Template', array('fetchPage'));
- $ocTpl->expects($this->once())
- ->method('fetchPage');
-
- $api = $this->getMock('OC\AppFramework\Core\API',
- array('getAppName', 'getTemplate'), array('app'));
- $api->expects($this->any())
- ->method('getAppName')
- ->will($this->returnValue('app'));
- $api->expects($this->once())
- ->method('getTemplate')
- ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app2'))
- ->will($this->returnValue($ocTpl));
-
- $tpl = new TemplateResponse($api, 'home', 'app2');
-
- $tpl->render();
- }
-
-
- public function testRenderDifferentRenderAs(){
- $ocTpl = $this->getMock('Template', array('fetchPage'));
- $ocTpl->expects($this->once())
- ->method('fetchPage');
-
- $api = $this->getMock('OC\AppFramework\Core\API',
- array('getAppName', 'getTemplate'), array('app'));
- $api->expects($this->any())
- ->method('getAppName')
- ->will($this->returnValue('app'));
- $api->expects($this->once())
- ->method('getTemplate')
- ->with($this->equalTo('home'), $this->equalTo('admin'), $this->equalTo('app'))
- ->will($this->returnValue($ocTpl));
-
- $tpl = new TemplateResponse($api, 'home');
- $tpl->renderAs('admin');
-
- $tpl->render();
- }
+// public function testRender(){
+// $ocTpl = $this->getMock('Template', array('fetchPage'));
+// $ocTpl->expects($this->once())
+// ->method('fetchPage');
+//
+// $tpl = new TemplateResponse('core', 'error');
+//
+// $tpl->render();
+// }
+//
+//
+// public function testRenderAssignsParams(){
+// $params = array('john' => 'doe');
+//
+// $tpl = new TemplateResponse('app', 'home');
+// $tpl->setParams($params);
+//
+// $tpl->render();
+// }
+//
+//
+// public function testRenderDifferentApp(){
+//
+// $tpl = new TemplateResponse('app', 'home', 'app2');
+//
+// $tpl->render();
+// }
public function testGetRenderAs(){
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
index dd85a9ad52f3c822c332f71cd291d0fc46af6497..95d42e4eb8ec81315e44fe1b486e4a80fec08016 100644
--- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -122,13 +122,13 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
private function getAPIMock(){
- return $this->getMock('OC\AppFramework\Core\API',
+ return $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
array('getAppName'), array('app'));
}
private function getControllerMock(){
- return $this->getMock('OC\AppFramework\Controller\Controller', array('method'),
+ return $this->getMock('OCP\AppFramework\Controller', array('method'),
array($this->getAPIMock(), new Request()));
}
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
index d0be7f7ca74994f63f3f6453bff3fa4c0c039877..7a93c0d4ddac9b309ff43858f60743a91824b560 100644
--- a/tests/lib/appframework/middleware/MiddlewareTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -44,10 +44,10 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase {
protected function setUp(){
$this->middleware = new ChildMiddleware();
- $this->api = $this->getMock('OC\AppFramework\Core\API',
+ $this->api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
array(), array('test'));
- $this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
+ $this->controller = $this->getMock('OCP\AppFramework\Controller',
array(), array($this->api, new Request()));
$this->exception = new \Exception();
$this->response = $this->getMock('OCP\AppFramework\Http\Response');
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index 3ed44282a7b0b3a625fd6ef88a2a67e90464123c..4bfd725ffd02d797647e2aa606d242101de86dbe 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -39,8 +39,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
private $request;
public function setUp() {
- $api = $this->getMock('OC\AppFramework\Core\API', array(), array('test'));
- $this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
+ $api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test'));
+ $this->controller = $this->getMock('OCP\AppFramework\Controller',
array(), array($api, new Request()));
$this->request = new Request();
@@ -51,24 +51,19 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
private function getAPI(){
- return $this->getMock('OC\AppFramework\Core\API',
+ return $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
array('isLoggedIn', 'passesCSRFCheck', 'isAdminUser',
- 'isSubAdminUser', 'activateNavigationEntry',
- 'getUserId'),
+ 'isSubAdminUser', 'getUserId'),
array('app'));
}
- private function checkNavEntry($method, $shouldBeActivated=false){
+ private function checkNavEntry($method){
$api = $this->getAPI();
- if($shouldBeActivated){
- $api->expects($this->once())
- ->method('activateNavigationEntry');
- } else {
- $api->expects($this->never())
- ->method('activateNavigationEntry');
- }
+ $serverMock = $this->getMock('\OC\Server', array());
+ $api->expects($this->any())->method('getServer')
+ ->will($this->returnValue($serverMock));
$sec = new SecurityMiddleware($api, $this->request);
$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
@@ -80,7 +75,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @NoCSRFRequired
*/
public function testSetNavigationEntry(){
- $this->checkNavEntry('testSetNavigationEntry', true);
+ $this->checkNavEntry('testSetNavigationEntry');
}
@@ -215,9 +210,33 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
/**
* @PublicPage
+ * @expectedException \OC\AppFramework\Middleware\Security\SecurityException
*/
public function testCsrfCheck(){
- $this->securityCheck('testCsrfCheck', 'passesCSRFCheck');
+ $api = $this->getAPI();
+ $request = $this->getMock('OC\AppFramework\Http\Request', array('passesCSRFCheck'));
+ $request->expects($this->once())
+ ->method('passesCSRFCheck')
+ ->will($this->returnValue(false));
+
+ $sec = new SecurityMiddleware($api, $request);
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testCsrfCheck');
+ }
+
+
+ /**
+ * @PublicPage
+ * @NoCSRFRequired
+ */
+ public function testNoCsrfCheck(){
+ $api = $this->getAPI();
+ $request = $this->getMock('OC\AppFramework\Http\Request', array('passesCSRFCheck'));
+ $request->expects($this->never())
+ ->method('passesCSRFCheck')
+ ->will($this->returnValue(false));
+
+ $sec = new SecurityMiddleware($api, $request);
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testNoCsrfCheck');
}
@@ -225,7 +244,14 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @PublicPage
*/
public function testFailCsrfCheck(){
- $this->securityCheck('testFailCsrfCheck', 'passesCSRFCheck', true);
+ $api = $this->getAPI();
+ $request = $this->getMock('OC\AppFramework\Http\Request', array('passesCSRFCheck'));
+ $request->expects($this->once())
+ ->method('passesCSRFCheck')
+ ->will($this->returnValue(true));
+
+ $sec = new SecurityMiddleware($api, $request);
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testFailCsrfCheck');
}
@@ -271,8 +297,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
public function testAfterExceptionReturnsRedirect(){
- $api = $this->getMock('OC\AppFramework\Core\API', array(), array('test'));
- $this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
+ $api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test'));
+ $serverMock = $this->getMock('\OC\Server', array('getNavigationManager'));
+ $api->expects($this->once())->method('getServer')
+ ->will($this->returnValue($serverMock));
+
+ $this->controller = $this->getMock('OCP\AppFramework\Controller',
array(), array($api, new Request()));
$this->request = new Request(