dbm-graph-api 1.1.45 → 1.1.47

package/package.json

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

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

@@ -20,55 +20,10 @@ export * as processAction from "./processAction/index.js";
 export * as taskrunner from "./taskrunner/index.js";
 export * as schema from "./schema/index.js";
 
-let fullSelectSetup = function() {
-    let selectPrefix = "graphApi/range/select/";
-    {
-        let name = "idSelection";
-        let currentSelect = new DbmGraphApi.range.select.IdSelection();
-        currentSelect.item.register(selectPrefix + name);
-    }
-
-    {
-        let name = "byObjectType";
-        let currentSelect = new DbmGraphApi.range.select.ByObjectType();
-        currentSelect.item.register(selectPrefix + name);
-    }
-
-    {
-        let name = "includePrivate";
-        let currentSelect = new DbmGraphApi.range.select.IncludePrivate();
-        currentSelect.item.register(selectPrefix + name);
-    }
-
-    {
-        let name = "includeDraft";
-        let currentSelect = new DbmGraphApi.range.select.IncludeDraft();
-        currentSelect.item.register(selectPrefix + name);
-    }
-
-    {
-        let name = "objectRelationQuery";
-        let currentSelect = new DbmGraphApi.range.select.ObjectRelationQuery();
-        currentSelect.item.register(selectPrefix + name);
-    }
-
-    {
-        let name = "globalObjectRelationQuery";
-        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);
-    }
+export const fullSelectSetup = function() {
+    DbmGraphApi.range.select.fullSetup();
 }
 
-
-
-export {fullSelectSetup};
-
 let registerEncoding = function(aName, aEncoder) {
     let encodePrefix = "graphApi/range/encode/";
     aEncoder.item.register(encodePrefix + aName);
@@ -386,6 +341,43 @@ export const setupEndpoints = function(aServer) {
 		return { success: false, error: "incorrect", message: "Incorrect details"};
 	});
 
+    aServer.post('/api/user/loginWith/*', async function handler (aRequest, aReply) {
+        let params = {...aRequest.body};
+
+        let request = new UrlRequest();
+        request.setup(aRequest, aReply);
+
+        let currentUrl = url.parse(aRequest.url);
+        let functionName = currentUrl.pathname.substring("/api/user/loginWith/".length);
+
+        let loginMethod = Dbm.getInstance().repository.getItemIfExists("loginMethods/" + functionName);
+        if(!loginMethod) {
+            aReply.code(404);
+            return { success: false, error: "notFound", message: "No login method " + functionName};
+        }
+
+        let user = await loginMethod.controller.getUser(params);
+        console.log(user);
+        if(user) {
+            let sessionId = await user.createSession();
+
+            let tempArray = sessionId.split(":");
+            let sessionDatabaseId = 1*tempArray[0];
+			let expiresTime = 1*tempArray[2];
+			let expiresDate = (new Date(expiresTime)).toUTCString();
+
+			aReply.header("Set-Cookie", "dbm_session=" +sessionId + "; Path=/; Expires=" + expiresDate + "; HttpOnly;");
+
+            let wsToken = crypto.randomBytes(32).toString('base64');
+            let expiryLength = 60;
+            let hashedWsToken = await user.generateSignedSessionToken(sessionDatabaseId, (new Date()).valueOf()+expiryLength*1000, wsToken, sessionId)
+
+			return { success: true, data: {id: user.id, "wsToken": hashedWsToken}};
+        }
+
+        return { success: false, error: "incorrect", message: "Incorrect details"};
+    });
+
     let getPublicSessionIdFomCookie = function(aCookies) {
         if(aCookies) {
             let cookies = aCookies.split(";");

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

@@ -0,0 +1,29 @@
+import Dbm from "dbm";
+
+import SelectBaseObject from "./SelectBaseObject.js";
+
+export default class IdentifiableObjectRelationQuery extends SelectBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async select(aQuery, aData, aRequest) {
+        //console.log("IdentifiableObjectRelationQuery::select");
+
+        this.requireParameters(aData, "path", "fromType", "fromIdentifier");
+
+        let globalObject = await Dbm.node.getDatabase().getIdentifiableObjectIfExists(aData["fromType"], aData["fromIdentifier"]);
+
+        if(!globalObject) {
+            console.log("No identifiable object", aData["fromType"], aData["fromIdentifier"]);
+            //METODO: send back in logs as sensitive
+        }
+
+        let ids = globalObject ? [globalObject.id] : [];
+        if(aData["path"] !== "(root)") {
+            ids = await Dbm.node.getDatabase().objectRelationQuery(ids, aData["path"]);
+        }
+
+        aQuery.includeOnly(ids);
+    }
+}

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

@@ -0,0 +1,19 @@
+import Dbm from "dbm";
+
+import SelectBaseObject from "./SelectBaseObject.js";
+
+export default class IncludeAnyStatus extends SelectBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async select(aQuery, aData, aRequest) {
+        await aRequest.connection.requireRole("admin");
+
+        aQuery.includeAnyStatus();
+    }
+
+    async filter(aIds, aData, aRequest) {
+        return aIds;
+    }
+}

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

@@ -5,6 +5,25 @@ export default class SelectBaseObject extends Dbm.core.BaseObject {
         super._construct();
     }
 
+    requireParameters(aData, ...aRequiredParameters) {
+        let isOk = true;
+        let missingParameters = [];
+
+        let currentArray = aRequiredParameters;
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            let currentParameterName = currentArray[i];
+            if(!aData[currentParameterName]) {
+                isOk = false;
+                missingParameters.push(currentParameterName);
+            }
+        }
+
+        if(!isOk) {
+            throw("Missing parameters: " + missingParameters.join(", "));
+        }
+    }
+
     async select(aQuery, aData, aRequest) {
 
     }

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

@@ -1,8 +1,33 @@
+import DbmGraphApi from "../../../../index.js";
+
 export {default as SelectBaseObject} from "./SelectBaseObject.js";
 export {default as IdSelection} from "./IdSelection.js";
 export {default as ByObjectType} from "./ByObjectType.js";
 export {default as IncludePrivate} from "./IncludePrivate.js";
 export {default as IncludeDraft} from "./IncludeDraft.js";
+export {default as IncludeAnyStatus} from "./IncludeAnyStatus.js";
 export {default as ObjectRelationQuery} from "./ObjectRelationQuery.js";
 export {default as GlobalObjectRelationQuery} from "./GlobalObjectRelationQuery.js";
-export {default as WithIdentifier} from "./WithIdentifier.js";
+export {default as WithIdentifier} from "./WithIdentifier.js";
+export {default as IdentifiableObjectRelationQuery} from "./IdentifiableObjectRelationQuery.js";
+
+export const PREFIX = "graphApi/range/select/";
+
+export const register = function(aName, aHandler) {
+    aHandler.item.register(PREFIX + aName);
+}
+
+export const fullSetup = function() {
+    register("byObjectType", new DbmGraphApi.range.select.ByObjectType());
+
+    register("idSelection", new DbmGraphApi.range.select.IdSelection());
+    register("withIdentifier", new DbmGraphApi.range.select.WithIdentifier());
+
+    register("includePrivate", new DbmGraphApi.range.select.IncludePrivate());
+    register("includeDraft", new DbmGraphApi.range.select.IncludeDraft());
+    register("includeAnyStatus", new DbmGraphApi.range.select.IncludeAnyStatus());
+
+    register("objectRelationQuery", new DbmGraphApi.range.select.ObjectRelationQuery());
+    register("globalObjectRelationQuery", new DbmGraphApi.range.select.GlobalObjectRelationQuery());
+    register("identifiableObjectRelationQuery", new DbmGraphApi.range.select.IdentifiableObjectRelationQuery());
+}