diff --git a/src/controllers/api/loginController.ts b/src/controllers/api/loginController.ts index 2dd7e6f0..6f81fbaa 100644 --- a/src/controllers/api/loginController.ts +++ b/src/controllers/api/loginController.ts @@ -7,7 +7,7 @@ import buildConfig from "@/static/data/buildConfig.json"; import { toLoginRequest } from "@/src/helpers/loginHelpers"; import { Account } from "@/src/models/loginModel"; import { createAccount, isCorrectPassword } from "@/src/services/loginService"; -import { IDatabaseAccountDocument, ILoginResponse } from "@/src/types/loginTypes"; +import { IDatabaseAccountJson, ILoginResponse } from "@/src/types/loginTypes"; import { DTLS, groups, HUB, platformCDNs } from "@/static/fixed_responses/login_static"; import { logger } from "@/src/utils/logger"; @@ -65,7 +65,7 @@ export const loginController: RequestHandler = async (request, response) => { response.json(createLoginResponse(account.toJSON(), buildLabel)); }; -const createLoginResponse = (account: IDatabaseAccountDocument, buildLabel: string): ILoginResponse => { +const createLoginResponse = (account: IDatabaseAccountJson, buildLabel: string): ILoginResponse => { return { id: account.id, DisplayName: account.DisplayName, diff --git a/src/models/loginModel.ts b/src/models/loginModel.ts index 3048335c..9b76a310 100644 --- a/src/models/loginModel.ts +++ b/src/models/loginModel.ts @@ -1,4 +1,4 @@ -import { IDatabaseAccountDocument } from "@/src/types/loginTypes"; +import { IDatabaseAccountJson } from "@/src/types/loginTypes"; import { model, Schema, SchemaOptions } from "mongoose"; const opts = { @@ -20,7 +20,7 @@ const opts = { // } // } -const databaseAccountSchema = new Schema( +const databaseAccountSchema = new Schema( { email: { type: String, required: true, unique: true }, password: { type: String, required: true }, @@ -48,4 +48,4 @@ databaseAccountSchema.set("toJSON", { virtuals: true }); -export const Account = model("Account", databaseAccountSchema); +export const Account = model("Account", databaseAccountSchema); diff --git a/src/services/loginService.ts b/src/services/loginService.ts index 8f0cc8d7..c251409d 100644 --- a/src/services/loginService.ts +++ b/src/services/loginService.ts @@ -1,6 +1,6 @@ import { Account } from "@/src/models/loginModel"; import { createInventory } from "@/src/services/inventoryService"; -import { IDatabaseAccount, IDatabaseAccountDocument } from "@/src/types/loginTypes"; +import { IDatabaseAccount, IDatabaseAccountJson } from "@/src/types/loginTypes"; import { createShip } from "./shipService"; import { Types } from "mongoose"; import { Loadout } from "@/src/models/inventoryModels/loadoutModel"; @@ -12,7 +12,7 @@ export const isCorrectPassword = (requestPassword: string, databasePassword: str return requestPassword === databasePassword; }; -export const createAccount = async (accountData: IDatabaseAccount): Promise => { +export const createAccount = async (accountData: IDatabaseAccount): Promise => { const account = new Account(accountData); try { await account.save(); diff --git a/src/types/loginTypes.ts b/src/types/loginTypes.ts index 8b3fa880..2a229b0e 100644 --- a/src/types/loginTypes.ts +++ b/src/types/loginTypes.ts @@ -24,7 +24,7 @@ export interface ILoginResponse extends IAccountAndLoginResponseCommons { } // Includes virtual ID -export interface IDatabaseAccountDocument extends IDatabaseAccount { +export interface IDatabaseAccountJson extends IDatabaseAccount { id: string; }