Merge pull request #4 from xlecours/adding_images_etag_header

Adding Etag headers for /candidates/visits/images/Image.php
maltheism · Apr 24, 2019 · 8fb5b64 · 8fb5b64
2 parents e5a0fee + 5e2238e
commit 8fb5b64
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/htdocs/api/v0.0.3-dev/APIBase.php b/htdocs/api/v0.0.3-dev/APIBase.php
@@ -115,7 +115,9 @@ function handleRequest()
         case 'PATCH':
             $this->handlePATCH();
             break;
-
+        case 'HEAD':
+            $this->handleHEAD();
+            break;
         }
     }
 
@@ -147,6 +149,19 @@ function handleETag()
      */
     abstract function calculateETag();
 
+    /**
+     * Handle a HEAD request
+     *
+     * @return void
+     */
+    function handleHEAD()
+    {
+        $ETag = $this->calculateETag();
+        $this->header("ETag: $ETag");
+        $this->handleGET();
+        $this->JSON = null;
+    }
+
     /**
      * Handle a GET request
      *

diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/images/Image.php b/htdocs/api/v0.0.3-dev/candidates/visits/images/Image.php
@@ -43,6 +43,7 @@ public function __construct($method, $CandID, $VisitLabel, $Filename)
         if (empty($this->AllowedMethods)) {
             $this->AllowedMethods = [
                                      'GET',
+                                     'HEAD',
                                     ];
         }
         $this->CandID     = $CandID;
@@ -143,7 +144,8 @@ protected function getHeader($headerName)
      */
     public function calculateETag()
     {
-        return null;
+        $filename = $this->getFullPath();
+        return hash_file('md5', $filename);
     }
 
     /**