Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Improve account logout handlers in desktop
Hakan Shehua758035be4e3
diff --git a/apps/desktop/src/main/jobs/sync-deleted-tokens.ts b/apps/desktop/src/main/jobs/sync-deleted-tokens.tsindex e7e3ee04..368a1307 100644--- a/apps/desktop/src/main/jobs/sync-deleted-tokens.ts+++ b/apps/desktop/src/main/jobs/sync-deleted-tokens.ts@@ -1,8 +1,11 @@+import { ApiErrorCode } from '@colanode/core';+import { serverService } from '@/main/services/server-service';import { createDebugger } from '@/main/debugger';import { databaseService } from '@/main/data/database-service';import { JobHandler } from '@/main/jobs';import { httpClient } from '@/shared/lib/http-client';+import { parseApiError } from '@/shared/lib/axios';export type SyncDeletedTokensInput = {type: 'sync_deleted_tokens';@@ -73,6 +76,25 @@ export class SyncDeletedTokensJobHandler`Logged out account ${deletedToken.account_id} from server ${deletedToken.domain}`);} catch (error) {+ const parsedError = parseApiError(error);+ if (+ parsedError.code === ApiErrorCode.TokenInvalid ||+ parsedError.code === ApiErrorCode.AccountNotFound ||+ parsedError.code === ApiErrorCode.DeviceNotFound+ ) {+ this.debug(+ `Account ${deletedToken.account_id} is already logged out, skipping...`+ );++ await databaseService.appDatabase+ .deleteFrom('deleted_tokens')+ .where('token', '=', deletedToken.token)+ .where('account_id', '=', deletedToken.account_id)+ .execute();++ continue;+ }+this.debug(`Failed to logout account ${deletedToken.account_id} from server ${deletedToken.domain}`,errordiff --git a/apps/desktop/src/main/services/account-service.ts b/apps/desktop/src/main/services/account-service.tsindex dc24d934..b17a8f4d 100644--- a/apps/desktop/src/main/services/account-service.ts+++ b/apps/desktop/src/main/services/account-service.ts@@ -1,4 +1,9 @@-import { AccountSyncOutput, LoginSuccessOutput } from '@colanode/core';+import {+ AccountSyncOutput,+ ApiErrorCode,+ ApiErrorOutput,+ LoginSuccessOutput,+} from '@colanode/core';import fs from 'fs';@@ -16,6 +21,7 @@ import { eventBus } from '@/shared/lib/event-bus';import { httpClient } from '@/shared/lib/http-client';import { socketService } from '@/main/services/socket-service';import { MutationError, MutationErrorCode } from '@/shared/mutations';+import { parseApiError } from '@/shared/lib/axios';class AccountService {private readonly debug = createDebugger('service:account');@@ -125,135 +131,146 @@ class AccountService {return;}- const { data, status } = await httpClient.get<AccountSyncOutput>(- '/v1/accounts/sync',- {- domain: server.domain,- token: account.token,- }- );-- this.debug(`Account sync response status code: ${status}`);-- if (status >= 400 && status < 500) {- this.debug(`Account ${account.email} is not valid, logging out...`);- await this.logoutAccount(account);- return;- }-- if (status !== 200) {- return;- }+ try {+ const { data, status } = await httpClient.get<AccountSyncOutput>(+ '/v1/accounts/sync',+ {+ domain: server.domain,+ token: account.token,+ }+ );- const currentWorkspaces = await databaseService.appDatabase- .selectFrom('workspaces')- .selectAll()- .where('account_id', '=', account.id)- .execute();+ this.debug(`Account sync response status code: ${status}`);- if (- data.account.name !== account.name ||- data.account.avatar !== account.avatar- ) {- const updatedAccount = await databaseService.appDatabase- .updateTable('accounts')- .returningAll()- .set({- name: data.account.name,- avatar: data.account.avatar,- })- .where('id', '=', account.id)- .executeTakeFirst();-- if (!updatedAccount) {- this.debug(`Failed to update account ${account.email} after sync`);+ if (status >= 400 && status < 500) {+ this.debug(`Account ${account.email} is not valid, logging out...`);+ await this.logoutAccount(account);return;- } else {- this.debug(`Updated account ${account.email} after sync`);}- eventBus.publish({- type: 'account_updated',- account: mapAccount(updatedAccount),- });- }-- for (const workspace of data.workspaces) {- const currentWorkspace = currentWorkspaces.find(- (w) => w.workspace_id === workspace.id- );+ if (status !== 200) {+ return;+ }- if (!currentWorkspace) {- // create workspace here- const createdWorkspace = await databaseService.appDatabase- .insertInto('workspaces')- .values({- workspace_id: workspace.id,- user_id: workspace.user.id,- account_id: account.id,- name: workspace.name,- avatar: workspace.avatar,- description: workspace.description,- role: workspace.user.role,- })+ const currentWorkspaces = await databaseService.appDatabase+ .selectFrom('workspaces')+ .selectAll()+ .where('account_id', '=', account.id)+ .execute();++ if (+ data.account.name !== account.name ||+ data.account.avatar !== account.avatar+ ) {+ const updatedAccount = await databaseService.appDatabase+ .updateTable('accounts').returningAll()+ .set({+ name: data.account.name,+ avatar: data.account.avatar,+ })+ .where('id', '=', account.id).executeTakeFirst();- if (!createdWorkspace) {- this.debug(- `Failed to create workspace ${workspace.id} for account ${account.email}`- );+ if (!updatedAccount) {+ this.debug(`Failed to update account ${account.email} after sync`);return;} else {- this.debug(- `Created workspace ${workspace.id} for account ${account.email} after sync`- );+ this.debug(`Updated account ${account.email} after sync`);}eventBus.publish({- type: 'workspace_created',- workspace: mapWorkspace(createdWorkspace),+ type: 'account_updated',+ account: mapAccount(updatedAccount),});- } else {- // update workspace here- const updatedWorkspace = await databaseService.appDatabase- .updateTable('workspaces')- .returningAll()- .set({- name: workspace.name,- avatar: workspace.avatar,- description: workspace.description,- role: workspace.user.role,- })- .where('user_id', '=', currentWorkspace.user_id)- .executeTakeFirst();+ }- if (!updatedWorkspace) {- this.debug(- `Failed to update workspace ${currentWorkspace.user_id} for account ${account.email}`- );- return;+ for (const workspace of data.workspaces) {+ const currentWorkspace = currentWorkspaces.find(+ (w) => w.workspace_id === workspace.id+ );++ if (!currentWorkspace) {+ // create workspace here+ const createdWorkspace = await databaseService.appDatabase+ .insertInto('workspaces')+ .values({+ workspace_id: workspace.id,+ user_id: workspace.user.id,+ account_id: account.id,+ name: workspace.name,+ avatar: workspace.avatar,+ description: workspace.description,+ role: workspace.user.role,+ })+ .returningAll()+ .executeTakeFirst();++ if (!createdWorkspace) {+ this.debug(+ `Failed to create workspace ${workspace.id} for account ${account.email}`+ );+ return;+ } else {+ this.debug(+ `Created workspace ${workspace.id} for account ${account.email} after sync`+ );+ }++ eventBus.publish({+ type: 'workspace_created',+ workspace: mapWorkspace(createdWorkspace),+ });} else {- this.debug(- `Updated workspace ${currentWorkspace.user_id} for account ${account.email} after sync`- );+ // update workspace here+ const updatedWorkspace = await databaseService.appDatabase+ .updateTable('workspaces')+ .returningAll()+ .set({+ name: workspace.name,+ avatar: workspace.avatar,+ description: workspace.description,+ role: workspace.user.role,+ })+ .where('user_id', '=', currentWorkspace.user_id)+ .executeTakeFirst();++ if (!updatedWorkspace) {+ this.debug(+ `Failed to update workspace ${currentWorkspace.user_id} for account ${account.email}`+ );+ return;+ } else {+ this.debug(+ `Updated workspace ${currentWorkspace.user_id} for account ${account.email} after sync`+ );+ }++ eventBus.publish({+ type: 'workspace_updated',+ workspace: mapWorkspace(updatedWorkspace),+ });}-- eventBus.publish({- type: 'workspace_updated',- workspace: mapWorkspace(updatedWorkspace),- });}- }- for (const workspace of currentWorkspaces) {- const updatedWorkspace = data.workspaces.find(- (w) => w.id === workspace.workspace_id- );+ for (const workspace of currentWorkspaces) {+ const updatedWorkspace = data.workspaces.find(+ (w) => w.id === workspace.workspace_id+ );- if (!updatedWorkspace) {- await this.deleteWorkspace(workspace.user_id);+ if (!updatedWorkspace) {+ await this.deleteWorkspace(workspace.user_id);+ }+ }+ } catch (error) {+ const parsedError = parseApiError(error);+ if (this.isSyncInvalid(parsedError)) {+ this.debug(`Account ${account.email} is not valid, logging out...`);+ await this.logoutAccount(account);+ return;}++ this.debug(`Failed to sync account ${account.email}: ${parsedError}`);}}@@ -338,6 +355,15 @@ class AccountService {return true;}++ private isSyncInvalid(error: ApiErrorOutput) {+ return (+ error.code === ApiErrorCode.TokenInvalid ||+ error.code === ApiErrorCode.TokenMissing ||+ error.code === ApiErrorCode.AccountNotFound ||+ error.code === ApiErrorCode.DeviceNotFound+ );+ }}export const accountService = new AccountService();