@duvdu-v1/duvdu 1.0.38 → 1.0.39

package/build/middlewares/auth.middleware.d.ts

@@ -1,29 +1,2 @@
-/// <reference types="qs" />
-/// <reference types="mongoose/types/aggregate" />
-/// <reference types="mongoose/types/callback" />
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/cursor" />
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/expressions" />
-/// <reference types="mongoose/types/helpers" />
-/// <reference types="mongoose/types/middlewares" />
-/// <reference types="mongoose/types/indexes" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/mongooseoptions" />
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/populate" />
-/// <reference types="mongoose/types/query" />
-/// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
-/// <reference types="mongoose/types/session" />
-/// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/validation" />
-/// <reference types="mongoose/types/virtuals" />
-/// <reference types="mongoose/types/inferschematype" />
-import 'express-async-errors';
 import { RequestHandler } from 'express';
-import { Model } from 'mongoose';
-export declare const auth: (User: Model<any>, Roles: Model<any>) => RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+export declare const isauthenticated: RequestHandler;

package/build/middlewares/auth.middleware.js

@@ -8,46 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.auth = void 0;
-require("express-async-errors");
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const generic_error_1 = require("../errors/generic-error");
+exports.isauthenticated = void 0;
+const jsonwebtoken_1 = require("jsonwebtoken");
 const unauthenticated_error_1 = require("../errors/unauthenticated-error");
-const generateToken_1 = require("../utils/generateToken");
-const auth = (User, Roles) => ((req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
-        throw new unauthenticated_error_1.UnauthenticatedError();
-    }
-    const user = yield User.findOne({ token: (_b = req.session) === null || _b === void 0 ? void 0 : _b.jwt });
-    if (!user) {
-        throw new unauthenticated_error_1.UnauthenticatedError();
-    }
-    if (!user.isVerified.value) {
-        throw new unauthenticated_error_1.UnauthenticatedError(`${user.isVerified.reason}`);
-    }
-    if (user.isBlocked) {
-        throw new generic_error_1.GenericError('the users access is denied due to their blocked status.');
-    }
+const unauthorized_error_1 = require("../errors/unauthorized-error");
+const isauthenticated = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!req.session.access)
+        return next(new unauthenticated_error_1.UnauthenticatedError('access token not found'));
+    let payload;
     try {
-        const payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
-        req.loggedUser = { id: payload.id, permession: payload.permession };
-        return next();
+        payload = (0, jsonwebtoken_1.verify)(req.session.access, process.env.JWT_KEY);
+        req.loggedUser = payload;
+        if (!req.loggedUser.isBlocked.value)
+            return next(new unauthorized_error_1.UnauthorizedError(`user is blocked:${req.loggedUser.isBlocked.reason}`));
     }
     catch (error) {
-        const role = yield Roles.findById(user.role);
-        if (!role)
-            return next(new unauthenticated_error_1.UnauthenticatedError('user dont have role'));
-        const token = (0, generateToken_1.generateToken)({ id: user._id, permession: role.features });
-        req.loggedUser = { id: user._id, permession: role.features };
-        user.token = token;
-        yield user.save();
-        req.session.jwt = token;
-        next();
+        return res.status(423).json({ message: 'access token expired' });
     }
-}));
-exports.auth = auth;
+    next();
+});
+exports.isauthenticated = isauthenticated;

package/build/middlewares/isAuthorized.middleware.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="qs" />
 import { RequestHandler } from 'express';
-export declare const isAuthorized: (permission: string) => RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+import { PERMISSIONS } from '../types/Permissions';
+export declare const isauthorized: (permission: PERMISSIONS) => RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;

package/build/middlewares/isAuthorized.middleware.js

@@ -9,11 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAuthorized = void 0;
+exports.isauthorized = void 0;
 const unauthorized_error_1 = require("../errors/unauthorized-error");
-const isAuthorized = (permission) => ((req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!req.loggedUser.permession.includes(permission))
-        return next(new unauthorized_error_1.UnauthorizedError('user not allowed access this route'));
-    return next();
+const systemRoles_1 = require("../types/systemRoles");
+const isauthorized = (permission) => ((req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    if (req.loggedUser.role.key === systemRoles_1.SystemRoles.admin)
+        return next();
+    if (!req.loggedUser.role.permissions.includes(permission))
+        return next(new unauthorized_error_1.UnauthorizedError());
+    next();
 }));
-exports.isAuthorized = isAuthorized;
+exports.isauthorized = isauthorized;

package/build/types/JwtPayload.d.ts

@@ -1,4 +1,13 @@
+import { PERMISSIONS } from './Permissions';
 export interface IjwtPayload {
     id: string;
-    permession: string[];
+    isVerified: boolean;
+    isBlocked: {
+        value: boolean;
+        reason?: string;
+    };
+    role: {
+        key: string;
+        permissions: PERMISSIONS[];
+    };
 }

package/build/types/Permissions.d.ts

@@ -0,0 +1,37 @@
+export declare enum PERMISSIONS {
+    resetPassword = "resetPassword",
+    updatePhoneNumber = "updatePhoneNumber",
+    changePassword = "changePassword",
+    updateProfile = "updateProfile",
+    bookmarks = "bookmarks",
+    createCategory = "create-category",
+    updateCategory = "update-category",
+    removeCategory = "remove-category",
+    getAdminCategories = "get-gategories-admin",
+    createTicket = "create ticket",
+    getAllTickets = "get-all-tickets",
+    updateTicket = "update-ticket",
+    removeTicket = "remove-ticket",
+    getTicket = "get-ticket",
+    createTerm = "create-term",
+    updateTerm = "update-term",
+    createPlanHandler = "create plan",
+    updatePlanHandler = "update plan",
+    getPlanHandler = "get plan",
+    getAllPlansHandler = "get all plans",
+    removePlanHandler = "remove plan",
+    createRoleHandler = "create role",
+    updateRoleHandler = "update role",
+    getRolesHandler = "get roles",
+    getRoleHandler = "get role",
+    removeRoleHandler = "remove role"
+}
+export declare const permissions: {
+    auth: PERMISSIONS[];
+    bookmarks: PERMISSIONS[];
+    category: PERMISSIONS[];
+    ticket: PERMISSIONS[];
+    terms: PERMISSIONS[];
+    plans: PERMISSIONS[];
+    roles: PERMISSIONS[];
+};

package/build/types/Permissions.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.permissions = exports.PERMISSIONS = void 0;
+var PERMISSIONS;
+(function (PERMISSIONS) {
+    PERMISSIONS["resetPassword"] = "resetPassword";
+    PERMISSIONS["updatePhoneNumber"] = "updatePhoneNumber";
+    PERMISSIONS["changePassword"] = "changePassword";
+    PERMISSIONS["updateProfile"] = "updateProfile";
+    PERMISSIONS["bookmarks"] = "bookmarks";
+    PERMISSIONS["createCategory"] = "create-category";
+    PERMISSIONS["updateCategory"] = "update-category";
+    PERMISSIONS["removeCategory"] = "remove-category";
+    PERMISSIONS["getAdminCategories"] = "get-gategories-admin";
+    PERMISSIONS["createTicket"] = "create ticket";
+    PERMISSIONS["getAllTickets"] = "get-all-tickets";
+    PERMISSIONS["updateTicket"] = "update-ticket";
+    PERMISSIONS["removeTicket"] = "remove-ticket";
+    PERMISSIONS["getTicket"] = "get-ticket";
+    PERMISSIONS["createTerm"] = "create-term";
+    PERMISSIONS["updateTerm"] = "update-term";
+    // plan
+    PERMISSIONS["createPlanHandler"] = "create plan";
+    PERMISSIONS["updatePlanHandler"] = "update plan";
+    PERMISSIONS["getPlanHandler"] = "get plan";
+    PERMISSIONS["getAllPlansHandler"] = "get all plans";
+    PERMISSIONS["removePlanHandler"] = "remove plan";
+    // roles
+    PERMISSIONS["createRoleHandler"] = "create role";
+    PERMISSIONS["updateRoleHandler"] = "update role";
+    PERMISSIONS["getRolesHandler"] = "get roles";
+    PERMISSIONS["getRoleHandler"] = "get role";
+    PERMISSIONS["removeRoleHandler"] = "remove role";
+})(PERMISSIONS || (exports.PERMISSIONS = PERMISSIONS = {}));
+exports.permissions = {
+    auth: [
+        PERMISSIONS.resetPassword,
+        PERMISSIONS.updatePhoneNumber,
+        PERMISSIONS.changePassword,
+        PERMISSIONS.updateProfile,
+    ],
+    bookmarks: [PERMISSIONS.bookmarks],
+    category: [
+        PERMISSIONS.createCategory,
+        PERMISSIONS.updateCategory,
+        PERMISSIONS.updateCategory,
+        PERMISSIONS.removeCategory,
+        PERMISSIONS.getAdminCategories,
+    ],
+    ticket: [
+        PERMISSIONS.createTicket,
+        PERMISSIONS.getTicket,
+        PERMISSIONS.getAllTickets,
+        PERMISSIONS.removeTicket,
+        PERMISSIONS.updateTicket,
+    ],
+    terms: [PERMISSIONS.createTerm, PERMISSIONS.updateTerm],
+    plans: [
+        PERMISSIONS.getPlanHandler,
+        PERMISSIONS.createPlanHandler,
+        PERMISSIONS.getAllPlansHandler,
+        PERMISSIONS.removePlanHandler,
+        PERMISSIONS.updatePlanHandler,
+    ],
+    roles: [
+        PERMISSIONS.getRoleHandler,
+        PERMISSIONS.getRolesHandler,
+        PERMISSIONS.createRoleHandler,
+        PERMISSIONS.updateRoleHandler,
+        PERMISSIONS.updateRoleHandler,
+        PERMISSIONS.removeRoleHandler,
+    ],
+};

package/build/types/model-names.d.ts

@@ -0,0 +1,10 @@
+export declare enum MODELS {
+    user = "users",
+    category = "categories",
+    plan = "plans",
+    project = "projects",
+    role = "roles",
+    bookmark = "bookmarks",
+    term = "terms",
+    ticket = "tickets"
+}

package/build/types/model-names.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MODELS = void 0;
+var MODELS;
+(function (MODELS) {
+    MODELS["user"] = "users";
+    MODELS["category"] = "categories";
+    MODELS["plan"] = "plans";
+    MODELS["project"] = "projects";
+    MODELS["role"] = "roles";
+    MODELS["bookmark"] = "bookmarks";
+    MODELS["term"] = "terms";
+    MODELS["ticket"] = "tickets";
+})(MODELS || (exports.MODELS = MODELS = {}));

package/build/types/systemRoles.d.ts

@@ -0,0 +1,5 @@
+export declare enum SystemRoles {
+    verified = "verified",
+    unverified = "unverified",
+    admin = "admin"
+}

package/build/types/systemRoles.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SystemRoles = void 0;
+var SystemRoles;
+(function (SystemRoles) {
+    SystemRoles["verified"] = "verified";
+    SystemRoles["unverified"] = "unverified";
+    SystemRoles["admin"] = "admin";
+})(SystemRoles || (exports.SystemRoles = SystemRoles = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duvdu-v1/duvdu",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [