Merge pull request #2 from Gamabunta57/master

PB-24082 - Improve Selenium API to allow mail type filtering

Author: cedricalfonsi

composer.json

@@ -2,7 +2,7 @@
   "name": "passbolt/passbolt-selenium-api",
   "description": "Passbolt selenium testing helper endpoints",
   "type": "cakephp-plugin",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "keywords": [
     "password",
     "passbolt",

src/Controller/EmailController.php

@@ -66,10 +66,16 @@ public function showLastEmail($username)
             throw new HttpException(__('The username does not exist.'));
         }
         $EmailQueue = TableRegistry::getTableLocator()->get('EmailQueue.EmailQueue');
-        $email = $EmailQueue->find('all')
+        $emailQuery = $EmailQueue->find('all')
             ->where(['email' => $username])
-            ->order(['created' => 'DESC'])
-            ->first();
+            ->order(['created' => 'DESC']);
+
+        $emailType = $this->getEmailType();
+        if (!is_null($emailType)) {
+            $emailQuery->where(['template' => $emailType]);
+        }
+
+        $email = $emailQuery->first();
         if (empty($email)) {
             throw new HttpException(__('No email was sent to this user.'));
         }
@@ -85,4 +91,22 @@ public function showLastEmail($username)
             ->setTemplate($email->template)
             ->setTemplatePath("email/$format");
     }
+
+    /**
+     * Returns a validated `has-type` filter set in the query parameters of the request if any.
+     * @return string|null
+     */
+    private function getEmailType() {
+        $filter = $this->request->getQuery('filter');
+        if (is_null($filter) || !is_array($filter)) {
+            return null;
+        }
+
+        $hasType = $filter['has-type'];
+        if (empty($hasType) || !is_string($hasType)) {
+            return null;
+        }
+
+        return $hasType;
+    }
 }