From 3611aee4687462bcae9a53c1f7b66bd934d8881d Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 6 Jan 2026 23:04:30 +0000 Subject: [PATCH] ts fixes --- client/src/pages/auth/RegisterInvite.tsx | 7 ++++--- client/src/types/invite.ts | 14 ++++++++++++++ server/src/controllers/AuthController.ts | 2 +- server/src/db/models/index.ts | 2 +- server/src/init/services.ts | 5 ++++- server/src/services/business/AuthService.ts | 8 +++++--- server/src/services/business/InviteService.ts | 10 +++++----- server/src/services/business/MaintenanceService.ts | 2 +- 8 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 client/src/types/invite.ts diff --git a/client/src/pages/auth/RegisterInvite.tsx b/client/src/pages/auth/RegisterInvite.tsx index e2b18c742..80ac89ad2 100644 --- a/client/src/pages/auth/RegisterInvite.tsx +++ b/client/src/pages/auth/RegisterInvite.tsx @@ -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; const RegisterInvite = () => { @@ -25,9 +26,9 @@ const RegisterInvite = () => { const { t } = useTranslation(); const navigate = useNavigate(); const { post, loading, error } = usePost, IUser>(); - const { response, error: errorInvite } = useGet>( - `/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(); diff --git a/client/src/types/invite.ts b/client/src/types/invite.ts new file mode 100644 index 000000000..af71528d3 --- /dev/null +++ b/client/src/types/invite.ts @@ -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; +} diff --git a/server/src/controllers/AuthController.ts b/server/src/controllers/AuthController.ts index b55b5db53..04ebab1de 100644 --- a/server/src/controllers/AuthController.ts +++ b/server/src/controllers/AuthController.ts @@ -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); diff --git a/server/src/db/models/index.ts b/server/src/db/models/index.ts index 7659a4099..9445bcfcc 100644 --- a/server/src/db/models/index.ts +++ b/server/src/db/models/index.ts @@ -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"; diff --git a/server/src/init/services.ts b/server/src/init/services.ts index 40e656f64..5d23813e5 100644 --- a/server/src/init/services.ts +++ b/server/src/init/services.ts @@ -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( diff --git a/server/src/services/business/AuthService.ts b/server/src/services/business/AuthService.ts index 9502c1a00..e1270d624 100644 --- a/server/src/services/business/AuthService.ts +++ b/server/src/services/business/AuthService.ts @@ -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 = { 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) { diff --git a/server/src/services/business/InviteService.ts b/server/src/services/business/InviteService.ts index 0b8e573d3..e24612346 100644 --- a/server/src/services/business/InviteService.ts +++ b/server/src/services/business/InviteService.ts @@ -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); } diff --git a/server/src/services/business/MaintenanceService.ts b/server/src/services/business/MaintenanceService.ts index f76865c22..9bb901750 100644 --- a/server/src/services/business/MaintenanceService.ts +++ b/server/src/services/business/MaintenanceService.ts @@ -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;