Core Update 1.4.0

core/Api/ApiKeyAPI.class.php

@@ -32,6 +32,7 @@ namespace Api\ApiKey {
 
   use Api\ApiKeyAPI;
   use Api\Parameter\Parameter;
+  use Api\Request;
   use DateTime;
   use Driver\SQL\Condition\Compare;
   use Exception;
@@ -64,12 +65,11 @@ namespace Api\ApiKey {
       if ($this->success) {
         $this->result["api_key"] = array(
           "api_key" => $apiKey,
-          "valid_until" => $validUntil->getTimestamp(),
+          "valid_until" => $validUntil->format("Y-m-d H:i:s"),
           "uid" => $sql->getLastInsertId(),
         );
-      } else {
-        $this->result["api_key"] = null;
       }
+
       return $this->success;
     }
   }
@@ -77,7 +77,9 @@ namespace Api\ApiKey {
   class Fetch extends ApiKeyAPI {
 
     public function __construct($user, $externalCall = false) {
-      parent::__construct($user, $externalCall, array());
+      parent::__construct($user, $externalCall, array(
+        "showActiveOnly" => new Parameter("showActiveOnly", Parameter::TYPE_BOOLEAN, true, true)
+      ));
       $this->loginRequired = true;
     }
 
@@ -87,12 +89,16 @@ namespace Api\ApiKey {
       }
 
       $sql = $this->user->getSQL();
-      $res = $sql->select("uid", "api_key", "valid_until")
+      $query = $sql->select("uid", "api_key", "valid_until", "active")
         ->from("ApiKey")
-        ->where(new Compare("user_id", $this->user->getId()))
-        ->where(new Compare("valid_until", $sql->currentTimestamp(), ">"))
-        ->where(new Compare("active", true))
-        ->execute();
+        ->where(new Compare("user_id", $this->user->getId()));
+
+      if ($this->getParam("showActiveOnly")) {
+        $query->where(new Compare("valid_until", $sql->currentTimestamp(), ">"))
+              ->where(new Compare("active", true));
+      }
+
+      $res = $query->execute();
 
       $this->success = ($res !== FALSE);
       $this->lastError = $sql->getLastError();
@@ -100,16 +106,12 @@ namespace Api\ApiKey {
       if($this->success) {
         $this->result["api_keys"] = array();
         foreach($res as $row) {
-          try {
-            $validUntil = (new DateTime($row["valid_until"]))->getTimestamp();
-          } catch (Exception $e) {
-            $validUntil = $row["valid_until"];
-          }
-
-          $this->result["api_keys"][] = array(
-            "uid" => intval($row["uid"]),
+          $apiKeyId = intval($row["uid"]);
+          $this->result["api_keys"][$apiKeyId] = array(
+            "id" => $apiKeyId,
             "api_key" => $row["api_key"],
-            "valid_until" => $validUntil,
+            "valid_until" => $row["valid_until"],
+            "revoked" => !$sql->parseBool($row["active"])
           );
         }
       }
@@ -146,7 +148,7 @@ namespace Api\ApiKey {
       $this->lastError = $sql->getLastError();
 
       if ($this->success) {
-        $this->result["valid_until"] = $validUntil->getTimestamp();
+        $this->result["valid_until"] = $validUntil;
       }
 
       return $this->success;
@@ -168,7 +170,7 @@ namespace Api\ApiKey {
       }
 
       $id = $this->getParam("id");
-      if(!$this->apiKeyExists($id))
+      if (!$this->apiKeyExists($id))
         return false;
 
       $sql = $this->user->getSQL();