add organization access to clients

src/auth/auth.route.ts

@@ -1,6 +1,6 @@
 import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
-import { getUserByEmail, updateUser } from "../user/user.service";
+import { getUserByEmail, updateUserInternal } from "../user/user.service";
-import { createSession, deleteSession, getSession } from "./auth.service";
+import { createSession, deleteSession } from "./auth.service";
 
 export async function authRoutes(fastify: FastifyInstance) {
   fastify.get(
@@ -24,7 +24,7 @@ export async function authRoutes(fastify: FastifyInstance) {
         if (userInDb == null)
           return res.code(401).send({ error: "not_allowed" });
 
-        await updateUser(userInDb.pid, {
+        await updateUserInternal(userInDb.pid, {
           firstName: user.givenname,
           lastName: user.familyname,
           email: user.email,

src/organization/organization.controller.ts

@@ -42,8 +42,7 @@ export async function listOrgsHandler(req: FastifyRequest, res: FastifyReply) {
   const queryParams = req.query as PageQueryParams;
 
   try {
-    const authUser = req.user;
+    const orgList = await listOrgs(queryParams, req.user);
-    const orgList = await listOrgs(queryParams, authUser.tenantId);
     return res.code(200).send(orgList);
   } catch (err) {
     return err;
@@ -84,8 +83,7 @@ export async function searchOrgHandler(req: FastifyRequest, res: FastifyReply) {
   const queryParams = req.query as PageQueryParams;
 
   try {
-    const authUser = req.user;
+    const orgList = await searchOrgs(queryParams, req.user);
-    const orgList = await searchOrgs(queryParams, authUser.tenantId);
     return res.code(200).send(orgList);
   } catch (err) {
     return err;

src/organization/organization.service.ts

@@ -1,3 +1,5 @@
+import mongoose from "mongoose";
+import { AuthenticatedUser } from "../auth";
 import { getFilterObject, getSortObject, PageQueryParams } from "../pagination";
 import { ChangeEvent, dbEvents } from "../realtime";
 import { generateId } from "../utils/id";
@@ -35,14 +37,26 @@ export async function getOrg(orgId: string, tenantId: string) {
   });
 }
 
-export async function listOrgs(params: PageQueryParams, tenantId: string) {
+export async function listOrgs(
+  params: PageQueryParams,
+  user: AuthenticatedUser
+) {
   const page = params.page || 1;
   const pageSize = params.pageSize || 10;
   const sortObj = getSortObject(params, orgFields);
   const filterObj = getFilterObject(params) || [];
 
+  if (user.role === "client") {
+    filterObj.push({
+      $or: [
+        { type: "county" },
+        { _id: new mongoose.Types.ObjectId(user.orgId) },
+      ],
+    });
+  }
+
   const orgs = await orgModel.aggregate([
-    { $match: { $and: [{ tenantId: tenantId }, ...filterObj] } },
+    { $match: { $and: [{ tenantId: user.tenantId }, ...filterObj] } },
     {
       $facet: {
         metadata: [{ $count: "count" }],
@@ -118,19 +132,31 @@ export async function deleteOrg(orgId: string, tenantId: string) {
   return res;
 }
 
-export async function searchOrgs(params: PageQueryParams, tenantId: string) {
+export async function searchOrgs(
+  params: PageQueryParams,
+  user: AuthenticatedUser
+) {
   const page = params.page || 1;
   const pageSize = params.pageSize || 10;
   const sortObj = getSortObject(params, orgFields);
   const filterObj = getFilterObject(params) || [];
 
+  if (user.role === "client") {
+    filterObj.push({
+      $or: [
+        { type: "county" },
+        { _id: new mongoose.Types.ObjectId(user.orgId) },
+      ],
+    });
+  }
+
   if (!params.searchToken)
     return { orgs: [], metadata: { count: 0, page, pageSize } };
 
   const regex = new RegExp(params.searchToken, "i");
 
   const orgs = await orgModel.aggregate([
-    { $match: { $and: [{ tenantId: tenantId }, ...filterObj] } },
+    { $match: { $and: [{ tenantId: user.tenantId }, ...filterObj] } },
     {
       $match: {
         $or: [{ name: { $regex: regex } }, { domain: { $regex: regex } }],

src/user/user.controller.ts

@@ -80,7 +80,7 @@ export async function updateUserHandler(
   const { userId } = req.params as { userId: string };
 
   try {
-    const updatedUser = await updateUser(userId, input);
+    const updatedUser = await updateUser(userId, input, req.user);
     if (!updateUser) return res.code(404).send({ error: "resource not found" });
 
     return res.code(200).send(updatedUser);

src/user/user.service.ts

@@ -13,7 +13,10 @@ export async function createUser(
   input: CreateUserInput,
   user: AuthenticatedUser
 ) {
-  if (input.role == "admin" && user.role != "superAdmin") {
+  if (
+    input.role === "superAdmin" ||
+    (input.role == "admin" && user.role != "superAdmin")
+  ) {
     throw ErrOpNotValid;
   }
 
@@ -82,7 +85,30 @@ export async function listUsers(tenantId: string) {
     );
 }
 
-export async function updateUser(userId: string, input: UpdateUserInput) {
+export async function updateUser(
+  userId: string,
+  input: UpdateUserInput,
+  user: AuthenticatedUser
+) {
+  if (
+    input.role === "superAdmin" ||
+    (input.role == "admin" && user.role != "superAdmin")
+  ) {
+    throw ErrOpNotValid;
+  }
+  return await userModel
+    .findOneAndUpdate({ pid: userId }, input, {
+      new: true,
+    })
+    .select(
+      "_id pid orgId firstName lastName name email role avatar status createdAt createdBy lastLogin"
+    );
+}
+
+export async function updateUserInternal(
+  userId: string,
+  input: UpdateUserInput
+) {
   return await userModel
     .findOneAndUpdate({ pid: userId }, input, {
       new: true,

src/utils/roles.ts

@@ -107,6 +107,7 @@ export const rules: Record<
       "permit:read",
       "file:upload",
       "file:download",
+      "org:read",
       "rts:read",
       "rts:write",
       "view:read",