slight refactoring

Author: evert

lib/Sabre/DAV/Auth/Plugin.php

@@ -38,13 +38,6 @@ class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
      */
     private $realm;
 
-    /**
-     * userName of currently logged in user 
-     * 
-     * @var string 
-     */
-    private $userInfo;
-
     /**
      * __construct 
      * 
@@ -74,19 +67,6 @@ public function initialize(Sabre_DAV_Server $server) {
 
     }
 
-    /**
-     * Returns the currently logged in user's information.
-     *
-     * This will only be set if authentication was succesful.
-     * 
-     * @return array|null 
-     */
-    public function getUserInfo() {
-
-        return $this->authBackend->getCurrentUser();
-
-    }
-
     /**
      * This method intercepts calls to PROPFIND and similar lookups 
      * 
@@ -98,7 +78,7 @@ public function getUserInfo() {
     public function afterGetProperties($href, &$properties) {
 
         if (array_key_exists('{DAV:}current-user-principal', $properties[404])) {
-            if ($ui = $this->getUserInfo()) {
+            if ($ui = $this->authBackend->getCurrentUser()) {
                 $properties[200]['{DAV:}current-user-principal'] = new Sabre_DAV_Property_Principal(Sabre_DAV_Property_Principal::HREF, $ui['uri']);
             } else {
                 $properties[200]['{DAV:}current-user-principal'] = new Sabre_DAV_Property_Principal(Sabre_DAV_Property_Principal::UNAUTHENTICATED);

tests/Sabre/DAV/Auth/PluginTest.php

@@ -24,10 +24,6 @@ function testAuthenticate() {
         $fakeServer->addPlugin($plugin);
         $fakeServer->broadCastEvent('beforeMethod',array('GET'));
 
-        $this->assertEquals(array(
-            'uri' => 'principals/admin',
-        ), $plugin->getUserInfo());
-
     }
 
     function testCurrentUserPrincipal() {