kuzzle 2.30.0-beta.1 → 2.30.1-beta.1

package/lib/api/controllers/memoryStorageController.js

@@ -267,11 +267,15 @@ function initMapping() {
           kassert.assertBodyAttributeType(request, "entries", "array");
 
           val.forEach((v) => {
-            if (typeof v !== "object" || !v.field || !v.value) {
+            if (
+              typeof v !== "object" ||
+              !v.field ||
+              (!v.value && v.value !== 0)
+            ) {
               throw kerror.get(
                 "invalid_argument",
                 "entries",
-                "<array of object>",
+                "<array of objects>",
               );
             }
 
@@ -348,7 +352,11 @@ function initMapping() {
           kassert.assertBodyHasAttribute(request, "entries");
           kassert.assertBodyAttributeType(request, "entries", "array");
           val.forEach((entry) => {
-            if (typeof entry !== "object" || !entry.key || !entry.value) {
+            if (
+              typeof entry !== "object" ||
+              !entry.key ||
+              (!entry.value && entry.value !== 0)
+            ) {
               throw kerror.get(
                 "invalid_argument",
                 "entries",

package/lib/core/security/profileRepository.d.ts

@@ -29,7 +29,6 @@ type UpdateOptions = {
  */
 export declare class ProfileRepository extends ObjectRepository<Profile> {
     private module;
-    private profiles;
     /**
      * @constructor
      */
@@ -42,7 +41,9 @@ export declare class ProfileRepository extends ObjectRepository<Profile> {
      * @returns {Promise.<Promise>}
      * @throws {NotFoundError} If the corresponding profile doesn't exist
      */
-    load(id: string): Promise<Profile>;
+    load(id: string, options?: {
+        key?: string;
+    }): Promise<Profile>;
     /**
      * Loads a Profile object given its id.
      * Stores the promise of the profile being loaded in the memcache
@@ -140,16 +141,6 @@ export declare class ProfileRepository extends ObjectRepository<Profile> {
      * @returns {Promise<Profile>}
      */
     fromDTO(dto: JSONObject): Promise<Profile>;
-    /**
-     * @override
-     */
-    truncate(opts: JSONObject): Promise<void>;
-    /**
-     * Invalidate the cache entries for the given profile. If none is provided,
-     * the entire cache is emptied.
-     * @param {string} [profileId]
-     */
-    invalidate(profileId?: string): void;
     /**
      * Optimize each policy to get a O(1) index access time
      * and a O(log(n)) collection search time.
@@ -168,8 +159,8 @@ export declare class ProfileRepository extends ObjectRepository<Profile> {
      * @param policy
      */
     private optimizePolicy;
-    toDTO(dto: Profile): Promise<JSONObject>;
-    deleteFromDatabase(id: string, options: JSONObject): Promise<any>;
+    toDTO(dto: Profile): JSONObject;
+    deleteFromDatabase(id: string, options: JSONObject): any;
     search(searchBody: JSONObject, options: JSONObject): Promise<{
         aggregations: any;
         hits: any[];

package/lib/core/security/profileRepository.js

@@ -51,7 +51,6 @@ const bluebird_1 = __importDefault(require("bluebird"));
 const lodash_1 = require("lodash");
 const kerror = __importStar(require("../../kerror"));
 const profile_1 = require("../../model/security/profile");
-const cacheDbEnum_1 = require("../cache/cacheDbEnum");
 const ObjectRepository_1 = require("../shared/ObjectRepository");
 /**
  * @class ProfileRepository
@@ -62,12 +61,8 @@ class ProfileRepository extends ObjectRepository_1.ObjectRepository {
      * @constructor
      */
     constructor(securityModule) {
-        super({
-            cache: cacheDbEnum_1.cacheDbEnum.NONE,
-            store: global.kuzzle.internalIndex,
-        });
+        super({ store: global.kuzzle.internalIndex });
         this.module = securityModule;
-        this.profiles = new Map();
         this.collection = "profiles";
         this.ObjectConstructor = profile_1.Profile;
     }
@@ -111,7 +106,7 @@ class ProfileRepository extends ObjectRepository_1.ObjectRepository {
          *
          * @param  {String} [id] - profile identifier
          */
-        global.kuzzle.onAsk("core:security:profile:invalidate", (id) => this.invalidate(id));
+        global.kuzzle.onAsk("core:security:profile:invalidate", (id) => this.deleteFromCache(id));
         /**
          * Gets multiple profiles
          * @param  {Array} ids
@@ -156,13 +151,18 @@ class ProfileRepository extends ObjectRepository_1.ObjectRepository {
      * @returns {Promise.<Promise>}
      * @throws {NotFoundError} If the corresponding profile doesn't exist
      */
-    async load(id) {
-        if (this.profiles.has(id)) {
-            return this.profiles.get(id);
+    async load(id, options = {}) {
+        const profile = await this.loadFromCache(id, options);
+        if (profile === null) {
+            const profileFromDatabase = await this.loadOneFromDatabase(id);
+            if (profileFromDatabase !== null) {
+                await this.persistToCache(profileFromDatabase);
+                profileFromDatabase.optimizedPolicies = this.optimizePolicies(profileFromDatabase.policies);
+            }
+            return profileFromDatabase;
         }
-        const profile = await super.load(id);
         profile.optimizedPolicies = this.optimizePolicies(profile.policies);
-        this.profiles.set(id, profile);
+        await this.refreshCacheTTL(profile);
         return profile;
     }
     /**
@@ -185,14 +185,7 @@ class ProfileRepository extends ObjectRepository_1.ObjectRepository {
             throw kerror.get("api", "assert", "invalid_type", "profileIds", "string[]");
         }
         for (const id of profileIds) {
-            let profile = this.profiles.get(id);
-            if (!profile) {
-                profile = this.loadOneFromDatabase(id).then((p) => {
-                    p.optimizedPolicies = this.optimizePolicies(p.policies);
-                    this.profiles.set(id, p);
-                    return p;
-                });
-            }
+            const profile = this.load(id);
             profiles.push(profile);
         }
         return bluebird_1.default.all(profiles);
@@ -342,7 +335,7 @@ class ProfileRepository extends ObjectRepository_1.ObjectRepository {
             }
         }
         await this.deleteFromDatabase(profile._id, { refresh });
-        this.profiles.delete(profile._id);
+        await this.deleteFromCache(profile._id);
     }
     /**
      * From a Profile object, returns a serialized object ready to be persisted
@@ -384,9 +377,9 @@ class ProfileRepository extends ObjectRepository_1.ObjectRepository {
             retryOnConflict,
         });
         const updatedProfile = await this.loadOneFromDatabase(profile._id);
+        await this.persistToCache(updatedProfile);
         // Recompute optimized policies based on new policies
         updatedProfile.optimizedPolicies = this.optimizePolicies(updatedProfile.policies);
-        this.profiles.set(profile._id, updatedProfile);
         return updatedProfile;
     }
     /**
@@ -410,32 +403,6 @@ class ProfileRepository extends ObjectRepository_1.ObjectRepository {
         }
         return profile;
     }
-    /**
-     * @override
-     */
-    async truncate(opts) {
-        try {
-            await super.truncate(opts);
-        }
-        finally {
-            // always clear the RAM cache: even if truncate fails in the middle of it,
-            // some of the cached profiles might not be valid anymore
-            this.invalidate();
-        }
-    }
-    /**
-     * Invalidate the cache entries for the given profile. If none is provided,
-     * the entire cache is emptied.
-     * @param {string} [profileId]
-     */
-    invalidate(profileId) {
-        if (!profileId) {
-            this.profiles.clear();
-        }
-        else {
-            this.profiles.delete(profileId);
-        }
-    }
     /**
      * Optimize each policy to get a O(1) index access time
      * and a O(log(n)) collection search time.
@@ -496,10 +463,10 @@ class ProfileRepository extends ObjectRepository_1.ObjectRepository {
     // Every method described after are for testing purpose only
     // Otherwise we cannot stub them
     // ============================================
-    async toDTO(dto) {
+    toDTO(dto) {
         return super.toDTO(dto);
     }
-    async deleteFromDatabase(id, options) {
+    deleteFromDatabase(id, options) {
         return super.deleteFromDatabase(id, options);
     }
     async search(searchBody, options) {

package/lib/core/security/roleRepository.js

@@ -43,7 +43,7 @@ class RoleRepository extends ObjectRepository {
    */
   constructor(securityModule) {
     super({
-      cache: cacheDbEnum.NONE,
+      cache: cacheDbEnum.INTERNAL,
       store: global.kuzzle.internalIndex,
     });
 

package/lib/core/shared/ObjectRepository.js

@@ -127,7 +127,7 @@ class ObjectRepository {
         let response;
         try {
             response = await global.kuzzle.ask(`core:cache:${this.cacheDb}:get`, key);
-            if (response === null) {
+            if (response === null || response === undefined) {
                 return null;
             }
             return await this.fromDTO({ ...JSON.parse(response) });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.30.0-beta.1",
+  "version": "2.30.1-beta.1",
   "description": "Kuzzle is an open-source solution that handles all the data management through a secured API, with a large choice of protocols.",
   "bin": "bin/start-kuzzle-server",
   "scripts": {