dbm-graph-api 1.1.23 → 1.1.25

package/package.json

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

package/src/dbm-graph-api/action/admin/AddAndProcessAction.js

@@ -8,6 +8,7 @@ export default class AddAndProcessAction extends Dbm.core.BaseObject {
     async performAction(aData, aEncodeSession) {
         let returnObject = {};
 
+        await aEncodeSession.outputController.requireRole("admin");
         let user = await aEncodeSession.outputController.getUser();
         
         if(user) {

package/src/dbm-graph-api/action/admin/AddUser.js

@@ -0,0 +1,51 @@
+import Dbm from "dbm";
+
+export default class AddUser extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performAction(aData, aEncodeSession) {
+        console.log("AddUser");
+        let returnObject = {};
+
+        await aEncodeSession.outputController.requireRole("admin");
+        let user = await aEncodeSession.outputController.getUser();
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        
+        if(user) {
+            let username = aData["username"];
+
+            if(username) {
+                let user = await database.getUserByUsername(username);
+
+                if(!user) {
+                    user = await database.createUser();
+                    returnObject["created"] = true;
+
+                    await user.setUsername(username);
+                    if(aData["password"]) {
+                        await user.setPassword(aData["password"]);
+                    }
+
+                    if(aData["role"]) {
+                        let role = await database.getIdentifiableObject("type/userRole", aData["role"]);
+                        await user.addIncomingRelation(role, "for");
+                    }
+                }
+                else {
+                    returnObject["created"] = false;
+                }
+
+                returnObject["id"] = user.id;
+            }
+            else {
+                throw("No username");
+            }
+            
+        }
+
+        return returnObject;
+    }
+}

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

@@ -1,3 +1,4 @@
 export {default as AddAndProcessAction} from "./AddAndProcessAction.js";
+export {default as AddUser} from "./AddUser.js";
 
 export * as setup from "./setup/index.js";

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

@@ -194,6 +194,13 @@ let fullEncodeSetup = function() {
         currentEncode.item.setValue("encodingType", name);
     }
 
+    {
+        let name = "admin_user";
+        let currentEncode = new DbmGraphApi.range.encode.admin.User();
+        currentEncode.item.register(encodePrefix + name);
+        currentEncode.item.setValue("encodingType", name);
+    }
+
     {
         let name = "helpSection";
         let currentEncode = new DbmGraphApi.range.encode.HelpSection();
@@ -245,6 +252,7 @@ let fullActionSetup = function() {
     registerActionFunction("incomingWebhook", new DbmGraphApi.action.IncomingWebhook());
     registerActionFunction("cron/processActions", new DbmGraphApi.action.cron.ProcessActions());
     registerActionFunction("admin/addAndProcessAction", new DbmGraphApi.action.admin.AddAndProcessAction());
+    registerActionFunction("admin/addUser", new DbmGraphApi.action.admin.AddUser());
 
     registerActionFunction("admin/setup/setupWebsite", new DbmGraphApi.action.admin.setup.SetupWebsite());
     registerActionFunction("admin/setup/setupOrganization", new DbmGraphApi.action.admin.setup.SetupOrganization());
@@ -763,7 +771,7 @@ export const setupSite = function(aServer) {
 		
 		returnString += `<link rel="stylesheet" type="text/css" href="${assetsUri}css/main.css?version=${version}" />
 		
-		<link rel="icon" type="image/png" href="${assetsUri}img/favicon.png">`;
+		<link rel="icon" type="image/png" href="${baseUrl}${assetsUri}img/favicon.png">`;
 
 		if(fields['meta/description']) {
 			returnString += `
@@ -779,15 +787,35 @@ export const setupSite = function(aServer) {
 			<meta property="og:url" content="${fullUrl}" />
 		`;
 
+        if(fields["lastModified"]) {
+            returnString += `<meta property="article:modified_time" content="${fields["lastModified"]}" />\n`;
+        }
+
+        let image = await urlObject.singleObjectRelationQuery("in:isMainImageFor:image");
+        if(image) {
+            let imageFields = await image.getFields();
+
+            if(imageFields["resizeUrl"]) {
+                let imageUrl = imageFields["resizeUrl"];
+                let scaleString = "width=1200,height=630,fit=cover,format=jpeg";
+                imageUrl = imageUrl.split("{scale}").join(scaleString);
+
+                returnString += `<meta property="og:image" content="${imageUrl}" />\n`;
+                returnString += `<meta property="og:image:width" content="1200" />\n`;
+                returnString += `<meta property="og:image:height" content="630" />\n`;
+                returnString += `<meta property="og:image:type" content="image/jpeg" />\n`;
+                returnString += `<meta property="twitter:card" content="summary_large_image" />\n`;
+            }
+            else {
+                let imageUrl = imageFields["url"];
+                returnString += `<meta property="og:image" content="${imageUrl}" />\n`;
+                returnString += `<meta property="twitter:card" content="summary_large_image" />\n`;
+            }
+        }
+
 		/*
 	<meta property="article:publisher" content="https://sv-se.facebook.com/..." />
-	<meta property="article:modified_time" content="2024-09-03T13:19:26+00:00" />
-
-	<meta property="og:image" content="https://..." />
-	<meta property="og:image:width" content="1024" />
-	<meta property="og:image:height" content="683" />
-	<meta property="og:image:type" content="image/jpeg" />
-	<meta name="twitter:card" content="summary_large_image" />
+	
 	*/
 
 		returnString += `</head>

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

@@ -20,10 +20,24 @@ export default class UrlRequest extends EncodeBaseObject {
         await aEncodingSession.encodeSingle(aId, "pageRepresentation");
 
         let fields = await object.getFields();
+
+        returnObject["publishDate"] = fields["publishDate"] ? fields["publishDate"] : null;
+
         returnObject["meta/description"] = fields["meta/description"] ? fields["meta/description"] : null;
         returnObject["seo/noIndex"] = fields["seo/noIndex"] ? fields["seo/noIndex"] : false;
         returnObject["seo/noFollow"] = fields["seo/noFollow"] ? fields["seo/noFollow"] : false;
 
+        {
+            let relatedItems = await object.objectRelationQuery("out:in:group/pageCategory");
+            returnObject["categories"] = await aEncodingSession.encodeObjects(relatedItems, "type");
+        }
+
+        {
+            let relatedItem = await object.singleObjectRelationQuery("out:in:group/pageCategory");
+
+            returnObject["category"] = await aEncodingSession.encodeObjectOrNull(relatedItem, "type");
+        }
+
         return returnObject;
     }
 }

package/src/dbm-graph-api/range/encode/admin/User.js

@@ -0,0 +1,26 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "../EncodeBaseObject.js";
+
+export default class User extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        await aEncodingSession.outputController.requireRole("admin");
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getUser(aId);
+
+        let fields = await object.getFields();
+        returnObject["name"] = fields["name"];
+        returnObject["username"] = await object.getUsername();
+
+        let relatedItems = await object.objectRelationQuery("in:for:type/userRole");
+        returnObject["roles"] = await aEncodingSession.encodeObjects(relatedItems, "type");
+
+        return returnObject;
+    }
+}

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

@@ -1 +1,2 @@
-export {default as Fields} from "./Fields.js";
+export {default as Fields} from "./Fields.js";
+export {default as User} from "./User.js";

package/src/dbm-graph-api/schema/JsonLdGenerator.js

@@ -172,9 +172,18 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
             "breadcrumb": {
               "@id": fullUrl +"#breadcrumb"
             },
-            
+            "publisher": {
+                "@id": this.baseUrl + "/" + "#organization"
+            }
           };
 
+          if(fields["publishDate"]) {
+            pageObject["datePublished"] = fields["publishDate"];
+          }
+          if(fields["lastModified"]) {
+            pageObject["dateModified"] = fields["lastModified"].split("T")[0];
+          }
+
           let image = await aPage.singleObjectRelationQuery("in:isMainImageFor:image");
             if(image) {
                 let fields = await image.getFields();
@@ -230,15 +239,6 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
           returnArray.push(breadcrumbList);
 
         return returnArray;
-
-
-        
-
-          /*
-          "primaryImageOfPage": {
-              "@id": "https://example.com/product/acme-coffee-maker#primaryimage"
-            }
-              */
     }
 }