RackspaceCloudFilesAdapter authenticate only when needed

ftassi · May 13, 2012 · f0a9e5e · f0a9e5e
1 parent 5c56f06
commit f0a9e5e
Showing 1 changed file with 27 additions and 10 deletions.
diff --git a/Storage/Adapter/RackspaceCloudFilesAdapter.php b/Storage/Adapter/RackspaceCloudFilesAdapter.php
@@ -11,29 +11,33 @@
  */
 class RackspaceCloudFilesAdapter implements CDNAdapterInterface
 {
-
     /**
      * 
      * @var \CF_Authentication 
      */
     protected $rackspaceAuthentication;
-    
+
     /**
      *
      * @var \CF_Connection
      */
     protected $rackspaceConnection;
-    
+
     /**
      *
      * @var string
      */
     protected $container;
-
+
+    /**
+     *
+     * @var boolean
+     */
+    protected $authenticated = false;
+
     function __construct(\CF_Authentication $rackspaceAuthentication)
     {
         $this->rackspaceAuthentication = $rackspaceAuthentication;
-        $this->rackspaceAuthentication->authenticate();
     }
 
     /**
@@ -52,7 +56,7 @@ public function setContainer($container)
     {
         $this->container = $container;
     }
-    
+
     /**
      *
      * @return \CF_Connection
@@ -70,15 +74,15 @@ public function setRackspaceConnection(\CF_Connection $rackspaceConnection)
     {
         $this->rackspaceConnection = $rackspaceConnection;
     }
-    
+
     /**
      *
      * @param string $filename 
      * @return string 
      */
     public function getAbsoluteUri($filename)
     {
-
+        $this->authenticate();
         $mediaContainer = $this->rackspaceConnection->get_container($this->container);
         $object = $mediaContainer->get_object($filename);
         return $object->public_uri();
@@ -91,20 +95,33 @@ public function getAbsoluteUri($filename)
      */
     public function put($filePath, $fileName)
     {
+        $this->authenticate();
         $mediaContainer = $this->rackspaceConnection->get_container($this->container);
         $object = $mediaContainer->create_object($fileName);
-        return $object->load_from_filename($filePath);        
+        return $object->load_from_filename($filePath);
     }
-    
+
     /**
      *
      * @param string $fileName
      * @return boolean
      */
     public function remove($fileName)
     {
+        $this->authenticate();
         $mediaContainer = $this->rackspaceConnection->get_container($this->container);
         return $mediaContainer->delete_object($fileName);
     }
 
+    /**
+     * Authenticave over Rackspace 
+     */
+    protected function authenticate()
+    {
+        if (!$this->authenticated) {
+            $this->rackspaceAuthentication->authenticate();
+            $this->authenticated = true;
+        }
+    }
+
 }