dbm-graph-api 1.1.49 → 1.1.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.49",
+  "version": "1.1.51",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.984.0",
     "@aws-sdk/s3-request-presigner": "^3.984.0",
-    "dbm": "^1.4.7",
+    "dbm": "^1.4.9",
     "html-to-text": "^9.0.5",
     "mime": "^4.1.0",
     "node-cron": "^4.2.1",

package/src/dbm-graph-api/Api.js

@@ -25,7 +25,7 @@ export default class Api extends Dbm.core.BaseObject {
         return this;
     }
 
-    _callback_connection(aWebSocket, aRequest) {
+    async _callback_connection(aWebSocket, aRequest) {
         let newWebSocketConnection = new WebSocketConnection();
 
         newWebSocketConnection.item.setValue("api", this.item);
@@ -48,17 +48,15 @@ export default class Api extends Dbm.core.BaseObject {
                     let userId = 1*value.split(":")[1];
                     let user = Dbm.getRepositoryItem("graphDatabase").controller.getUser(userId);
     
-                    user.verifySession(value).then(function(aIsValidSession) {
-                        //console.log("verifySession", aIsValidSession);
+                    let isValidSession = await user.verifySession(value);
     
-                        if(aIsValidSession) {
-                            newWebSocketConnection.setInitialUser(userId);
-                        }
-                        else {
-                            newWebSocketConnection.setInitialUser(0);
-                        }
-                        
-                    });
+                    if(isValidSession) {
+                        await newWebSocketConnection.setInitialUser(userId);
+                    }
+                    else {
+                        await newWebSocketConnection.setInitialUser(0);
+                    };
+
                     hasUserCookie = true;
                     break;
                 }
@@ -66,7 +64,7 @@ export default class Api extends Dbm.core.BaseObject {
         }
         
         if(!hasUserCookie) {
-            newWebSocketConnection.setInitialUser(0);
+            await newWebSocketConnection.setInitialUser(0);
         }
     }
 	

package/src/dbm-graph-api/UrlRequest.js

@@ -30,16 +30,36 @@ export default class UrlRequest extends Dbm.core.BaseObject {
         let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
         let urlObject = await database.getObjectByUrl(url);
 
+		let logs = [];
+
         if(urlObject) {
-            let encodeSession = new DbmGraphApi.range.EncodeSession();
-            encodeSession.outputController = this;
+			let isOk = false;
+			let visibility = await urlObject.getVisibility();
+			if(visibility === "public") {
+				isOk = true;
+			}
+			else {
+				let isAdmin = await this.hasRole("admin");
+				if(isAdmin) {
+					isOk = true;
+				}
+			}
 
-            await encodeSession.encodeSingleWithTypes(urlObject.id, ["urlRequest"]);
-            encodeSession.destroy();
-            this._responseData = {"id": urlObject.id};
+			if(isOk) {
+				let encodeSession = new DbmGraphApi.range.EncodeSession();
+				encodeSession.outputController = this;
+
+				await encodeSession.encodeSingleWithTypes(urlObject.id, ["urlRequest"]);
+				encodeSession.destroy();
+				this._responseData = {"id": urlObject.id, "logs": logs};
+			}
+            else {
+				this._responseData = {"id": urlObject.id, "logs": ["Not allowed to load item"]};
+			}
         }
         else {
-            this._responseData = {"id": 0};
+			logs.push("Not found");
+            this._responseData = {"id": 0, "logs": logs};
         }
 	}
 	
@@ -111,13 +131,29 @@ export default class UrlRequest extends Dbm.core.BaseObject {
 		let encodeSession = new DbmGraphApi.range.EncodeSession();
 		encodeSession.outputController = this;
 
-		//METODO: check visibility
+		let isOk = false;
+		let visibility = await Dbm.node.getDatabase().getObjectVisibility(aId);
+		if(visibility === "public") {
+			isOk = true;
+		}
+		else {
+			let isAdmin = await this.hasRole("admin");
+			if(isAdmin) {
+				isOk = true;
+			}
+		}
 
-		await encodeSession.encodeSingleWithTypes(aId, aEncodes);
+		let logs = [];
+		if(isOk) {
+			await encodeSession.encodeSingleWithTypes(aId, aEncodes);
 
-		encodeSession.destroy();
+			encodeSession.destroy();
+		}
+		else {
+			logs.push("Not allowed to load item");
+		}
 
-		this._responseData = {"id": aId};
+		this._responseData = {"id": aId, "logs": logs};
 	}
 	
 	async requestData(aFunctionName, aData) {
@@ -166,15 +202,15 @@ export default class UrlRequest extends Dbm.core.BaseObject {
 
 		let incomingWebhook = await database.createObject("private", ["incomingWebhook"]);
 		await incomingWebhook.updateField("data", data);
-		await incomingWebhook.addIncomingRelation(webhookType, "for");
+		await incomingWebhook.incomingRelations.add(webhookType, "for");
 		
 		let actionType = await database.getTypeObject("type/actionType", "incomingWebhook/" + type);
 		let actionStatus = await database.getTypeObject("status/actionStatus", "readyToProcess");
 		
 		let action = await database.createObject("private", ["action"]);
-		await action.addIncomingRelation(actionType, "for");
-		await action.addIncomingRelation(incomingWebhook, "from");
-		await action.addIncomingRelation(actionStatus, "for");
+		await action.incomingRelations.add(actionType, "for");
+		await action.outgoingRelations.add(incomingWebhook, "from");
+		await action.incomingRelations.add(actionStatus, "for");
 
 		returnObject["id"] = incomingWebhook.id;
 		returnObject["action"] = action.id;
@@ -236,6 +272,26 @@ export default class UrlRequest extends Dbm.core.BaseObject {
 			throw(new Error("Only signed in users can use this endpoint"));
 		}
 
+		let hasRole = await user.hasRole(aRole);
+        if(!hasRole) {
+    		throw(new Error("User doesn't have privileges"));
+        }
+
 		return true;
 	}
+
+	async hasRole(aRole) {
+        let user = await this.getUser();
+
+		if(!user) {
+			return false;
+		}
+
+        let hasRole = await user.hasRole(aRole);
+        if(!hasRole) {
+            return false;
+        }
+
+		return true;
+    }
 }

package/src/dbm-graph-api/WebSocketConnection.js

@@ -166,23 +166,39 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
             case "item":
                 {
                     let id = data['id'];
-                    //METODO: check visibility in database
-
-                    let encodeSession = new DbmGraphApi.range.EncodeSession();
-                    encodeSession.outputController = this;
+                    
+                    let isOk = false;
+                    let visibility = await Dbm.node.getDatabase().getObjectVisibility(id);
+                    if(visibility === "public") {
+                        isOk = true;
+                    }
+                    else {
+                        let isAdmin = await this.hasRole("admin");
+                        if(isAdmin) {
+                            isOk = true;
+                        }
+                    }
 
                     let logs = [];
 
-                    try {
-                        await encodeSession.encodeSingleWithTypes(id, data.encode);
+                    if(isOk) {
+                        let encodeSession = new DbmGraphApi.range.EncodeSession();
+                        encodeSession.outputController = this;
+
+                        try {
+                            await encodeSession.encodeSingleWithTypes(id, data.encode);
+                        }
+                        catch(theError) {
+                            logs.push(theError.message);
+                            console.error(theError);
+                        }
+
+                        encodeSession.destroy();
                     }
-                    catch(theError) {
-                        logs.push(theError.message);
-                        console.error(theError);
+                    else {
+                        logs.push("Not allowed to load item");
                     }
 
-                    encodeSession.destroy();
-
                     this._sendData({"type": "item/response", "id": id, "requestId": data["requestId"], "logs": logs});
                 }
                 break;
@@ -192,32 +208,47 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     if(url[url.length-1] !== "/") {
                         url += "/";
                     }
-                    //METODO: check visibility in database
-
                     
-
-                    let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+                    let database = Dbm.node.getDatabase();
                     let urlObject = await database.getObjectByUrl(url);
 
+                    let logs = [];
+
+                    let id = 0;
                     if(urlObject) {
-                        let encodeSession = new DbmGraphApi.range.EncodeSession();
-                        encodeSession.outputController = this;
+                        id = urlObject.id;
 
-                        await encodeSession.encodeSingleWithTypes(urlObject.id, ["urlRequest"]);
-                        encodeSession.destroy();
-                        this._sendData({"type": "url/response", "id": urlObject.id, "requestId": data["requestId"]});
-                    }
-                    else {
-                        this._sendData({"type": "url/response", "id": 0, "requestId": data["requestId"]});
+                        let isOk = false;
+                        let visibility = await urlObject.getVisibility();
+                        if(visibility === "public") {
+                            isOk = true;
+                        }
+                        else {
+                            let isAdmin = await this.hasRole("admin");
+                            if(isAdmin) {
+                                isOk = true;
+                            }
+                        }
+
+                        if(isOk) {
+                            let encodeSession = new DbmGraphApi.range.EncodeSession();
+                            encodeSession.outputController = this;
+
+                            await encodeSession.encodeSingleWithTypes(urlObject.id, ["urlRequest"]);
+                            encodeSession.destroy();
+                        }
+                        else {
+                            logs.push("Not allowed to load item");
+                        }
                     }
+                    
+                    this._sendData({"type": "url/response", "id": id, "requestId": data["requestId"], "logs": logs});
                 }
                 break;
             case "admin/createObject":
                 {
-                    //METODO: require role
                     let returnId = 0;
-                    let user = await this.getUser();
-                    if(user) {
+                    if(await this.hasRole("admin")) {
                         let types = data['types'];
                         let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
                         let visibility = data['visibility'] ? data['visibility'] : 'draft';
@@ -256,8 +287,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
                     let theObject = database.getObject(data.id);
 
-                    let user = await this.getUser();
-                    if(user) {
+                    if(await this.hasRole("admin")) {
                         if(data.changes) {
                             await this._applyChanges(theObject, data.changes, request);
                         }
@@ -288,21 +318,28 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
                     let isVerified = await user.verifySignedSessionToken(data.token);
 
+                    let roleIds = [];
                     let userId = 0;
                     if(isVerified) {
-                        //METODO: set user for connection
-                        
                         userId = user.id;
                         this.item.setValue("user", user);
+
+                        let roles = await user.getRoles();
+            
+                        let currentArray = roles;
+                        let currentArrayLength = currentArray.length;
+                        for(let i = 0; i < currentArrayLength; i++) {
+                            roleIds.push(await currentArray[i].getIdentifier());
+                        }
                     }
 
-                    this._sendData({"type": "currentUser/response", "id": userId, "requestId": data["requestId"]});
+                    this._sendData({"type": "currentUser/response", "id": userId, "roles": roleIds, "requestId": data["requestId"]});
                 }
                 break;
             case "user/signOut":
                 {
                     this.item.setValue("user", null);
-                    this._sendData({"type": "currentUser/response", "id": 0, "requestId": data["requestId"]});
+                    this._sendData({"type": "currentUser/response", "id": 0, "roles": [], "requestId": data["requestId"]});
                 }
                 break;
             case "heartbeat":
@@ -367,19 +404,27 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
         
     }
 
-    setInitialUser(aId) {
+    async setInitialUser(aId) {
 
-        if(aId) {
-            let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        let roleIds = [];
 
-            let user = database.getUser(aId);
+        if(aId) {
+            let user = Dbm.node.getDatabase().getUser(aId);
             this.item.setValue("user", user);
+
+            let roles = await user.getRoles();
+            
+            let currentArray = roles;
+            let currentArrayLength = currentArray.length;
+            for(let i = 0; i < currentArrayLength; i++) {
+                roleIds.push(await currentArray[i].getIdentifier());
+            }
         }
         else {
             this.item.setValue("user", null);
         }
 
-        this._sendData({"type": "connectionReady", "user": aId});
+        this._sendData({"type": "connectionReady", "user": aId, "roles": roleIds});
     }
 
     async getUser() {
@@ -393,6 +438,26 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 			throw(new Error("Only signed in users can use this endpoint"));
 		}
 
+        let hasRole = await user.hasRole(aRole);
+        if(!hasRole) {
+            throw(new Error("User doesn't have privileges"));
+        }
+
 		return true;
 	}
+
+    async hasRole(aRole) {
+        let user = await this.getUser();
+
+		if(!user) {
+			return false;
+		}
+
+        let hasRole = await user.hasRole(aRole);
+        if(!hasRole) {
+            return false;
+        }
+
+		return true;
+    }
 }

package/src/dbm-graph-api/index.js

@@ -558,7 +558,7 @@ export const setupEndpoints = function(aServer) {
         request.setup(aRequest, aReply);
 
         let currentUrl = url.parse(aRequest.url);
-        let webhookType = currentUrl.pathname.substring("/api/incomingWebhook/".length);
+        let webhookType = currentUrl.pathname.substring("/api/webhook/".length);
 
         await request.incomingWebhook(webhookType, params);
 
@@ -571,7 +571,7 @@ export const setupEndpoints = function(aServer) {
         request.setup(aRequest, aReply);
 
         let currentUrl = url.parse(aRequest.url);
-        let webhookType = currentUrl.pathname.substring("/api/incomingWebhook/".length);
+        let webhookType = currentUrl.pathname.substring("/api/webhook/".length);
 
         await request.incomingWebhook(webhookType, params);