my-typescript-library-rahul52us 1.3.4 → 1.3.5

package/src/routes/user.route.ts

@@ -1,14 +1,33 @@
 import express from "express";
-import { authenticateJWT } from "../controllers/auth.controller";
-import { getalluser, getPermissionsService, registerUser } from "../services/authentication";
-import { getUserAccountService, updateUserAccountDetailsService } from "../services/authentication/getuser.service";
-import { deleteUser, deleteUserHandler, updateUserHandler } from "../services/authentication/login.service";
+
+import {
+  changePasswordUser,
+  registerUser,
+  isLoggedIn,
+  getalluser,
+  getPermissionsService,
+} from "~/services/authentication";
+
+import {
+  deleteUser,
+  deleteUserHandler,
+  getCurrentUser,
+  updateUserHandler,
+} from "~/services/authentication/login.service";
+
+import { authenticateJWT } from "~/controllers/auth.controller";
+
+import { grantAccess } from "~/controllers/rbac/rbac.controller";
+import {
+  getUserAccountService,
+  updateUserAccountDetailsService,
+} from "~/services/authentication/getuser.service";
 
 const User = express.Router();
 
-// User.get("/isLoggedIn", authenticateJWT, isLoggedIn);
+User.get("/isLoggedIn", authenticateJWT, isLoggedIn);
 
-// User.post("/changePassword", authenticateJWT, changePasswordUser);
+User.post("/changePassword", authenticateJWT, changePasswordUser);
 
 User.delete("/logout", (req, res, next) => {
   req.logOut((err) => {
@@ -21,18 +40,21 @@ User.delete("/logout", (req, res, next) => {
 
 User.post("/create", authenticateJWT, registerUser); // authenticateJWT, grantAccess('canCreateUser', 'User'),
 
-User.get('/get', authenticateJWT, getalluser)
+// User.get('/get', authenticateJWT, grantAccess('get', 'user'), getalluser)
 
+User.get("/get", authenticateJWT, getalluser);
 
 User.delete(
   "/delete/:id",
   authenticateJWT,
+  grantAccess("delete", "user"),
   deleteUserHandler
 );
 
 User.put(
   "/update/:id",
   authenticateJWT,
+  grantAccess("update", "user"),
   updateUserHandler
 );
 
@@ -45,6 +67,6 @@ User.put(
   authenticateJWT,
   updateUserAccountDetailsService
 );
-User.delete('/delete/:Id', deleteUser);
+//User.delete('/delete/:Id', deleteUser);
 
 export default User;

package/src/routes/userrole.route.ts

@@ -1,11 +1,13 @@
 import express, { Request, Response, NextFunction, Router } from 'express';
+import { authenticateJWT } from '~/controllers/auth.controller';
+import { createUserRoleService, deleteRoleService, getRoleById, getUserRolesService } from '~/services/userroles/userrole.service';
 
 
 const UserRole = express.Router();
 
-// UserRole.post('/create', authenticateJWT, createUserRoleService )
-// UserRole.get('/get',authenticateJWT, getUserRolesService )
-// UserRole.get('/getbyid/:id',authenticateJWT, getRoleById)
-// UserRole.delete('/delete/:id',authenticateJWT, deleteRoleService )
+UserRole.post('/create', authenticateJWT, createUserRoleService )
+UserRole.get('/get',authenticateJWT, getUserRolesService )
+UserRole.get('/getbyid/:id',authenticateJWT, getRoleById)
+UserRole.delete('/delete/:id',authenticateJWT, deleteRoleService )
 
  export default UserRole;

package/src/routes/workflow.route.ts

@@ -1,11 +1,19 @@
 import express from "express";
-import { authenticateJWT } from "../controllers/auth.controller";
+import { authenticateJWT } from "~/controllers/auth.controller";
 import {
   createWorkflowSettingService,
   getWorkflowSettingsService,
-} from "../services/workflow/workSettings.service";
-import { createWorkFlowService, deleteWorkflow, getallUsersWorkFlowService, getallWorkFlowService, getDefaultWorkFlowService, updateWorkFlowService, updateWorkFlowUserStatus } from "../services/workflow/workflow.service";
-
+} from "~/services/workflow/workSettings.service";
+import {
+  createWorkFlowService,
+  deleteWorkflow,
+  getDefaultWorkFlowService,
+  getallUsersWorkFlowService,
+  getallWorkFlowService,
+  updateWorkFlowService,
+  updateWorkFlowStatusService,
+  updateWorkFlowUserStatus,
+} from "~/services/workflow/workflow.service";
 
 const WorkFlow = express.Router();
 

package/src/server.ts

@@ -13,4 +13,3 @@ export { default as UserRole } from './routes/userrole.route';
 export { default as Document } from './routes/document.route';
 export { default as WorkFlow } from './routes/workflow.route';
 export { default as Form } from './routes/form.route';
-export {setupLibrary as setupLibrary} from './setupModal'

package/src/services/authentication/change-password.service.ts

@@ -1,12 +1,12 @@
 import { NextFunction, Request, Response } from "express";
 
 import dayjs from "dayjs";
-import { findUser } from "../../repository/user.repository";
-import logger from "../../utils/logger";
-import sendMail from "../../libs/mail";
-import compileEmailTemplate from "../../helpers/compile-email-template";
+import { findUser } from "~/repository/user.repository";
+import logger from "~/utils/logger";
+import sendMail from "~/libs/mail";
+import compileEmailTemplate from "~/helpers/compile-email-template";
 
-import { changePasswordValidation } from "../../validations/authenticate.validation";
+import { changePasswordValidation } from "~/validations/authenticate.validation";
 import { createNotificationsService } from "../notifications/notifications.service";
 import { getUserServiceByLevel } from "./getuser.service";
 
@@ -25,7 +25,7 @@ export async function changePasswordUser(
   req: UserRequest,
   res: Response,
   next: NextFunction
-): Promise<Response> {
+): Promise<any> {
   try {
     const { currentPassword, newPassword, confirmPassword, id } = req.body;
     if (!req.user) {
@@ -49,7 +49,7 @@ export async function changePasswordUser(
       });
     }
 
-    let user;
+    let user :any = null;
     if (!id) {
       user = req.user;
       const updatePassword = await user.changePassword(
@@ -97,7 +97,7 @@ export async function changePasswordUser(
 
 export async function changeWorkFlowUserPassword(id: string, password: string) {
   try {
-    let user = await findUser({ id });
+    let user : any = await findUser({ id });
     if (user) {
       user.setPassword(password, async (err: any, user: any) => {
         if (err) {

package/src/services/authentication/forgot-password.service.ts

@@ -1,17 +1,17 @@
 import { Request, Response, NextFunction } from 'express';
 
 import { findUser, getUserByIdAndJoinUserToken } from '../../repository/user.repository';
-import generateRandomKey from '../../helpers/genarateRandomkey';
-import { createToken, updateUserTokenById } from '../../repository/user_tokens.repository';
-import logger from '../../utils/logger';
-import sendMail from '../../libs/mail';
-import compileEmailTemplate from '../../helpers/compile-email-template';
-import { SEND_MAIL_TYPE } from '../../constants/send-mail-type.constant';
+import generateRandomKey from '~/helpers/genarateRandomkey';
+import { createToken, updateUserTokenById } from '~/repository/user_tokens.repository';
+import logger from '~/utils/logger';
+import sendMail from '~/libs/mail';
+import compileEmailTemplate from '~/helpers/compile-email-template';
+import { SEND_MAIL_TYPE } from '~/constants/send-mail-type.constant';
 
-export async function forgotPasswordUser(req: any, res: Response, next: NextFunction) {
+export async function forgotPasswordUser(req: Request, res: Response, next: NextFunction): Promise<any> {
   try {
     const { email } = req.body;
-    const user : any = await findUser({ email });
+    const user = await findUser({ email });
     if (!user || !user._id) {
       return res.status(300).json({ status:'error', message: "User doesn't exist" })
     }

package/src/services/authentication/getuser.service.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
-import { updateorganisation } from "../../repository/organisation.repository";
-import accountsSchema from "../../repository/schemas/accounts.schema";
+import { updateorganisation } from "~/repository/organisation.repository";
+import accountsSchema from "~/repository/schemas/accounts.schema";
 import {
   getallusers,
   getCompanyByUserId,
@@ -9,7 +9,7 @@ import {
   getUserByLevel,
   updateUserAccountDetails,
   updateUserWorkFlowStatus,
-} from "../../repository/user.repository";
+} from "~/repository/user.repository";
 import { createNotificationsService } from "../notifications/notifications.service";
 import { findOrgDetailsService } from "../organisation/organisation.service";
 

package/src/services/authentication/login.service.ts

@@ -1,10 +1,10 @@
 import { NextFunction, Request, Response } from 'express';
-import { deleteUserById, findUser, findUserProps, getUser, updateUser } from '../../repository/user.repository';
-import { loginValidation } from '../../validations/authenticate.validation';
+import { deleteUserById, findUser, findUserProps, getUser, updateUser } from '~/repository/user.repository';
+import { loginValidation } from '~/validations/authenticate.validation';
 import passport from 'passport';
 import * as jwt from 'jsonwebtoken'
-import { JWT_SECRET } from "../../utils/env";
-import { clearCookie, COOKIE_NAME } from '../../utils/cookie';
+import { JWT_SECRET } from "~/utils/env";
+import { clearCookie, COOKIE_NAME } from '~/utils/cookie';
 
 
 interface UserRequest extends Request {
@@ -52,7 +52,7 @@ export async function loginUser(req: Request, res: Response, next: NextFunction)
   })(req, res, next);
 }
 
-export async function isLoggedIn(req: any, res: Response, next: NextFunction) : Promise<any>{
+export async function isLoggedIn(req: Request, res: Response, next: NextFunction): Promise<any> {
   if (req.user) {
     return res.status(200).send(true)
   }

package/src/services/authentication/register.admin.service.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from 'express';
 
-import { findOrg, createOrg } from '../../repository/organisation.repository';
+import { findOrg, createOrg } from '~/repository/organisation.repository';
 
 import { registerUser } from './register.service';
 
@@ -10,7 +10,7 @@ interface UserRequest extends Request {
   }
 }
 
-export async function registerAdmin(req: UserRequest, res: Response, next: NextFunction): Promise<Response> {
+export async function registerAdmin(req: UserRequest, res: Response, next: NextFunction): Promise<any> {
   try {
     let { email, company, gstNumber, license, type } = req.body;
     if (!type) {

package/src/services/authentication/register.service.ts

@@ -1,14 +1,14 @@
 import { Request, Response, NextFunction } from 'express';
 import mongoose from 'mongoose';
-import { findUser, createUser, createWorkFlowUser } from '../../repository/user.repository';
-import { createToken } from '../../repository/user_tokens.repository';
-import { registerValidation } from '../../validations/authenticate.validation';
-import sendMail from '../../libs/mail';
-import { SEND_MAIL_TYPE } from '../../constants/send-mail-type.constant';
-import compileEmailTemplate from '../../helpers/compile-email-template';
-import generateRandomKey from '../../helpers/genarateRandomkey';
-import { sign } from '../../helpers/jwt.helper';
-import { updateUserHandler } from '../../services/authentication/login.service';
+import { findUser, createUser, createWorkFlowUser } from '~/repository/user.repository';
+import { createToken } from '~/repository/user_tokens.repository';
+import { registerValidation } from '~/validations/authenticate.validation';
+import sendMail from '~/libs/mail';
+import { SEND_MAIL_TYPE } from '~/constants/send-mail-type.constant';
+import compileEmailTemplate from '~/helpers/compile-email-template';
+import generateRandomKey from '~/helpers/genarateRandomkey';
+import { sign } from '~/helpers/jwt.helper';
+import { updateUserHandler } from '~/services/authentication/login.service';
 
 
 interface UserRequest extends Request {

package/src/services/authentication/resend-email.service.ts

@@ -3,23 +3,23 @@ import { NextFunction, Request, Response } from 'express';
 import {
     changeTokenStatus,
     createToken,
-} from '../../repository/user_tokens.repository';
+} from '~/repository/user_tokens.repository';
 
-import { normalizeEmail } from '../../helpers/string.helper';
+import { normalizeEmail } from '~/helpers/string.helper';
 
-import type { UserProfile } from '../../repository/user.repository';
+import type { UserProfile } from '~/repository/user.repository';
 
-import generateRandomKey from '../../helpers/genarateRandomkey';
-import compileEmailTemplate from '../../helpers/compile-email-template';
-import sendMail from '../../libs/mail';
-import { SEND_MAIL_TYPE } from '../../constants/send-mail-type.constant';
+import generateRandomKey from '~/helpers/genarateRandomkey';
+import compileEmailTemplate from '~/helpers/compile-email-template';
+import sendMail from '~/libs/mail';
+import { SEND_MAIL_TYPE } from '~/constants/send-mail-type.constant';
 
-import type { VerifyTokenRequest } from '../../services/authentication/verify-email.service';
+import type { VerifyTokenRequest } from '~/services/authentication/verify-email.service';
 
-export async function resendEmailAction(req: any, res: Response, next: NextFunction): Promise<Response> {
+export async function resendEmailAction(req: Request, res: Response, next: NextFunction): Promise<any> {
     try {
         const type = req.body.type;
-        const user = req.user as any;
+        const user = req.user as UserProfile;
 
         let template;
         let subject;

package/src/services/authentication/reset-password.service.ts

@@ -1,52 +1,73 @@
 import dayjs from 'dayjs';
 import { NextFunction, Request, Response } from 'express';
 
-import { findUser } from '../../repository/user.repository';
-import { findToken, removeUserToken } from '../../repository/user_tokens.repository';
-import logger from '../../utils/logger';
-import { changePasswordValidation } from '../../validations/authenticate.validation';
+import { findUser } from '~/repository/user.repository';
+import { findToken, removeUserToken } from '~/repository/user_tokens.repository';
+import logger from '~/utils/logger';
+import { changePasswordValidation } from '~/validations/authenticate.validation';
 import { resendEmailAction } from './resend-email.service';
 
-export async function resetPasswordUser(req: any, res: Response, next: NextFunction) {
+export async function resetPasswordUser(
+  req: Request,
+  res: Response,
+  next: NextFunction
+): Promise<any> {
   try {
     const { token, password, confirmPassword } = req.body;
 
+    console.log(token)
     const validateResult = changePasswordValidation({ password });
     if (Array.isArray(validateResult) && validateResult.length) {
-      return res.status(300).json({ message: (validateResult.map((it) => it.message).join(',')) })
+      return res
+        .status(300)
+        .json({ message: validateResult.map((it) => it.message).join(",") });
     }
     if (password !== confirmPassword) {
-      return res.status(300).json({ status: 'error', message: 'Password and Confirm password do not match' })
+      return res
+        .status(300)
+        .json({
+          status: "error",
+          message: "Password and Confirm password do not match",
+        });
     }
     const session = await findToken(token);
-    const user = await findUser({ id: session.user_id });
+    console.log(session)
+    const user : any = await findUser({ id: session.user_id });
 
     if (!user) {
-      return res.status(300).json({ status: 'error', message: 'User not found' })
+      return res
+        .status(300)
+        .json({ status: "error", message: "User not found" });
     }
 
-    req.user = user
-    req.body.type = token.type
+    req.user = user;
+    req.body.type = token.type;
 
     if (!session || !session._id) {
       return resendEmailAction(req, res, next);
     }
 
-    if (dayjs(session.updated_at).add(15, 'm').diff(dayjs()) < 0) {
+    if (dayjs(session.updated_at).add(15, "m").diff(dayjs()) < 0) {
       return resendEmailAction(req, res, next);
     }
 
     await user.setPassword(password, (err: any, user: any) => {
       if (err) {
-        return res.status(300).json({ status: 'error', message: 'Your password has not been updated' })
+        return res
+          .status(300)
+          .json({
+            status: "error",
+            message: "Your password has not been updated",
+          });
       }
       user.save();
       removeUserToken(session._id);
-      return res.status(200).json({ status: 'success', message: 'Your password has been updated' })
+      return res
+        .status(200)
+        .json({ status: "success", message: "Your password has been updated" });
     });
-
   } catch (error) {
     logger.error(error);
-    return res.status(400).json({ status: 'error', message: error })
+    return res.status(400).json({ status: "error", message: error });
   }
 }

package/src/services/authentication/verify-email.service.ts

@@ -3,11 +3,11 @@ import dayjs from 'dayjs';
 import {
   findToken,
   changeTokenStatus
-} from '../../repository/user_tokens.repository';
-import { activeUser, findUser } from '../../repository/user.repository';
+} from '~/repository/user_tokens.repository';
+import { activeUser, findUser } from '~/repository/user.repository';
 
-import logger from '../../utils/logger';
-import { SEND_MAIL_TYPE } from '../../constants/send-mail-type.constant';
+import logger from '~/utils/logger';
+import { SEND_MAIL_TYPE } from '~/constants/send-mail-type.constant';
 
 import { resendEmailAction } from './resend-email.service';
 
@@ -21,7 +21,7 @@ export type VerifyTokenRequest = Request & {
   };
 };
 
-export async function verifyEmail(req: any, res: Response, next: NextFunction): Promise<Response> {
+export async function verifyEmail(req: VerifyTokenRequest, res: Response, next: NextFunction): Promise<any> {
   try {
     const authToken: string = req.query.token;
     console.log(authToken);