ts fixes
This commit is contained in:
1 parent
61bf2a0dfb
commit
3611aee468
8 files changed
+35
-15
No files matched your search
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user