Move PrivateUserDocument to server-types

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;

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";
 

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<TachiAPIClientDocument, "clientSecret">;
 }
+
+// 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;
+}