From f6cd2b87ce3a01f319eb01418f95d4a9de3b2410 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Wed, 18 Nov 2020 11:25:28 -0500
Subject: [PATCH] Port token data from Microsub branch

---
 lib/Database.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Database.php b/lib/Database.php
index 8bcd829..ace75a8 100644
--- a/lib/Database.php
+++ b/lib/Database.php
@@ -398,15 +398,16 @@ class Database {
      * @param string $class The class of the token e.g. the protocol name
      * @param string|null $id The value of the token; if none is provided a UUID will be generated
      * @param \DateTimeInterface|null $expires An optional expiry date and time for the token
+     * @param string $data Application-specific data associated with a token
      */
-    public function tokenCreate(string $user, string $class, string $id = null, \DateTimeInterface $expires = null): string {
+    public function tokenCreate(string $user, string $class, string $id = null, \DateTimeInterface $expires = null, string $data = null): string {
         if (!$this->userExists($user)) {
             throw new User\ExceptionConflict("doesNotExist", ["action" => __FUNCTION__, "user" => $user]);
         }
         // generate a token if it's not provided
         $id = $id ?? UUID::mint()->hex;
         // save the token to the database
-        $this->db->prepare("INSERT INTO arsse_tokens(id,class,\"user\",expires) values(?,?,?,?)", "str", "str", "str", "datetime")->run($id, $class, $user, $expires);
+        $this->db->prepare("INSERT INTO arsse_tokens(id,class,\"user\",expires,data) values(?,?,?,?,?)", "str", "str", "str", "datetime", "str")->run($id, $class, $user, $expires, $data);
         // return the ID
         return $id;
     }
@@ -428,7 +429,7 @@ class Database {
 
     /** Look up data associated with a token */
     public function tokenLookup(string $class, string $id): array {
-        $out = $this->db->prepare("SELECT id,class,\"user\",created,expires from arsse_tokens where class = ? and id = ? and (expires is null or expires > CURRENT_TIMESTAMP)", "str", "str")->run($class, $id)->getRow();
+        $out = $this->db->prepare("SELECT id,class,\"user\",created,expires,data from arsse_tokens where class = ? and id = ? and (expires is null or expires > CURRENT_TIMESTAMP)", "str", "str")->run($class, $id)->getRow();
         if (!$out) {
             throw new Db\ExceptionInput("subjectMissing", ["action" => __FUNCTION__, "field" => "token", 'id' => $id]);
         }