A local-first personal finance app
✨Enforce OPENID login (#4423)
lelemmf5a1293e3ce2
diff --git a/packages/sync-server/src/account-db.js b/packages/sync-server/src/account-db.jsindex 7d6fa1f27d..b94d4131c6 100644--- a/packages/sync-server/src/account-db.js+++ b/packages/sync-server/src/account-db.js@@ -27,11 +27,15 @@ export function needsBootstrap() {export function listLoginMethods() {const accountDb = getAccountDb();const rows = accountDb.all('SELECT method, display_name, active FROM auth');- return rows.map(r => ({- method: r.method,- active: r.active,- displayName: r.display_name,- }));+ return rows+ .filter(f =>+ rows.length > 1 && config.enforceOpenId ? f.method === 'openid' : true,+ )+ .map(r => ({+ method: r.method,+ active: r.active,+ displayName: r.display_name,+ }));}export function getActiveLoginMethod() {diff --git a/packages/sync-server/src/config-types.ts b/packages/sync-server/src/config-types.tsindex 464c2dc3fb..957f3c8b38 100644--- a/packages/sync-server/src/config-types.ts+++ b/packages/sync-server/src/config-types.ts@@ -40,4 +40,5 @@ export interface Config {};multiuser: boolean;token_expiration?: 'never' | 'openid-provider' | number;+ enforceOpenId: boolean;}diff --git a/packages/sync-server/src/load-config.js b/packages/sync-server/src/load-config.jsindex d991d8e6e2..c6d8820c46 100644--- a/packages/sync-server/src/load-config.js+++ b/packages/sync-server/src/load-config.js@@ -88,6 +88,7 @@ const defaultConfig = {projectRoot,multiuser: false,token_expiration: 'never',+ enforceOpenId: false,};/** @type {import('./config-types.js').Config} */@@ -221,6 +222,17 @@ const finalConfig = {token_expiration: process.env.ACTUAL_TOKEN_EXPIRATION? process.env.ACTUAL_TOKEN_EXPIRATION: config.token_expiration,+ enforceOpenId: process.env.ACTUAL_OPENID_ENFORCE+ ? (() => {+ const value = process.env.ACTUAL_OPENID_ENFORCE.toLowerCase();+ if (!['true', 'false'].includes(value)) {+ throw new Error(+ 'ACTUAL_OPENID_ENFORCE must be either "true" or "false"',+ );+ }+ return value === 'true';+ })()+ : config.enforceOpenId,};debug(`using port ${finalConfig.port}`);debug(`using hostname ${finalConfig.hostname}`);diff --git a/upcoming-release-notes/4423.md b/upcoming-release-notes/4423.mdnew file mode 100644index 0000000000..b1523fbb29--- /dev/null+++ b/upcoming-release-notes/4423.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [lelemm]+---++Added `ACTUAL_OPENID_ENFORCE=true` enviroment variable to enforce only OpenID auth.\ No newline at end of file