Refactor userResolvers, models and helpers

package.json

@@ -61,7 +61,6 @@
     "@octokit/graphql": "^7.0.1",
     "@octokit/rest": "^19.0.13",
     "@types/node-cron": "^3.0.11",
-    "apollo-server": "^3.13.0",
     "axios": "^1.7.7",
     "bcryptjs": "^2.4.3",
     "cloudinary": "^1.30.1",
@@ -88,7 +87,8 @@
     "ts-node-dev": "^2.0.0",
     "tslog": "^4.9.2",
     "ws": "^8.11.0",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",

src/helpers/generateRandomPassword.ts

@@ -4,5 +4,6 @@ export default function generateRandomPassword(length = 8) {
   return generator.generate({
     length,
     numbers: true,
+    symbols: true,
   });
 }

src/helpers/organization.helper.ts

@@ -1,7 +1,9 @@
 import { GraphQLError } from 'graphql'
 import 'dotenv/config'
 import { JwtPayload, verify } from 'jsonwebtoken'
-import { Organization } from '../models/organization.model'
+import { IOrganization, Organization } from '../models/organization.model'
+import { IOrgUserData, IUser, IUserMethods} from '../models/user'
+import { HydratedDocument } from 'mongoose'
 
 export async function checkLoggedInOrganization(token?: string) {
   const SECRET = process.env.SECRET as string
@@ -27,6 +29,14 @@ export async function checkLoggedInOrganization(token?: string) {
       })
     }
 
+    if(org.isDeleted){
+      throw new GraphQLError(`Organization named ${name} was deleted`, {
+        extensions: {
+          code: 'AUTHENTICATION_ERROR',
+        },
+      })
+    }
+
     return org
   } catch (error: any) {
     if (error.message === 'invalid signature') {
@@ -50,3 +60,15 @@ export async function checkLoggedInOrganization(token?: string) {
     }
   }
 }
+
+export function isPartOfOrganization(user: HydratedDocument<IUser, IUserMethods>, org: HydratedDocument<IOrganization>): HydratedDocument<IOrgUserData>{
+  const orgUserData = user.organizations.find(data=>data.orgId.toString()===org._id.toString())
+  if(!orgUserData){
+    throw new GraphQLError(`User ${user.email} is not part of ${org.name}`,{
+      extensions: {
+        code: "FORBIDDEN"
+      }
+    })
+  }
+  return orgUserData
+}