dbm-graph-api 1.1.36 → 1.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.36",
+  "version": "1.1.38",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.741.0",
     "@aws-sdk/s3-request-presigner": "^3.741.0",
-    "dbm": "^1.2.5",
+    "dbm": "^1.2.7",
     "mime": "^4.0.6",
     "sharp": "^0.33.5",
     "ws": "^8.18.0"

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

@@ -123,12 +123,21 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
                     let dataFunctionItem = Dbm.getInstance().repository.getItemIfExists("graphApi/data/" + data['functionName']);
                     
+                    
                     let returnData = null;
-                    if(dataFunctionItem) {
-                        returnData = await dataFunctionItem.controller.getData(data['data'], encodeSession);
+                    let logs = [];
+
+                    try {
+                        if(dataFunctionItem) {
+                            returnData = await dataFunctionItem.controller.getData(data['data'], encodeSession);
+                        }
+                    }
+                    catch(theError) {
+                        logs.push(theError.message);
+                        console.error(theError);
                     }
 
-                    this._sendData({"type": "data/response", "data": returnData, "requestId": data["requestId"]});
+                    this._sendData({"type": "data/response", "data": returnData, "requestId": data["requestId"], "logs": logs});
                 }
                 break;
             case "action":
@@ -290,6 +299,12 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     this._sendData({"type": "currentUser/response", "id": userId, "requestId": data["requestId"]});
                 }
                 break;
+            case "user/signOut":
+                {
+                    this.item.setValue("user", null);
+                    this._sendData({"type": "currentUser/response", "id": 0, "requestId": data["requestId"]});
+                }
+                break;
             case "heartbeat":
                 {
                     this._sendData({"type": "heartbeat/response"});
@@ -332,6 +347,8 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 		this.item.api.controller.connectionClosed(this);
 		this.item.setValue("api", null);
 		this.item.setValue("controller", null);
+
+        this.item.setValue("user", null);
 	}
 
     addListeners() {

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

@@ -368,38 +368,74 @@ export const setupEndpoints = function(aServer) {
 		return { success: false, error: "incorrect", message: "Incorrect details"};
 	});
 
-    aServer.get('/api/user/me', async function handler (aRequest, aReply) {
-        let cookies = aRequest.headers.cookie ? aRequest.headers.cookie.split(";") : [];
-        let currentArray = cookies;
-        let currentArrayLength = currentArray.length;
-        for(let i = 0; i < currentArrayLength; i++) {
-            let [key, value] = currentArray[i].split("=");
-            if(key === "dbm_session" || key === " dbm_session") {
-                let userId = 1*value.split(":")[1];
-                let user = Dbm.getInstance().repository.getItem("graphDatabase").controller.getUser(userId);
-
-                let isValidSession = await user.verifySession(value);
-                if(isValidSession) {
-                    return {success: true, data: {id: userId}};
+    let getPublicSessionIdFomCookie = function(aCookies) {
+        if(aCookies) {
+            let cookies = aCookies.split(";");
+            let currentArray = cookies;
+            let currentArrayLength = currentArray.length;
+            for(let i = 0; i < currentArrayLength; i++) {
+                let [key, value] = currentArray[i].split("=");
+                if(key === "dbm_session" || key === " dbm_session") {
+                    return value;
                 }
             }
         }
+        
+        return null;
+    }
+
+    let getUserFromPublicSessionId = async function(aPublicSessionId) {
+        if(aPublicSessionId) {
+            let userId = 1*aPublicSessionId.split(":")[1];
+            let user = Dbm.getRepositoryItem("graphDatabase").controller.getUser(userId);
+
+            let isValidSession = await user.verifySession(aPublicSessionId);
+            if(isValidSession) {
+                return user;
+            }
+        }
+
+        return null;
+    }
+
+    let getUserFromCookie = async function(aCookies) {
+        let publicSessionId = getPublicSessionIdFomCookie(aCookies);
+        return await getUserFromPublicSessionId(publicSessionId);
+    }
+
+    aServer.get('/api/user/me', async function handler (aRequest, aReply) {
+        let user = await getUserFromCookie(aRequest.headers.cookie);
+        if(user) {
+            return {success: true, data: {id: user.id}};
+        }
 
         return {success: false, data: null};
     });
 
 	aServer.post('/api/user/logout', async function handler (aRequest, aReply) {
-		console.log(aRequest.body);
 
-		//METODO: clear session from database
-		//METODO: clear cookie
+        let publicSessionId = getPublicSessionIdFomCookie(aRequest.headers.cookie);
+        let user = await getUserFromPublicSessionId(publicSessionId);
+
+        if(user) {
+            let sessionId = 1*publicSessionId.split(":")[0];
+            await user.deleteSession(sessionId);
+        }
+
+        aReply.header("Set-Cookie", "dbm_session=; Path=/; Max-Age=0; HttpOnly;");
+        return {success: true, data: null};
 	});
 
 	aServer.post('/api/user/renewSession', async function handler (aRequest, aReply) {
-		console.log(aRequest.body);
+		let user = await getUserFromCookie(aRequest.headers.cookie);
+        if(user) {
+            //METODO: update session
+		    //METODO: update cookie
+
+            //METODO: return success
+        }
 
-		//METODO: clear session from database
-		//METODO: clear cookie
+		return {success: false, data: null};
 	});
 	
 	aServer.get('/api/url', async function handler (aRequest, aReply) {