@armi-wave/common 1.2.0 → 1.5.0

package/build/enums/AccountType.d.ts

@@ -0,0 +1,5 @@
+export declare enum AccountType {
+    Normal = "normal",
+    Business = "business",
+    Page = "page"
+}

package/build/enums/AccountType.js

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

package/build/enums/PaidPlan.d.ts

@@ -0,0 +1,3 @@
+export declare enum PaidPlan {
+    Normal = "normal"
+}

package/build/enums/PaidPlan.js

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

package/build/enums/PostType.d.ts

@@ -0,0 +1,7 @@
+export declare enum PostType {
+    Normal = "normal",
+    Sponsored = "sponsored",
+    Meme = "meme",
+    News = "news",
+    Paid = "paid"
+}

package/build/enums/PostType.js

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

package/build/errors/bad-request-error.d.ts

@@ -0,0 +1,9 @@
+import CustomError from './custom-error';
+export default class BadRequestError extends CustomError {
+    message: string;
+    statusCode: number;
+    constructor(message: string);
+    serializeErrors(): {
+        message: string;
+    }[];
+}

package/build/errors/bad-request-error.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const custom_error_1 = __importDefault(require("./custom-error"));
+class BadRequestError extends custom_error_1.default {
+    constructor(message) {
+        super(message);
+        this.message = message;
+        this.statusCode = 400;
+        Object.setPrototypeOf(this, BadRequestError.prototype);
+    }
+    serializeErrors() {
+        return [{ message: this.message }];
+    }
+}
+exports.default = BadRequestError;

package/build/errors/custom-error.d.ts

@@ -0,0 +1,8 @@
+export default abstract class CustomError extends Error {
+    abstract statusCode: number;
+    constructor(message: string);
+    abstract serializeErrors(): {
+        message: string;
+        field?: string;
+    }[];
+}

package/build/errors/custom-error.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class CustomError extends Error {
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, CustomError.prototype);
+    }
+}
+exports.default = CustomError;

package/build/errors/database-connection-error.d.ts

@@ -0,0 +1,9 @@
+import CustomError from './custom-error';
+export default class DatabaseConnectionError extends CustomError {
+    statusCode: number;
+    reason: string;
+    constructor();
+    serializeErrors(): {
+        message: string;
+    }[];
+}

package/build/errors/database-connection-error.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const custom_error_1 = __importDefault(require("./custom-error"));
+class DatabaseConnectionError extends custom_error_1.default {
+    constructor() {
+        super('Error connecting to database');
+        this.statusCode = 500;
+        this.reason = 'Error connection to database';
+        Object.setPrototypeOf(this, DatabaseConnectionError.prototype);
+    }
+    serializeErrors() {
+        return [
+            {
+                message: this.reason,
+            },
+        ];
+    }
+}
+exports.default = DatabaseConnectionError;

package/build/errors/not-authorized-error.d.ts

@@ -0,0 +1,8 @@
+import CustomError from './custom-error';
+export default class NotAuthorizedError extends CustomError {
+    statusCode: number;
+    constructor();
+    serializeErrors(): {
+        message: string;
+    }[];
+}

package/build/errors/not-authorized-error.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const custom_error_1 = __importDefault(require("./custom-error"));
+class NotAuthorizedError extends custom_error_1.default {
+    constructor() {
+        super('Not Authorized');
+        this.statusCode = 401;
+        Object.setPrototypeOf(this, NotAuthorizedError.prototype);
+    }
+    serializeErrors() {
+        return [
+            {
+                message: 'Not Authorized',
+            },
+        ];
+    }
+}
+exports.default = NotAuthorizedError;

package/build/errors/not-found-error.d.ts

@@ -0,0 +1,8 @@
+import CustomError from './custom-error';
+export default class NotFoundError extends CustomError {
+    statusCode: number;
+    constructor();
+    serializeErrors(): {
+        message: string;
+    }[];
+}

package/build/errors/not-found-error.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const custom_error_1 = __importDefault(require("./custom-error"));
+class NotFoundError extends custom_error_1.default {
+    constructor() {
+        super('Not Found');
+        this.statusCode = 404;
+        Object.setPrototypeOf(this, NotFoundError.prototype);
+    }
+    serializeErrors() {
+        return [
+            {
+                message: 'Not Found',
+            },
+        ];
+    }
+}
+exports.default = NotFoundError;

package/build/errors/request-validation-error.d.ts

@@ -0,0 +1,11 @@
+import { ValidationError } from 'express-validator';
+import CustomError from './custom-error';
+export default class RequestValidationError extends CustomError {
+    errors: ValidationError[];
+    statusCode: number;
+    constructor(errors: ValidationError[]);
+    serializeErrors(): {
+        message: any;
+        field: string;
+    }[];
+}

package/build/errors/request-validation-error.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const custom_error_1 = __importDefault(require("./custom-error"));
+class RequestValidationError extends custom_error_1.default {
+    constructor(errors) {
+        super('Error with validation');
+        this.errors = errors;
+        this.statusCode = 400;
+        Object.setPrototypeOf(this, RequestValidationError.prototype);
+    }
+    serializeErrors() {
+        return this.errors.map((err) => {
+            return {
+                message: err.msg,
+                field: err.param,
+            };
+        });
+    }
+}
+exports.default = RequestValidationError;

package/build/index.d.ts

@@ -0,0 +1,15 @@
+import User from './models/User';
+import Post from './models/Post';
+import Comment from './models/Comment';
+import BadRequestError from './errors/bad-request-error';
+import DatabaseConnectionError from './errors/database-connection-error';
+import CustomError from './errors/custom-error';
+import NotAuthorizedError from './errors/not-authorized-error';
+import NotFoundError from './errors/not-found-error';
+import RequestValidationError from './errors/request-validation-error';
+export { User, Post, Comment };
+export { BadRequestError, DatabaseConnectionError, CustomError, NotAuthorizedError, NotFoundError, RequestValidationError, };
+export * from './middlewares/current-user';
+export * from './middlewares/error-handler';
+export * from './middlewares/require-auth';
+export * from './middlewares/validate-request';

package/build/index.js

@@ -0,0 +1,42 @@
+"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);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestValidationError = exports.NotFoundError = exports.NotAuthorizedError = exports.CustomError = exports.DatabaseConnectionError = exports.BadRequestError = exports.Comment = exports.Post = exports.User = void 0;
+const User_1 = __importDefault(require("./models/User"));
+exports.User = User_1.default;
+const Post_1 = __importDefault(require("./models/Post"));
+exports.Post = Post_1.default;
+const Comment_1 = __importDefault(require("./models/Comment"));
+exports.Comment = Comment_1.default;
+const bad_request_error_1 = __importDefault(require("./errors/bad-request-error"));
+exports.BadRequestError = bad_request_error_1.default;
+const database_connection_error_1 = __importDefault(require("./errors/database-connection-error"));
+exports.DatabaseConnectionError = database_connection_error_1.default;
+const custom_error_1 = __importDefault(require("./errors/custom-error"));
+exports.CustomError = custom_error_1.default;
+const not_authorized_error_1 = __importDefault(require("./errors/not-authorized-error"));
+exports.NotAuthorizedError = not_authorized_error_1.default;
+const not_found_error_1 = __importDefault(require("./errors/not-found-error"));
+exports.NotFoundError = not_found_error_1.default;
+const request_validation_error_1 = __importDefault(require("./errors/request-validation-error"));
+exports.RequestValidationError = request_validation_error_1.default;
+__exportStar(require("./middlewares/current-user"), exports);
+__exportStar(require("./middlewares/error-handler"), exports);
+__exportStar(require("./middlewares/require-auth"), exports);
+__exportStar(require("./middlewares/validate-request"), exports);

package/build/middlewares/current-user.d.ts

@@ -0,0 +1,14 @@
+import { NextFunction, Request, Response } from 'express';
+interface UserPayload {
+    id: string;
+    email: string;
+}
+declare global {
+    namespace Express {
+        interface Request {
+            currentUser?: UserPayload;
+        }
+    }
+}
+export declare const currentUser: (req: Request, res: Response, next: NextFunction) => void;
+export {};

package/build/middlewares/current-user.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.currentUser = void 0;
+const jsonwebtoken_1 = require("jsonwebtoken");
+const currentUser = (req, res, next) => {
+    var _a;
+    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
+        return next();
+    }
+    try {
+        const payload = (0, jsonwebtoken_1.verify)(req.session.jwt, process.env.JWT_KEY);
+        req.currentUser = payload;
+    }
+    catch (error) { }
+    next();
+};
+exports.currentUser = currentUser;

package/build/middlewares/error-handler.d.ts

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

package/build/middlewares/error-handler.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.errorHandler = void 0;
+const custom_error_1 = __importDefault(require("../errors/custom-error"));
+const errorHandler = (err, req, res, next) => {
+    if (err instanceof custom_error_1.default) {
+        return res.status(err.statusCode).send({ errors: err.serializeErrors() });
+    }
+    console.error(err);
+    res.status(400).send({
+        errors: [{ message: 'Something went wrong' }],
+    });
+};
+exports.errorHandler = errorHandler;

package/build/middlewares/require-auth.d.ts

@@ -0,0 +1,2 @@
+import { NextFunction, Request, Response } from 'express';
+export declare const requireAuth: (req: Request, res: Response, next: NextFunction) => void;

package/build/middlewares/require-auth.js

@@ -0,0 +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.requireAuth = void 0;
+const not_authorized_error_1 = __importDefault(require("../errors/not-authorized-error"));
+const requireAuth = (req, res, next) => {
+    if (!req.currentUser) {
+        throw new not_authorized_error_1.default();
+    }
+    next();
+};
+exports.requireAuth = requireAuth;

package/build/middlewares/validate-request.d.ts

@@ -0,0 +1,2 @@
+import { NextFunction, Request, Response } from 'express';
+export declare const validateRequest: (req: Request, res: Response, next: NextFunction) => void;

package/build/middlewares/validate-request.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateRequest = void 0;
+const express_validator_1 = require("express-validator");
+const request_validation_error_1 = __importDefault(require("../errors/request-validation-error"));
+const validateRequest = (req, res, next) => {
+    const errors = (0, express_validator_1.validationResult)(req);
+    if (!errors.isEmpty()) {
+        throw new request_validation_error_1.default(errors.array());
+    }
+    next();
+};
+exports.validateRequest = validateRequest;

package/build/models/Comment.d.ts

@@ -0,0 +1,26 @@
+import mongoose from 'mongoose';
+interface CommentAttributes {
+    idPost: string;
+    username: string;
+    likes: number;
+    upVotes: number;
+    downVotes: number;
+    reportNr: number;
+    contentUrl: string;
+    text: string;
+}
+interface CommentModel extends mongoose.Model<CommentDocument> {
+    build(attrs: CommentAttributes): CommentDocument;
+}
+interface CommentDocument extends mongoose.Document {
+    idPost: string;
+    username: string;
+    likes: number;
+    upVotes: number;
+    downVotes: number;
+    reportNr: number;
+    contentUrl: string;
+    text: string;
+}
+declare const Comment: CommentModel;
+export default Comment;

package/build/models/Comment.js

@@ -0,0 +1,53 @@
+"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 commentSchema = new mongoose_1.default.Schema({
+    idPost: {
+        type: String,
+        required: true,
+    },
+    username: {
+        type: String,
+        required: true,
+    },
+    likes: {
+        type: Number,
+        required: true,
+    },
+    upVotes: {
+        type: Number,
+        required: true,
+    },
+    downVotes: {
+        type: Number,
+        required: true,
+    },
+    reportNr: {
+        type: Number,
+        required: true,
+    },
+    contentUrl: {
+        type: String,
+        required: true,
+    },
+    text: {
+        type: String,
+        required: true,
+    },
+}, {
+    toJSON: {
+        transform(doc, ret) {
+            ret.id = ret._id;
+            delete ret.__v;
+            delete ret._id;
+        },
+    },
+});
+commentSchema.statics.build = (attrs) => {
+    return new Comment(attrs);
+};
+const Comment = mongoose_1.default.model('Comment', commentSchema);
+exports.default = Comment;

package/build/models/Post.d.ts

@@ -0,0 +1,31 @@
+import mongoose from 'mongoose';
+import { PostType } from '../enums/PostType';
+interface PostAttributes {
+    idUser: string;
+    username: string;
+    likes: number;
+    upVotes: number;
+    downVotes: number;
+    saved: number;
+    postType: PostType;
+    reportNr: number;
+    contentUrl: string;
+    text: string;
+}
+interface PostModel extends mongoose.Model<PostDocument> {
+    build(attrs: PostAttributes): PostDocument;
+}
+interface PostDocument extends mongoose.Document {
+    idUser: string;
+    username: string;
+    likes: number;
+    upVotes: number;
+    downVotes: number;
+    saved: number;
+    postType: PostType;
+    reportNr: number;
+    contentUrl: string;
+    text: string;
+}
+declare const Post: PostModel;
+export default Post;

package/build/models/Post.js

@@ -0,0 +1,61 @@
+"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 postSchema = new mongoose_1.default.Schema({
+    idUser: {
+        type: String,
+        required: true,
+    },
+    username: {
+        type: String,
+        required: true,
+    },
+    likes: {
+        type: Number,
+        required: true,
+    },
+    upVotes: {
+        type: Number,
+        required: true,
+    },
+    downVotes: {
+        type: Number,
+        required: true,
+    },
+    saved: {
+        type: Number,
+        required: true,
+    },
+    postType: {
+        type: String,
+        required: true,
+    },
+    reportNr: {
+        type: Number,
+        required: true,
+    },
+    contentUrl: {
+        type: String,
+        required: true,
+    },
+    text: {
+        type: String,
+        required: true,
+    },
+}, {
+    toJSON: {
+        transform(doc, ret) {
+            ret.id = ret._id;
+            delete ret.__v;
+            delete ret._id;
+        },
+    },
+});
+postSchema.statics.build = (attrs) => {
+    return new Post(attrs);
+};
+const Post = mongoose_1.default.model('Post', postSchema);
+exports.default = Post;

package/build/models/User.d.ts

@@ -0,0 +1,66 @@
+import mongoose from 'mongoose';
+import { AccountType } from '../enums/AccountType';
+import { PaidPlan } from '../enums/PaidPlan';
+interface UserAttributes {
+    email: string;
+    username: string;
+    password: string;
+    name: string;
+    accountType: AccountType;
+    surname: string;
+    followers: number;
+    following: number;
+    phoneNumber: string;
+    verified: boolean;
+    paidPlan: PaidPlan;
+    savedPosts: string[];
+    likedPosts: string[];
+    upVotedPosts: string[];
+    likedComments: string[];
+    bannedAccounts: string[];
+    reportedPosts: string[];
+    validReportedPosts: string[];
+    totalLikes: number;
+    totalUpVotes: number;
+    totalDownVotes: number;
+    location: string;
+    height: number;
+    weight: number;
+    profession: string;
+    grossIncome: number;
+    netIncome: number;
+}
+interface UserModel extends mongoose.Model<UserDocument> {
+    build(attrs: UserAttributes): UserDocument;
+}
+interface UserDocument extends mongoose.Document {
+    email: string;
+    username: string;
+    password: string;
+    name: string;
+    accountType: AccountType;
+    surname: string;
+    followers: number;
+    following: number;
+    phoneNumber: string;
+    verified: boolean;
+    paidPlan: PaidPlan;
+    savedPosts: string[];
+    likedPosts: string[];
+    upVotedPosts: string[];
+    likedComments: string[];
+    bannedAccounts: string[];
+    reportedPosts: string[];
+    validReportedPosts: string[];
+    totalLikes: number;
+    totalUpVotes: number;
+    totalDownVotes: number;
+    location: string;
+    height: number;
+    weight: number;
+    profession: string;
+    grossIncome: number;
+    netIncome: number;
+}
+declare const User: UserModel;
+export default User;

package/build/models/User.js

@@ -0,0 +1,172 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 });
+const mongoose_1 = __importDefault(require("mongoose"));
+const password_1 = __importDefault(require("../utils/password"));
+const userSchema = new mongoose_1.default.Schema({
+    email: {
+        type: String,
+        required: true,
+        unique: true,
+    },
+    username: {
+        type: String,
+        required: true,
+        unique: true,
+    },
+    password: {
+        type: String,
+        required: true,
+    },
+    name: {
+        type: String,
+        required: true,
+    },
+    accountType: {
+        type: String,
+        required: true,
+    },
+    surname: {
+        type: String,
+        required: true,
+    },
+    followers: {
+        type: Number,
+        required: true,
+    },
+    following: {
+        type: Number,
+        required: true,
+    },
+    phoneNumber: {
+        type: String,
+        required: true,
+    },
+    verified: {
+        type: Boolean,
+        required: true,
+    },
+    paidPlan: {
+        type: String,
+        required: true,
+    },
+    savedPosts: {
+        type: Array,
+        required: true,
+    },
+    likedPosts: {
+        type: Array,
+        required: true,
+    },
+    upVotedPosts: {
+        type: Array,
+        required: true,
+    },
+    likedComments: {
+        type: Array,
+        required: true,
+    },
+    bannedAccounts: {
+        type: Array,
+        required: true,
+    },
+    reportedPosts: {
+        type: Array,
+        required: true,
+    },
+    validReportedPosts: {
+        type: Array,
+        required: true,
+    },
+    totalLikes: {
+        type: Number,
+        required: true,
+    },
+    totalUpVotes: {
+        type: Number,
+        required: true,
+    },
+    totalDownVotes: {
+        type: Number,
+        required: true,
+    },
+    location: {
+        type: String,
+        required: true,
+    },
+    height: {
+        type: Number,
+        required: true,
+    },
+    weight: {
+        type: Number,
+        required: true,
+    },
+    profession: {
+        type: String,
+        required: true,
+    },
+    grossIncome: {
+        type: Number,
+        required: true,
+    },
+    netIncome: {
+        type: Number,
+        required: true,
+    },
+}, {
+    toJSON: {
+        transform(doc, ret) {
+            ret.id = ret._id;
+            delete ret.password;
+            delete ret.__v;
+            delete ret._id;
+            delete ret.followers;
+            delete ret.following;
+            delete ret.phoneNumber;
+            delete ret.verified;
+            delete ret.paidPlan;
+            delete ret.savedPosts;
+            delete ret.likedPosts;
+            delete ret.upVotedPosts;
+            delete ret.likedComments;
+            delete ret.bannedAccounts;
+            delete ret.reportedPosts;
+            delete ret.validReportedPosts;
+            delete ret.totalLikes;
+            delete ret.totalUpVotes;
+            delete ret.totalDownVotes;
+            delete ret.location;
+            delete ret.height;
+            delete ret.weight;
+            delete ret.profession;
+            delete ret.grossIncome;
+            delete ret.netIncome;
+        },
+    },
+});
+userSchema.pre('save', function (done) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (this.isModified('password')) {
+            const hashedPassword = yield password_1.default.toHash(this.get('password'));
+            this.set('password', hashedPassword);
+        }
+        done();
+    });
+});
+userSchema.statics.build = (attrs) => {
+    return new User(attrs);
+};
+const User = mongoose_1.default.model('User', userSchema);
+exports.default = User;

package/build/utils/password.d.ts

@@ -0,0 +1,4 @@
+export default class Password {
+    static toHash(password: string): Promise<string>;
+    static compare(storedPassword: string, suppliedPassword: string): Promise<boolean>;
+}

package/build/utils/password.js

@@ -0,0 +1,31 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const crypto_1 = require("crypto");
+const util_1 = require("util");
+const scryptAsync = (0, util_1.promisify)(crypto_1.scrypt);
+class Password {
+    static toHash(password) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const salt = (0, crypto_1.randomBytes)(16).toString('hex');
+            const buffer = (yield scryptAsync(password, salt, 64));
+            return `${buffer.toString('hex')}.${salt}`;
+        });
+    }
+    static compare(storedPassword, suppliedPassword) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [hashedPassword, salt] = storedPassword.split('.');
+            const buffer = (yield scryptAsync(suppliedPassword, salt, 64));
+            return buffer.toString('hex') === hashedPassword;
+        });
+    }
+}
+exports.default = Password;

package/package.json

@@ -1,11 +1,22 @@
 {
   "name": "@armi-wave/common",
-  "version": "1.2.0",
+  "version": "1.5.0",
   "description": "",
-  "main": "./src/index.ts",
+  "main": "./build/index.js",
+  "types": "./build/index.d.ts",
+  "files": [
+    "build/**/*"
+  ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc",
+    "pub": "git add . && git commit -m \"Updates\" && npm version feature && npm run build && npm publish"
   },
   "author": "Armiron Kurbalaj",
-  "license": "ISC"
+  "license": "ISC",
+  "dependencies": {
+    "express": "^4.18.1",
+    "express-validator": "^6.14.2",
+    "jsonwebtoken": "^8.5.1"
+  }
 }

package/src/index.ts

@@ -1,3 +0,0 @@
-import User from './models/User';
-
-export { User };

package/src/models/User.ts

@@ -1,223 +0,0 @@
-import mongoose, { ObjectId } from 'mongoose';
-import Password from '../utils/password';
-
-interface UserAttributes {
-  email: string;
-  username: string;
-  password: string;
-  name: string;
-  surname: string;
-  followers: number;
-  following: number;
-  phoneNumber: string;
-  verified: boolean;
-  paidPlan: string;
-  savedPosts: ObjectId[];
-  likedPosts: ObjectId[];
-  upVotedPosts: ObjectId[];
-  likedComments: ObjectId[];
-  bannedAccounts: ObjectId[];
-  reportedPosts: ObjectId[];
-  validReportedPosts: ObjectId[];
-  totalLikes: number;
-  totalUpVotes: number;
-  totalDownVotes: number;
-  location: string;
-  height: number;
-  weight: number;
-  profession: string;
-  grossIncome: number;
-  netIncome: number;
-}
-
-interface UserModel extends mongoose.Model<UserDocument> {
-  build(attrs: UserAttributes): UserDocument;
-}
-
-interface UserDocument extends mongoose.Document {
-  email: string;
-  username: string;
-  password: string;
-  name: string;
-  surname: string;
-  followers: number;
-  following: number;
-  phoneNumber: string;
-  verified: boolean;
-  paidPlan: string;
-  savedPosts: ObjectId[];
-  likedPosts: ObjectId[];
-  upVotedPosts: ObjectId[];
-  likedComments: ObjectId[];
-  bannedAccounts: ObjectId[];
-  reportedPosts: ObjectId[];
-  validReportedPosts: ObjectId[];
-  totalLikes: number;
-  totalUpVotes: number;
-  totalDownVotes: number;
-  location: string;
-  height: number;
-  weight: number;
-  profession: string;
-  grossIncome: number;
-  netIncome: number;
-}
-
-const userSchema = new mongoose.Schema(
-  {
-    email: {
-      type: String,
-      required: true,
-      unique: true,
-    },
-    username: {
-      type: String,
-      required: true,
-      unique: true,
-    },
-    password: {
-      type: String,
-      required: true,
-    },
-    name: {
-      type: String,
-      required: true,
-    },
-    surname: {
-      type: String,
-      required: true,
-    },
-    followers: {
-      type: Number,
-      required: true,
-    },
-    following: {
-      type: Number,
-      required: true,
-    },
-    phoneNumber: {
-      type: String,
-      required: true,
-    },
-    verified: {
-      type: Boolean,
-      required: true,
-    },
-    paidPlan: {
-      type: String,
-      required: true,
-    },
-    savedPosts: {
-      type: Array,
-      required: true,
-    },
-    likedPosts: {
-      type: Array,
-      required: true,
-    },
-    upVotedPosts: {
-      type: Array,
-      required: true,
-    },
-    likedComments: {
-      type: Array,
-      required: true,
-    },
-    bannedAccounts: {
-      type: Array,
-      required: true,
-    },
-    reportedPosts: {
-      type: Array,
-      required: true,
-    },
-    validReportedPosts: {
-      type: Array,
-      required: true,
-    },
-    totalLikes: {
-      type: Number,
-      required: true,
-    },
-    totalUpVotes: {
-      type: Number,
-      required: true,
-    },
-    totalDownVotes: {
-      type: Number,
-      required: true,
-    },
-    location: {
-      type: String,
-      required: true,
-    },
-    height: {
-      type: Number,
-      required: true,
-    },
-    weight: {
-      type: Number,
-      required: true,
-    },
-    profession: {
-      type: String,
-      required: true,
-    },
-    grossIncome: {
-      type: Number,
-      required: true,
-    },
-    netIncome: {
-      type: Number,
-      required: true,
-    },
-  },
-  {
-    toJSON: {
-      transform(doc, ret) {
-        ret.id = ret._id;
-        delete ret.password;
-        delete ret.__v;
-        delete ret._id;
-        delete ret.followers;
-        delete ret.following;
-        delete ret.phoneNumber;
-        delete ret.verified;
-        delete ret.paidPlan;
-        delete ret.savedPosts;
-        delete ret.likedPosts;
-        delete ret.upVotedPosts;
-        delete ret.likedComments;
-        delete ret.bannedAccounts;
-        delete ret.reportedPosts;
-        delete ret.validReportedPosts;
-        delete ret.totalLikes;
-        delete ret.totalUpVotes;
-        delete ret.totalDownVotes;
-        delete ret.location;
-        delete ret.height;
-        delete ret.weight;
-        delete ret.profession;
-        delete ret.grossIncome;
-        delete ret.netIncome;
-      },
-    },
-  }
-);
-
-userSchema.pre('save', async function (done) {
-  if (this.isModified('password')) {
-    const hashedPassword = await Password.toHash(this.get('password'));
-    this.set('password', hashedPassword);
-  }
-
-  done();
-});
-
-userSchema.statics.build = (attrs: UserAttributes) => {
-  return new User(attrs);
-};
-
-const User = mongoose.model<UserDocument, UserModel>('User', userSchema);
-
-export default User;

package/src/utils/password.ts

@@ -1,19 +0,0 @@
-import { scrypt, randomBytes } from 'crypto';
-import { promisify } from 'util';
-
-const scryptAsync = promisify(scrypt);
-
-export default class Password {
-  static async toHash(password: string) {
-    const salt = randomBytes(16).toString('hex');
-    const buffer = (await scryptAsync(password, salt, 64)) as Buffer;
-
-    return `${buffer.toString('hex')}.${salt}`;
-  }
-
-  static async compare(storedPassword: string, suppliedPassword: string) {
-    const [hashedPassword, salt] = storedPassword.split('.');
-    const buffer = (await scryptAsync(suppliedPassword, salt, 64)) as Buffer;
-    return buffer.toString('hex') === hashedPassword;
-  }
-}