speedly 1.2.13 → 1.2.17

package/dist/cjs/auth/auth.d.ts

@@ -1,20 +1,3 @@
-import { Request, Response, NextFunction } from 'express';
-type Handler = (req: Request, res: Response, next: (errorMessage?: string) => unknown) => unknown;
-type AdminArgs = [{
-    permission: string;
-}, ...Handler[]] | Handler[];
-interface UseAuth {
-    (req: Request, res: Response, next: NextFunction): any;
-    user?: (...handlers: Handler[]) => UseAuth;
-    admin?: (...handlers: AdminArgs) => UseAuth;
-    any?: (...handlers: Handler[]) => UseAuth;
-}
-declare const auth: (config?: {
-    admin: {
-        role: string;
-        model: string;
-    };
-    jwtSecretEnv: string;
-    customValidator: (req: Request, key: string) => boolean;
-}) => UseAuth;
+import * as Types from "./types";
+declare const auth: Types.Auth;
 export default auth;

package/dist/cjs/auth/auth.js

@@ -1,72 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const getConfig_1 = __importDefault(require("../util/getConfig"));
-const gConfig = { admin: { role: 'ADMIN', model: '../models/admin' }, jwtSecretEnv: 'JWT_KEY', customValidator: (req, key) => { return true; }, ...(0, getConfig_1.default)('auth') };
-const holders = {};
-const auth = (config = gConfig) => {
-    // const adminModel = require('../models/admin')
-    let handlerState = {};
-    let useAuth = async (req, res, next) => {
-        try {
-            const nextFunc = (handlers, index = 0) => (errorMessage = '') => {
-                if (errorMessage)
-                    return next(errorMessage);
-                if (!handlers.length || !handlers[index + 1])
-                    return next();
-                handlers[index + 1](req, res, nextFunc(handlers, index + 1));
-            };
-            const keys = Object.keys(handlerState);
-            for (let i = 0; i < keys.length; i++) {
-                const key = keys[i];
-                if (!handlerState[key]?.handlers?.length)
-                    continue;
-                if (await gConfig?.customValidator?.(req, key)) {
-                    return await handlerState[key].handlers[0](req, res, nextFunc(handlerState[key].handlers));
-                }
-                else if (await gConfig?.customValidator?.(req, key) == null) {
-                    return next({ status: 401, json: { message: 'unauthorized' } });
-                }
-                else if (i === keys.length - 1) {
-                    next({ status: 405, json: { message: 'you don\'t have access to this section' } });
-                }
-                else
-                    continue;
-            }
-        }
-        catch (error) {
-            console.log('auth', 42, error);
-            next({ status: 403, json: { message: (error instanceof Error ? error.message : 'error on authentication please login again') } });
-        }
-    };
-    holders.admin = (...handlers) => {
-        if (!Array.isArray(handlers))
-            throw new Error('handlers must be an array');
-        const hasConfig = typeof handlers[0] === 'object' && 'permission' in handlers[0];
-        const configObj = hasConfig ? handlers[0] : undefined;
-        const handlerFns = hasConfig ? handlers.slice(1) : handlers;
-        handlerState[`admin${configObj?.permission ? `:${configObj.permission}` : ''}`] = {
-            ...(configObj ? { config: configObj } : {}),
-            handlers: handlerFns
-        };
-        return useAuth;
-    };
-    holders.user = (...handlers) => {
-        if (!Array.isArray(handlers))
-            throw new Error('handlers must be an array');
-        handlerState.user = { handlers };
-        return useAuth;
-    };
-    holders.any = (...handlers) => {
-        if (!Array.isArray(handlers))
-            throw new Error('handlers must be an array');
-        handlerState.any = { handlers };
-        return useAuth;
-    };
-    useAuth = Object.assign(useAuth, holders);
-    return useAuth;
+const getConfig_1 = require("../util/getConfig");
+const gConfig = {
+    admin: { role: "ADMIN", model: "../models/admin" },
+    jwtSecretEnv: "JWT_KEY",
+    customValidator: (req, key) => {
+        return true;
+    },
+    ...(0, getConfig_1.default)("auth"),
+};
+const executer = (authType) => async (req, res, next) => {
+    const accessResult = await gConfig?.customValidator?.(req, authType);
+    if (accessResult == null)
+        return next({ status: 401, json: { message: 'Unauthorized' } });
+    if (!accessResult)
+        return next({ status: 403, json: { message: 'Forbidden' } });
+    return next();
+};
+const auth = {
+    user: () => {
+        return executer("user");
+    },
+    admin: (config) => {
+        return executer(`admin${config?.permission ? `:${config.permission}` : ''}`);
+    },
+    any: () => {
+        return executer("any");
+    },
 };
-console.log('auth', 81, typeof auth);
 exports.default = auth;

package/dist/cjs/auth/auth2.d.ts

@@ -0,0 +1,18 @@
+import { Request, Response, NextFunction } from "express";
+type Handler = (req: Request, res: Response, next: (errorMessage?: string) => unknown) => unknown;
+type UseAuth = (req: Request, res: Response, next: NextFunction) => UseAuth | {
+    user?: (...handlers: Handler[]) => unknown;
+    admin?: (...handlers: [{
+        permission: string;
+    }, ...Handler[]] | Handler[]) => unknown;
+    any?: (...handlers: Handler[]) => unknown;
+};
+declare const auth: (config?: {
+    admin: {
+        role: string;
+        model: string;
+    };
+    jwtSecretEnv: string;
+    customValidator: (req: Request, key: string) => boolean;
+}) => UseAuth;
+export default auth;

package/dist/cjs/auth/auth2.js

@@ -0,0 +1,93 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const getConfig_1 = __importDefault(require("../util/getConfig"));
+const gConfig = {
+    admin: { role: "ADMIN", model: "../models/admin" },
+    jwtSecretEnv: "JWT_KEY",
+    customValidator: (req, key) => {
+        return true;
+    },
+    ...(0, getConfig_1.default)("auth"),
+};
+const holders = {};
+const auth = (config = gConfig) => {
+    // const adminModel = require('../models/admin')
+    let handlerState = {};
+    let useAuth = async (req, res, next) => {
+        try {
+            const nextFunc = (handlers, index = 0) => (errorMessage = "") => {
+                if (errorMessage)
+                    return next(errorMessage);
+                if (!handlers.length || !handlers[index + 1])
+                    return next();
+                handlers[index + 1](req, res, nextFunc(handlers, index + 1));
+            };
+            const keys = Object.keys(handlerState);
+            for (let i = 0; i < keys.length; i++) {
+                const key = keys[i];
+                if (!handlerState[key]?.handlers?.length)
+                    continue;
+                if (await gConfig?.customValidator?.(req, key)) {
+                    return await handlerState[key].handlers[0](req, res, nextFunc(handlerState[key].handlers));
+                }
+                else if ((await gConfig?.customValidator?.(req, key)) == null) {
+                    return next({ status: 401, json: { message: "unauthorized" } });
+                }
+                else if (i === keys.length - 1) {
+                    next({
+                        status: 405,
+                        json: { message: "you don't have access to this section" },
+                    });
+                }
+                else
+                    continue;
+            }
+        }
+        catch (error) {
+            console.log("auth", 42, error);
+            next({
+                status: 403,
+                json: {
+                    message: error instanceof Error
+                        ? error.message
+                        : "error on authentication please login again",
+                },
+            });
+        }
+    };
+    holders.admin = (...handlers) => {
+        if (!Array.isArray(handlers))
+            throw new Error("handlers must be an array");
+        const hasConfig = typeof handlers[0] === "object" && "permission" in handlers[0];
+        const configObj = hasConfig
+            ? handlers[0]
+            : undefined;
+        const handlerFns = hasConfig
+            ? handlers.slice(1)
+            : handlers;
+        handlerState[`admin${configObj?.permission ? `:${configObj.permission}` : ""}`] = {
+            ...(configObj ? { config: configObj } : {}),
+            handlers: handlerFns,
+        };
+        return useAuth;
+    };
+    holders.user = (...handlers) => {
+        if (!Array.isArray(handlers))
+            throw new Error("handlers must be an array");
+        handlerState.user = { handlers };
+        return useAuth;
+    };
+    holders.any = (...handlers) => {
+        if (!Array.isArray(handlers))
+            throw new Error("handlers must be an array");
+        handlerState.any = { handlers };
+        return useAuth;
+    };
+    useAuth = Object.assign(useAuth, holders);
+    return useAuth;
+};
+console.log("auth", 81, typeof auth);
+exports.default = auth;

package/dist/cjs/auth/types.d.ts

@@ -0,0 +1,19 @@
+import { Request, Response, NextFunction } from 'express';
+type Handler = (req: Request, res: Response, next: (errorMessage?: string) => unknown) => unknown;
+type Executer = (authField: string) => (req: Request, res: Response, next: NextFunction) => unknown;
+type Auth = {
+    user: () => Handler;
+    admin: (config?: {
+        permission: string;
+    }) => Handler;
+    any: () => Handler;
+};
+type ConfigType = {
+    customValidator?: (req: Request, key: string) => Promise<boolean | null>;
+    jwtSecretEnv?: string;
+    admin?: {
+        role: string;
+        model: string;
+    };
+};
+export { Handler, Executer, Auth, ConfigType };

package/dist/cjs/auth/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/db/db.d.ts

@@ -117,7 +117,7 @@ declare const db: (collectionName: string, config?: ConfigsType) => {
         limit(value: number): /*elided*/ any;
         populate(value: string | object | (string | object)[]): /*elided*/ any;
     };
-    aggregate: (pipeline?: never[]) => {
+    aggregate: (pipeline?: any[]) => {
         (req: Request, res: Response, next: NextFunction): Promise<void>;
         select(value: string | {
             [key: string]: -1 | 1;
@@ -177,5 +177,5 @@ declare const db: (collectionName: string, config?: ConfigsType) => {
         limit(value: number): /*elided*/ any;
         populate(value: string | object | (string | object)[]): /*elided*/ any;
     };
-} | undefined;
+};
 export default db;

package/dist/cjs/db/db.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 let __path = "./models/";
-const path_1 = __importDefault(require("path"));
-const strToObj_1 = __importDefault(require("../util/strToObj"));
-const getConfig_1 = __importDefault(require("../util/getConfig"));
-const translator_1 = __importDefault(require("../util/translator"));
+const path_1 = require("path");
+const strToObj_1 = require("../util/strToObj");
+const getConfig_1 = require("../util/getConfig");
+const translator_1 = require("../util/translator");
 let configs = {
     dbType: "mongodb",
     path: "../models",

package/dist/cjs/index.js

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.models = exports.validator = exports.uploader = exports.db = exports.auth = void 0;
-const auth_1 = __importDefault(require("./auth/auth"));
+const auth_1 = require("./auth/auth");
 exports.auth = auth_1.default;
-const db_1 = __importDefault(require("./db/db"));
+const db_1 = require("./db/db");
 exports.db = db_1.default;
-const uploader_1 = __importDefault(require("./uploader/uploader"));
+const uploader_1 = require("./uploader/uploader");
 exports.uploader = uploader_1.default;
-const validator_1 = __importDefault(require("./validator/validator"));
+const validator_1 = require("./validator/validator");
 exports.validator = validator_1.default;
-const translation_1 = __importDefault(require("./model/translation"));
+const translation_1 = require("./model/translation");
 const models = { translation: translation_1.default };
 exports.models = models;

package/dist/cjs/model/translation.js

@@ -1,9 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const mongoose_1 = __importDefault(require("mongoose"));
+const mongoose_1 = require("mongoose");
 const schema = new mongoose_1.default.Schema({
     text: { type: String, required: true },
     lang: { type: String, required: true, },

package/dist/cjs/uploader/uploader.d.ts

@@ -19,5 +19,5 @@ declare const _default: (destination?: string | ((req: Request, file: Express.Mu
     fields: (fields: multer.Field[]) => (req: Request, res: Response, next: NextFunction) => void;
     any: () => (req: Request, res: Response, next: NextFunction) => void;
     none: () => (req: Request, res: Response, next: NextFunction) => void;
-} | undefined;
+};
 export default _default;

package/dist/cjs/uploader/uploader.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const multer_1 = __importDefault(require("multer"));
-const mongoose_1 = __importDefault(require("mongoose"));
-const getConfig_1 = __importDefault(require("../util/getConfig"));
+const path_1 = require("path");
+const fs_1 = require("fs");
+const multer_1 = require("multer");
+const mongoose_1 = require("mongoose");
+const getConfig_1 = require("../util/getConfig");
 const relativePath = '../../../public';
 let configs = {
     saveInDb: false,

package/dist/cjs/util/getConfig.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const fs_1 = require("fs");
+const path_1 = require("path");
 const find = (field, ...args) => {
     const rel = path_1.default.join.apply(null, [].slice.call(args));
     if (!require?.main?.filename)

package/dist/cjs/util/translator.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const axios_1 = __importDefault(require("axios"));
-const translation_1 = __importDefault(require("./../model/translation"));
-const getConfig_1 = __importDefault(require("./getConfig"));
+const axios_1 = require("axios");
+const translation_1 = require("./../model/translation");
+const getConfig_1 = require("./getConfig");
 const configs = { ...(0, getConfig_1.default)('translate') };
 async function firstSuccessful(promises) {
     return new Promise((resolve, reject) => {

package/dist/esm/auth/auth.d.ts

@@ -1,20 +1,3 @@
-import { Request, Response, NextFunction } from 'express';
-type Handler = (req: Request, res: Response, next: (errorMessage?: string) => unknown) => unknown;
-type AdminArgs = [{
-    permission: string;
-}, ...Handler[]] | Handler[];
-interface UseAuth {
-    (req: Request, res: Response, next: NextFunction): any;
-    user?: (...handlers: Handler[]) => UseAuth;
-    admin?: (...handlers: AdminArgs) => UseAuth;
-    any?: (...handlers: Handler[]) => UseAuth;
-}
-declare const auth: (config?: {
-    admin: {
-        role: string;
-        model: string;
-    };
-    jwtSecretEnv: string;
-    customValidator: (req: Request, key: string) => boolean;
-}) => UseAuth;
+import * as Types from "./types";
+declare const auth: Types.Auth;
 export default auth;

package/dist/esm/auth/auth.js

@@ -4,69 +4,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getConfig_1 = __importDefault(require("../util/getConfig"));
-const gConfig = { admin: { role: 'ADMIN', model: '../models/admin' }, jwtSecretEnv: 'JWT_KEY', customValidator: (req, key) => { return true; }, ...(0, getConfig_1.default)('auth') };
-const holders = {};
-const auth = (config = gConfig) => {
-    // const adminModel = require('../models/admin')
-    let handlerState = {};
-    let useAuth = async (req, res, next) => {
-        try {
-            const nextFunc = (handlers, index = 0) => (errorMessage = '') => {
-                if (errorMessage)
-                    return next(errorMessage);
-                if (!handlers.length || !handlers[index + 1])
-                    return next();
-                handlers[index + 1](req, res, nextFunc(handlers, index + 1));
-            };
-            const keys = Object.keys(handlerState);
-            for (let i = 0; i < keys.length; i++) {
-                const key = keys[i];
-                if (!handlerState[key]?.handlers?.length)
-                    continue;
-                if (await gConfig?.customValidator?.(req, key)) {
-                    return await handlerState[key].handlers[0](req, res, nextFunc(handlerState[key].handlers));
-                }
-                else if (await gConfig?.customValidator?.(req, key) == null) {
-                    return next({ status: 401, json: { message: 'unauthorized' } });
-                }
-                else if (i === keys.length - 1) {
-                    next({ status: 405, json: { message: 'you don\'t have access to this section' } });
-                }
-                else
-                    continue;
-            }
-        }
-        catch (error) {
-            console.log('auth', 42, error);
-            next({ status: 403, json: { message: (error instanceof Error ? error.message : 'error on authentication please login again') } });
-        }
-    };
-    holders.admin = (...handlers) => {
-        if (!Array.isArray(handlers))
-            throw new Error('handlers must be an array');
-        const hasConfig = typeof handlers[0] === 'object' && 'permission' in handlers[0];
-        const configObj = hasConfig ? handlers[0] : undefined;
-        const handlerFns = hasConfig ? handlers.slice(1) : handlers;
-        handlerState[`admin${configObj?.permission ? `:${configObj.permission}` : ''}`] = {
-            ...(configObj ? { config: configObj } : {}),
-            handlers: handlerFns
-        };
-        return useAuth;
-    };
-    holders.user = (...handlers) => {
-        if (!Array.isArray(handlers))
-            throw new Error('handlers must be an array');
-        handlerState.user = { handlers };
-        return useAuth;
-    };
-    holders.any = (...handlers) => {
-        if (!Array.isArray(handlers))
-            throw new Error('handlers must be an array');
-        handlerState.any = { handlers };
-        return useAuth;
-    };
-    useAuth = Object.assign(useAuth, holders);
-    return useAuth;
+const gConfig = {
+    admin: { role: "ADMIN", model: "../models/admin" },
+    jwtSecretEnv: "JWT_KEY",
+    customValidator: (req, key) => {
+        return true;
+    },
+    ...(0, getConfig_1.default)("auth"),
+};
+const executer = (authType) => async (req, res, next) => {
+    const accessResult = await gConfig?.customValidator?.(req, authType);
+    if (accessResult == null)
+        return next({ status: 401, json: { message: 'Unauthorized' } });
+    if (!accessResult)
+        return next({ status: 403, json: { message: 'Forbidden' } });
+    return next();
+};
+const auth = {
+    user: () => {
+        return executer("user");
+    },
+    admin: (config) => {
+        return executer(`admin${config?.permission ? `:${config.permission}` : ''}`);
+    },
+    any: () => {
+        return executer("any");
+    },
 };
-console.log('auth', 81, typeof auth);
 exports.default = auth;

package/dist/esm/auth/types.d.ts

@@ -0,0 +1,19 @@
+import { Request, Response, NextFunction } from 'express';
+type Handler = (req: Request, res: Response, next: (errorMessage?: string) => unknown) => unknown;
+type Executer = (authField: string) => (req: Request, res: Response, next: NextFunction) => unknown;
+type Auth = {
+    user: () => Handler;
+    admin: (config?: {
+        permission: string;
+    }) => Handler;
+    any: () => Handler;
+};
+type ConfigType = {
+    customValidator?: (req: Request, key: string) => Promise<boolean | null>;
+    jwtSecretEnv?: string;
+    admin?: {
+        role: string;
+        model: string;
+    };
+};
+export { Handler, Executer, Auth, ConfigType };

package/dist/esm/auth/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speedly",
-  "version": "1.2.13",
+  "version": "1.2.17",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",