renamed reAuth to reconnect

Author: mevdschee

README.md

@@ -829,6 +829,8 @@ should not use the "authorization" middleware, but you do need to use the "recon
     },
 
 This will make the API connect to the database specifying "mevdschee" as the username and "secret123" as the password.
+The OpenAPI specification is less specific on allowed and disallowed operations, when you are using database permissions,
+as the permissions are not read in the reflection step.
 
 NB: You may want to retrieve the username and password from the session (the "$_SESSION" variable).
 

api.php

@@ -4116,27 +4116,29 @@ private function database(): ReflectedDatabase
 
         private function loadDatabase(bool $useCache): ReflectedDatabase
         {
-            $data = $useCache ? $this->cache->get('ReflectedDatabase') : '';
+            $key = sprintf('%s-ReflectedDatabase', $this->db->getCacheKey());
+            $data = $useCache ? $this->cache->get($key) : '';
             if ($data != '') {
                 $database = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));
             } else {
                 $database = ReflectedDatabase::fromReflection($this->db->reflection());
                 $data = gzcompress(json_encode($database, JSON_UNESCAPED_UNICODE));
-                $this->cache->set('ReflectedDatabase', $data, $this->ttl);
+                $this->cache->set($key, $data, $this->ttl);
             }
             return $database;
         }
 
         private function loadTable(string $tableName, bool $useCache): ReflectedTable
         {
-            $data = $useCache ? $this->cache->get("ReflectedTable($tableName)") : '';
+            $key = sprintf('%s-ReflectedTable(%s)', $this->db->getCacheKey(), $tableName);
+            $data = $useCache ? $this->cache->get($key) : '';
             if ($data != '') {
                 $table = ReflectedTable::fromJson(json_decode(gzuncompress($data)));
             } else {
                 $tableType = $this->database()->getType($tableName);
                 $table = ReflectedTable::fromReflection($this->db->reflection(), $tableName, $tableType);
                 $data = gzcompress(json_encode($table, JSON_UNESCAPED_UNICODE));
-                $this->cache->set("ReflectedTable($tableName)", $data, $this->ttl);
+                $this->cache->set($key, $data, $this->ttl);
             }
             return $table;
         }
@@ -5467,6 +5469,17 @@ private function query(string $sql, array $parameters): \PDOStatement
             $stmt->execute($parameters);
             return $stmt;
         }
+
+        public function getCacheKey(): string
+        {
+            return md5(json_encode([
+                $this->driver,
+                $this->address,
+                $this->port,
+                $this->database,
+                $this->username
+            ]));
+        }
     }
 }
 
@@ -9688,7 +9701,7 @@ public function __construct(Config $config)
                 $config->getUsername(),
                 $config->getPassword()
             );
-            $prefix = sprintf('phpcrudapi-%s-%s-%s-', $config->getDriver(), $config->getDatabase(), substr(md5(__FILE__), 0, 8));
+            $prefix = sprintf('phpcrudapi-%s-', substr(md5(__FILE__), 0, 8));
             $cache = CacheFactory::create($config->getCacheType(), $prefix, $config->getCachePath());
             $reflection = new ReflectionService($db, $cache, $config->getCacheTime());
             $responder = new JsonResponder();

src/Tqdev/PhpCrudApi/Api.php

@@ -53,7 +53,7 @@ public function __construct(Config $config)
             $config->getUsername(),
             $config->getPassword()
         );
-        $prefix = sprintf('phpcrudapi-%s-%s-%s-', $config->getDriver(), $config->getDatabase(), substr(md5(__FILE__), 0, 8));
+        $prefix = sprintf('phpcrudapi-%s-', substr(md5(__FILE__), 0, 8));
         $cache = CacheFactory::create($config->getCacheType(), $prefix, $config->getCachePath());
         $reflection = new ReflectionService($db, $cache, $config->getCacheTime());
         $responder = new JsonResponder();

src/Tqdev/PhpCrudApi/Column/ReflectionService.php

@@ -34,27 +34,29 @@ private function database(): ReflectedDatabase
 
     private function loadDatabase(bool $useCache): ReflectedDatabase
     {
-        $data = $useCache ? $this->cache->get('ReflectedDatabase') : '';
+        $key = sprintf('%s-ReflectedDatabase', $this->db->getCacheKey());
+        $data = $useCache ? $this->cache->get($key) : '';
         if ($data != '') {
             $database = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));
         } else {
             $database = ReflectedDatabase::fromReflection($this->db->reflection());
             $data = gzcompress(json_encode($database, JSON_UNESCAPED_UNICODE));
-            $this->cache->set('ReflectedDatabase', $data, $this->ttl);
+            $this->cache->set($key, $data, $this->ttl);
         }
         return $database;
     }
 
     private function loadTable(string $tableName, bool $useCache): ReflectedTable
     {
-        $data = $useCache ? $this->cache->get("ReflectedTable($tableName)") : '';
+        $key = sprintf('%s-ReflectedTable(%s)', $this->db->getCacheKey(), $tableName);
+        $data = $useCache ? $this->cache->get($key) : '';
         if ($data != '') {
             $table = ReflectedTable::fromJson(json_decode(gzuncompress($data)));
         } else {
             $tableType = $this->database()->getType($tableName);
             $table = ReflectedTable::fromReflection($this->db->reflection(), $tableName, $tableType);
             $data = gzcompress(json_encode($table, JSON_UNESCAPED_UNICODE));
-            $this->cache->set("ReflectedTable($tableName)", $data, $this->ttl);
+            $this->cache->set($key, $data, $this->ttl);
         }
         return $table;
     }

src/Tqdev/PhpCrudApi/Database/GenericDB.php

@@ -306,4 +306,15 @@ private function query(string $sql, array $parameters): \PDOStatement
         $stmt->execute($parameters);
         return $stmt;
     }
+
+    public function getCacheKey(): string
+    {
+        return md5(json_encode([
+            $this->driver,
+            $this->address,
+            $this->port,
+            $this->database,
+            $this->username
+        ]));
+    }
 }