Add session management
This commit is contained in:
@@ -21,8 +21,7 @@ export async function getUserHandler(req: FastifyRequest, res: FastifyReply) {
|
||||
const { userId } = req.params as { userId: string };
|
||||
|
||||
try {
|
||||
const authUser = req.user;
|
||||
const user = await getUser(userId, authUser.tenantId);
|
||||
const user = await getUser(userId);
|
||||
if (user == null)
|
||||
return res.code(404).send({ error: "resource not found" });
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ export const userModel = mongoose.model(
|
||||
},
|
||||
avatar: String,
|
||||
status: String,
|
||||
claims: [String],
|
||||
createdAt: Date,
|
||||
createdBy: mongoose.Types.ObjectId,
|
||||
lastLogin: Date,
|
||||
@@ -40,6 +41,7 @@ const userCore = {
|
||||
})
|
||||
.email(),
|
||||
avatar: z.string().url().optional(),
|
||||
claims: z.array(z.string()).optional(),
|
||||
};
|
||||
|
||||
const createUserInput = z.object({
|
||||
@@ -51,7 +53,21 @@ const createUserResponse = z.object({
|
||||
...userCore,
|
||||
});
|
||||
|
||||
const updateUserInput = z.object({
|
||||
firstName: z.string().max(30).optional(),
|
||||
lastName: z.string().max(30).optional(),
|
||||
email: z
|
||||
.string({
|
||||
required_error: "Email is required",
|
||||
invalid_type_error: "Email must be a valid string",
|
||||
})
|
||||
.email()
|
||||
.optional(),
|
||||
avatar: z.string().url().optional(),
|
||||
});
|
||||
|
||||
export type CreateUserInput = z.infer<typeof createUserInput>;
|
||||
export type UpdateUserInput = z.infer<typeof updateUserInput>;
|
||||
|
||||
export const { schemas: userSchemas, $ref: $user } = buildJsonSchemas(
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { generateId } from "../utils/id";
|
||||
import { CreateUserInput, userModel } from "./user.schema";
|
||||
import { CreateUserInput, UpdateUserInput, userModel } from "./user.schema";
|
||||
|
||||
export async function createUser(input: CreateUserInput, tenantId: string) {
|
||||
const user = await userModel.create({
|
||||
@@ -13,9 +13,17 @@ export async function createUser(input: CreateUserInput, tenantId: string) {
|
||||
return user;
|
||||
}
|
||||
|
||||
export async function getUser(userId: string, tenantId: string) {
|
||||
export async function getUser(userId: string) {
|
||||
const user = await userModel.findOne({
|
||||
$and: [{ tenantId: tenantId }, { pid: userId }],
|
||||
$and: [{ pid: userId }],
|
||||
});
|
||||
return user;
|
||||
}
|
||||
|
||||
export async function getUserByEmail(email: string) {
|
||||
return await userModel.findOne({ email: email });
|
||||
}
|
||||
|
||||
export async function updateUser(userId: string, input: UpdateUserInput) {
|
||||
return await userModel.findOneAndUpdate({ pid: userId }, input);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user