bruce-models 1.3.8 → 1.4.0

package/dist/bruce-models.es5.js

@@ -1564,7 +1564,9 @@ var Entity;
                         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.
@@ -1576,7 +1578,7 @@ var Entity;
                 }
             }
             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)
             };
         });
     }
@@ -1748,7 +1750,9 @@ var Entity;
             for (let i = 0; i < entities.length; i++) {
                 const entity = entities[i];
                 const id = entity.Bruce.ID;
-                api.Cache.Set(GetCacheKey(id), entity, Api.DEFAULT_CACHE_DURATION);
+                api.Cache.Set(GetCacheKey(id), {
+                    entity: entity
+                }, Api.DEFAULT_CACHE_DURATION);
             }
             return {
                 entities: entities
@@ -6060,11 +6064,19 @@ var User;
             if (cacheData) {
                 return cacheData;
             }
-            const req = yield api.GET(`user/${id}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
-            api.Cache.Set(GetCacheKey(id, accountId), req, 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, Api.DEFAULT_CACHE_DURATION);
+            return prom;
         });
     }
     User.Get = Get;
@@ -6205,11 +6217,19 @@ var User;
                 if (cacheData) {
                     return cacheData;
                 }
-                const req = yield api.GET(`userByEmail/${email}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
-                api.Cache.Set(GetEmailCacheKey(email, accountId), req, 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, Api.DEFAULT_CACHE_DURATION);
+                return prom;
             });
         }
         LoginUser.GetByEmail = GetByEmail;
@@ -6240,7 +6260,9 @@ var User;
                 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) {
@@ -6382,7 +6404,7 @@ var User;
                     try {
                         const data = yield api.GET("usersByClientAccount/accessTokens", reqParams);
                         res({
-                            tokens: data.Items
+                            users: data.Items
                         });
                     }
                     catch (e) {
@@ -6392,7 +6414,9 @@ var User;
                 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, Api.DEFAULT_CACHE_DURATION);
@@ -6424,7 +6448,7 @@ var User;
                 data = yield api.POST("accessToken", data, reqParams);
                 api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
                 return {
-                    token: data
+                    user: data
                 };
             });
         }