dbm-graph-api 1.1.37 → 1.1.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.37",
+  "version": "1.1.39",
   "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.6",
+    "dbm": "^1.2.8",
     "mime": "^4.0.6",
     "sharp": "^0.33.5",
     "ws": "^8.18.0"

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

@@ -299,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"});
@@ -341,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

@@ -57,6 +57,12 @@ let fullSelectSetup = function() {
         let currentSelect = new DbmGraphApi.range.select.GlobalObjectRelationQuery();
         currentSelect.item.register(selectPrefix + name);
     }
+
+    {
+        let name = "withIdentifier";
+        let currentSelect = new DbmGraphApi.range.select.WithIdentifier();
+        currentSelect.item.register(selectPrefix + name);
+    }
 }
 
 
@@ -226,6 +232,10 @@ let fullEncodeSetup = function() {
     registerEncoding("language", DbmGraphApi.range.encode.SingleRelation.create("language", "in:for:language", "type"));
     registerEncodingClass(DbmGraphApi.range.encode.TranslatedName);
     registerEncoding("translationGroup", new DbmGraphApi.range.encode.TranslationGroup());
+
+    registerEncoding("menuLocation", new DbmGraphApi.range.encode.MenuLocation());
+    registerEncoding("menu", new DbmGraphApi.range.encode.Menu());
+    registerEncoding("menuItem", new DbmGraphApi.range.encode.MenuItem());
 }
 
 export {fullEncodeSetup};
@@ -368,38 +378,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) {

package/src/dbm-graph-api/range/encode/Menu.js

@@ -0,0 +1,27 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class Menu extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        await aEncodingSession.encodeSingle(aId, "language");
+
+        {
+            let relatedItems = await object.objectRelationQuery("in:in:menuItem");
+            returnObject["menuItems"] = await aEncodingSession.encodeObjects(relatedItems, "menuItem");
+        }
+
+        let fields = await object.getFields();
+        returnObject["order"] = fields["order"] ? fields["order"] : null;
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/MenuItem.js

@@ -0,0 +1,21 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class MenuItem extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        let fields = await object.getFields();
+        returnObject["label"] = fields["label"] ? fields["label"] : null;
+        returnObject["link"] = fields["link"] ? fields["link"] : null;
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/MenuLocation.js

@@ -0,0 +1,23 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class MenuLocation extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        await aEncodingSession.encodeSingle(aId, "identifier");
+
+        let relatedItem = await object.singleObjectRelationQuery("in:at:menu");
+
+        returnObject["menu"] = await aEncodingSession.encodeObjectOrNull(relatedItem, "menu");
+
+        return returnObject;
+    }
+}

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

@@ -26,5 +26,8 @@ export {default as SingleRelation} from "./SingleRelation.js";
 export {default as TranslatedTitle} from "./TranslatedTitle.js";
 export {default as TranslatedName} from "./TranslatedName.js";
 export {default as TranslationGroup} from "./TranslationGroup.js";
+export {default as MenuLocation} from "./MenuLocation.js";
+export {default as Menu} from "./Menu.js";
+export {default as MenuItem} from "./MenuItem.js";
 
 export * as admin from "./admin/index.js";

package/src/dbm-graph-api/range/select/WithIdentifier.js

@@ -0,0 +1,17 @@
+import Dbm from "dbm";
+
+import SelectBaseObject from "./SelectBaseObject.js";
+
+export default class WithIdentifier extends SelectBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async select(aQuery, aData, aRequest) {
+        aQuery.withIdentifier(aData["identifier"]);
+    }
+
+    async filter(aIds, aData, aRequest) {
+        return aIds;
+    }
+}

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

@@ -4,4 +4,5 @@ export {default as ByObjectType} from "./ByObjectType.js";
 export {default as IncludePrivate} from "./IncludePrivate.js";
 export {default as IncludeDraft} from "./IncludeDraft.js";
 export {default as ObjectRelationQuery} from "./ObjectRelationQuery.js";
-export {default as GlobalObjectRelationQuery} from "./GlobalObjectRelationQuery.js";
+export {default as GlobalObjectRelationQuery} from "./GlobalObjectRelationQuery.js";
+export {default as WithIdentifier} from "./WithIdentifier.js";