updated at 2024-04-01T09:22:37-04:00

gristlabs · Apr 1, 2024 · c52ce78 · c52ce78
1 parent 126cc18
commit c52ce78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/core b/core
diff --git a/ext/app/gen-server/lib/Activation.ts b/ext/app/gen-server/lib/Activation.ts
@@ -1,7 +1,6 @@
-import { ApiError } from 'app/common/ApiError';
 import { HomeDBManager } from 'app/gen-server/lib/HomeDBManager';
 import { ActivationReader, addActivationMiddleware } from 'app/server/lib/ActivationReader';
-import { getUser, RequestWithLogin } from 'app/server/lib/Authorizer';
+import { RequestWithLogin } from 'app/server/lib/Authorizer';
 import { expressWrap } from 'app/server/lib/expressWrap';
 import { GristServer } from 'app/server/lib/GristServer';
 import { IBilling } from 'app/server/lib/IBilling';
@@ -36,12 +35,8 @@ export class Activation implements IBilling {
       return;
     }
 
-    app.get('/api/activation/status', expressWrap(async (req, res) => {
-      const {loginEmail} = getUser(req);
-      const defaultEmail = process.env.GRIST_DEFAULT_EMAIL;
-      if (!defaultEmail || loginEmail !== defaultEmail) {
-        throw new ApiError('Access denied', 403);
-      }
+    const requireInstallAdmin = this._gristServer.getInstallAdmin().getMiddlewareRequireAdmin();
+    app.get('/api/activation/status', requireInstallAdmin, expressWrap(async (req, res) => {
       const data = await this._getActivationStatus();
       return sendOkReply(null, res, data);
     }));
+2 −2		README.md
+2 −2		app/client/components/Forms/FormView.ts
+152 −0		app/client/components/GristClientSocket.ts
+10 −10		app/client/components/GristWSConnection.ts
+1 −2		app/client/lib/helpScout.ts
+2 −2		app/client/lib/imports.d.ts
+1 −1		app/client/lib/imports.js
+18 −21		app/client/models/AppModel.ts
+6 −16		app/client/models/UserPrefs.ts
+3 −3		app/client/models/gristUrlState.ts
+23 −18		app/client/ui/AccountWidget.ts
+270 −0		app/client/ui/AdminPanel.ts
+2 −2		app/client/ui/AppHeader.ts
+3 −3		app/client/ui/AppUI.ts
+16 −2		app/client/ui/DocHistory.ts
+1 −1		app/client/ui/DocMenu.ts
+9 −0		app/client/ui/HomeLeftPane.ts
+112 −134		app/client/ui/SupportGristNudge.ts
+16 −111		app/client/ui/SupportGristPage.ts
+2 −1		app/client/ui/TopBar.ts
+2 −4		app/client/ui/TutorialCard.ts
+6 −1		app/common/UserAPI.ts
+8 −13		app/common/gristUrls.ts
+4 −1		app/gen-server/ApiServer.ts
+1 −1		app/server/lib/ActiveDoc.ts
+10 −26		app/server/lib/Client.ts
+21 −18		app/server/lib/Comm.ts
+25 −14		app/server/lib/FlexServer.ts
+3 −1		app/server/lib/GristServer.ts
+138 −0		app/server/lib/GristServerSocket.ts
+111 −0		app/server/lib/GristSocketServer.ts
+6 −0		app/server/lib/ICreate.ts
+52 −0		app/server/lib/InstallAdmin.ts
+0 −10		app/server/lib/Telemetry.ts
+22 −24		app/server/lib/requestUtils.ts
+1 −9		app/server/lib/sendAppPage.ts
+1 −1		buildtools/update_schema.sh
+1 −1		buildtools/update_type_info.sh
+3 −1		package.json
+1 −1		sandbox/bundle_as_wheel.sh
+1 −1		sandbox/pyodide/build_packages.sh
+1 −1		sandbox/pyodide/setup.sh
+36 −3		static/locales/en.client.json
+36 −3		static/locales/es.client.json
+38 −4		static/locales/ru.client.json
+38 −4		static/locales/sl.client.json
+2 −1		stubs/app/server/server.ts
+195 −0		test/nbrowser/AdminPanel.ts
+98 −137		test/nbrowser/SupportGrist.ts
+96 −22		test/server/Comm.ts
+11 −10		test/server/gristClient.ts
+10 −4		test/server/lib/DocApi.ts
+170 −0		test/server/lib/GristSockets.ts
+2 −2		test/server/lib/ManyFetches.ts
+2 −10		test/server/lib/Telemetry.ts
+1 −1		test/test_under_docker.sh
+97 −8		yarn.lock