Merge pull request #78 from Tolfix/dev

v2.3

Author: Tolfx

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpg-api",
-  "version": "v2.2",
+  "version": "v2.3",
   "description": "Central Payment Gateway",
   "main": "./build/Main.js",
   "dependencies": {
@@ -28,6 +28,7 @@
     "easyinvoice": "^2.0.8",
     "express": "^4.17.1",
     "express-fileupload": "^1.2.1",
+    "express-rate-limit": "^6.2.0",
     "express-session": "^1.17.2",
     "express-swagger-generator": "github:Tolfix/express-swagger-generator",
     "graphql-compose": "^9.0.6",

src/Cache/reCache.ts

@@ -196,9 +196,6 @@ export async function reCache_Images()
      });
  }
 
-/**
- * @deprecated
- */
 export async function reCache()
 {
     await reCache_Configs();

src/Database/Models/Transactions.model.ts

@@ -17,7 +17,7 @@ const TransactionsSchema = new Schema
         },
 
         customer_uid: {
-            type: Number,
+            type: Number || String,
             required: true
         },
 

src/Lib/MongoFind.ts

@@ -3,19 +3,32 @@ import { Request } from "express"
 import { MongooseQueryParser } from "mongoose-query-parser";
 const p = new MongooseQueryParser();
 
-export default function MongoFind<T>(model: Model<T>, query: Request["query"], eQuery?: any)
+export default async function MongoFind<T>(model: Model<T>, query: Request["query"], eQuery?: any)
 {
     const data = p.parse(query);
 
     const b = model.find({
         ...data.filter,
         ...eQuery ?? {}
     }).sort(data.sort ?? "1").skip(data.skip ?? 0).limit(data.limit ?? 10);
+    
     if(data.select)
         b.select(data.select);
 
     if(data.populate)
         b.populate(data.populate);
 
-    return b.exec();
+    const c = await b.exec();
+
+    // Total count
+    const count = await model.countDocuments({
+        ...data.filter,
+        ...eQuery ?? {},
+    });
+
+    return {
+        data: c, 
+        totalPages: Math.ceil(count / (data.limit ?? 10)),
+        totalCount: count,
+    }
 }

src/Middlewares/EnsureAdmin.ts

@@ -6,66 +6,66 @@ import jwt from "jsonwebtoken";
 import { JWT_Access_Token } from "../Config";
 import Logger from "../Lib/Logger";
 
-export default function EnsureAdmin(req: Request, res: Response, next: NextFunction)
+export default function EnsureAdmin(eR = false)
 {
-    const authHeader = req.headers['authorization'];
-    if(!authHeader)
-        return APIError("Missing 'authorization' in header")(res);
-
-    const b64auth = (authHeader).split(' ');
-
-    if(!b64auth[0].toLocaleLowerCase().match(/basic|bearer/g))
-        return APIError("Missing 'basic' or 'bearer' in authorization")(res);
-
-    if(!b64auth[1])
-        return APIError("Missing 'buffer' in authorization")(res);
-
-    if(b64auth[0].toLocaleLowerCase() === "basic")
+    return (req: Request, res: Response, next?: NextFunction) =>
     {
-        // Check if buffer, or base64
-        let [login, password] = (Buffer.isBuffer(b64auth[1]) ? Buffer.from(b64auth[1], 'base64') : b64auth[1]).toString().split(':');
-        if(login.includes("==") || password.includes("=="))
-        {
-            // Assuming base64 string
-            // Convert it to normal string
-            Logger.error(`Admin authorizing with base64 string`);
-            Logger.info(`Encoding admin credentials to normal string`);
-            login = atob(login);
-            password = login.split(":")[1];
-            login = login.split(":")[0];
-        }
-        
-        Logger.warning(`Authoring admin with username: ${login}`);
 
-        return bcrypt.compare(password, (CacheAdmin.get(getAdminByUsername(login) ?? "ADM_")?.["password"]) ?? "", (err, match) =>
+        const authHeader = req.headers['authorization'];
+        if(!authHeader)
+            return eR ? Promise.resolve(false) : APIError("Missing 'authorization' in header")(res);
+    
+        const b64auth = (authHeader).split(' ');
+    
+        if(!b64auth[0].toLocaleLowerCase().match(/basic|bearer/g))
+            return eR ? Promise.resolve(false) : APIError("Missing 'basic' or 'bearer' in authorization")(res);
+    
+        if(!b64auth[1])
+            return eR ? Promise.resolve(false) : APIError("Missing 'buffer' in authorization")(res);
+    
+        if(b64auth[0].toLocaleLowerCase() === "basic")
         {
+            // Check if buffer, or base64
+            let [login, password] = (Buffer.isBuffer(b64auth[1]) ? Buffer.from(b64auth[1], 'base64') : b64auth[1]).toString().split(':');
+            if(login.includes("==") || password.includes("=="))
+            {
+                // Assuming base64 string
+                // Convert it to normal string
+                Logger.error(`Admin authorizing with base64 string`);
+                Logger.info(`Encoding admin credentials to normal string`);
+                login = atob(login);
+                password = login.split(":")[1];
+                login = login.split(":")[0];
+            }
+            
+            eR ? null : Logger.warning(`Authoring admin with username: ${login}`);
+    
+            const match = bcrypt.compare(password, (CacheAdmin.get(getAdminByUsername(login) ?? "ADM_")?.["password"]) ?? "")
             if(!match)
             {
-                Logger.warning(`Authorization failed for admin with username: ${login}`);
-                return APIError("Unauthorized admin", 403)(res);
+                eR ? null : Logger.warning(`Authorization failed for admin with username: ${login}`);
+                return eR ? Promise.resolve(false) : APIError("Unauthorized admin", 403)(res);
             }
 
-            return next();
-        });
-    }
-
-    if(b64auth[0].toLocaleLowerCase() === "bearer")
-    {
-        const token = (Buffer.isBuffer(b64auth[1]) ? Buffer.from(b64auth[1], 'base64') : b64auth[1]).toString();
-        Logger.warning(`Authoring admin with token: ${token}`);
-        jwt.verify(token, JWT_Access_Token, (err, payload) =>
+            return eR ? Promise.resolve(true) : next?.();
+        }
+    
+        if(b64auth[0].toLocaleLowerCase() === "bearer")
         {
-            if(err || !payload)
+            const token = (Buffer.isBuffer(b64auth[1]) ? Buffer.from(b64auth[1], 'base64') : b64auth[1]).toString();
+            eR ? null : Logger.warning(`Authoring admin with token: ${token}`);
+            const payload = jwt.verify(token, JWT_Access_Token);
+            if(!payload)
             {
-                Logger.warning(`Authorization failed for admin with token: ${token}`);
-                return APIError("Unauthorized admin", 403)(res);
+                eR ? null : Logger.warning(`Authorization failed for admin with token: ${token}`);
+                return eR ? Promise.resolve(false) : APIError("Unauthorized admin", 403)(res);
             }
 
-            Logger.warning(`Authorized admin with token: ${token}`);
+            eR ? null : Logger.warning(`Authorized admin with token: ${token}`);
 
-            return next();
-        });
+            return eR ? Promise.resolve(true) : next?.();
+        }
+
+        return Promise.resolve(false);
     }
-    
-    return null;
 }

src/Middlewares/EnsureAuth.ts

@@ -4,14 +4,14 @@ import { JWT_Access_Token } from "../Config";
 import Logger from "../Lib/Logger";
 import { APIError } from "../Lib/Response";
 
-export default function EnsureAuth()
+export default function EnsureAuth(eR = false)
 {
-    return (req: Request, res: Response, next: NextFunction) =>
+    return (req: Request, res: Response, next?: NextFunction) =>
     {
         const authHeader = req.headers['authorization'];
         const tokenQuery = req.query.access_token;
         if(!authHeader && !tokenQuery)
-            return APIError({
+            return eR ? Promise.resolve(false) : APIError({
                 text: "Missing 'authorization' in header"
             })(res);
 
@@ -24,13 +24,13 @@ export default function EnsureAuth()
 
         // @ts-ignore
         if(!b64auth[0].toLocaleLowerCase().match(/query|bearer/g))
-            return APIError({
+            return eR ? Promise.resolve(false) : APIError({
                 text: "Missing 'basic' or 'bearer' in authorization"
             })(res);
 
         // @ts-ignore
         if(!b64auth[1])
-            return APIError({
+            return eR ? Promise.resolve(false) : APIError({
                 text: "Missing 'buffer' in authorization"
             })(res);
 
@@ -39,22 +39,21 @@ export default function EnsureAuth()
         {
             // @ts-ignore
             const token = (Buffer.isBuffer(b64auth[1]) ? Buffer.from(b64auth[1], 'base64') : b64auth[1]).toString();
-            jwt.verify(token, JWT_Access_Token, (err, payload) =>
-            {
-                if (err) 
-                    return APIError(`Unauthorized user.`, 403)(res);
-
-                // @ts-ignore
-                if(!payload?.data?.id)
-                    return APIError(`Wrong payload.`, 403)(res);
-    
-                //@ts-ignore
-                req.customer = payload.data;
-                // @ts-ignore
-                Logger.api(`Authorizing`, payload.data);
-    
-                return next();
-            });
+
+            const payload = jwt.verify(token, JWT_Access_Token);
+            if (!payload) 
+                return eR ? Promise.resolve(false) : APIError(`Unauthorized user.`, 403)(res);
+
+            // @ts-ignore
+            if(!payload?.data?.id)
+                return eR ? Promise.resolve(false) : APIError(`Wrong payload.`, 403)(res);
+
+            //@ts-ignore
+            req.customer = payload.data;
+            // @ts-ignore
+            eR ? null : Logger.api(`Authorizing`, payload.data);
+
+            return eR ? Promise.resolve(true) : next?.();
         }
 
 

src/Models/BaseModelAPI.ts

@@ -1,4 +1,4 @@
-import { Request } from "express";
+import { Request, Response } from "express";
 import MongoFind from "../Lib/MongoFind";
 
 export default class BaseModelAPI<IModel extends { uid: string }>
@@ -42,19 +42,23 @@ export default class BaseModelAPI<IModel extends { uid: string }>
         });
     }
 
-    public findAll(query: Request["query"]): Promise<Array<IModel>>
+    public findAll(query: Request["query"], res: Response): Promise<Array<IModel>>
     {
         return new Promise((resolve, reject) =>
         {
-            MongoFind(this.iModel, query).then((result: any) =>
+            MongoFind(this.iModel, query).then((result) =>
             {
-                const r = result.map((i: any) =>
+                const r = result.data.map((i: any) =>
                 {
                     const r = i.toJSON();
                     //@ts-ignore
                     delete r.__v;
                     return r;
                 });
+
+                res.setHeader("X-Total-Pages", result.totalPages);
+                res.setHeader("X-Total", result.totalCount);
+
                 resolve(r);
             }).catch(reject);
         });

src/Server/Routes/v1/Admin/Admin.config.ts

@@ -19,7 +19,7 @@ export = class AdminRouter
          * @group Admin - Admin routes
          * @security JWT
          */
-        this.router.get("/validate", EnsureAdmin, (req, res) =>
+        this.router.get("/validate", EnsureAdmin(), (req, res) =>
         {
             APISuccess("Authenticated", 202)(res);
         });
@@ -32,7 +32,7 @@ export = class AdminRouter
          * @returns {APIError} 404 - Failed
          * @security Basic
          */
-        this.router.post("/auth", EnsureAdmin, (req, res) =>
+        this.router.post("/auth", EnsureAdmin(), (req, res) =>
         {
             const token = jwt.sign({
                 data: 'admin',

src/Server/Routes/v2/Categories/Categories.config.ts

@@ -25,22 +25,22 @@ export = class CategoryRouter
         ])
 
         this.router.post("/", [
-            EnsureAdmin,
+            EnsureAdmin(),
             CategoryController.insert
         ]);
 
         this.router.patch("/:uid", [
-            EnsureAdmin,
+            EnsureAdmin(),
             CategoryController.patch
         ]);
 
         this.router.put("/:uid", [
-            EnsureAdmin,
+            EnsureAdmin(),
             CategoryController.patch
         ]);
 
         this.router.delete("/:uid", [
-            EnsureAdmin,
+            EnsureAdmin(),
             CategoryController.removeById
         ]);
     }

src/Server/Routes/v2/Categories/Categories.controller.ts

@@ -33,7 +33,7 @@ function getByUid(req: Request, res: Response)
 
 function list(req: Request, res: Response)
 {
-    API.findAll(req.query).then((result: any) =>
+    API.findAll(req.query, res).then((result: any) =>
     {
         APISuccess(result)(res)
     })