@cocreate/api 1.17.0 → 1.18.1

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [1.18.1](https://github.com/CoCreate-app/CoCreate-api/compare/v1.18.0...v1.18.1) (2023-12-01)
+
+
+### Bug Fixes
+
+* added constructor ([cfd4f49](https://github.com/CoCreate-app/CoCreate-api/commit/cfd4f4960b48f48a4ef3b4bc75272cb192800480))
+
+# [1.18.0](https://github.com/CoCreate-app/CoCreate-api/compare/v1.17.0...v1.18.0) (2023-11-25)
+
+
+### Bug Fixes
+
+* update licensing details ([7ba9214](https://github.com/CoCreate-app/CoCreate-api/commit/7ba9214f494a5ae71e056853edb6bb730e6d666d))
+
+
+### Features
+
+* upgrade dependencies for latest features and fixes ([22a8e3a](https://github.com/CoCreate-app/CoCreate-api/commit/22a8e3ae85d8f73d203978ca9a3529e6d7babc94))
+
 # [1.17.0](https://github.com/CoCreate-app/CoCreate-api/compare/v1.16.0...v1.17.0) (2023-11-25)
 
 

package/README.md

@@ -39,12 +39,12 @@ $ yarn install @cocreate/api
 
 # Table of Contents
 
-- [Table of Contents](#table-of-contents)
-- [Announcements](#announcements)
-- [Roadmap](#roadmap)
-- [How to Contribute](#how-to-contribute)
-- [About](#about)
-- [License](#license)
+-   [Table of Contents](#table-of-contents)
+-   [Announcements](#announcements)
+-   [Roadmap](#roadmap)
+-   [How to Contribute](#how-to-contribute)
+-   [About](#about)
+-   [License](#license)
 
 <a name="announcements"></a>
 
@@ -78,8 +78,14 @@ We want this library to be community-driven, and CoCreate led. We need your help
 
 We appreciate your continued support, thank you!
 
-
 <a name="license"></a>
+
 # License
 
-[The MIT License (MIT)](https://github.com/CoCreate-app/CoCreate-api/blob/master/LICENSE)
+This software is dual-licensed under the GNU Affero General Public License version 3 (AGPLv3) and a commercial license.
+
+-   **Open Source Use**: For open-source projects and non-commercial use, this software is available under the AGPLv3. The AGPLv3 allows you to freely use, modify, and distribute this software, provided that all modifications and derivative works are also licensed under the AGPLv3. For the full license text, see the [LICENSE file](https://github.com/CoCreate-app/CoCreate-api/blob/master/LICENSE).
+
+-   **Commercial Use**: For-profit companies and individuals intending to use this software for commercial purposes must obtain a commercial license. The commercial license is available when you sign up for an API key on our [website](https://cocreate.app). This license permits proprietary use and modification of the software without the copyleft requirements of the AGPLv3. It is ideal for integrating this software into proprietary commercial products and applications.
+
+If you have not purchased a commercial license and intend to use this software for commercial purposes, you are required to sign up for an API key on our website.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/api",
-  "version": "1.17.0",
+  "version": "1.18.1",
   "description": "A simple api helper component in vanilla javascript used by JavaScript developers to create thirdparty api intergrations. CoCreate-api includes the client component and server side for api processing. Thirdparty apis can be accessible using HTML5 attributes and/or JavaScript API. ",
   "keywords": [
     "thirdparty-api-intergration",
@@ -59,11 +59,11 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.13.0",
-    "@cocreate/crud-client": "^1.30.0",
-    "@cocreate/element-prototype": "^1.14.1",
-    "@cocreate/render": "^1.34.0",
-    "@cocreate/socket-client": "^1.34.0",
-    "@cocreate/utils": "^1.28.0"
+    "@cocreate/actions": "^1.14.0",
+    "@cocreate/crud-client": "^1.31.0",
+    "@cocreate/element-prototype": "^1.15.0",
+    "@cocreate/render": "^1.35.0",
+    "@cocreate/socket-client": "^1.35.0",
+    "@cocreate/utils": "^1.29.0"
   }
 }

package/src/server.js

@@ -1,102 +1,60 @@
-const CRUD = require('@cocreate/crud-client')
-const socketClient = require('@cocreate/socket-client')
-let socket = new socketClient("ws");
-
-CRUD.setSocket(socket);
-
-var api = (() => {
-    return {
-        getOrg: async (config, component) => {
-
-            socket.create({
-                namespace: config["organization_id"],
-                room: null,
-                host: config["host"]
-            })
-
-            let org = await CRUD.send({
-                method: 'object.read',
-                array: "organizations",
-                key: config["key"],
-                organization_id: config["organization_id"],
-                object: {
-                    _id: config["organization_id"]
-                }
+class CoCreateApi {
+    constructor(crud) {
+        this.wsManager = crud.wsManager
+        this.crud = crud
+        this.init()
+    }
 
-            });
+    async getOrganization(config, component) {
 
-            if (!org || !org.object && !org.object[0]) {
-                console.log(component, " Error GET ORG  in : ", e);
-                return false;
+        let org = await CRUD.send({
+            method: 'object.read',
+            array: "organizations",
+            key: config["key"],
+            organization_id: config["organization_id"],
+            object: {
+                _id: config["organization_id"]
             }
 
-            return org.object[0];
-        },
-
-        getOrgInRoutesbyHostname: async (config, hostname) => {
-            var socket_config = {
-                "config": {
-                    "key": config["config"]["key"],
-                    "organization_id": config["config"]["organization_id"],
-                },
-                "prefix": "ws",
-                "host": "server.cocreate.app:8088"
-            };
-
-            socket.create({
-                namespace: socket_config.config.organization_id,
-                room: null,
-                host: socket_config.host
-            })
+        });
 
-            let data2 = await CRUD.send({
-                method: 'object.read',
-                array: "organizations",
-                object: {
-                    $filter: {
-                        query: [{
-                            key: 'host',
-                            operator: "$in",
-                            value: [hostname]
-                        }],
-                    },
-                },
-                key: config["config"]["key"],
-                organization_id: config["config"]["organization_id"]
-            });
-
-            var org = data2.object[0]
+        if (!org || !org.object && !org.object[0]) {
+            console.log(component, " Error GET ORG  in : ", e);
+            return false;
+        }
 
-            var socket_config = {
-                "config": {
-                    "key": org["key"],
-                    "organization_id": org["_id"].toString(),
-                },
-                "prefix": "ws",
-                "host": "server.cocreate.app:8088"
-            }
+        return org.object[0];
+    }
 
-            //other connection
-            socket.create({
-                namespace: socket_config.config.organization_id,
-                room: null,
-                host: socket_config.host
-            })
+    async getApiKey(organization_id, name) {
+        this.organizations[organization_id] = this.getOrganization(organization_id, name)
+        this.organizations[organization_id] = await this.organizations[organization_id]
+        return this.organizations[organization_id]
+    }
 
-            let myOrg = await CRUD.send({
-                method: 'object.read',
-                array: "organizations",
-                key: org["key"],
-                organization_id: org["_id"],
-                object: {
-                    _id: org["_id"]
-                }
-            });
-            let result = { 'row': myOrg, 'socket_config': socket_config };
-            return result;
+    async getOrganizationNew(organization_id, name) {
+        let organization = await this.crud.send({
+            method: 'object.read',
+            database: organization_id,
+            array: 'organizations',
+            object: [{ _id: organization_id }],
+            organization_id
+        })
+
+        if (organization
+            && organization.object
+            && organization.object[0]) {
+            if (organization.object[0].apis && organization.object[0].apis[name]) {
+                return organization.object[0].apis && organization.object[0].apis[name]
+            } else
+                return { [this.name]: false, error: 'An apikey could not be found' }
+        } else {
+            return { serverOrganization: false, error: 'An organization could not be found' }
         }
 
     }
-})();
 
-module.exports = api;
+}
+
+
+module.exports = CoCreateApi;