dbm-graph-api 1.1.51 → 1.1.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.51",
+  "version": "1.1.54",
   "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.9",
+    "dbm": "^1.4.10",
     "html-to-text": "^9.0.5",
     "mime": "^4.1.0",
     "node-cron": "^4.2.1",

package/src/dbm-graph-api/action/cron/ProcessActions.js

@@ -20,6 +20,7 @@ export default class ProcessActions extends Dbm.core.BaseObject {
             await action.changeLinkedType("status/actionStatus", "processing");
 
             let actionType = await action.getSingleLinkedType("type/actionType");
+            console.log("Action type: " + actionType);
             
             let processActionItem = Dbm.getInstance().repository.getItemIfExists("graphApi/processAction/" + actionType);
             
@@ -39,6 +40,7 @@ export default class ProcessActions extends Dbm.core.BaseObject {
             returnObject["remaining"] = 0;
         }
 
+        console.log(returnObject);
         return returnObject;
     }
 }

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

@@ -4,4 +4,5 @@ export {default as SubmitForm} from "./SubmitForm.js";
 
 export * as cron from "./cron/index.js";
 export * as admin from "./admin/index.js";
-export * as development from "./development/index.js";
+export * as development from "./development/index.js";
+export * as verification from "./verification/index.js";

package/src/dbm-graph-api/action/verification/SendEmailVerification.js

@@ -0,0 +1,66 @@
+import Dbm from "dbm";
+import crypto from "crypto";
+
+export default class SendEmailVerification extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+
+        this.item.requireProperty("dataSalt", "7m,/7!lH6U~2lL[Z0RMfE`y.KKa+twH}[A7*|6=f|mu?sB[efsGJD{i~GU$<m8Q|");
+        this.item.requireProperty("codeSalt", "rUMP^jiM%llGT+EnV{@?l[CmPdv.Oq-Z>ZgX;DV85NAp o:B]QO`n]Kyl=vhE~hC");
+    }
+
+    _timestampToMysqlDate(aTime) {
+        let date = new Date(aTime);
+
+        return date.toISOString().split("T").join(" ").split(".")[0];
+    }
+
+    async performAction(aData, aEncodeSession) {
+        let returnObject = {};
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+
+        let verification = await database.createObject("private", ["verification"]);
+        verification.addObjectType("verification/email");
+        
+        let email = aData["email"];
+
+        let hash = crypto.createHash('sha256');
+        hash.update(email + verification.id + this.item.dataSalt);
+        let hashedData = hash.digest('hex');
+        await verification.updateField("data", hashedData);
+
+        let now = (new Date()).valueOf();
+        let expireTime = now + 15 * 60 * 1000;
+        let unverifiedStatus = await database.getTypeObject("status/verifcationStatus", "unverified");
+        await verification.incomingRelations.add(unverifiedStatus, "for", this._timestampToMysqlDate(now), this._timestampToMysqlDate(expireTime));
+
+        let expiredStatus = await database.getTypeObject("status/verifcationStatus", "expired");
+        await verification.incomingRelations.add(expiredStatus, "for", this._timestampToMysqlDate(expireTime));
+
+        let code = crypto.randomInt(100000, 1000000);
+        let codeHash = crypto.createHash('sha256');
+        codeHash.update(code + "" + verification.id + this.item.codeSalt);
+        let hashedCode = codeHash.digest('hex');
+        await verification.updateField("code", hashedCode);
+
+        let key = crypto.randomUUID();
+        await verification.setIdentifier(key);
+        
+        returnObject["email"] = email;
+        returnObject["key"] = key;
+
+        let codeKeywords = {
+            "code": code
+        }
+
+        let keywordReplace = new Dbm.utils.KeywordReplace();
+        keywordReplace.addKeywordProvider("verification", codeKeywords);
+
+        let language = aData["language"] ? aData["language"] : "en";
+        let communication = await Dbm.node.communication.sendEmailTemplate("emailVerification", email, keywordReplace, language);
+        await verification.incomingRelations.add(communication, "for");
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/action/verification/Verify.js

@@ -0,0 +1,66 @@
+import Dbm from "dbm";
+import crypto from "crypto";
+
+export default class Verify extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+
+        this.item.requireProperty("codeSalt", "rUMP^jiM%llGT+EnV{@?l[CmPdv.Oq-Z>ZgX;DV85NAp o:B]QO`n]Kyl=vhE~hC");
+    }
+
+    _timestampToMysqlDate(aTime) {
+        let date = new Date(aTime);
+
+        return date.toISOString().split("T").join(" ").split(".")[0];
+    }
+
+    async performAction(aData, aEncodeSession) {
+        let returnObject = {};
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+
+        let key = aData["key"];
+
+        returnObject["result"] = "none";
+
+        let verification = await database.getIdentifiableObjectIfExists("verification", key);
+        if(verification) {
+
+            let statusObject = await verification.singleObjectRelationQuery("in:for:status/verifcationStatus");
+            let status = await statusObject.getIdentifier();
+
+            if(status === "unverified" || status === "verified") {
+                let code = aData["code"];
+
+                let fields = await verification.getFields();
+
+                let codeHash = crypto.createHash('sha256');
+                codeHash.update(code + "" + verification.id + this.item.codeSalt);
+                let hashedCode = codeHash.digest('hex');
+
+                if(fields["code"] === hashedCode) {
+                    if(status === "unverified") {
+                        let now = (new Date()).valueOf();
+                        let expireTime = now + 30 * 60 * 1000;
+                        let verifiedStatus = await database.getTypeObject("status/verifcationStatus", "verified");
+                        await verification.incomingRelations.replace(verifiedStatus, "for", "status/verifcationStatus", this._timestampToMysqlDate(expireTime));
+
+                        let expiredStatus = await database.getTypeObject("status/verifcationStatus", "expired");
+                        await verification.incomingRelations.add(expiredStatus, "for", this._timestampToMysqlDate(expireTime));
+                    }
+
+                    returnObject["result"] = "verified";
+                }
+                else {
+                    returnObject["result"] = "incorrectCode";
+                }
+            }
+            else {
+                returnObject["result"] = "invalidStatus";
+            }
+            
+        }
+        
+        return returnObject;
+    }
+}

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

@@ -0,0 +1,2 @@
+export {default as SendEmailVerification} from "./SendEmailVerification.js";
+export {default as Verify} from "./Verify.js";

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

@@ -236,6 +236,9 @@ export const fullActionSetup = function() {
     registerActionFunction("admin/setup/setupWebsite", new DbmGraphApi.action.admin.setup.SetupWebsite());
     registerActionFunction("admin/setup/setupOrganization", new DbmGraphApi.action.admin.setup.SetupOrganization());
 
+    registerActionFunction("verification/sendEmailVerification", new DbmGraphApi.action.verification.SendEmailVerification());
+    registerActionFunction("verification/verify", new DbmGraphApi.action.verification.Verify());
+
     registerActionFunction("development/restartServer", new DbmGraphApi.action.development.RestartServer());
     registerActionFunction("development/restartDatabaseConnection", new DbmGraphApi.action.development.RestartDatabaseConnection());
 

package/src/dbm-graph-api/processAction/communication/SendEmail.js

@@ -3,6 +3,8 @@ import Dbm from "dbm";
 export default class SendEmail extends Dbm.core.BaseObject {
     _construct() {
         super._construct();
+
+        this.item.requireProperty("client", null);
     }
 
     async process(aAction) {

package/src/dbm-graph-api/taskrunner/InternalTaskRunner.js

@@ -50,6 +50,7 @@ export default class InternalTaskRunner extends Dbm.core.BaseObject {
 
         if(this._isRunning) {
             if(runDirect) {
+                console.log("Run direct");
                 this._intervalId = setTimeout(this._runNextTaskBound, 1);
             }
             else {