Fix cache invalidation

Author: cdujeu

core/src/core/classes/class.AuthService.php

@@ -1147,7 +1147,8 @@ public static function getRole($roleId, $createIfNotExists = false)
     public static function updateRole($roleObject, $userObject = null)
     {
         ConfService::getConfStorageImpl()->updateRole($roleObject, $userObject);
-        CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
+        //CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
+        ConfService::getInstance()->invalidateLoadedRepositories();
     }
     /**
      * Delete a role by its id
@@ -1158,7 +1159,8 @@ public static function updateRole($roleObject, $userObject = null)
     public static function deleteRole($roleId)
     {
         ConfService::getConfStorageImpl()->deleteRole($roleId);
-        CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
+        //CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
+        ConfService::getInstance()->invalidateLoadedRepositories();
     }
 
     public static function filterPluginParameters($pluginId, $params, $repoId = null)

core/src/core/classes/class.ConfService.php

@@ -599,7 +599,8 @@ public function invalidateLoadedRepositories()
     {
         if(isSet($_SESSION["REPOSITORIES"])) unset($_SESSION["REPOSITORIES"]);
         $this->configs["REPOSITORIES"] = null;
-        CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
+        CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, $this->getRegistryCacheKey(true));
+        CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, $this->getRegistryCacheKey(false));
     }
 
     private function cacheRepository($repoId, $repository){
@@ -1007,6 +1008,7 @@ public function addRepositoryInst($oRepository)
         }
         AJXP_Controller::applyHook("workspace.after_create", array($oRepository));
         AJXP_Logger::info(__CLASS__,"Create Repository", array("repo_name"=>$oRepository->getDisplay()));
+        CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "repository:".$oRepository->getId(), $oRepository);
         $this->invalidateLoadedRepositories();
         return null;
     }
@@ -1134,8 +1136,8 @@ public static function replaceRepository($oldId, $oRepositoryObject)
     }
     /**
      * See static method
-     * @param $oldId
-     * @param $oRepositoryObject
+     * @param string $oldId
+     * @param Repository $oRepositoryObject
      * @return int
      */
     public function replaceRepositoryInst($oldId, $oRepositoryObject)
@@ -1149,6 +1151,7 @@ public function replaceRepositoryInst($oldId, $oRepositoryObject)
         AJXP_Controller::applyHook("workspace.after_update", array($oRepositoryObject));
         AJXP_Logger::info(__CLASS__,"Edit Repository", array("repo_name"=>$oRepositoryObject->getDisplay()));
         $this->invalidateLoadedRepositories();
+        CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "repository:" . $oRepositoryObject->getId(), $oRepositoryObject);
         return 0;
     }
     /**
@@ -1198,6 +1201,7 @@ public function deleteRepositoryInst($repoId)
         AJXP_Controller::applyHook("workspace.after_delete", array($repoId));
         AJXP_Logger::info(__CLASS__,"Delete Repository", array("repo_id"=>$repoId));
         $this->invalidateLoadedRepositories();
+        CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, "repository:".$repoId);
         return 0;
     }
 

core/src/plugins/access.s3/class.s3CacheService.php

@@ -31,7 +31,7 @@ class s3CacheService implements \Aws\CacheInterface
      * @return mixed|null Returns the value or null if not found.
      */
     public function get($key) {
-        return  \CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, $key);
+        return  \CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $key);
     }
 
     /**
@@ -43,7 +43,7 @@ public function get($key) {
      *                      to 0 to allow an unlimited lifetime.
      */
     public function set($key, $value, $ttl = 0) {
-        \CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, $key, $value, $ttl);
+        \CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $key, $value, $ttl);
     }
 
     /**
@@ -52,6 +52,6 @@ public function set($key, $value, $ttl = 0) {
      * @param string $key Key to remove.
      */
     public function remove($key) {
-        \CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, $key);
+        \CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, $key);
     }
 }

core/src/plugins/core.access/src/Stream/PathWrapper.php

@@ -18,7 +18,6 @@
 class PathWrapper extends AJXP_SchemeTranslatorWrapper
 {
     const CACHE_KEY='PathWrapperParams';
-    const CACHE_EXPIRY_TIME = 10000;
 
     /*
      * @array localParams
@@ -30,14 +29,13 @@ public static function applyInitPathHook($url, $context = 'core')
         $params = [];
         $parts = AJXP_Utils::safeParseUrl($url);
 
-        if (! ($params = self::getLocalParams(self::CACHE_KEY . $url)) &&
-            ! ($params = CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, self::CACHE_KEY . $url))) {
+        if (! ($params = self::getLocalParams(self::CACHE_KEY . $url)) ) {
 
             // Nothing in cache
             $repositoryId = $parts["host"];
             $repository = ConfService::getRepositoryById($parts["host"]);
             if ($repository == null) {
-                throw new Exception("Cannot find repository");
+                throw new \Exception("Cannot find repository");
             }
 
             $configHost = $repository->getOption('HOST');
@@ -61,7 +59,6 @@ public static function applyInitPathHook($url, $context = 'core')
             $params['key'] = md5($params['keybase']);
 
             self::addLocalParams(self::CACHE_KEY . $url, $params);
-            CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, self::CACHE_KEY . $url, $params, self::CACHE_EXPIRY_TIME);
         }
 
         $repoData = self::actualRepositoryWrapperData($parts["host"]);