Move login system into ICreate

app/server/MergedServer.ts

@@ -6,10 +6,8 @@
  */
 
 import {FlexServer, FlexServerOptions} from 'app/server/lib/FlexServer';
-import {GristLoginSystem} from 'app/server/lib/GristServer';
 import log from 'app/server/lib/log';
 import {getGlobalConfig} from "app/server/lib/globalConfig";
-import {IDocStorageManager} from './lib/IDocStorageManager';
 
 // Allowed server types. We'll start one or a combination based on the value of GRIST_SERVERS
 // environment variable.
@@ -61,11 +59,6 @@ interface ServerOptions extends FlexServerOptions {
   // If set, documents saved to external storage such as s3 (default is to check environment variables,
   // which get set in various ways in dev/test entry points)
   externalStorage?: boolean;
-
-  loginSystem?: () => Promise<GristLoginSystem>;
-
-  // Invoked in addDoc if set. Grist Desktop uses this to override DocStorageManager's getPath function.
-  storageManagerDecorator?: (original: IDocStorageManager) => void;
 }
 
 export class MergedServer {
@@ -81,10 +74,6 @@ export class MergedServer {
       ms.flexServer.setServesPlugins(false);
     }
 
-    if (ms._options.loginSystem) {
-      ms.flexServer.setLoginSystem(ms._options.loginSystem);
-    }
-
     ms.flexServer.addCleanup();
     ms.flexServer.setDirectory();
 

app/server/lib/FlexServer.ts

@@ -52,7 +52,6 @@ import {IDocStorageManager} from 'app/server/lib/IDocStorageManager';
 import {EmptyNotifier, INotifier} from 'app/server/lib/INotifier';
 import {InstallAdmin} from 'app/server/lib/InstallAdmin';
 import log from 'app/server/lib/log';
-import {getLoginSystem} from 'app/server/lib/logins';
 import {IPermitStore} from 'app/server/lib/Permit';
 import {getAppPathTo, getAppRoot, getInstanceRoot, getUnpackedAppRoot} from 'app/server/lib/places';
 import {addPluginEndpoints, limitToPlugins} from 'app/server/lib/PluginEndpoint';
@@ -182,14 +181,15 @@ export class FlexServer implements GristServer {
   private _getSignUpRedirectUrl: (req: express.Request, target: URL) => Promise<string>;
   private _getLogoutRedirectUrl: (req: express.Request, nextUrl: URL) => Promise<string>;
   private _sendAppPage: (req: express.Request, resp: express.Response, options: ISendAppPageOptions) => Promise<void>;
-  private _getLoginSystem?: () => Promise<GristLoginSystem>;
+  private _getLoginSystem: () => Promise<GristLoginSystem>;
   // Set once ready() is called
   private _isReady: boolean = false;
   private _updateManager: UpdateManager;
   private _sandboxInfo: SandboxInfo;
 
   constructor(public port: number, public name: string = 'flexServer',
               public readonly options: FlexServerOptions = {}) {
+    this._getLoginSystem = create.getLoginSystem;
     this.settings = options.settings;
     this.app = express();
     this.app.set('port', port);
@@ -269,11 +269,6 @@ export class FlexServer implements GristServer {
     });
   }
 
-  // Allow overridding the login system.
-  public setLoginSystem(loginSystem: () => Promise<GristLoginSystem>) {
-    this._getLoginSystem = loginSystem;
-  }
-
   public getHost(): string {
     return `${this.host}:${this.getOwnPort()}`;
   }
@@ -1975,7 +1970,7 @@ export class FlexServer implements GristServer {
   }
 
   public resolveLoginSystem() {
-    return process.env.GRIST_TEST_LOGIN ? getTestLoginSystem() : (this._getLoginSystem?.() || getLoginSystem());
+    return process.env.GRIST_TEST_LOGIN ? getTestLoginSystem() : (this._getLoginSystem() );
   }
 
   public addUpdatesCheck() {

app/server/lib/ICreate.ts

@@ -1,9 +1,10 @@
 import {GristDeploymentType} from 'app/common/gristUrls';
+import { getCoreLoginSystem } from "app/server/lib/coreLogins";
 import {getThemeBackgroundSnippet} from 'app/common/Themes';
 import {Document} from 'app/gen-server/entity/Document';
 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 {createDummyTelemetry, GristLoginSystem, GristServer} from 'app/server/lib/GristServer';
 import {IBilling} from 'app/server/lib/IBilling';
 import {EmptyNotifier, INotifier} from 'app/server/lib/INotifier';
 import {InstallAdmin, SimpleInstallAdmin} from 'app/server/lib/InstallAdmin';
@@ -46,6 +47,8 @@ export interface ICreate {
   getSqliteVariant?(): SqliteVariant;
   getSandboxVariants?(): Record<string, SpawnFn>;
 
+  getLoginSystem(): Promise<GristLoginSystem>;
+
   // Used by Grist Desktop to override the getPath function.
   decorateDocStorageManager? (original: IDocStorageManager): void;
 }
@@ -89,6 +92,7 @@ export function makeSimpleCreator(opts: {
   getSqliteVariant?: () => SqliteVariant,
   getSandboxVariants?: () => Record<string, SpawnFn>,
   createInstallAdmin?: (dbManager: HomeDBManager) => Promise<InstallAdmin>,
+  getLoginSystem?: () => Promise<GristLoginSystem>,
   decorateDocStorageManager?: (original: IDocStorageManager) => void,
 }): ICreate {
   const {deploymentType, sessionSecret, storage, notifier, billing, telemetry} = opts;
@@ -164,6 +168,7 @@ export function makeSimpleCreator(opts: {
     getSqliteVariant: opts.getSqliteVariant,
     getSandboxVariants: opts.getSandboxVariants,
     createInstallAdmin: opts.createInstallAdmin || (async (dbManager) => new SimpleInstallAdmin(dbManager)),
+    getLoginSystem: opts.getLoginSystem || getCoreLoginSystem,
     decorateDocStorageManager: opts.decorateDocStorageManager,
   };
 }