dbm-graph-api 1.1.46 → 1.1.48

package/package.json

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

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

@@ -341,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(";");
@@ -656,10 +693,18 @@ export const setupSite = function(aServer) {
 		let assetsUri = site.assetsUri;
 		let language = site.language;
 		let siteName = site.name;
-		let loader = "loader.js?version=" + site.version;
-		if((process.env.NODE_ENV === "production" && request.query.forceLoad !== "unminified") || request.query.forceLoad === "minified") {
-			loader = "loader.min.js?version=" + site.version;
-		}
+        let loaderName = "loader";
+		
+        if(request.query.forceLoader) {
+            loaderName = request.query.forceLoader;
+        }
+        else {
+            if((process.env.NODE_ENV === "production" && request.query.forceLoad !== "unminified") || request.query.forceLoad === "minified") {
+                loaderName += ".min";
+            }
+        }
+        
+        let loader = loaderName + ".js?version=" + site.version;
 
 		let url = request.url;
         let shouldRedirect = false;

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/index.js

@@ -5,6 +5,7 @@ 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";
@@ -24,6 +25,7 @@ export const fullSetup = function() {
 
     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());