@duvdu-v1/duvdu 1.1.144 → 1.1.146

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

@@ -1,2 +1,4 @@
 import { RequestHandler } from 'express';
+import { IjwtPayload } from '../types/JwtPayload';
 export declare const isauthenticated: RequestHandler;
+export declare const generateAccessToken: (payload: IjwtPayload) => string;

package/build/middlewares/auth.middleware.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,13 +32,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isauthenticated = void 0;
-const jsonwebtoken_1 = require("jsonwebtoken");
+exports.generateAccessToken = exports.isauthenticated = void 0;
+const jsonwebtoken_1 = __importStar(require("jsonwebtoken"));
 const unauthenticated_error_1 = require("../errors/unauthenticated-error");
 const unauthorized_error_1 = require("../errors/unauthorized-error");
+const Role_model_1 = require("../models/Role.model");
+const User_model_1 = require("../models/User.model");
 const isauthenticated = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     if (!req.session.access)
         return next(new unauthenticated_error_1.UnauthenticatedError({ en: 'access token not found', ar: 'الرمز المميز للوصول غير موجود' }, req.lang));
+    if (!req.session.refresh)
+        return next(new unauthenticated_error_1.UnauthenticatedError({ en: 'refresh token not found', ar: 'الرمز المميز للوصول غير موجود' }, req.lang));
     let payload;
     try {
         payload = (0, jsonwebtoken_1.verify)(req.session.access, process.env.JWT_KEY);
@@ -27,8 +54,27 @@ const isauthenticated = (req, res, next) => __awaiter(void 0, void 0, void 0, fu
             }, req.lang));
     }
     catch (error) {
-        return res.status(423).json({ message: 'access token expired' });
+        // return res.status(423).json({ message: 'access token expired' });
+        const user = yield User_model_1.Users.findOne({ token: req.session.refresh });
+        if (!user)
+            return res.status(423).json({ message: 'refresh token expired' });
+        const role = yield Role_model_1.Roles.findById(user.role);
+        if (!role)
+            return res.status(423).json({ message: 'invalid role' });
+        const accessToken = (0, exports.generateAccessToken)({
+            id: user.id,
+            isVerified: user.isVerified,
+            isBlocked: user.isBlocked,
+            role: { key: role.key, permissions: role.permissions },
+        });
+        req.session.access = accessToken;
+        req.session.refresh = user.token;
+        next();
     }
     next();
 });
 exports.isauthenticated = isauthenticated;
+const generateAccessToken = (payload) => jsonwebtoken_1.default.sign(payload, process.env.JWT_KEY, {
+    expiresIn: process.env.NODE_ENV === 'development' ? '1d' : '1h',
+});
+exports.generateAccessToken = generateAccessToken;

package/build/models/Review.model.d.ts

@@ -22,8 +22,9 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import { CYCLES, Iuser } from '@duvdu-v1/duvdu';
 import { Types } from 'mongoose';
+import { CYCLES } from '../types/cycles';
+import { Iuser } from '../types/User';
 export interface IProjectReview {
     user: Types.ObjectId | Iuser;
     project: Types.ObjectId;

package/build/models/Review.model.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContractReview = exports.ProjectReview = void 0;
-const duvdu_1 = require("@duvdu-v1/duvdu");
 const mongoose_1 = require("mongoose");
-exports.ProjectReview = (0, mongoose_1.model)(duvdu_1.MODELS.projectReview, new mongoose_1.Schema({
-    user: { type: mongoose_1.Schema.Types.ObjectId, ref: duvdu_1.MODELS.user },
+const model_names_1 = require("./../types/model-names");
+const cycles_1 = require("../types/cycles");
+exports.ProjectReview = (0, mongoose_1.model)(model_names_1.MODELS.projectReview, new mongoose_1.Schema({
+    user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     project: { type: mongoose_1.Schema.Types.ObjectId },
-    cycle: { type: String, enum: duvdu_1.CYCLES },
+    cycle: { type: String, enum: cycles_1.CYCLES },
     rate: { type: Number, default: 0 },
     comment: { type: String, default: null }
-}, { timestamps: true }));
-exports.ContractReview = (0, mongoose_1.model)(duvdu_1.MODELS.contractReview, new mongoose_1.Schema({
-    user: { type: mongoose_1.Schema.Types.ObjectId, ref: duvdu_1.MODELS.user },
+}, { timestamps: true, collection: model_names_1.MODELS.projectReview }));
+exports.ContractReview = (0, mongoose_1.model)(model_names_1.MODELS.contractReview, new mongoose_1.Schema({
+    user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     contract: { type: mongoose_1.Schema.Types.ObjectId },
-    cycle: { type: String, enum: duvdu_1.CYCLES },
+    cycle: { type: String, enum: cycles_1.CYCLES },
     rate: { type: Number, default: 0 },
     comment: { type: String, default: null }
-}, { timestamps: true }));
+}, { timestamps: true, collection: model_names_1.MODELS.contractReview }));

package/build/models/notification.model.js

@@ -8,6 +8,7 @@ exports.Notification = (0, mongoose_1.model)(model_names_1.MODELS.notifications,
         type: mongoose_1.Schema.Types.ObjectId,
         ref: model_names_1.MODELS.user,
         // required:true
+        default: null
     },
     targetUser: {
         type: mongoose_1.Schema.Types.ObjectId,

package/build/types/Permissions.d.ts

@@ -25,21 +25,21 @@ export declare enum PERMISSIONS {
     getRolesHandler = "get roles",
     getRoleHandler = "get role",
     removeRoleHandler = "remove role",
-    createProtfolioProjectHandler = "create portfolio project",
-    updatePortfolioProjectHandler = "update portfolio project",
-    removePortfolioProjectHandler = "remove portfolio project",
-    getCrmPortfolioProjectsHandlers = "get crm portfolio projects",
-    getAnalysisHandler = "get analysis handler",
+    createProjectHandler = "create project project",
+    updateProjectHandler = "update project project",
+    removeProjectHandler = "remove project project",
+    getCrmProjectsHandlers = "get crm project projects",
+    getAnalysisHandler = "get project analysis handler",
     createCopyrightHandler = "create copyright project",
     updateCopyrightHandler = "update copyright project",
     removeCopyrightHandler = "remove copyright project",
     getCrmCopyrightsHandlers = "get crm copyright projects",
     getCopyrightAnalysisHandler = "get copyright analysis handler",
-    createStudioProjectHandler = "create studio project",
-    updateStudioProjectHandler = "update studio project",
-    removeStudioProjectHandler = "remove studio project",
-    getCrmStudioProjectsHandlers = "get crm studio projects",
-    getStudioAnalysisHandler = "get studio analysis handler",
+    createRentalProjectHandler = "create Rental project",
+    updateRentalProjectHandler = "update Rental project",
+    removeRentalProjectHandler = "remove Rental project",
+    getCrmRentalProject = "get crm rental projects",
+    getRentalAnalysisHandler = "get Rental analysis handler",
     getAllReportsHandler = "get all reports",
     getReportHandler = "get report",
     updateReportHandler = "update report",
@@ -52,7 +52,7 @@ export declare enum PERMISSIONS {
     createTeamProjectHandler = "create team project",
     updateTeamProjectHandler = "update team project",
     deleteTeamProjectHandler = "delete team project",
-    deleteProducerHandler = "delete producer",
+    getProducerAnalysis = "get producer analysis",
     createRankHandler = "create rank",
     updateRankHandler = "update rank",
     deleteRankHandler = "delete rank",
@@ -68,11 +68,12 @@ export declare const permissions: {
     terms: PERMISSIONS[];
     plans: PERMISSIONS[];
     roles: PERMISSIONS[];
-    portfolioPost: PERMISSIONS[];
+    Post: PERMISSIONS[];
     copyrights: PERMISSIONS[];
-    studioBooking: PERMISSIONS[];
+    RentalBooking: PERMISSIONS[];
     booking: PERMISSIONS[];
     teamProject: PERMISSIONS[];
     rank: PERMISSIONS[];
     setting: PERMISSIONS[];
+    producer: PERMISSIONS[];
 };

package/build/types/Permissions.js

@@ -31,24 +31,24 @@ var PERMISSIONS;
     PERMISSIONS["getRolesHandler"] = "get roles";
     PERMISSIONS["getRoleHandler"] = "get role";
     PERMISSIONS["removeRoleHandler"] = "remove role";
-    // portfolio-post
-    PERMISSIONS["createProtfolioProjectHandler"] = "create portfolio project";
-    PERMISSIONS["updatePortfolioProjectHandler"] = "update portfolio project";
-    PERMISSIONS["removePortfolioProjectHandler"] = "remove portfolio project";
-    PERMISSIONS["getCrmPortfolioProjectsHandlers"] = "get crm portfolio projects";
-    PERMISSIONS["getAnalysisHandler"] = "get analysis handler";
+    // project
+    PERMISSIONS["createProjectHandler"] = "create project project";
+    PERMISSIONS["updateProjectHandler"] = "update project project";
+    PERMISSIONS["removeProjectHandler"] = "remove project project";
+    PERMISSIONS["getCrmProjectsHandlers"] = "get crm project projects";
+    PERMISSIONS["getAnalysisHandler"] = "get project analysis handler";
     // copyrights
     PERMISSIONS["createCopyrightHandler"] = "create copyright project";
     PERMISSIONS["updateCopyrightHandler"] = "update copyright project";
     PERMISSIONS["removeCopyrightHandler"] = "remove copyright project";
     PERMISSIONS["getCrmCopyrightsHandlers"] = "get crm copyright projects";
     PERMISSIONS["getCopyrightAnalysisHandler"] = "get copyright analysis handler";
-    // studio-booking
-    PERMISSIONS["createStudioProjectHandler"] = "create studio project";
-    PERMISSIONS["updateStudioProjectHandler"] = "update studio project";
-    PERMISSIONS["removeStudioProjectHandler"] = "remove studio project";
-    PERMISSIONS["getCrmStudioProjectsHandlers"] = "get crm studio projects";
-    PERMISSIONS["getStudioAnalysisHandler"] = "get studio analysis handler";
+    // Rental-booking
+    PERMISSIONS["createRentalProjectHandler"] = "create Rental project";
+    PERMISSIONS["updateRentalProjectHandler"] = "update Rental project";
+    PERMISSIONS["removeRentalProjectHandler"] = "remove Rental project";
+    PERMISSIONS["getCrmRentalProject"] = "get crm rental projects";
+    PERMISSIONS["getRentalAnalysisHandler"] = "get Rental analysis handler";
     // reports
     PERMISSIONS["getAllReportsHandler"] = "get all reports";
     PERMISSIONS["getReportHandler"] = "get report";
@@ -65,7 +65,7 @@ var PERMISSIONS;
     PERMISSIONS["updateTeamProjectHandler"] = "update team project";
     PERMISSIONS["deleteTeamProjectHandler"] = "delete team project";
     // producer
-    PERMISSIONS["deleteProducerHandler"] = "delete producer";
+    PERMISSIONS["getProducerAnalysis"] = "get producer analysis";
     // rank
     PERMISSIONS["createRankHandler"] = "create rank";
     PERMISSIONS["updateRankHandler"] = "update rank";
@@ -113,11 +113,11 @@ exports.permissions = {
         PERMISSIONS.updateRoleHandler,
         PERMISSIONS.removeRoleHandler,
     ],
-    portfolioPost: [
-        PERMISSIONS.createProtfolioProjectHandler,
-        PERMISSIONS.updatePortfolioProjectHandler,
-        PERMISSIONS.removePortfolioProjectHandler,
-        PERMISSIONS.getCrmPortfolioProjectsHandlers,
+    Post: [
+        PERMISSIONS.createProjectHandler,
+        PERMISSIONS.updateProjectHandler,
+        PERMISSIONS.removeProjectHandler,
+        PERMISSIONS.getCrmProjectsHandlers,
         PERMISSIONS.getAnalysisHandler,
     ],
     copyrights: [
@@ -127,12 +127,12 @@ exports.permissions = {
         PERMISSIONS.getCrmCopyrightsHandlers,
         PERMISSIONS.getCopyrightAnalysisHandler,
     ],
-    studioBooking: [
-        PERMISSIONS.createStudioProjectHandler,
-        PERMISSIONS.updateStudioProjectHandler,
-        PERMISSIONS.removeStudioProjectHandler,
-        PERMISSIONS.getCrmStudioProjectsHandlers,
-        PERMISSIONS.getStudioAnalysisHandler,
+    RentalBooking: [
+        PERMISSIONS.createRentalProjectHandler,
+        PERMISSIONS.updateRentalProjectHandler,
+        PERMISSIONS.removeRentalProjectHandler,
+        PERMISSIONS.getRentalAnalysisHandler,
+        PERMISSIONS.getCrmRentalProject,
     ],
     booking: [PERMISSIONS.booking],
     teamProject: [
@@ -153,5 +153,8 @@ exports.permissions = {
         PERMISSIONS.createSettingHandler,
         PERMISSIONS.updateSettingHandler,
         PERMISSIONS.deleteSettingHandler
+    ],
+    producer: [
+        PERMISSIONS.getProducerAnalysis,
     ]
 };

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

@@ -26,5 +26,7 @@ export declare enum MODELS {
     rank = "ranks",
     setting = "settings",
     allContracts = "all_contracts",
-    contractReports = "contract_reports"
+    contractReports = "contract_reports",
+    projectReview = "project_reviews",
+    contractReview = "contract_review"
 }

package/build/types/model-names.js

@@ -31,4 +31,6 @@ var MODELS;
     MODELS["setting"] = "settings";
     MODELS["allContracts"] = "all_contracts";
     MODELS["contractReports"] = "contract_reports";
+    MODELS["projectReview"] = "project_reviews";
+    MODELS["contractReview"] = "contract_review";
 })(MODELS || (exports.MODELS = MODELS = {}));

package/package.json

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