@@ -5,6 +5,8 @@ const router = express.Router();
|
|||||||
import dotenv from "dotenv";
|
import dotenv from "dotenv";
|
||||||
dotenv.config();
|
dotenv.config();
|
||||||
|
|
||||||
|
const loan_service = loan_service;
|
||||||
|
|
||||||
import {
|
import {
|
||||||
getItemsFromDatabaseV2,
|
getItemsFromDatabaseV2,
|
||||||
changeInSafeStateV2,
|
changeInSafeStateV2,
|
||||||
@@ -40,7 +42,7 @@ router.post("/change-state/:key/:itemId", authenticate, async (req, res) => {
|
|||||||
router.get(
|
router.get(
|
||||||
"/get-loan-by-code/:key/:loan_code",
|
"/get-loan-by-code/:key/:loan_code",
|
||||||
authenticate,
|
authenticate,
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const loan_code = req.params.loan_code;
|
const loan_code = req.params.loan_code;
|
||||||
const result = await getLoanByCodeV2(loan_code);
|
const result = await getLoanByCodeV2(loan_code);
|
||||||
@@ -56,7 +58,7 @@ router.get(
|
|||||||
router.post(
|
router.post(
|
||||||
"/set-return-date/:key/:loan_code",
|
"/set-return-date/:key/:loan_code",
|
||||||
authenticate,
|
authenticate,
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const loanCode = req.params.loan_code;
|
const loanCode = req.params.loan_code;
|
||||||
const result = await setReturnDateV2(loanCode);
|
const result = await setReturnDateV2(loanCode);
|
||||||
@@ -72,7 +74,7 @@ router.post(
|
|||||||
router.post(
|
router.post(
|
||||||
"/set-take-date/:key/:loan_code",
|
"/set-take-date/:key/:loan_code",
|
||||||
authenticate,
|
authenticate,
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const loanCode = req.params.loan_code;
|
const loanCode = req.params.loan_code;
|
||||||
const result = await setTakeDateV2(loanCode);
|
const result = await setTakeDateV2(loanCode);
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ const router = express.Router();
|
|||||||
import dotenv from "dotenv";
|
import dotenv from "dotenv";
|
||||||
dotenv.config();
|
dotenv.config();
|
||||||
|
|
||||||
|
const loan_service = "Loan Service";
|
||||||
|
const loan_mailer_service = "Loan Mailer";
|
||||||
|
|
||||||
// database funcs import
|
// database funcs import
|
||||||
import {
|
import {
|
||||||
createLoanInDatabase,
|
createLoanInDatabase,
|
||||||
@@ -24,7 +27,7 @@ import { sendMailLoan } from "./services/mailer.js";
|
|||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
"/createLoan",
|
"/createLoan",
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
authenticate,
|
authenticate,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
try {
|
try {
|
||||||
@@ -62,7 +65,7 @@ router.post(
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
if (await checkIfServiceIsActive2("Loan Mailer")) {
|
if (await checkIfServiceIsActive2(loan_mailer_service)) {
|
||||||
const mailInfo = await getLoanInfoWithID(result.data.id);
|
const mailInfo = await getLoanInfoWithID(result.data.id);
|
||||||
console.log(mailInfo);
|
console.log(mailInfo);
|
||||||
sendMailLoan(
|
sendMailLoan(
|
||||||
@@ -102,7 +105,7 @@ router.post(
|
|||||||
|
|
||||||
router.get(
|
router.get(
|
||||||
"/loans",
|
"/loans",
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
authenticate,
|
authenticate,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const result = await getLoansFromDatabase(req.user.username);
|
const result = await getLoansFromDatabase(req.user.username);
|
||||||
@@ -118,7 +121,7 @@ router.get(
|
|||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
"/set-return-date/:loan_code",
|
"/set-return-date/:loan_code",
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
authenticate,
|
authenticate,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const loanCode = req.params.loan_code;
|
const loanCode = req.params.loan_code;
|
||||||
@@ -133,7 +136,7 @@ router.post(
|
|||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
"/set-take-date/:loan_code",
|
"/set-take-date/:loan_code",
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
authenticate,
|
authenticate,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const loanCode = req.params.loan_code;
|
const loanCode = req.params.loan_code;
|
||||||
@@ -157,7 +160,7 @@ router.get("/all-items", authenticate, async (req, res) => {
|
|||||||
|
|
||||||
router.delete(
|
router.delete(
|
||||||
"/delete-loan/:id",
|
"/delete-loan/:id",
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
authenticate,
|
authenticate,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const loanId = req.params.id;
|
const loanId = req.params.id;
|
||||||
@@ -182,7 +185,7 @@ router.delete(
|
|||||||
|
|
||||||
router.get(
|
router.get(
|
||||||
"/all-loans",
|
"/all-loans",
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
authenticate,
|
authenticate,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const result = await getALLLoans();
|
const result = await getALLLoans();
|
||||||
@@ -196,7 +199,7 @@ router.get(
|
|||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
"/borrowable-items",
|
"/borrowable-items",
|
||||||
checkIfServiceIsActive("Loan Service"),
|
checkIfServiceIsActive(loan_service),
|
||||||
authenticate,
|
authenticate,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const { startDate, endDate } = req.body || {};
|
const { startDate, endDate } = req.body || {};
|
||||||
|
|||||||
@@ -5,13 +5,16 @@ const router = express.Router();
|
|||||||
import dotenv from "dotenv";
|
import dotenv from "dotenv";
|
||||||
dotenv.config();
|
dotenv.config();
|
||||||
|
|
||||||
|
const user_frontend_service = "User Frontend";
|
||||||
|
const contact_form_service = "Contact Form Service";
|
||||||
|
|
||||||
// database funcs import
|
// database funcs import
|
||||||
import { loginFunc, changePassword } from "./database/userMgmt.database.js";
|
import { loginFunc, changePassword } from "./database/userMgmt.database.js";
|
||||||
import { sendMail } from "./services/mailer_v2.js";
|
import { sendMail } from "./services/mailer_v2.js";
|
||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
"/login",
|
"/login",
|
||||||
checkIfServiceIsActive("User Frontend"),
|
checkIfServiceIsActive(user_frontend_service),
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const result = await loginFunc(req.body.username, req.body.password);
|
const result = await loginFunc(req.body.username, req.body.password);
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
@@ -31,7 +34,7 @@ router.post(
|
|||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
"/change-password",
|
"/change-password",
|
||||||
checkIfServiceIsActive("User Frontend"),
|
checkIfServiceIsActive(user_frontend_service),
|
||||||
authenticate,
|
authenticate,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const oldPassword = req.body.oldPassword;
|
const oldPassword = req.body.oldPassword;
|
||||||
@@ -48,7 +51,7 @@ router.post(
|
|||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
"/contact",
|
"/contact",
|
||||||
checkIfServiceIsActive("Contact Form Service"),
|
checkIfServiceIsActive(contact_form_service),
|
||||||
authenticate,
|
authenticate,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const message = req.body.message;
|
const message = req.body.message;
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ import { verifyAPIKeyDB } from "./database.js";
|
|||||||
import { checkIfServiceIsActive2 } from "./functions.js";
|
import { checkIfServiceIsActive2 } from "./functions.js";
|
||||||
env.config();
|
env.config();
|
||||||
|
|
||||||
|
const api_service = "API";
|
||||||
|
const user_frontend_service = "User Frontend";
|
||||||
|
|
||||||
const secretKey = process.env.SECRET_KEY;
|
const secretKey = process.env.SECRET_KEY;
|
||||||
if (!secretKey) {
|
if (!secretKey) {
|
||||||
throw new Error("Missing SECRET_KEY environment variable");
|
throw new Error("Missing SECRET_KEY environment variable");
|
||||||
@@ -46,7 +49,7 @@ export async function authenticate(req, res, next) {
|
|||||||
const apiKey = req.params.key;
|
const apiKey = req.params.key;
|
||||||
|
|
||||||
if (authHeader) {
|
if (authHeader) {
|
||||||
const serviceActive = await checkIfServiceIsActive2("User Frontend");
|
const serviceActive = await checkIfServiceIsActive2(user_frontend_service);
|
||||||
if (!serviceActive) {
|
if (!serviceActive) {
|
||||||
return res
|
return res
|
||||||
.status(503)
|
.status(503)
|
||||||
@@ -69,7 +72,7 @@ export async function authenticate(req, res, next) {
|
|||||||
return res.status(403).json({ message: "Present token invalid" }); // present token invalid
|
return res.status(403).json({ message: "Present token invalid" }); // present token invalid
|
||||||
}
|
}
|
||||||
} else if (apiKey) {
|
} else if (apiKey) {
|
||||||
const serviceActive = await checkIfServiceIsActive2("API");
|
const serviceActive = await checkIfServiceIsActive2(api_service);
|
||||||
if (!serviceActive) {
|
if (!serviceActive) {
|
||||||
return res
|
return res
|
||||||
.status(503)
|
.status(503)
|
||||||
|
|||||||
Reference in New Issue
Block a user