@cocreate/api 1.18.0 → 1.18.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.18.2](https://github.com/CoCreate-app/CoCreate-api/compare/v1.18.1...v1.18.2) (2023-12-09)
+
+
+### Bug Fixes
+
+* options ([b84440d](https://github.com/CoCreate-app/CoCreate-api/commit/b84440dc78ac217bf3676be975fb4ad6febe1fd9))
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/api",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "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",

package/src/client.js

@@ -11,7 +11,7 @@ const CoCreateApi = {
 
     init: function ({ name, endPoints, options }) {
         this.register({ name, endPoints, options });
-        if (options.socket !== false && !socket.sockets.size)
+        if (options && options.socket !== false && !socket.sockets.size)
             socket.create({ prefix: 'api' });
     },
 

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;