This commit is contained in:
Alex Holliday committed 2026-01-06 23:04:30 +00:00
1 parent 61bf2a0dfb
commit 3611aee468
8 files changed
+35 -15

No files matched your search

+4 -3
View File
@@ -17,6 +17,7 @@ import { registerSchema } from "@/validation";
import { useGet } from "@/hooks/UseApi";
import { useParams } from "react-router";
import type { IUser } from "@/types/user";
import type { Invite } from "@/types/invite";
type FormData = z.infer<typeof registerSchema>;
const RegisterInvite = () => {
@@ -25,9 +26,9 @@ const RegisterInvite = () => {
const { t } = useTranslation();
const navigate = useNavigate();
const { post, loading, error } = usePost<Partial<FormData>, IUser>();
const { response, error: errorInvite } = useGet<ApiResponse<any>>(
`/invite/${token}`
);
const { response, error: errorInvite } = useGet<
ApiResponse<{ user: IUser; invite: Invite }>
>(`/invite/${token}`);
const { user, invite } = response?.data || {};
const hasUser = Boolean(user);
const dispatch = useAppDispatch();
+14
View File
@@ -0,0 +1,14 @@
export interface Invite {
id: string;
orgId: string;
orgRoleId?: string;
teamId: string;
teamRoleId: string;
email: string;
tokenHash: string;
createdBy: string;
updatedBy: string;
expiry: string;
createdAt: string;
updatedAt: string;
}
+1 -1
View File
@@ -72,7 +72,7 @@ class AuthController {
throw new Error("Registration failed");
}
await this.inviteService.delete(invite._id.toString());
await this.inviteService.delete(invite.id);
const jwt = encode(tokenizedUser);
+1 -1
View File
@@ -27,7 +27,7 @@ export type { IInvite } from "./auth/Invite.js";
export { Role } from "./auth/Role.js";
export type { IRole } from "./auth/Role.js";
export { Maintenance, MaintenanceRepeats } from "./maintenance/Maintenance.js";
export { Maintenance } from "./maintenance/Maintenance.js";
export type { IMaintenance } from "./maintenance/Maintenance.js";
export { Org } from "./auth/Org.js";
+4 -1
View File
@@ -42,6 +42,7 @@ import {
MongoRoleRepository,
MongoTeamRepository,
MongoInviteRepository,
MongoTeamMembershipRepository,
} from "@/repositories/index.js";
export const initServices = async () => {
@@ -53,13 +54,15 @@ export const initServices = async () => {
const roleRepository = new MongoRoleRepository();
const teamRepository = new MongoTeamRepository();
const inviteRepository = new MongoInviteRepository();
const teamMembershipRepository = new MongoTeamMembershipRepository();
const checkService = new CheckService(checksRepository, monitorRepository);
const inviteService = new InviteService(
userRepository,
roleRepository,
teamRepository,
inviteRepository
inviteRepository,
teamMembershipRepository
);
const maintenanceService = new MaintenanceService();
const monitorStatsService = new MonitorStatsService(
+5 -3
View File
@@ -24,6 +24,8 @@ import { PERMISSIONS } from "@/types/permissions.js";
import type { Entitlements } from "@/types/entitlements.js";
import type { IEntitlementsProvider } from "@/services/system/EntitlementsService.js";
import type { IMonitorRepository } from "@/repositories/index.js";
import type { Invite } from "@/types/domain/index.js";
import mongoose from "mongoose";
const SERVICE_NAME = "AuthService";
@@ -47,7 +49,7 @@ export interface IAuthService {
returnableUser: IUserReturnable;
}>;
registerWithInvite(
invite: IInvite,
invite: Invite,
signupData: RegisterData
): Promise<{
tokenizedUser: ITokenizedUser;
@@ -229,7 +231,7 @@ class AuthService implements IAuthService {
}
}
registerWithInvite = async (invite: IInvite, signupData: RegisterData) => {
registerWithInvite = async (invite: Invite, signupData: RegisterData) => {
const created: Record<string, any> = {
user: null,
orgMembership: null,
@@ -279,7 +281,7 @@ class AuthService implements IAuthService {
orgId,
});
if (orgMembership && !orgMembership.roleId && orgRoleId) {
orgMembership.roleId = orgRoleId;
orgMembership.roleId = new mongoose.Types.ObjectId(orgRoleId);
await orgMembership.save();
}
if (!orgMembership) {
@@ -70,13 +70,13 @@ class InviteService implements IInviteService {
// Check if already a team member
const user = await this.userRepository.findByEmail(email);
const existingMembership =
await this.teamMembershipRepository.findByUserId(
user?.id || "",
let existingMembership = null;
if (user) {
existingMembership = await this.teamMembershipRepository.findByUserId(
user.id,
teamId
);
}
if (existingMembership) {
throw new ApiError("User is already a team member", 409);
}
@@ -3,9 +3,9 @@ import {
IUserContext,
IMaintenance,
Maintenance,
MaintenanceRepeats,
} from "@/db/models/index.js";
import ApiError from "@/utils/ApiError.js";
import { MaintenanceRepeats } from "@/types/domain/index.js";
const SERVICE_NAME = "MaintenanceService";
const DAY_MS = 24 * 60 * 60 * 1000;