@duvdu-v1/duvdu 1.1.363 → 1.1.365

package/build/guards/index.d.ts

@@ -0,0 +1,4 @@
+export * from './isEmailVerified.guard';
+export * from './isPhoneNumberVerified.guard';
+export * from './isFaceRecognitionVerified.guard';
+export * from './isAccountPublished.guard';

package/build/guards/index.js

@@ -0,0 +1,20 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./isEmailVerified.guard"), exports);
+__exportStar(require("./isPhoneNumberVerified.guard"), exports);
+__exportStar(require("./isFaceRecognitionVerified.guard"), exports);
+__exportStar(require("./isAccountPublished.guard"), exports);

package/build/guards/isAccountPublished.guard.d.ts

@@ -0,0 +1,2 @@
+import type { Request, Response, NextFunction } from 'express';
+export declare const isAccountPublishedGuard: (req: Request, res: Response, next: NextFunction) => Response<any, Record<string, any>> | undefined;

package/build/guards/isAccountPublished.guard.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAccountPublishedGuard = void 0;
+const User_1 = require("../types/User");
+const isAccountPublishedGuard = (req, res, next) => {
+    const loggedUser = req.loggedUser;
+    if ((loggedUser === null || loggedUser === void 0 ? void 0 : loggedUser.status) !== User_1.UserStatus.published)
+        return res.status(403).json({
+            message: {
+                en: 'Your account is still under review.',
+                ar: 'حسابك قيد المراجعة.',
+            },
+        });
+    next();
+};
+exports.isAccountPublishedGuard = isAccountPublishedGuard;

package/build/guards/isFaceRecognitionVerified.guard.d.ts

@@ -0,0 +1,2 @@
+import type { Request, Response, NextFunction } from 'express';
+export declare const isFaceRecognitionVerifiedGuard: (req: Request, res: Response, next: NextFunction) => Response<any, Record<string, any>> | undefined;

package/build/guards/isFaceRecognitionVerified.guard.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isFaceRecognitionVerifiedGuard = void 0;
+const isFaceRecognitionVerifiedGuard = (req, res, next) => {
+    const loggedUser = req.loggedUser;
+    if (!(loggedUser === null || loggedUser === void 0 ? void 0 : loggedUser.isFaceRecognitionVerified))
+        return res.status(403).json({
+            message: {
+                en: 'Your face is not verified yet by an admin.',
+                ar: 'لم يتم التحقق من وجهك بعد بواسطة المسؤول.',
+            },
+        });
+    next();
+};
+exports.isFaceRecognitionVerifiedGuard = isFaceRecognitionVerifiedGuard;

package/build/index.d.ts

@@ -106,3 +106,4 @@ export * from './config/winston';
 export * from './middlewares/pull.connection';
 export * from './mailer/mailer.service';
 export * from './mailer/mailer.interface';
+export * from './guards';

package/build/index.js

@@ -124,3 +124,4 @@ __exportStar(require("./config/winston"), exports);
 __exportStar(require("./middlewares/pull.connection"), exports);
 __exportStar(require("./mailer/mailer.service"), exports);
 __exportStar(require("./mailer/mailer.interface"), exports);
+__exportStar(require("./guards"), exports);

package/build/middlewares/auth.middleware.js

@@ -61,6 +61,7 @@ const isauthenticated = (req, res, next) => __awaiter(void 0, void 0, void 0, fu
         if (!user) {
             return next(new unauthorized_error_1.UnauthorizedError({ en: 'user not found', ar: 'لا يوجد مستخدم' }, req.lang));
         }
+        req.loggedUser.status = user.status;
         if (user.isBlocked.value)
             return next(new unauthorized_error_1.UnauthorizedError({
                 en: `Forbidden: User is blocked ${req.loggedUser.isBlocked.reason}`,

package/build/models/User.model.js

@@ -13,6 +13,7 @@ exports.Users = void 0;
 const mongoose_1 = require("mongoose");
 const rank_service_1 = require("../services/rank.service");
 const model_names_1 = require("../types/model-names");
+const User_1 = require("../types/User");
 const userSchema = new mongoose_1.Schema({
     googleId: { type: String, default: null },
     appleId: { type: String, default: null },
@@ -76,6 +77,21 @@ const userSchema = new mongoose_1.Schema({
     projectsView: { type: Number, default: 0 },
     haveInvitation: { type: Boolean, default: false },
     faceRecognition: { type: String, default: null },
+    isFaceRecognitionVerified: { type: Boolean, default: false },
+    status: {
+        type: String,
+        enum: Object.values(User_1.UserStatus),
+        default: User_1.UserStatus.underReview,
+    },
+    adminReviewFeedback: {
+        type: [
+            new mongoose_1.Schema({
+                note: { type: String, required: true },
+                admin: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user, required: true },
+            }, { timestamps: { createdAt: true, updatedAt: false } }),
+        ],
+        default: [],
+    },
     projectsCount: { type: Number, default: 0 },
     hasFreeTime: { type: Boolean, default: false },
     experties: {
@@ -103,6 +119,7 @@ const userSchema = new mongoose_1.Schema({
     .index({ email: 1 }, { unique: true, partialFilterExpression: { isEmailVerified: true } })
     .index({ 'phoneNumber.number': 1 }, { unique: true, partialFilterExpression: { isPhoneNumberVerified: true } })
     .index({ username: 1 }, { unique: true });
+userSchema.index({ status: 1, isFaceRecognitionVerified: 1 });
 userSchema.pre('save', function (next) {
     return __awaiter(this, void 0, void 0, function* () {
         if (this.isModified('acceptedProjectsCounter') ||

package/build/types/Permissions.d.ts

@@ -9,6 +9,9 @@ export declare enum PERMISSIONS {
     unBlockUser = "un-block-user",
     listUsers = "list-users",
     removeUser = "remove-user",
+    listEligibleUsersToReview = "list-eligible-users-to-review",
+    acceptUserReview = "accept-user-review",
+    declineUserReview = "decline-user-review",
     listAdmins = "list-admins",
     createAdmin = "create-admin",
     updateAdmin = "update-admin",

package/build/types/Permissions.js

@@ -15,6 +15,9 @@ var PERMISSIONS;
     PERMISSIONS["unBlockUser"] = "un-block-user";
     PERMISSIONS["listUsers"] = "list-users";
     PERMISSIONS["removeUser"] = "remove-user";
+    PERMISSIONS["listEligibleUsersToReview"] = "list-eligible-users-to-review";
+    PERMISSIONS["acceptUserReview"] = "accept-user-review";
+    PERMISSIONS["declineUserReview"] = "decline-user-review";
     // admin
     PERMISSIONS["listAdmins"] = "list-admins";
     PERMISSIONS["createAdmin"] = "create-admin";
@@ -204,6 +207,9 @@ exports.permissions = {
         PERMISSIONS.blockAdmin,
         PERMISSIONS.unBlockAdmin,
         PERMISSIONS.removeAdmin,
+        PERMISSIONS.listEligibleUsersToReview,
+        PERMISSIONS.acceptUserReview,
+        PERMISSIONS.declineUserReview,
     ],
     category: [
         PERMISSIONS.createCategory,
@@ -227,6 +233,9 @@ exports.permissions = {
         PERMISSIONS.blockUser,
         PERMISSIONS.unBlockUser,
         PERMISSIONS.removeUser,
+        PERMISSIONS.listEligibleUsersToReview,
+        PERMISSIONS.acceptUserReview,
+        PERMISSIONS.declineUserReview,
     ],
     admins: [PERMISSIONS.listAdmins, PERMISSIONS.createAdmin, PERMISSIONS.updateAdmin, PERMISSIONS.blockAdmin, PERMISSIONS.unBlockAdmin, PERMISSIONS.removeAdmin],
     messages: [PERMISSIONS.listMessagesFromTo, PERMISSIONS.sendNotificationToUsers, PERMISSIONS.listMessages],

package/build/types/User.d.ts

@@ -16,6 +16,15 @@ export declare enum VerificationReason {
     completeSginUp = "complete-sginup",
     CompleteSginUpVerfied = "complete-sginup-verified"
 }
+export declare enum UserStatus {
+    underReview = "under_review",
+    published = "published"
+}
+export interface IadminReviewFeedback {
+    note: string;
+    createdAt: Date;
+    admin: Types.ObjectId;
+}
 export interface Iuser {
     _id: Types.ObjectId;
     id: string;
@@ -85,6 +94,9 @@ export interface Iuser {
     projectsView: number;
     haveInvitation: boolean;
     faceRecognition: string | null;
+    isFaceRecognitionVerified: boolean;
+    status: UserStatus;
+    adminReviewFeedback: IadminReviewFeedback[];
     projectsCount: number;
     isDeleted: boolean;
     hasFreeTime: boolean;

package/build/types/User.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VerificationReason = void 0;
+exports.UserStatus = exports.VerificationReason = void 0;
 var VerificationReason;
 (function (VerificationReason) {
     VerificationReason["updateOldPhoneNumber"] = "update-old-phone-number";
@@ -17,3 +17,8 @@ var VerificationReason;
     VerificationReason["completeSginUp"] = "complete-sginup";
     VerificationReason["CompleteSginUpVerfied"] = "complete-sginup-verified";
 })(VerificationReason || (exports.VerificationReason = VerificationReason = {}));
+var UserStatus;
+(function (UserStatus) {
+    UserStatus["underReview"] = "under_review";
+    UserStatus["published"] = "published";
+})(UserStatus || (exports.UserStatus = UserStatus = {}));

package/build/utils/bucket-wasabi.d.ts

@@ -9,6 +9,8 @@ declare class BucketWasabi {
     removeBucketFiles(...filePaths: string[]): Promise<void>;
     private getContentType;
     getPresignedUrl(fileKey: string): Promise<string>;
+    signKeys<T extends Record<string, any>>(obj: T, keys: (keyof T)[]): Promise<T>;
+    signList(keys: (string | null | undefined)[]): Promise<(string | null | undefined)[]>;
     private getImageBytes;
     validateFace(imageKey: string): Promise<{
         isValid: boolean;

package/build/utils/bucket-wasabi.js

@@ -204,7 +204,6 @@ class BucketWasabi {
     }
     getPresignedUrl(fileKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('[getPresignedUrl] fileKey:', fileKey, '| bucket:', this.bucketName);
             const redis = yield (0, redis_connection_1.getRedisClient)();
             const cacheKey = `wasabi:presigned:${fileKey}`;
             const cached = yield redis.get(cacheKey);
@@ -215,11 +214,28 @@ class BucketWasabi {
                 Key: fileKey,
                 Expires: 3600,
             });
-            console.log('[getPresignedUrl] generated url:', url);
             yield redis.set(cacheKey, url, 'EX', 3000);
             return url;
         });
     }
+    signKeys(obj, keys) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!obj)
+                return obj;
+            yield Promise.all(keys.map((k) => __awaiter(this, void 0, void 0, function* () {
+                if (obj[k])
+                    obj[k] = yield this.getPresignedUrl(obj[k]);
+            })));
+            return obj;
+        });
+    }
+    signList(keys) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(keys === null || keys === void 0 ? void 0 : keys.length))
+                return keys;
+            return Promise.all(keys.map((k) => (k ? this.getPresignedUrl(k) : k)));
+        });
+    }
     // Fetches the image from Wasabi and returns it as bytes for Rekognition
     getImageBytes(imageKey) {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

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