A local-first personal finance app
Add session token authentication to API init() (#6540)
Bradley Nelsona58bac6de632
diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.tsindex cb25d16bbc..c6703977b9 100644--- a/packages/loot-core/src/server/main.ts+++ b/packages/loot-core/src/server/main.ts@@ -227,13 +227,36 @@ export async function initApp(isDev, socketName) {}}-export type InitConfig = {+type BaseInitConfig = {dataDir?: string;- serverURL?: string;- password?: string;verbose?: boolean;};+type ServerInitConfig = BaseInitConfig & {+ serverURL: string;+};++type PasswordAuthConfig = ServerInitConfig & {+ password: string;+ sessionToken?: never;+};++type SessionTokenAuthConfig = ServerInitConfig & {+ sessionToken: string;+ password?: never;+};++type NoServerConfig = BaseInitConfig & {+ serverURL?: undefined;+ password?: never;+ sessionToken?: never;+};++export type InitConfig =+ | PasswordAuthConfig+ | SessionTokenAuthConfig+ | NoServerConfig;+export async function init(config: InitConfig) {// Get from build@@ -258,7 +281,26 @@ export async function init(config: InitConfig) {if (serverURL) {setServer(serverURL);- if (config.password) {+ if ('sessionToken' in config && config.sessionToken) {+ // Session token authentication+ await runHandler(handlers['subscribe-set-token'], {+ token: config.sessionToken,+ });+ // Validate the token+ const user = await runHandler(handlers['subscribe-get-user'], undefined);+ if (!user || user.tokenExpired === true) {+ // Clear invalid token+ await runHandler(handlers['subscribe-set-token'], { token: '' });+ throw new Error(+ 'Authentication failed: invalid or expired session token',+ );+ }+ if (user.offline === true) {+ // Clear token since we can't validate+ await runHandler(handlers['subscribe-set-token'], { token: '' });+ throw new Error('Authentication failed: server offline or unreachable');+ }+ } else if ('password' in config && config.password) {const result = await runHandler(handlers['subscribe-sign-in'], {password: config.password,});diff --git a/upcoming-release-notes/6540.md b/upcoming-release-notes/6540.mdnew file mode 100644index 0000000000..129df62316--- /dev/null+++ b/upcoming-release-notes/6540.md@@ -0,0 +1,6 @@+---+category: Features+authors: [BCNelson]+---++Add session token authentication option to API initialization, enhancing authentication flexibility.