bruce-models 1.3.8 → 1.4.0

package/dist/bruce-models.umd.js

@@ -1535,7 +1535,9 @@
                             try {
                                 const data = yield req;
                                 const item = data.Items.find(x => x.Bruce.ID == entityId);
-                                res(item);
+                                res({
+                                    entity: item
+                                });
                             }
                             catch (e) {
                                 // No showing error as we don't want to see it 2000 times.
@@ -1547,7 +1549,7 @@
                     }
                 }
                 return {
-                    entities: (yield Promise.all(reqs)).filter(x => !!x)
+                    entities: (yield Promise.all(reqs)).map(x => x === null || x === void 0 ? void 0 : x.entity).filter(x => !!x)
                 };
             });
         }
@@ -1719,7 +1721,9 @@
                 for (let i = 0; i < entities.length; i++) {
                     const entity = entities[i];
                     const id = entity.Bruce.ID;
-                    api.Cache.Set(GetCacheKey(id), entity, exports.Api.DEFAULT_CACHE_DURATION);
+                    api.Cache.Set(GetCacheKey(id), {
+                        entity: entity
+                    }, exports.Api.DEFAULT_CACHE_DURATION);
                 }
                 return {
                     entities: entities
@@ -5857,11 +5861,19 @@
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = yield api.GET(`user/${id}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
-                api.Cache.Set(GetCacheKey(id, accountId), req, exports.Api.DEFAULT_CACHE_DURATION);
-                return {
-                    user: req
-                };
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`user/${id}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
+                        res({
+                            user: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.Cache.Set(GetCacheKey(id, accountId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         User.Get = Get;
@@ -6002,11 +6014,19 @@
                     if (cacheData) {
                         return cacheData;
                     }
-                    const req = yield api.GET(`userByEmail/${email}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
-                    api.Cache.Set(GetEmailCacheKey(email, accountId), req, exports.Api.DEFAULT_CACHE_DURATION);
-                    return {
-                        user: req
-                    };
+                    const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                        try {
+                            const data = yield api.GET(`userByEmail/${email}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
+                            res({
+                                user: data
+                            });
+                        }
+                        catch (e) {
+                            rej(e);
+                        }
+                    }));
+                    api.Cache.Set(GetEmailCacheKey(email, accountId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                    return prom;
                 });
             }
             LoginUser.GetByEmail = GetByEmail;
@@ -6037,7 +6057,9 @@
                     req.then((data) => {
                         const users = data.users;
                         for (let i = 0; i < users.length; i++) {
-                            api.Cache.Set(GetCacheKey(users[i].ID, accountId), users[i]);
+                            api.Cache.Set(GetCacheKey(users[i].ID, accountId), {
+                                user: users[i]
+                            });
                         }
                     });
                     if (!exclusive) {
@@ -6179,7 +6201,7 @@
                         try {
                             const data = yield api.GET("usersByClientAccount/accessTokens", reqParams);
                             res({
-                                tokens: data.Items
+                                users: data.Items
                             });
                         }
                         catch (e) {
@@ -6189,7 +6211,9 @@
                     req.then((data) => {
                         const users = data.tokens;
                         for (let i = 0; i < users.length; i++) {
-                            api.Cache.Set(GetCacheKey(users[i].ID, accountId), users[i]);
+                            api.Cache.Set(GetCacheKey(users[i].ID, accountId), {
+                                user: users[i]
+                            });
                         }
                     });
                     api.Cache.Set(GetListCacheKey(accountId), req, exports.Api.DEFAULT_CACHE_DURATION);
@@ -6221,7 +6245,7 @@
                     data = yield api.POST("accessToken", data, reqParams);
                     api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                     return {
-                        token: data
+                        user: data
                     };
                 });
             }