From 786ba6b31e9af4ec2d87156d299d2f9042e18973 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 5 Jul 2024 16:02:39 +0200 Subject: [PATCH] Move HomeDBManager to gen-server/lib/homedb (#1076) --- app/gen-server/ApiServer.ts | 2 +- app/gen-server/lib/Activations.ts | 2 +- app/gen-server/lib/DocApiForwarder.ts | 2 +- app/gen-server/lib/Doom.ts | 2 +- app/gen-server/lib/Housekeeper.ts | 2 +- app/gen-server/lib/Usage.ts | 2 +- app/gen-server/lib/{ => homedb}/HomeDBManager.ts | 0 app/gen-server/lib/homedb/UsersManager.ts | 2 +- app/server/companion.ts | 2 +- app/server/lib/AppEndpoint.ts | 2 +- app/server/lib/Authorizer.ts | 2 +- app/server/lib/Client.ts | 2 +- app/server/lib/DocApi.ts | 2 +- app/server/lib/DocManager.ts | 2 +- app/server/lib/DocWorker.ts | 2 +- app/server/lib/FlexServer.ts | 2 +- app/server/lib/GranularAccess.ts | 2 +- app/server/lib/GristServer.ts | 2 +- app/server/lib/HostedMetadataManager.ts | 2 +- app/server/lib/HostedStorageManager.ts | 2 +- app/server/lib/ICreate.ts | 2 +- app/server/lib/InstallAdmin.ts | 2 +- app/server/lib/Telemetry.ts | 2 +- app/server/lib/TestLogin.ts | 2 +- app/server/lib/extractOrg.ts | 2 +- app/server/lib/requestUtils.ts | 2 +- app/server/lib/sendAppPage.ts | 2 +- stubs/app/server/server.ts | 2 +- test/gen-server/ApiServer.ts | 2 +- test/gen-server/ApiServerAccess.ts | 2 +- test/gen-server/ApiServerBugs.ts | 2 +- test/gen-server/AuthCaching.ts | 2 +- test/gen-server/apiUtils.ts | 2 +- test/gen-server/migrations.ts | 2 +- test/gen-server/seed.ts | 2 +- test/gen-server/testUtils.ts | 2 +- test/nbrowser/homeUtil.ts | 2 +- test/nbrowser/testServer.ts | 2 +- test/server/lib/Authorizer.ts | 2 +- test/server/lib/HostedStorageManager.ts | 2 +- test/testUtils.ts | 2 +- 41 files changed, 40 insertions(+), 40 deletions(-) rename app/gen-server/lib/{ => homedb}/HomeDBManager.ts (100%) diff --git a/app/gen-server/ApiServer.ts b/app/gen-server/ApiServer.ts index 915012ad..b927d62f 100644 --- a/app/gen-server/ApiServer.ts +++ b/app/gen-server/ApiServer.ts @@ -9,7 +9,7 @@ import {FullUser} from 'app/common/LoginSessionAPI'; import {BasicRole} from 'app/common/roles'; import {OrganizationProperties, PermissionDelta} from 'app/common/UserAPI'; import {User} from 'app/gen-server/entity/User'; -import {BillingOptions, HomeDBManager, QueryResult, Scope} from 'app/gen-server/lib/HomeDBManager'; +import {BillingOptions, HomeDBManager, QueryResult, Scope} from 'app/gen-server/lib/homedb/HomeDBManager'; import {getAuthorizedUserId, getUserId, getUserProfiles, RequestWithLogin} from 'app/server/lib/Authorizer'; import {getSessionUser, linkOrgWithEmail} from 'app/server/lib/BrowserSession'; import {expressWrap} from 'app/server/lib/expressWrap'; diff --git a/app/gen-server/lib/Activations.ts b/app/gen-server/lib/Activations.ts index b089efbe..2648c98b 100644 --- a/app/gen-server/lib/Activations.ts +++ b/app/gen-server/lib/Activations.ts @@ -1,6 +1,6 @@ import { makeId } from 'app/server/lib/idUtils'; import { Activation } from 'app/gen-server/entity/Activation'; -import { HomeDBManager } from 'app/gen-server/lib/HomeDBManager'; +import { HomeDBManager } from 'app/gen-server/lib/homedb/HomeDBManager'; /** * Manage activations. Not much to do currently, there is at most one diff --git a/app/gen-server/lib/DocApiForwarder.ts b/app/gen-server/lib/DocApiForwarder.ts index 3545a63a..ed58e03b 100644 --- a/app/gen-server/lib/DocApiForwarder.ts +++ b/app/gen-server/lib/DocApiForwarder.ts @@ -5,7 +5,7 @@ import {AbortController} from 'node-abort-controller'; import { ApiError } from 'app/common/ApiError'; import { SHARE_KEY_PREFIX } from 'app/common/gristUrls'; import { removeTrailingSlash } from 'app/common/gutil'; -import { HomeDBManager } from "app/gen-server/lib/HomeDBManager"; +import { HomeDBManager } from "app/gen-server/lib/homedb/HomeDBManager"; import { assertAccess, getOrSetDocAuth, getTransitiveHeaders, RequestWithLogin } from 'app/server/lib/Authorizer'; import { IDocWorkerMap } from "app/server/lib/DocWorkerMap"; import { expressWrap } from "app/server/lib/expressWrap"; diff --git a/app/gen-server/lib/Doom.ts b/app/gen-server/lib/Doom.ts index cbce2587..1d6bc0d6 100644 --- a/app/gen-server/lib/Doom.ts +++ b/app/gen-server/lib/Doom.ts @@ -1,7 +1,7 @@ import { ApiError } from 'app/common/ApiError'; import { FullUser } from 'app/common/UserAPI'; import { Organization } from 'app/gen-server/entity/Organization'; -import { HomeDBManager, Scope } from 'app/gen-server/lib/HomeDBManager'; +import { HomeDBManager, Scope } from 'app/gen-server/lib/homedb/HomeDBManager'; import { INotifier } from 'app/server/lib/INotifier'; import { scrubUserFromOrg } from 'app/gen-server/lib/scrubUserFromOrg'; import { GristLoginSystem } from 'app/server/lib/GristServer'; diff --git a/app/gen-server/lib/Housekeeper.ts b/app/gen-server/lib/Housekeeper.ts index c40379fe..c3012bec 100644 --- a/app/gen-server/lib/Housekeeper.ts +++ b/app/gen-server/lib/Housekeeper.ts @@ -7,7 +7,7 @@ import { Document } from 'app/gen-server/entity/Document'; import { Organization } from 'app/gen-server/entity/Organization'; import { Product } from 'app/gen-server/entity/Product'; import { Workspace } from 'app/gen-server/entity/Workspace'; -import { HomeDBManager, Scope } from 'app/gen-server/lib/HomeDBManager'; +import { HomeDBManager, Scope } from 'app/gen-server/lib/homedb/HomeDBManager'; import { fromNow } from 'app/gen-server/sqlUtils'; import { getAuthorizedUserId } from 'app/server/lib/Authorizer'; import { expressWrap } from 'app/server/lib/expressWrap'; diff --git a/app/gen-server/lib/Usage.ts b/app/gen-server/lib/Usage.ts index 865fa2b1..9082bdcc 100644 --- a/app/gen-server/lib/Usage.ts +++ b/app/gen-server/lib/Usage.ts @@ -1,7 +1,7 @@ import {Document} from 'app/gen-server/entity/Document'; import {Organization} from 'app/gen-server/entity/Organization'; import {User} from 'app/gen-server/entity/User'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import log from 'app/server/lib/log'; // Frequency of logging usage information. Not something we need diff --git a/app/gen-server/lib/HomeDBManager.ts b/app/gen-server/lib/homedb/HomeDBManager.ts similarity index 100% rename from app/gen-server/lib/HomeDBManager.ts rename to app/gen-server/lib/homedb/HomeDBManager.ts diff --git a/app/gen-server/lib/homedb/UsersManager.ts b/app/gen-server/lib/homedb/UsersManager.ts index 168665f3..e070273a 100644 --- a/app/gen-server/lib/homedb/UsersManager.ts +++ b/app/gen-server/lib/homedb/UsersManager.ts @@ -17,7 +17,7 @@ import { Group } from 'app/gen-server/entity/Group'; import { Login } from 'app/gen-server/entity/Login'; import { User } from 'app/gen-server/entity/User'; import { appSettings } from 'app/server/lib/AppSettings'; -import { HomeDBManager, PermissionDeltaAnalysis, Scope } from 'app/gen-server/lib/HomeDBManager'; +import { HomeDBManager, PermissionDeltaAnalysis, Scope } from 'app/gen-server/lib/homedb/HomeDBManager'; import { AvailableUsers, GetUserOptions, NonGuestGroup, QueryResult, Resource, RunInTransaction, UserProfileChange } from 'app/gen-server/lib/homedb/Interfaces'; diff --git a/app/server/companion.ts b/app/server/companion.ts index f28475c8..bad8092c 100644 --- a/app/server/companion.ts +++ b/app/server/companion.ts @@ -1,7 +1,7 @@ import { Level, TelemetryContracts } from 'app/common/Telemetry'; import { version } from 'app/common/version'; import { synchronizeProducts } from 'app/gen-server/entity/Product'; -import { HomeDBManager } from 'app/gen-server/lib/HomeDBManager'; +import { HomeDBManager } from 'app/gen-server/lib/homedb/HomeDBManager'; import { applyPatch } from 'app/gen-server/lib/TypeORMPatches'; import { getMigrations, getOrCreateConnection, getTypeORMSettings, undoLastMigration, updateDb } from 'app/server/lib/dbUtils'; diff --git a/app/server/lib/AppEndpoint.ts b/app/server/lib/AppEndpoint.ts index b327a4e1..8147bfcf 100644 --- a/app/server/lib/AppEndpoint.ts +++ b/app/server/lib/AppEndpoint.ts @@ -11,7 +11,7 @@ import {LocalPlugin} from "app/common/plugin"; import {TELEMETRY_TEMPLATE_SIGNUP_COOKIE_NAME} from 'app/common/Telemetry'; import {Document as APIDocument, PublicDocWorkerUrlInfo} from 'app/common/UserAPI'; import {Document} from "app/gen-server/entity/Document"; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {assertAccess, getTransitiveHeaders, getUserId, isAnonymousUser, RequestWithLogin} from 'app/server/lib/Authorizer'; import {DocStatus, IDocWorkerMap} from 'app/server/lib/DocWorkerMap'; diff --git a/app/server/lib/Authorizer.ts b/app/server/lib/Authorizer.ts index 6f9a6741..0386a6d3 100644 --- a/app/server/lib/Authorizer.ts +++ b/app/server/lib/Authorizer.ts @@ -7,7 +7,7 @@ import {canEdit, canView, getWeakestRole, Role} from 'app/common/roles'; import {UserOptions} from 'app/common/UserAPI'; import {Document} from 'app/gen-server/entity/Document'; import {User} from 'app/gen-server/entity/User'; -import {DocAuthKey, DocAuthResult, HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {DocAuthKey, DocAuthResult, HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {forceSessionChange, getSessionProfiles, getSessionUser, getSignInStatus, linkOrgWithEmail, SessionObj, SessionUserObj, SignInStatus} from 'app/server/lib/BrowserSession'; import {RequestWithOrg} from 'app/server/lib/extractOrg'; diff --git a/app/server/lib/Client.ts b/app/server/lib/Client.ts index 0364ca36..ce2a9b0b 100644 --- a/app/server/lib/Client.ts +++ b/app/server/lib/Client.ts @@ -8,7 +8,7 @@ import {TelemetryMetadata} from 'app/common/Telemetry'; import {ANONYMOUS_USER_EMAIL} from 'app/common/UserAPI'; import {normalizeEmail} from 'app/common/emails'; import {User} from 'app/gen-server/entity/User'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {ActiveDoc} from 'app/server/lib/ActiveDoc'; import {Authorizer} from 'app/server/lib/Authorizer'; import {ScopedSession} from 'app/server/lib/BrowserSession'; diff --git a/app/server/lib/DocApi.ts b/app/server/lib/DocApi.ts index 297cafff..f7d0a946 100644 --- a/app/server/lib/DocApi.ts +++ b/app/server/lib/DocApi.ts @@ -30,7 +30,7 @@ import {TelemetryMetadataByLevel} from "app/common/Telemetry"; import {WebhookFields} from "app/common/Triggers"; import TriggersTI from 'app/common/Triggers-ti'; import {DocReplacementOptions, DocState, DocStateComparison, DocStates, NEW_DOCUMENT_CODE} from 'app/common/UserAPI'; -import {HomeDBManager, makeDocAuthResult} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager, makeDocAuthResult} from 'app/gen-server/lib/homedb/HomeDBManager'; import * as Types from "app/plugin/DocApiTypes"; import DocApiTypesTI from "app/plugin/DocApiTypes-ti"; import {GristObjCode} from "app/plugin/GristData"; diff --git a/app/server/lib/DocManager.ts b/app/server/lib/DocManager.ts index 437559f8..f342ab9a 100644 --- a/app/server/lib/DocManager.ts +++ b/app/server/lib/DocManager.ts @@ -15,7 +15,7 @@ import {Invite} from 'app/common/sharing'; import {tbind} from 'app/common/tbind'; import {TelemetryMetadataByLevel} from 'app/common/Telemetry'; import {NEW_DOCUMENT_CODE} from 'app/common/UserAPI'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {assertAccess, Authorizer, DocAuthorizer, DummyAuthorizer, isSingleUserMode, RequestWithLogin} from 'app/server/lib/Authorizer'; import {Client} from 'app/server/lib/Client'; diff --git a/app/server/lib/DocWorker.ts b/app/server/lib/DocWorker.ts index 7bb8d8e6..b8f0d608 100644 --- a/app/server/lib/DocWorker.ts +++ b/app/server/lib/DocWorker.ts @@ -3,7 +3,7 @@ * In hosted environment, this comprises the functionality of the DocWorker instance type. */ import {isAffirmative} from 'app/common/gutil'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {ActionHistoryImpl} from 'app/server/lib/ActionHistoryImpl'; import {assertAccess, getOrSetDocAuth, RequestWithLogin} from 'app/server/lib/Authorizer'; import {Client} from 'app/server/lib/Client'; diff --git a/app/server/lib/FlexServer.ts b/app/server/lib/FlexServer.ts index 812e1d21..a3568ecb 100644 --- a/app/server/lib/FlexServer.ts +++ b/app/server/lib/FlexServer.ts @@ -20,7 +20,7 @@ import {Activations} from 'app/gen-server/lib/Activations'; import {DocApiForwarder} from 'app/gen-server/lib/DocApiForwarder'; import {getDocWorkerMap} from 'app/gen-server/lib/DocWorkerMap'; import {Doom} from 'app/gen-server/lib/Doom'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {Housekeeper} from 'app/gen-server/lib/Housekeeper'; import {Usage} from 'app/gen-server/lib/Usage'; import {AccessTokens, IAccessTokens} from 'app/server/lib/AccessTokens'; diff --git a/app/server/lib/GranularAccess.ts b/app/server/lib/GranularAccess.ts index 69fcf2ee..08626869 100644 --- a/app/server/lib/GranularAccess.ts +++ b/app/server/lib/GranularAccess.ts @@ -35,7 +35,7 @@ import { EmptyRecordView, InfoView, RecordView } from 'app/common/RecordView'; import { canEdit, canView, isValidRole, Role } from 'app/common/roles'; import { User } from 'app/common/User'; import { FullUser, UserAccessData } from 'app/common/UserAPI'; -import { HomeDBManager } from 'app/gen-server/lib/HomeDBManager'; +import { HomeDBManager } from 'app/gen-server/lib/homedb/HomeDBManager'; import { GristObjCode } from 'app/plugin/GristData'; import { DocClients } from 'app/server/lib/DocClients'; import { getDocSessionAccess, getDocSessionAltSessionId, getDocSessionShare, diff --git a/app/server/lib/GristServer.ts b/app/server/lib/GristServer.ts index 1e926395..265535d7 100644 --- a/app/server/lib/GristServer.ts +++ b/app/server/lib/GristServer.ts @@ -8,7 +8,7 @@ import { Organization } from 'app/gen-server/entity/Organization'; import { User } from 'app/gen-server/entity/User'; import { Workspace } from 'app/gen-server/entity/Workspace'; import { Activations } from 'app/gen-server/lib/Activations'; -import { HomeDBManager } from 'app/gen-server/lib/HomeDBManager'; +import { HomeDBManager } from 'app/gen-server/lib/homedb/HomeDBManager'; import { IAccessTokens } from 'app/server/lib/AccessTokens'; import { RequestWithLogin } from 'app/server/lib/Authorizer'; import { Comm } from 'app/server/lib/Comm'; diff --git a/app/server/lib/HostedMetadataManager.ts b/app/server/lib/HostedMetadataManager.ts index bce0a055..f49a545b 100644 --- a/app/server/lib/HostedMetadataManager.ts +++ b/app/server/lib/HostedMetadataManager.ts @@ -1,4 +1,4 @@ -import {DocumentMetadata, HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {DocumentMetadata, HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import log from 'app/server/lib/log'; /** diff --git a/app/server/lib/HostedStorageManager.ts b/app/server/lib/HostedStorageManager.ts index 9be39f85..fa73beb6 100644 --- a/app/server/lib/HostedStorageManager.ts +++ b/app/server/lib/HostedStorageManager.ts @@ -8,7 +8,7 @@ import {DocumentUsage} from 'app/common/DocUsage'; import {buildUrlId, parseUrlId} from 'app/common/gristUrls'; import {KeyedOps} from 'app/common/KeyedOps'; import {DocReplacementOptions, NEW_DOCUMENT_CODE} from 'app/common/UserAPI'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {checksumFile} from 'app/server/lib/checksumFile'; import {DocSnapshotInventory, DocSnapshotPruner} from 'app/server/lib/DocSnapshots'; import {IDocWorkerMap} from 'app/server/lib/DocWorkerMap'; diff --git a/app/server/lib/ICreate.ts b/app/server/lib/ICreate.ts index 3ca48d0c..4b4d66ee 100644 --- a/app/server/lib/ICreate.ts +++ b/app/server/lib/ICreate.ts @@ -1,7 +1,7 @@ import {GristDeploymentType} from 'app/common/gristUrls'; import {getThemeBackgroundSnippet} from 'app/common/Themes'; import {Document} from 'app/gen-server/entity/Document'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {ExternalStorage} from 'app/server/lib/ExternalStorage'; import {createDummyTelemetry, GristServer} from 'app/server/lib/GristServer'; import {IBilling} from 'app/server/lib/IBilling'; diff --git a/app/server/lib/InstallAdmin.ts b/app/server/lib/InstallAdmin.ts index 0a00bfa1..f7fdba0d 100644 --- a/app/server/lib/InstallAdmin.ts +++ b/app/server/lib/InstallAdmin.ts @@ -1,5 +1,5 @@ import {ApiError} from 'app/common/ApiError'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {appSettings} from 'app/server/lib/AppSettings'; import {getUser, RequestWithLogin} from 'app/server/lib/Authorizer'; import {User} from 'app/gen-server/entity/User'; diff --git a/app/server/lib/Telemetry.ts b/app/server/lib/Telemetry.ts index 6d341600..a08381c1 100644 --- a/app/server/lib/Telemetry.ts +++ b/app/server/lib/Telemetry.ts @@ -17,7 +17,7 @@ import { import {TelemetryPrefsWithSources} from 'app/common/InstallAPI'; import {Activation} from 'app/gen-server/entity/Activation'; import {Activations} from 'app/gen-server/lib/Activations'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {RequestWithLogin} from 'app/server/lib/Authorizer'; import {getDocSessionUser, OptDocSession} from 'app/server/lib/DocSession'; import {expressWrap} from 'app/server/lib/expressWrap'; diff --git a/app/server/lib/TestLogin.ts b/app/server/lib/TestLogin.ts index 2cd0d5ac..12ef87a3 100644 --- a/app/server/lib/TestLogin.ts +++ b/app/server/lib/TestLogin.ts @@ -1,4 +1,4 @@ -import {SUPPORT_EMAIL} from 'app/gen-server/lib/HomeDBManager'; +import {SUPPORT_EMAIL} from 'app/gen-server/lib/homedb/HomeDBManager'; import {GristLoginSystem, GristServer} from 'app/server/lib/GristServer'; import {Request} from 'express'; diff --git a/app/server/lib/extractOrg.ts b/app/server/lib/extractOrg.ts index 787fa1b8..524aa97e 100644 --- a/app/server/lib/extractOrg.ts +++ b/app/server/lib/extractOrg.ts @@ -3,7 +3,7 @@ import { mapGetOrSet, MapWithTTL } from 'app/common/AsyncCreate'; import { extractOrgParts, getHostType, getKnownOrg } from 'app/common/gristUrls'; import { isAffirmative } from 'app/common/gutil'; import { Organization } from 'app/gen-server/entity/Organization'; -import { HomeDBManager } from 'app/gen-server/lib/HomeDBManager'; +import { HomeDBManager } from 'app/gen-server/lib/homedb/HomeDBManager'; import { GristServer } from 'app/server/lib/GristServer'; import { getOriginUrl } from 'app/server/lib/requestUtils'; import { NextFunction, Request, RequestHandler, Response } from 'express'; diff --git a/app/server/lib/requestUtils.ts b/app/server/lib/requestUtils.ts index de0326d4..7f693966 100644 --- a/app/server/lib/requestUtils.ts +++ b/app/server/lib/requestUtils.ts @@ -1,7 +1,7 @@ import {ApiError} from 'app/common/ApiError'; import { DEFAULT_HOME_SUBDOMAIN, isOrgInPathOnly, parseSubdomain, sanitizePathTail } from 'app/common/gristUrls'; import * as gutil from 'app/common/gutil'; -import {DocScope, QueryResult, Scope} from 'app/gen-server/lib/HomeDBManager'; +import {DocScope, QueryResult, Scope} from 'app/gen-server/lib/homedb/HomeDBManager'; import {getUserId, RequestWithLogin} from 'app/server/lib/Authorizer'; import {RequestWithOrg} from 'app/server/lib/extractOrg'; import {RequestWithGrist} from 'app/server/lib/GristServer'; diff --git a/app/server/lib/sendAppPage.ts b/app/server/lib/sendAppPage.ts index ec53f2be..3fce3c38 100644 --- a/app/server/lib/sendAppPage.ts +++ b/app/server/lib/sendAppPage.ts @@ -12,7 +12,7 @@ import {isAffirmative} from 'app/common/gutil'; import {getTagManagerSnippet} from 'app/common/tagManager'; import {Document} from 'app/common/UserAPI'; import {AttachedCustomWidgets, IAttachedCustomWidget} from "app/common/widgetTypes"; -import {SUPPORT_EMAIL} from 'app/gen-server/lib/HomeDBManager'; +import {SUPPORT_EMAIL} from 'app/gen-server/lib/homedb/HomeDBManager'; import {isAnonymousUser, isSingleUserMode, RequestWithLogin} from 'app/server/lib/Authorizer'; import {RequestWithOrg} from 'app/server/lib/extractOrg'; import {GristServer} from 'app/server/lib/GristServer'; diff --git a/stubs/app/server/server.ts b/stubs/app/server/server.ts index e8761cef..6fbffdf5 100644 --- a/stubs/app/server/server.ts +++ b/stubs/app/server/server.ts @@ -6,7 +6,7 @@ import {commonUrls} from 'app/common/gristUrls'; import {isAffirmative} from 'app/common/gutil'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {fixSiteProducts} from 'app/gen-server/lib/Housekeeper'; const debugging = isAffirmative(process.env.DEBUG) || isAffirmative(process.env.VERBOSE); diff --git a/test/gen-server/ApiServer.ts b/test/gen-server/ApiServer.ts index 9546a51c..39aba8c3 100644 --- a/test/gen-server/ApiServer.ts +++ b/test/gen-server/ApiServer.ts @@ -8,7 +8,7 @@ import {createEmptyOrgUsageSummary, OrgUsageSummary} from 'app/common/DocUsage'; import {Document, Workspace} from 'app/common/UserAPI'; import {Organization} from 'app/gen-server/entity/Organization'; import {Product} from 'app/gen-server/entity/Product'; -import {HomeDBManager, UserChange} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager, UserChange} from 'app/gen-server/lib/homedb/HomeDBManager'; import {TestServer} from 'test/gen-server/apiUtils'; import {TEAM_FREE_PLAN} from 'app/common/Features'; diff --git a/test/gen-server/ApiServerAccess.ts b/test/gen-server/ApiServerAccess.ts index 2742fed5..33abe90b 100644 --- a/test/gen-server/ApiServerAccess.ts +++ b/test/gen-server/ApiServerAccess.ts @@ -4,7 +4,7 @@ import {Deps} from 'app/gen-server/ApiServer'; import {Organization} from 'app/gen-server/entity/Organization'; import {Product} from 'app/gen-server/entity/Product'; import {User} from 'app/gen-server/entity/User'; -import {HomeDBManager, UserChange} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager, UserChange} from 'app/gen-server/lib/homedb/HomeDBManager'; import {SendGridConfig, SendGridMail} from 'app/gen-server/lib/NotifierTypes'; import axios, {AxiosResponse} from 'axios'; import {delay} from 'bluebird'; diff --git a/test/gen-server/ApiServerBugs.ts b/test/gen-server/ApiServerBugs.ts index 020b09c7..f8ef2112 100644 --- a/test/gen-server/ApiServerBugs.ts +++ b/test/gen-server/ApiServerBugs.ts @@ -4,7 +4,7 @@ import * as chai from 'chai'; import {configForUser} from 'test/gen-server/testUtils'; import * as testUtils from 'test/server/testUtils'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {TestServer} from 'test/gen-server/apiUtils'; diff --git a/test/gen-server/AuthCaching.ts b/test/gen-server/AuthCaching.ts index 5789d1ce..d28f7382 100644 --- a/test/gen-server/AuthCaching.ts +++ b/test/gen-server/AuthCaching.ts @@ -1,5 +1,5 @@ import {delay} from 'app/common/delay'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {FlexServer} from 'app/server/lib/FlexServer'; import log from 'app/server/lib/log'; import {main as mergedServerMain} from 'app/server/mergedServerMain'; diff --git a/test/gen-server/apiUtils.ts b/test/gen-server/apiUtils.ts index 5737a496..2dbaf73c 100644 --- a/test/gen-server/apiUtils.ts +++ b/test/gen-server/apiUtils.ts @@ -11,7 +11,7 @@ import {User} from 'app/gen-server/entity/User'; import {Workspace} from 'app/gen-server/entity/Workspace'; import {SessionUserObj} from 'app/server/lib/BrowserSession'; import {getDocWorkerMap} from 'app/gen-server/lib/DocWorkerMap'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import * as docUtils from 'app/server/lib/docUtils'; import {FlexServer, FlexServerOptions} from 'app/server/lib/FlexServer'; import {main as mergedServerMain, ServerType} from 'app/server/mergedServerMain'; diff --git a/test/gen-server/migrations.ts b/test/gen-server/migrations.ts index e6a45b98..f3cc32df 100644 --- a/test/gen-server/migrations.ts +++ b/test/gen-server/migrations.ts @@ -1,7 +1,7 @@ import {QueryRunner} from "typeorm"; import * as roles from "app/common/roles"; import {Organization} from 'app/gen-server/entity/Organization'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {Permissions} from 'app/gen-server/lib/Permissions'; import {assert} from 'chai'; import {addSeedData, createInitialDb, removeConnection, setUpDB} from 'test/gen-server/seed'; diff --git a/test/gen-server/seed.ts b/test/gen-server/seed.ts index 5a6addc9..274283ce 100644 --- a/test/gen-server/seed.ts +++ b/test/gen-server/seed.ts @@ -40,7 +40,7 @@ import {Organization} from "app/gen-server/entity/Organization"; import {Product, PRODUCTS, synchronizeProducts, teamFreeFeatures} from "app/gen-server/entity/Product"; import {User} from "app/gen-server/entity/User"; import {Workspace} from "app/gen-server/entity/Workspace"; -import {EXAMPLE_WORKSPACE_NAME} from 'app/gen-server/lib/HomeDBManager'; +import {EXAMPLE_WORKSPACE_NAME} from 'app/gen-server/lib/homedb/HomeDBManager'; import {Permissions} from 'app/gen-server/lib/Permissions'; import {getOrCreateConnection, runMigrations, undoLastMigration, updateDb} from 'app/server/lib/dbUtils'; import {FlexServer} from 'app/server/lib/FlexServer'; diff --git a/test/gen-server/testUtils.ts b/test/gen-server/testUtils.ts index ef14ad00..3f7707ab 100644 --- a/test/gen-server/testUtils.ts +++ b/test/gen-server/testUtils.ts @@ -2,7 +2,7 @@ import {GristLoadConfig} from 'app/common/gristUrls'; import {BillingAccount} from 'app/gen-server/entity/BillingAccount'; import {Organization} from 'app/gen-server/entity/Organization'; import {Product} from 'app/gen-server/entity/Product'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {INotifier} from 'app/server/lib/INotifier'; import {AxiosRequestConfig} from "axios"; import {delay} from 'bluebird'; diff --git a/test/nbrowser/homeUtil.ts b/test/nbrowser/homeUtil.ts index f19bfc58..b5edccd4 100644 --- a/test/nbrowser/homeUtil.ts +++ b/test/nbrowser/homeUtil.ts @@ -13,7 +13,7 @@ import {normalizeEmail} from 'app/common/emails'; import {UserProfile} from 'app/common/LoginSessionAPI'; import {BehavioralPrompt, UserPrefs, WelcomePopup} from 'app/common/Prefs'; import {DocWorkerAPI, UserAPI, UserAPIImpl} from 'app/common/UserAPI'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {TestingHooksClient} from 'app/server/lib/TestingHooks'; import EventEmitter = require('events'); diff --git a/test/nbrowser/testServer.ts b/test/nbrowser/testServer.ts index 417ad8dc..4928a253 100644 --- a/test/nbrowser/testServer.ts +++ b/test/nbrowser/testServer.ts @@ -11,7 +11,7 @@ * into a file whose path is printed when server starts. */ import {encodeUrl, IGristUrlState, parseSubdomain} from 'app/common/gristUrls'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import log from 'app/server/lib/log'; import {getAppRoot} from 'app/server/lib/places'; import {makeGristConfig} from 'app/server/lib/sendAppPage'; diff --git a/test/server/lib/Authorizer.ts b/test/server/lib/Authorizer.ts index d8d6389d..191e3920 100644 --- a/test/server/lib/Authorizer.ts +++ b/test/server/lib/Authorizer.ts @@ -1,5 +1,5 @@ import {parseUrlId} from 'app/common/gristUrls'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {DocManager} from 'app/server/lib/DocManager'; import {FlexServer} from 'app/server/lib/FlexServer'; import axios from 'axios'; diff --git a/test/server/lib/HostedStorageManager.ts b/test/server/lib/HostedStorageManager.ts index ae8224c3..2fee78c2 100644 --- a/test/server/lib/HostedStorageManager.ts +++ b/test/server/lib/HostedStorageManager.ts @@ -2,7 +2,7 @@ import {ErrorOrValue, freezeError, mapGetOrSet, MapWithTTL} from 'app/common/Asy import {ObjMetadata, ObjSnapshot, ObjSnapshotWithMetadata} from 'app/common/DocSnapshot'; import {SCHEMA_VERSION} from 'app/common/schema'; import {DocWorkerMap} from 'app/gen-server/lib/DocWorkerMap'; -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {ActiveDoc} from 'app/server/lib/ActiveDoc'; import {create} from 'app/server/lib/create'; import {DocManager} from 'app/server/lib/DocManager'; diff --git a/test/testUtils.ts b/test/testUtils.ts index bda21d13..e8affb5a 100644 --- a/test/testUtils.ts +++ b/test/testUtils.ts @@ -1,4 +1,4 @@ -import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; +import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; export async function getDatabase(typeormDb?: string): Promise { const origTypeormDB = process.env.TYPEORM_DATABASE;