Use param objects

pulsar-edit · Sep 11, 2023 · 0864d96 · 0864d96
1 parent ae3f29d
commit 0864d96
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 26 deletions.
diff --git a/src/controllers/getStars.js b/src/controllers/getStars.js
@@ -20,10 +20,8 @@ module.exports = {
       "X-Content-Type-Options": "nosniff"
     }
   },
-  params(req, context) {
-    return {
-      auth: query.auth(req)
-    };
+  params: {
+    auth: (context, req) => { return context.query.auth(req); }
   },
 
   /**

diff --git a/src/controllers/getThemes.js b/src/controllers/getThemes.js
@@ -10,12 +10,10 @@ module.exports = {
       "X-Content-Type-Options": "nosniff"
     }
   },
-  params(req, context) {
-    return {
-      page: context.query.page(req),
-      sort: context.query.sort(req),
-      direction: context.query.dir(req)
-    };
+  params: {
+    page: (context, req) => { return context.query.page(req); },
+    sort: (context, req) => { return context.query.sort(req); },
+    direction: (context, req) => { return context.query.dir(req); }
   },
 
   /**

diff --git a/src/controllers/getThemesFeatured.js b/src/controllers/getThemesFeatured.js
@@ -9,10 +9,9 @@ module.exports = {
       "X-Content-Type-Options": "nosniff"
     }
   },
-  params(req, context) {
+  params: {
     // Currently we don't seem to utilize any query parameters here.
     // We likely want to make this match whatever is used in getPackagesFeatured.js
-    return {};
   },
   async logic(params, context) {
     const col = await context.database.getFeaturedThemes();

diff --git a/src/controllers/getUpdates.js b/src/controllers/getUpdates.js
@@ -21,9 +21,7 @@ module.exports = {
       "X-Content-Type-Options": "nosniff"
     }
   },
-  params(req, context) {
-    return {};
-  },
+  params: {},
 
   /**
    * @async

diff --git a/src/controllers/getUsers.js b/src/controllers/getUsers.js
@@ -24,10 +24,8 @@ module.exports = {
       "Access-Control-Allow-Credentials": true
     }
   },
-  params(req, context) {
-    return {
-      auth: context.query.auth(req)
-    };
+  params: {
+    auth: (context, req) => { return context.query.auth(req); }
   },
   preLogic(req, res, context) {
     res.header("Access-Control-Allow-Methods", "GET");

diff --git a/src/controllers/getUsersLogin.js b/src/controllers/getUsersLogin.js
@@ -20,10 +20,8 @@ module.exports = {
       "X-Content-Type-Options": "nosniff"
     }
   },
-  params(req, context) {
-    return {
-      login: context.query.login(req)
-    };
+  params: {
+    login: (context, req) => { return context.query.login(req); }
   },
 
   /**

diff --git a/src/setupEndpoints.js b/src/setupEndpoints.js
@@ -85,7 +85,11 @@ for (const node of endpoints) {
     switch(node.endpoint.method) {
       case "GET":
         app.get(path, limiter, async (req, res) => {
-          let params = node.params(req, context);
+          let params = {};
+
+          for (const param in node.params) {
+            params[param] = node.params[param](context, req);
+          }
 
           if (typeof node.preLogic === "function") {
             node.preLogic(req, res, context);
@@ -104,7 +108,11 @@ for (const node of endpoints) {
         });
       case "POST":
         app.post(path, limiter, async (req, res) => {
-          let params = node.params(req, context);
+          let params = {};
+
+          for (const param in node.params) {
+            params[param] = node.params[param](context, req);
+          }
 
           if (typeof node.preLogic === "function") {
             node.preLogic(req, res, context);
@@ -123,7 +131,11 @@ for (const node of endpoints) {
         });
       case "DELETE":
         app.delete(path, limiter, async (req, res) => {
-          let params = node.params(req, context);
+          let params = {};
+
+          for (const param in node.params) {
+            params[param] = node.params[param](context, req);
+          }
 
           if (typeof node.preLogic === "function") {
             node.preLogic(req, res, context);