@gudhub/core 1.1.24 → 1.1.26

package/GUDHUB/PipeService/PipeService.js

@@ -200,10 +200,12 @@ export class PipeService {
           //-- Emiting messages from the MessageBox
           //We use timeout to emit message after subscriber is created
           setTimeout(() => {
-            this.emit(...this.messageBox[listenerName]);
+            if(this.messageBox[listenerName]) {
+              this.emit(...this.messageBox[listenerName]);
 
-            //we mark message after it was readed as "to be removed" to remove it in next itration 
-            this.messageBox[listenerName][4] = true;
+              //we mark message after it was readed as "to be removed" to remove it in next itration 
+              this.messageBox[listenerName][4] = true;
+            }
           }, 0);
         }
       }

package/GUDHUB/Utils/filter/utils.js

@@ -56,7 +56,8 @@ export function getDate({ type, date = 0, match = true } = {}, itemTime) {
       const daysToEnd = date == -2 ? 13 : 6;
       const weekEnd = weekStart + daysToEnd;
       const weekDayStart = newDate.setDate(weekStart + date * 7);
-      const weekDayEnd = newDate.setDate(weekEnd + date * 7);
+      const currentDate = new Date();
+      const weekDayEnd = currentDate.setDate(weekEnd + date * 7);
 
       const [sunday, saturday] = getWeek(weekDayStart, weekDayEnd);
 

package/GUDHUB/Utils/groupManager/GroupManager.js

@@ -0,0 +1,166 @@
+export class GroupManager {
+    constructor(gudhub, req) {
+      this.req = req;
+      this.gudhub = gudhub;
+    }
+  
+    //********************* CREATE GROUP *********************//
+  
+    async createGroupApi(groupName) {
+      try {
+        const form = {
+          token: await this.gudhub.auth.getToken(),
+          group_name: groupName,
+        };
+        const group = await this.req.post({
+          url: "/api/sharing-group/create-group",
+          form,
+        });
+        return group;
+      } catch (err) {
+        console.log(err);
+        return null;
+      }
+    }
+
+    //********************* UPDATE GROUP *********************//
+
+    async updateGroupApi(groupId, groupName) {
+        try {
+          const form = {
+            token: await this.gudhub.auth.getToken(),
+            group_name: groupName,
+            group_id: groupId
+          };
+          const group = await this.req.post({
+            url: "/api/sharing-group/update-group",
+            form,
+          });
+          return group;
+        } catch (err) {
+          console.log(err);
+          return null;
+        }
+    }
+
+    //********************* DELETE GROUP *********************//
+
+    async deleteGroupApi(groupId) {
+        try {
+          const form = {
+            token: await this.gudhub.auth.getToken(),
+            group_id: groupId
+          };
+          const group = await this.req.post({
+            url: "/api/sharing-group/delete-group",
+            form,
+          });
+          return group;
+        } catch (err) {
+          console.log(err);
+          return null;
+        }
+    }
+
+    //********************* ADD USER TO GROUP *********************//
+
+    async addUserToGroupApi(groupId, userId, permission) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                group_id: groupId,
+                user_id: userId,
+                group_permission: permission
+            };
+            const group = await this.req.post({
+                url: "/api/sharing-group/add-user-to-group",
+                form,
+            });
+            return group;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    //********************* GET USERS BY GROUP *********************//
+
+    async getUsersByGroupApi(groupId) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                group_id: groupId,
+            };
+            const group = await this.req.post({
+                url: "/api/sharing-group/get-users-by-group",
+                form,
+            });
+            return group;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    //********************* UPDATE USER IN GROUP *********************//
+
+    async updateUserInGroupApi(userId, groupId, permission) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                user_id: userId,
+                group_id: groupId,
+                group_permission: permission
+            };
+            const group = await this.req.post({
+                url: "/api/sharing-group/update-user-in-group",
+                form,
+            });
+            return group;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    //********************* REMOVE USER FROM GROUP *********************//
+
+    async deleteUserFromGroupApi(userId, groupId) {
+      try {
+          const form = {
+              token: await this.gudhub.auth.getToken(),
+              user_id: userId,
+              group_id: groupId
+          };
+          const group = await this.req.post({
+              url: "/api/sharing-group/delete-user-from-group",
+              form,
+          });
+          return group;
+      } catch (err) {
+          console.log(err);
+          return null;
+      }
+    }
+
+    //********************* GET GROUPS BY USER *********************//
+
+    async getGroupsByUserApi(userId) {
+      try {
+          const form = {
+              token: await this.gudhub.auth.getToken(),
+              user_id: userId
+          };
+          const group = await this.req.post({
+              url: "/api/sharing-group/get-groups-by-user",
+              form,
+          });
+          return group;
+      } catch (err) {
+          console.log(err);
+          return null;
+      }
+    }
+
+  }
+  

package/GUDHUB/Utils/groupManager/groupManager.test.js

@@ -0,0 +1,65 @@
+import { GudHub } from '../../gudhub.js';
+
+describe("GROUP MANAGEMENT", async function() {
+    const gudhub = new GudHub();
+
+    it("CREATE GROUP FOR SHARING / should return object with group name and id", async function () {
+        const group = await gudhub.groupSharing.createGroup('Test group');
+        group.should.property('group_name').equal('Test group');
+        group.should.property('group_id').equal(1);
+    })
+
+    it("ADD USER TO GROUP / should return user, group id's and permission for user", async function () {
+        // PermissionStatus: 0 - no access, 1 - read and write, 2 - admin, 3 - owner -> default when create group
+        const group = await gudhub.groupSharing.addUserToGroup(1, 1695, 1);
+        group.should.property('user_id').equal('1695');
+        group.should.property('group_id').equal('1');
+        group.should.property('group_permission').equal('1');
+    })
+
+    it("UPDATE GROUP WITH NEW NAME", async function () {
+        const group = await gudhub.groupSharing.updateGroup(1, 'New group name');
+        group.should.property('group_name').equal('New group name');
+        group.should.property('group_id').equal('1');
+    })
+
+    it("GET USERS IN GROUP / should return array with users in group", async function () {
+        const group = await gudhub.groupSharing.getUsersByGroup(1);
+        const groupUsersLength = group.length;
+        groupUsersLength.should.equal(2);
+        group[0].should.property('group_id').equal(1);
+        group[0].should.property('user_id').equal(1695);
+        group[0].should.property('group_permission').equal(1);
+    })
+
+    it("GET GROUPS BY USER / should return array with groups for specific user", async function () {
+        const group = await gudhub.groupSharing.getGroupsByUser(1695);
+        const groupUsersLength = group.length;
+        groupUsersLength.should.equal(1);
+        group[0].should.property('group_id').equal(1);
+        group[0].should.property('user_id').equal(1695);
+        group[0].should.property('group_permission').equal(1);
+        group[0].should.property('group_name').equal('New group name');
+    })
+
+    it("UPDATE USER IN GROUP / should return object with user_id, group_id and new permission", async function () {
+        const group = await gudhub.groupSharing.updateUserInGroup(1695, 1, 0);
+        group.should.property('user_id').equal('1695');
+        group.should.property('group_id').equal('1');
+        group.should.property('group_permission').equal('0');
+    })
+
+    it("DELETE USER FROM GROUP / should return deleted user_id with group_id and permission", async function () {
+        const group = await gudhub.groupSharing.deleteUserFromGroup(1695, 1);
+        group.should.property('user_id').equal('1695');
+        group.should.property('group_id').equal('1');
+        group.should.property('group_permission').equal(0);
+    })
+
+    it("DELETE GROUP / should return deleted group", async function () {
+        const group = await gudhub.groupSharing.deleteGroup(1);
+        group.should.property('group_name').equal('New group name');
+        group.should.property('group_id').equal('1');
+    })
+
+});

package/GUDHUB/Utils/sharing/AppGroupSharing.js

@@ -0,0 +1,111 @@
+export class AppGroupSharing {
+    
+    constructor(gudhub, req) {
+      this.req = req;
+      this.gudhub = gudhub;
+      
+    }
+
+    //********************* ADD APP TO GROUP *********************//
+
+    async addAppToGroupApi(appId, groupId, permission) {
+      try {
+          const form = {
+              token: await this.gudhub.auth.getToken(),
+              app_id: appId,
+              group_id: groupId,
+              app_permission: permission
+          };
+          const group = await this.req.post({
+              url: "/api/sharing-group/add-app-to-group",
+              form,
+          });
+          return group;
+      } catch (err) {
+          console.log(err);
+          return null;
+      }
+    }
+
+    //********************* GET APPS BY GROUP *********************//
+
+    async getAppsByGroupApi(groupId) {
+      try {
+          const form = {
+              token: await this.gudhub.auth.getToken(),
+              group_id: groupId
+          };
+          const group = await this.req.post({
+              url: "/api/sharing-group/get-apps-by-group",
+              form,
+          });
+          return group;
+      } catch (err) {
+          console.log(err);
+          return null;
+      }
+    }
+
+    //********************* UPDATE APP IN GROUP *********************//
+
+    async updateAppInGroupApi(appId, groupId, permission) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                group_id: groupId,
+                app_id: appId,
+                app_permission: permission
+            };
+            const group = await this.req.post({
+                url: "/api/sharing-group/update-app-in-group",
+                form,
+            });
+            return group;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    //********************* DELETE APP FROM GROUP *********************//
+
+    async deleteAppFromGroupApi(appId, groupId, permission) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                group_id: groupId,
+                app_id: appId,
+                app_permission: permission
+            };
+            const group = await this.req.post({
+                url: "/api/sharing-group/delete-app-from-group",
+                form,
+            });
+            return group;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    //********************* GET GROUPS BY APP *********************//
+
+    async getGroupsByAppApi(appId) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                app_id: appId
+            };
+            const group = await this.req.post({
+                url: "/api/sharing-group/get-groups-by-app",
+                form,
+            });
+            return group;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+}
+  

package/GUDHUB/Utils/sharing/GroupSharing.js

@@ -0,0 +1,71 @@
+import { GroupManager } from "../groupManager/GroupManager.js";
+import { AppGroupSharing } from "./AppGroupSharing.js";
+export class GroupSharing {
+    constructor(gudhub, req, pipeService) {
+      this.req = req;
+      this.gudhub = gudhub;
+      this.pipeService = pipeService;
+      this.groupManager = new GroupManager(gudhub, req);
+      this.appGroupSharing = new AppGroupSharing(gudhub, req);
+    }
+
+    createGroup(groupName) {
+      return this.groupManager.createGroupApi(groupName);
+    }
+
+    updateGroup(groupId, groupName) {
+      return this.groupManager.updateGroupApi(groupId, groupName);
+    }
+
+    deleteGroup(groupId) {
+      return this.groupManager.deleteGroupApi(groupId);
+    }
+
+    async addUserToGroup(userId, groupId, permission) {
+      let newUser = await  this.groupManager.addUserToGroupApi(userId, groupId, permission);
+      this.pipeService.emit("group_members_add", { app_id: "group_sharing"}, newUser);
+      return newUser;
+    }
+
+    getUsersByGroup(groupId) {
+      return this.groupManager.getUsersByGroupApi(groupId);
+    }
+
+    async updateUserInGroup(userId, groupId, permission) {
+      let updatedUser = await this.groupManager.updateUserInGroupApi(userId, groupId, permission);
+      this.pipeService.emit("group_members_update", { app_id: "group_sharing"}, updatedUser);
+      return updatedUser;
+    }
+
+    async deleteUserFromGroup(userId, groupId) {
+      let deletedUser = await this.groupManager.deleteUserFromGroupApi(userId, groupId);
+      this.pipeService.emit("group_members_delete", { app_id: "group_sharing"}, deletedUser);
+      return deletedUser;
+    }
+
+    getGroupsByUser(userId) {
+      return this.groupManager.getGroupsByUserApi(userId);
+    }
+
+    addAppToGroup(appId, groupId, permission) {
+      return this.appGroupSharing.addAppToGroupApi(appId, groupId, permission);
+    }
+
+    getAppsByGroup(groupId) {
+      return this.appGroupSharing.getAppsByGroupApi(groupId);
+    }
+
+    updateAppInGroup(appId, groupId, permission) {
+      return this.appGroupSharing.updateAppInGroupApi(appId, groupId, permission);
+    }
+
+    deleteAppFromGroup(appId, groupId, permission) {
+      return this.appGroupSharing.deleteAppFromGroupApi(appId, groupId, permission);
+    }
+
+    getGroupsByApp(appId) {
+      return this.appGroupSharing.getGroupsByAppApi(appId);
+    }
+
+  }
+  

package/GUDHUB/Utils/sharing/Sharing.js

@@ -0,0 +1,101 @@
+export class Sharing {
+    
+    constructor(gudhub, req) {
+      this.req = req;
+      this.gudhub = gudhub;
+      
+    }
+
+    async add(appId, userId, permission) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                app_id: appId,
+                user_id: userId,
+                sharing_permission: permission
+            };
+            const response = await this.req.post({
+                url: "/sharing/add",
+                form,
+            });
+            return response;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    async update(appId, userId, permission) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                app_id: appId,
+                user_id: userId,
+                sharing_permission: permission
+            };
+            const response = await this.req.post({
+                url: "/sharing/update",
+                form,
+            });
+            return response;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    async delete(appId, userId) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                app_id: appId,
+                user_id: userId
+            };
+            const response = await this.req.post({
+                url: "/sharing/delete",
+                form,
+            });
+            return response;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    async getAppUsers(appId) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                app_id: appId
+            };
+            const response = await this.req.post({
+                url: "/sharing/get-app-users",
+                form,
+            });
+            return response;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    async addInvitation(guestsEmails, apps) {
+        try {
+            const form = {
+                token: await this.gudhub.auth.getToken(),
+                guests_emails: guestsEmails,
+                apps
+            };
+            const response = await this.req.post({
+                url: "/api/invitation/add",
+                form,
+            });
+            return response;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+}
+  

package/GUDHUB/Utils/sharing/appGroupSharing.test.js

@@ -0,0 +1,43 @@
+import { GudHub } from '../../gudhub.js';
+
+describe("SHARING APP TO GROUP OF USERS", async function() {
+    // PermissionStatus: 0 - no access, 1 - read, 2 - write, 3 - admin, 4 - owner -> default when create app
+    const gudhub = new GudHub();
+
+    it("SHARE APP TO GROUP / should return object with app id, group id and app permission", async function () {
+        const group = await gudhub.groupSharing.addAppToGroup(16259, 1, 1);
+        group.should.property('app_id').equal('16259');
+        group.should.property('app_permission').equal('1');
+        group.should.property('group_id').equal('1');
+    })
+
+    it("GET APPS BY GROUP ID / should return array with apps id", async function () {
+        const group = await gudhub.groupSharing.getAppsByGroup(1);
+        group[0].should.property('app_id').equal('16259');
+        group[0].should.property('app_permission').equal('1');
+        group[0].should.property('group_id').equal('1');
+    })
+
+    it("UPDATE PERMISSION FOR APP IN GROUP / should return object with group id, app id and new permission", async function () {
+        const group = await gudhub.groupSharing.updateAppInGroup(16259, 1, 2);
+        group.should.property('app_id').equal('16259');
+        group.should.property('app_permission').equal('2');
+        group.should.property('group_id').equal('1');
+    })
+
+    it("DELETE APP FROM GROUP / should return object with group id, app id and permission", async function () {
+        const group = await gudhub.groupSharing.deleteAppFromGroup(16259, 1, 2);
+        group.should.property('app_id').equal('16259');
+        group.should.property('app_permission').equal('2');
+        group.should.property('group_id').equal('1');
+    })
+
+    it("GET GROUPS BY APP / should return array with groups of current app", async function () {
+        const group = await gudhub.groupSharing.getGroupsByApp(16259);
+        group[0].should.property('group_name').equal('New group name');
+        group[0].should.property('group_id').equal('1');
+        group[0].should.property('app_permission').equal('2');
+    })
+
+
+});

package/GUDHUB/Utils/sharing/sharing.test.js

@@ -0,0 +1,48 @@
+import { GudHub } from '../../gudhub.js';
+
+describe("SHARING APP TO USER", async function() {
+    // PermissionStatus: 0 - no access, 1 - read, 2 - write, 3 - admin, 4 - owner -> default when create app
+    const gudhub = new GudHub();
+
+    it("SHARE APP TO USER / should return object with app id, user id and app permission", async function () {
+        const response = await gudhub.sharing.add(16259, 25, 2);
+        response.should.property('app_id').equal('16259');
+        response.should.property('permission').equal('2');
+        response.should.property('user_id').equal('25');
+    })
+
+    it("UPDATE PERMISSION FOR USER / should return object with app id, user id and new permission", async function () {
+        const response = await gudhub.sharing.update(16259, 25, 3);
+        response.should.property('app_id').equal('16259');
+        response.should.property('permission').equal('3');
+        response.should.property('user_id').equal('25');
+    })
+
+    it("DELETE APP FOR USER / should return object with deleted user", async function () {
+        const response = await gudhub.sharing.delete(16259, 25);
+        response.should.property('app_id').equal('16259');
+        response.should.property('permission').equal('3');
+        response.should.property('user_id').equal('25');
+    })
+
+    it("GET USERS WHICH HAVE RIGHTS IN APP / should return array with users which have rights to app", async function () {
+        const response = await gudhub.sharing.getAppUsers(16259);
+        response[0].should.property('app_id').equal('16259');
+        response[0].should.property('sharing_permission').equal('4');
+        response[0].should.property('user_id').equal('58');
+        response[0].should.property('fullname').equal('Vasya Pupkin');
+        response[0].should.property('avatar_128');
+    })
+
+    it("SEND INVITES TO APPS / should return array with emails and app id's with permission", async function () {
+        const response = await gudhub.sharing.addInvitation(['fabricator2@gudhub.com'], [{app_id: 16259, permission: 2}, {app_id: 214, permission: 1}]);
+        response.length.should.equal(2);
+        response[0].should.property('app_id').equal('16259');
+        response[0].should.property('guest_email').equal('fabricator2@gudhub.com');
+        response[0].should.property('permission').equal('2');
+        response[1].should.property('app_id').equal('214');
+        response[1].should.property('guest_email').equal('fabricator2@gudhub.com');
+        response[1].should.property('permission').equal('1');
+        
+    })
+});

package/GUDHUB/gudhub.js

@@ -15,6 +15,8 @@ import { DocumentManager } from "./DocumentManager/DocumentManager.js";
 import { Interpritate } from './GHConstructor/interpritate.js'
 import { IS_WEB } from "./consts.js";
 import { WebsocketHandler } from './WebSocket/WebsocketHandler.js';
+import { GroupSharing } from './Utils/sharing/GroupSharing.js';
+import { Sharing } from './Utils/sharing/Sharing.js';
 
 export class GudHub {
   constructor(
@@ -36,6 +38,8 @@ export class GudHub {
     this.util = new Utils(this);
     this.req = new GudHubHttpsService(options.server_url);
     this.auth = new Auth(this.req, this.storage);
+    this.sharing = new Sharing(this, this.req);
+    this.groupSharing = new GroupSharing(this, this.req, this.pipeService);
     if (authKey) this.storage.setUser({ auth_key: authKey });
     this.req.init(this.auth.getToken.bind(this.auth));