From 395f796a579a6ee41626bda48d21d361feb55fb4 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@hebeler.club>
Date: Fri, 24 Feb 2023 11:54:33 +0100
Subject: [PATCH] migrated all routes to new router

---
 pass/app.js          | 37 +------------------------------------
 pass/routes/index.js | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/pass/app.js b/pass/app.js
index 722122b..0778cfb 100644
--- a/pass/app.js
+++ b/pass/app.js
@@ -2,16 +2,11 @@ var createError = require("http-errors");
 var express = require("express");
 var path = require("path");
 var cookieParser = require("cookie-parser");
-var browserify = require("browserify-middleware");
+
 
 var logger = require("morgan");
 
 var indexRouter = require("./routes/index");
-var authenticationRouter = require("./routes/authentication");
-var keyRouter = require("./routes/key");
-var paypalCheckoutRouter = require("./routes/checkout/paypal.js");
-//var checkoutRouter = require("./routes/checkout/checkout");
-var redeemRouter = require("./routes/redeem.js");
 
 var app = express();
 
@@ -44,36 +39,6 @@ app.use((req, res, next) => {
 app.use(/^((\/.*)?\/keys)/, indexRouter);
 app.use(indexRouter);
 
-
-app.use("/", authenticationRouter);
-app.use("/", indexRouter);
-app.use("/key", keyRouter);
-//app.use("/checkout", checkoutRouter);
-app.use("/redeem", redeemRouter);
-
-// Browserified Javascript files
-app.get(
-  "/js/base.js",
-  browserify(path.join(__dirname, "resources", "js", "base.js"))
-);
-
-app.get(
-  "/js/funding_sources.js",
-  browserify(path.join(__dirname, "resources", "js", "funding_sources.js"))
-);
-
-app.get(
-  "/js/checkout_paypal.js",
-  (req, res, next) => {
-    res.header({ "Access-Control-Allow-Origin": "https://www.paypal.com" });
-    next();
-  },
-  browserify(path.join(__dirname, "resources", "js", "checkout_paypal.js"))
-);
-app.get("/js/enter.js", browserify(path.join(__dirname, "resources", "js", "enter.js")));
-
-app.use("/webhooks/paypal", paypalCheckoutRouter);
-app.use("/js/paypal", paypalCheckoutRouter);
 // catch 404 and forward to error handler
 app.use(function (req, res, next) {
   next(createError(404));
diff --git a/pass/routes/index.js b/pass/routes/index.js
index 1bb275f..31f2733 100644
--- a/pass/routes/index.js
+++ b/pass/routes/index.js
@@ -3,11 +3,16 @@ const Order = require("../app/Order.js");
 var router = express.Router({ mergeParams: true });
 
 var lessMiddleware = require("less-middleware");
+var browserify = require("browserify-middleware");
+var paypalCheckoutRouter = require("../routes/checkout/paypal.js");
 var path = require("path");
 
 router.use(lessMiddleware(path.join(__dirname, "..", "public")));
 router.use(express.static(path.join(__dirname, "..", "public")));
 
+var authenticationRouter = require("../routes/authentication");
+router.use("/", authenticationRouter);
+
 /* GET home page. */
 router.get("/", function (req, res, next) {
   res.render("index", {
@@ -16,4 +21,28 @@ router.get("/", function (req, res, next) {
   });
 });
 
+var keyRouter = require("../routes/key");
+router.use("/key", keyRouter);
+
+router.use("/webhooks/paypal", paypalCheckoutRouter);
+
+// Browserified Javascript files
+router.get(
+  "/js/base.js",
+  browserify(path.join(__dirname, "..", "resources", "js", "base.js"))
+);
+router.get(
+  "/js/funding_sources.js",
+  browserify(path.join(__dirname, "..", "resources", "js", "funding_sources.js"))
+);
+router.get(
+  "/js/checkout_paypal.js",
+  (req, res, next) => {
+    res.header({ "Access-Control-Allow-Origin": "https://www.paypal.com" });
+    next();
+  },
+  browserify(path.join(__dirname, "..", "resources", "js", "checkout_paypal.js"))
+);
+router.get("/js/enter.js", browserify(path.join(__dirname, "..", "resources", "js", "enter.js")));
+
 module.exports = router;
-- 
GitLab