@joystick.js/node-canary 0.0.0-canary.385 → 0.0.0-canary.387

package/dist/app/api/register_getters.js

@@ -1 +1 @@
-import c from"./format_api_error.js";import d from"./get.js";import g from"./get_api_context.js";import y from"./get_api_url_component.js";import h from"./handle_api_error.js";import a from"../../lib/is_valid_json.js";import w from"../../lib/types.js";import v from"./validate_session.js";const x=(p={},n=[],u={},_={})=>{for(let o=0;o<n?.length;o+=1){const[i,s]=n[o];p.get(`/api/_getters/${y(i)}`,...w.is_array(s?.middleware)?s?.middleware:[],async(t={},e={})=>{if(process.databases?._sessions&&!await v(t,e))return e.status(403).send(JSON.stringify({errors:[c(new Error("Unauthorized request."))]}));const m=await g(t,e,u),f=a(t?.query?.input)?JSON.parse(t?.query?.input):null,l=a(t?.query?.output)?JSON.parse(t?.query?.output):null;d({get_name:i,get_options:{input:f,output:l},getter_definition:s,request_context:m,api_schema_options:_}).then(r=>e.status(200).send(JSON.stringify(r))).catch(r=>{h(`api.getters.${i}`,r,e)})})}};var z=x;export{z as default};
+import f from"./format_api_error.js";import g from"./get.js";import d from"./get_api_context.js";import y from"./get_api_url_component.js";import h from"./handle_api_error.js";import p from"../../lib/is_valid_json.js";import w from"../../lib/types.js";import v from"./validate_session.js";const x=(u={},n=[],_={},m={})=>{for(let r=0;r<n?.length;r+=1){const[s,i]=n[r];u.get(`/api/_getters/${y(s)}`,...w.is_array(i?.middleware)?i?.middleware:[],async(t={},e={})=>{if(process.databases?._sessions&&!await v(t,e))return e.status(403).send(JSON.stringify({errors:[f(new Error("Unauthorized request."))]}));const l=await d(t,e,_),a=p(t?.query?.input)?JSON.parse(t?.query?.input):null;console.log(a);const c=p(t?.query?.output)?JSON.parse(t?.query?.output):null;g({get_name:s,get_options:{input:a,output:c},getter_definition:i,request_context:l,api_schema_options:m}).then(o=>e.status(200).send(JSON.stringify(o))).catch(o=>{h(`api.getters.${s}`,o,e)})})}};var z=x;export{z as default};

package/dist/app/middleware/context.js

@@ -1 +1 @@
-const t=(e="",n=null)=>{if(req?.context?.user&&e)return res.redirect(e);if(n)return n()},r=(e="",n=null)=>{if(!req?.context?.user&&e)return res.redirect(e);if(n)return n()},s=async(e,n,o)=>{e.context={...e?.context||{},if_logged_in:t,ifLoggedIn:t,if_not_logged_in:r,ifNotLoggedIn:r,...process.databases||{}},o()};var i=s;export{i as default};
+const g=(n="",e=null,o={})=>{if(o?.req?.context?.user&&n)return o?.res.redirect(n);if(e)return e()},f=(n="",e=null,o={})=>{if(!o?.req?.context?.user&&n)return o?.res.redirect(n);if(e)return e()},d=async(n,e,o)=>{n.context={...n?.context||{},if_logged_in:(t="",i)=>g(t,i,{req:n,res:e}),ifLoggedIn:(t="",i)=>g(t,i,{req:n,res:e}),if_not_logged_in:(t="",i)=>f(t,i,{req:n,res:e}),ifNotLoggedIn:(t="",i)=>f(t,i,{req:n,res:e}),...process.databases||{}},o()};var r=d;export{r as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystick.js/node-canary",
   "type": "module",
-  "version": "0.0.0-canary.385",
+  "version": "0.0.0-canary.387",
   "description": "The Node.js framework for Joystick.",
   "main": "./dist/index.js",
   "scripts": {

package/src/app/api/register_getters.js

@@ -28,6 +28,9 @@ const register_getters = (express_app = {}, getter_definitions = [], api_context
 
         const context = await get_api_context(req, res, api_context);
         const input = is_valid_json(req?.query?.input) ? JSON.parse(req?.query?.input) : null;
+
+        console.log(input);
+        
         const output = is_valid_json(req?.query?.output) ? JSON.parse(req?.query?.output) : null;
 
 				get({

package/src/app/middleware/context.js

@@ -1,6 +1,6 @@
-const if_logged_in = (redirect_path = "", callback = null) => {
-  if (!!req?.context?.user && redirect_path) {
-    return res.redirect(redirect_path);
+const if_logged_in = (redirect_path = "", callback = null, http = {}) => {
+  if (!!http?.req?.context?.user && redirect_path) {
+    return http?.res.redirect(redirect_path);
   }
 
   if (callback) {
@@ -8,9 +8,9 @@ const if_logged_in = (redirect_path = "", callback = null) => {
   }
 };
 
-const if_not_logged_in = (redirect_path = "", callback = null) => {
-  if (!req?.context?.user && redirect_path) {
-    return res.redirect(redirect_path);
+const if_not_logged_in = (redirect_path = "", callback = null, http = {}) => {
+  if (!http?.req?.context?.user && redirect_path) {
+    return http?.res.redirect(redirect_path);
   }
 
   if (callback) {
@@ -21,10 +21,10 @@ const if_not_logged_in = (redirect_path = "", callback = null) => {
 const context_middleware = async (req, res, next) => {
   req.context = {
     ...(req?.context || {}),
-    if_logged_in,
-	  ifLoggedIn: if_logged_in,
-	  if_not_logged_in,
-	  ifNotLoggedIn: if_not_logged_in,
+    if_logged_in: (redirect_path = '', callback) => if_logged_in(redirect_path, callback, { req, res }),
+	  ifLoggedIn: (redirect_path = '', callback) => if_logged_in(redirect_path, callback, { req, res }),
+	  if_not_logged_in: (redirect_path = '', callback) => if_not_logged_in(redirect_path, callback, { req, res }),
+	  ifNotLoggedIn: (redirect_path = '', callback) => if_not_logged_in(redirect_path, callback, { req, res }),
 	  ...(process.databases || {}),
   };