Merge pull request #18 from gristlabs/paulfitz/freshen-electron

bring desktop app up to date with current grist-core
gristlabs · Nov 27, 2023 · c4240c5 · c4240c5
2 parents 04a8fc5 + 88b0aa0
commit c4240c5
Show file tree

Hide file tree

Showing 3 changed files with 306 additions and 259 deletions.
diff --git a/core b/core
diff --git a/ext/app/electron/logins.ts b/ext/app/electron/logins.ts
@@ -1,12 +1,10 @@
 import {ApiError} from 'app/common/ApiError';
-import {UserProfile} from 'app/common/LoginSessionAPI';
 import {expressWrap} from 'app/server/lib/expressWrap';
 import {GristLoginMiddleware, GristLoginSystem, GristServer,
         setUserInSession} from 'app/server/lib/GristServer';
 import {getDefaultProfile} from 'app/server/lib/MinimalLogin';
 import {getOrgUrl} from 'app/server/lib/requestUtils';
 import {Request} from 'express';
-import {IncomingMessage} from 'http';
 
 const cookie = require('cookie');
 
@@ -52,12 +50,6 @@ export async function getMinimalElectronLoginSystem(credential: string,
           }));
           return 'electron-login';
         },
-        async getProfile(req: Request|IncomingMessage): Promise<UserProfile|null|undefined> {
-          if ((req as any).forbidLogin) {
-            return null;
-          }
-          return undefined;
-        },
         getWildcardMiddleware() {
           if (authMode === 'none') {
             return [];