@gudhub/core 1.1.119 → 1.1.120

package/GUDHUB/Storage/ModulesList.js

@@ -1203,6 +1203,13 @@ export default function generateModulesList(async_modules_path, file_server_url,
             type: 'automation',
             icon: 'automation_item_constructor'
         },
+        {
+            data_type: 'InvitationsGenerator',
+            name: 'Invitations Generator',
+            url: file_server_url + '/' + automation_modules_path + 'invitations_generator_node.js',
+            type: 'automation',
+            icon: 'automation_api'
+        },
         {
             data_type: 'ItemDestructor',
             name: 'Item Destructor',

package/GUDHUB/Utils/sharing/GroupInvitation.js

@@ -0,0 +1,64 @@
+export class GroupInvitation {
+    constructor(gudhub, req) {
+      this.req = req;
+      this.gudhub = gudhub;
+    }
+
+    async groupInvitationCreate(sharingGroups, actions) {
+        try {
+            const form = {
+                sharing_groups: sharingGroups,
+                actions,
+                token: await this.gudhub.auth.getToken(),
+            };
+
+            const groupInventation = await this.req.post({
+                url: "/api/invitation/create",
+                form,
+            });
+
+            return groupInventation;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    async groupInvitationGet(invitationId) {
+        try {
+            const form = {
+                invitation_id: invitationId
+            };
+            
+            const groupInventation = await this.req.post({
+                url: "/api/invitation/get",
+                form,
+            });
+
+            return groupInventation;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+
+    async groupInvitationAccept(invitationId) {
+        try {
+            const form = {
+                invitation_id: invitationId
+            };
+            
+            const groupInventation = await this.req.post({
+                url: "/api/invitation/accept",
+                form,
+            });
+
+            return groupInventation;
+        } catch (err) {
+            console.log(err);
+            return null;
+        }
+    }
+}
+
+export default GroupInvitation;

package/GUDHUB/config.js

@@ -1,7 +1,7 @@
 export const server_url = "https://app.gudhub.com/GudHub";
 //export const server_url = "https://app.gudhub.com/GudHub_Temp";
 //export const server_url = "https://integration.gudhub.com/GudHub";
-// export const server_url = "http://localhost:9000";
+//export const server_url = "http://localhost:9000";
 export const wss_url = "wss://app.gudhub.com/GudHub/ws/app/";
 export const node_server_url = "https://app.gudhub.com/api/services/prod"
 export const async_modules_path = 'build/latest/async_modules_node/';

package/GUDHUB/gudhub.js

@@ -16,6 +16,7 @@ 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 { GroupInvitation } from './Utils/sharing/GroupInvitation.js';
 import { Sharing } from './Utils/sharing/Sharing.js';
 import { WebSocketEmitter } from './WebSocket/WebSocketEmitter.js';
 
@@ -46,6 +47,7 @@ export class GudHub {
     this.auth = new Auth(this.req, this.storage);
     this.sharing = new Sharing(this, this.req);
     this.groupSharing = new GroupSharing(this, this.req, this.pipeService);
+    this.groupInventation = new GroupInvitation(this, this.req);
 
     // Login with access token - pass to setUser access token and after it user can  make requests with access token
     // This method created for optimize GudHub  initialization without auth key

package/GUDHUB/invitation.test.js

@@ -1,21 +1,34 @@
-import should from "should";
+// import should from "should";
 import sinon from "sinon";
-import axios from "axios";
-import GroupInvitation from "../GUDHUB/Utils/sharing/GroupInventation.js";
+import { GroupInvitation } from "../GUDHUB/Utils/sharing/GroupInvitation.js";
 
 describe("Invitation API", function () {
-
   const token = "fgdr5rfd4e5hsjkdrkdemdxm6re5erl";
 
+  let gudhub;
+  let req;
+  let api;
+
+  beforeEach(() => {
+    gudhub = {
+      auth: {
+        getToken: sinon.stub().resolves(token)
+      }
+    };
+
+    req = {
+      post: sinon.stub()
+    };
+
+    api = new GroupInvitation(gudhub, req);
+  });
+
   afterEach(() => {
     sinon.restore();
   });
 
   it("groupInvitationCreate should call correct endpoint and return data", async function () {
-
-    const api = new GroupInvitation(token);
-
-    const sharing_groups = [
+    const sharingGroups = [
       { group_id: 7853, permission: 1 },
       { group_id: 7862, permission: 1 }
     ];
@@ -25,79 +38,79 @@ describe("Invitation API", function () {
       { app_id: 54122, field_id: 748122, item_id: 5415122 }
     ];
 
-    const postStub = sinon.stub(api.api, "post").resolves({
-      data: {
-        invitation_id: "r5fh587guj7r",
-        invitation_status: 0
-      }
+    req.post.resolves({
+      invitation_id: "r5fh587guj7r",
+      invitation_status: 0
     });
 
-    const result = await api.groupInvitationCreate(sharing_groups, actions);
+    const result = await api.groupInvitationCreate(sharingGroups, actions);
 
     result.should.have.property("invitation_id", "r5fh587guj7r");
     result.should.have.property("invitation_status", 0);
 
-    postStub.calledOnce.should.be.true();
-    postStub.firstCall.args[0].should.equal("invitation/create");
+    gudhub.auth.getToken.calledOnce.should.be.true();
+    req.post.calledOnce.should.be.true();
 
-    const body = postStub.firstCall.args[1];
-    body.token.should.equal(token);
-    body.sharing_groups.should.eql(sharing_groups);
-    body.actions.should.eql(actions);
+    const arg = req.post.firstCall.args[0];
+    arg.should.have.property("url", "/api/invitation/create");
+    arg.should.have.property("form");
+    arg.form.token.should.equal(token);
+    arg.form.sharing_groups.should.eql(sharingGroups);
+    arg.form.actions.should.eql(actions);
   });
 
-
   it("groupInvitationGet should return full invitation structure", async function () {
-
-    const api = new GroupInvitation(token);
-    const invitation_id = "lknvzl3266bkjbkb";
-
-    sinon.stub(api.api, "get").resolves({
-      data: {
-        invitation_id,
-        invitation_status: 0,
-        Inviter_user: {
-          fullname: "Andrii Atlas",
-          avatar_128: "url128",
-          avatar_512: "url512"
-        },
-        sharing_groups: [
-          { group_name: "3D Rendering Team", group_permission: 1 }
-        ]
-      }
+    const invitationId = "lknvzl3266bkjbkb";
+
+    req.post.resolves({
+      invitation_id: invitationId,
+      invitation_status: 0,
+      Inviter_user: {
+        fullname: "Andrii Atlas",
+        avatar_128: "url128",
+        avatar_512: "url512"
+      },
+      sharing_groups: [
+        { group_name: "3D Rendering Team", group_permission: 1 }
+      ]
     });
 
-    const result = await api.groupInvitationGet(invitation_id);
+    const result = await api.groupInvitationGet(invitationId);
 
-    result.should.have.property("invitation_id", invitation_id);
+    result.should.have.property("invitation_id", invitationId);
     result.should.have.property("invitation_status", 0);
     result.should.have.property("Inviter_user");
     result.should.have.property("sharing_groups");
 
-    result.Inviter_user.should.have.property("fullname");
+    result.Inviter_user.should.have.property("fullname", "Andrii Atlas");
     result.sharing_groups.should.be.Array();
-  });
 
+    req.post.calledOnce.should.be.true();
 
-  it("groupInvitationAccept should send token and return accepted status", async function () {
+    const arg = req.post.firstCall.args[0];
+    arg.should.have.property("url", "/api/invitation/get");
+    arg.should.have.property("form");
+    arg.form.invitation_id.should.equal(invitationId);
+  });
 
-    const api = new GroupInvitation(token);
-    const invitation_id = "lknvzl3266bkjbkb";
+  it("groupInvitationAccept should send invitation id and return accepted status", async function () {
+    const invitationId = "lknvzl3266bkjbkb";
 
-    const postStub = sinon.stub(api.api, "post").resolves({
-      data: {
-        invitation_id,
-        invitation_status: 1
-      }
+    req.post.resolves({
+      invitation_id: invitationId,
+      invitation_status: 1
     });
 
-    const result = await api.groupInvitationAccept(invitation_id);
+    const result = await api.groupInvitationAccept(invitationId);
 
-    result.invitation_status.should.equal(1);
+    result.should.have.property("invitation_id", invitationId);
+    result.should.have.property("invitation_status", 1);
 
-    const body = postStub.firstCall.args[1];
-    body.invitation_id.should.equal(invitation_id);
-    body.token.should.equal(token);
-  });
+    req.post.calledOnce.should.be.true();
 
+    const arg = req.post.firstCall.args[0];
+    arg.should.have.property("url", "/api/invitation/accept");
+    arg.should.have.property("form");
+    arg.form.invitation_id.should.equal(invitationId);
+  });
 });

package/fake_server/fake_java_server.js

@@ -193,7 +193,7 @@ export default function (app) {
         ]);
     })
 
-    app.post('/invitation/create', (req, res) => {
+    app.post('/api/invitation/create', (req, res) => {
         const { sharing_groups, actions, token } = req.body;
 
         if (!sharing_groups || !actions || !token) {
@@ -206,8 +206,8 @@ export default function (app) {
         });
     });
 
-    app.get('/invitation/get', (req, res) => {
-        const { invitation_id } = req.query;
+    app.post('/api/invitation/get', (req, res) => {
+        const { invitation_id } = req.body;
 
         if (!invitation_id) {
             return res.status(400).json({ error: "Missing invitation_id" });
@@ -234,11 +234,11 @@ export default function (app) {
         });
     });
 
-    app.post('/invitation/accept', (req, res) => {
-        const { invitation_id, token } = req.body;
+    app.post('/api/invitation/accept', (req, res) => {
+        const { invitation_id } = req.body;
 
-        if (!invitation_id || !token) {
-            return res.status(400).json({ error: "Missing required fields" });
+        if (!invitation_id) {
+            return res.status(400).json({ error: "Missing invitation_id" });
         }
 
         res.status(200).json({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.1.119",
+  "version": "1.1.120",
   "description": "",
   "main": "index.js",
   "scripts": {