akhilmeka/permit-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added client role and related code

Browse Source
This commit is contained in:
Akhil Meka
2025-05-03 17:02:37 +05:30
parent c84cd055d4
commit 5800069e6b
9 changed files with 229 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/user/user.controller.ts
View File

@@ -1,13 +1,14 @@
import { FastifyReply, FastifyRequest } from 'fastify';
import { FastifyReply, FastifyRequest } from "fastify";
import {
createUser,
deleteUser,
ErrMissingOrdId,
ErrOpNotValid,
getUser,
listUsers,
updateUser,
} from './user.service';
import { CreateUserInput, UpdateUserInput } from './user.schema';
} from "./user.service";
import { CreateUserInput, UpdateUserInput } from "./user.schema";
export async function createUserHandler(
req: FastifyRequest,
@@ -19,8 +20,12 @@ export async function createUserHandler(
const user = await createUser(body, req.user);
return res.code(201).send(user);
} catch (err) {
if (err instanceof Error && err.message == ErrOpNotValid.message)
return res.code(400).send(err.message);
if (
err instanceof Error &&
(err.message == ErrOpNotValid.message ||
err.message == ErrMissingOrdId.message)
)
return res.code(400).send({ error: err.message });
return err;
}
}
@@ -29,14 +34,14 @@ export async function getCurrentUserHandler(
req: FastifyRequest,
res: FastifyReply
) {
if (req.user.type !== 'user') {
if (req.user.type !== "user") {
return res.code(400).send();
}
try {
const user = await getUser(req.user.userId);
if (user == null)
return res.code(404).send({ error: 'resource not found' });
return res.code(404).send({ error: "resource not found" });
return res.code(200).send(user);
} catch (err) {
@@ -50,7 +55,7 @@ export async function getUserHandler(req: FastifyRequest, res: FastifyReply) {
try {
const user = await getUser(userId);
if (user == null)
return res.code(404).send({ error: 'resource not found' });
return res.code(404).send({ error: "resource not found" });
return res.code(200).send(user);
} catch (err) {
@@ -76,7 +81,7 @@ export async function updateUserHandler(
try {
const updatedUser = await updateUser(userId, input);
if (!updateUser) return res.code(404).send({ error: 'resource not found' });
if (!updateUser) return res.code(404).send({ error: "resource not found" });
return res.code(200).send(updatedUser);
} catch (err) {
@@ -93,7 +98,7 @@ export async function deleteUserHandler(
try {
const deleteResult = await deleteUser(userId, req.user.tenantId);
if (deleteResult.deletedCount == 0)
return res.code(404).send({ error: 'resource not found' });
return res.code(404).send({ error: "resource not found" });
return res.code(204).send();
} catch (err) {

33
src/user/user.schema.ts
View File

@@ -1,7 +1,7 @@
import { buildJsonSchemas } from 'fastify-zod';
import mongoose, { InferSchemaType } from 'mongoose';
import { z } from 'zod';
import { roles } from '../utils/roles';
import { buildJsonSchemas } from "fastify-zod";
import mongoose, { InferSchemaType } from "mongoose";
import { z } from "zod";
import { roles } from "../utils/roles";
const userSchema = new mongoose.Schema({
tenantId: {
@@ -30,7 +30,7 @@ const userSchema = new mongoose.Schema({
},
defaultClient: {
type: mongoose.Types.ObjectId,
ref: 'organization',
ref: "organization",
},
passKeys: [new mongoose.Schema({}, { _id: false, strict: false })],
challenge: new mongoose.Schema(
@@ -53,7 +53,7 @@ const userSchema = new mongoose.Schema({
dev: Boolean,
});
export const userModel = mongoose.model('user', userSchema);
export const userModel = mongoose.model("user", userSchema);
export type User = InferSchemaType<typeof userSchema>;
@@ -62,8 +62,8 @@ const userCore = {
lastName: z.string().max(30),
email: z
.string({
required_error: 'Email is required',
invalid_type_error: 'Email must be a valid string',
required_error: "Email is required",
invalid_type_error: "Email must be a valid string",
})
.email(),
avatar: z.string().optional(),
@@ -75,14 +75,9 @@ const createUserInput = z
.object({
...userCore,
})
.superRefine((data, ctx) => {
if (data.role == 'builder' && !data.orgId) {
ctx.addIssue({
path: ['orgId'],
message: 'orgId is required when role is "builder"',
code: z.ZodIssueCode.custom,
});
}
.refine((data) => data.role !== "client" || data.orgId, {
message: 'orgId is required when role is "client"',
path: ["orgId"],
});
const updateUserInput = z.object({
@@ -90,8 +85,8 @@ const updateUserInput = z.object({
lastName: z.string().max(30).optional(),
email: z
.string({
required_error: 'Email is required',
invalid_type_error: 'Email must be a valid string',
required_error: "Email is required",
invalid_type_error: "Email must be a valid string",
})
.email()
.optional(),
@@ -125,5 +120,5 @@ export const { schemas: userSchemas, $ref: $user } = buildJsonSchemas(
updateUserInput,
userResponse,
},
{ $id: 'user' }
{ $id: "user" }
);

37
src/user/user.service.ts
View File

@@ -1,43 +1,50 @@
import mongoose from 'mongoose';
import { generateId, generateToken } from '../utils/id';
import { CreateUserInput, UpdateUserInput, userModel } from './user.schema';
import { sendMail } from '../utils/mail';
import { AuthenticatedUser } from '../auth';
import mongoose from "mongoose";
import { generateId, generateToken } from "../utils/id";
import { CreateUserInput, UpdateUserInput, userModel } from "./user.schema";
import { sendMail } from "../utils/mail";
import { AuthenticatedUser } from "../auth";
export const ErrOpNotValid = new Error('operation is not valid');
export const ErrOpNotValid = new Error("operation is not valid");
export const ErrMissingOrdId = new Error(
"orgId is required when role is client"
);
export async function createUser(
input: CreateUserInput,
user: AuthenticatedUser
) {
if (input.role == 'admin' && user.role != 'superAdmin') {
if (input.role == "admin" && user.role != "superAdmin") {
throw ErrOpNotValid;
}
if (input.role == "client" && !input.orgId) {
throw ErrMissingOrdId;
}
const token = await generateToken();
const newUser = await userModel.create({
tenantId: user.tenantId,
pid: generateId(),
name: input.firstName + ' ' + input.lastName,
name: input.firstName + " " + input.lastName,
createdAt: new Date(),
createdBy: user.userId,
token: {
value: token,
expiry: new Date(Date.now() + 3600 * 48 * 1000),
},
status: 'invited',
status: "invited",
...input,
});
const sent = await sendMail(
input.email,
'You have been invited to Quicker Permtis.',
"You have been invited to Quicker Permtis.",
`Click <a href="${
process.env.SERVER_DOMAIN +
'/auth/webauthn/register?token=' +
"/auth/webauthn/register?token=" +
token +
'&email=' +
"&email=" +
newUser.email
}">here</a> to register.`
);
@@ -56,7 +63,7 @@ export async function getUser(userId: string) {
}
export async function getUserByToken(token: string) {
return await userModel.findOne({ 'token.value': token });
return await userModel.findOne({ "token.value": token });
}
export async function getUserByEmail(email: string) {
@@ -67,7 +74,7 @@ export async function listUsers(tenantId: string) {
return await userModel
.find({ $and: [{ tenantId: tenantId }, { dev: { $ne: true } }] })
.select(
'_id pid orgId firstName lastName name email role avatar status createdAt createdBy lastLogin'
"_id pid orgId firstName lastName name email role avatar status createdAt createdBy lastLogin"
);
}
@@ -77,7 +84,7 @@ export async function updateUser(userId: string, input: UpdateUserInput) {
new: true,
})
.select(
'_id pid orgId firstName lastName name email role avatar status createdAt createdBy lastLogin'
"_id pid orgId firstName lastName name email role avatar status createdAt createdBy lastLogin"
);
}