1 files changed, 49 insertions, 3 deletions
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 3755d45fa09..7276a11e4d9 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;
 
 
@@ -86,7 +87,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']);
 		});
 
 		$this['MiddlewareDispatcher'] = $this->share(function($c){
@@ -129,10 +130,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);
 	}
 
@@ -143,4 +144,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);
+	}
 }