From f45dfb3b33900b5e8da7d9db5cea8a217d271b4c Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Wed, 13 Apr 2022 12:50:04 +0100 Subject: [PATCH] Move PrivateUserDocument to server-types --- server/src/external/mongo/db.ts | 2 +- server/src/server/router/api/v1/auth/auth.ts | 9 ++------- server/src/utils/types.ts | 9 +++++++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/server/src/external/mongo/db.ts b/server/src/external/mongo/db.ts index 527db645f..92fba9e9c 100644 --- a/server/src/external/mongo/db.ts +++ b/server/src/external/mongo/db.ts @@ -24,7 +24,6 @@ import { MilestoneSetDocument, OrphanChart, PBScoreDocument, - PrivateUserInfoDocument, PublicUserDocument, RecentlyViewedFolderDocument, ScoreDocument, @@ -41,6 +40,7 @@ import { UserSettings, } from "tachi-common"; import { GetMillisecondsSince } from "utils/misc"; +import { PrivateUserInfoDocument } from "utils/types"; const logger = CreateLogCtx(__filename); let dbName = ServerConfig.MONGO_DATABASE_NAME; diff --git a/server/src/server/router/api/v1/auth/auth.ts b/server/src/server/router/api/v1/auth/auth.ts index 57492b4ae..ea721356b 100644 --- a/server/src/server/router/api/v1/auth/auth.ts +++ b/server/src/server/router/api/v1/auth/auth.ts @@ -2,15 +2,10 @@ import bcrypt from "bcryptjs"; import db from "external/mongo/db"; import CreateLogCtx from "lib/logger/logger"; import { Environment, ServerConfig } from "lib/setup/config"; -import { - integer, - PrivateUserInfoDocument, - PublicUserDocument, - UserAuthLevels, - UserSettings, -} from "tachi-common"; +import { integer, PublicUserDocument, UserAuthLevels, UserSettings } from "tachi-common"; import nodeFetch from "utils/fetch"; import { Random20Hex } from "utils/misc"; +import { PrivateUserInfoDocument } from "utils/types"; import { CreateURLWithParams } from "utils/url"; import { FormatUserDoc } from "utils/user"; diff --git a/server/src/utils/types.ts b/server/src/utils/types.ts index ab8a5869c..b265f5d09 100644 --- a/server/src/utils/types.ts +++ b/server/src/utils/types.ts @@ -16,6 +16,7 @@ import { GoalSubscriptionDocument, MilestoneDocument, MilestoneSetDocument, + integer, } from "tachi-common"; declare module "express-session" { @@ -75,3 +76,11 @@ export interface TachiRequestData { apiClientDoc: Omit; } + +// This is only used on tachi-server, and isn't exposed -- so shouldn't be a part +// of common. +export interface PrivateUserInfoDocument { + userID: integer; + password: string; + email: string; +}