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 sync
Hakan Shehu5b40313ff41c
diff --git a/apps/desktop/src/main/services/account-service.ts b/apps/desktop/src/main/services/account-service.tsindex 9c47da1f..fc390c0f 100644--- a/apps/desktop/src/main/services/account-service.ts+++ b/apps/desktop/src/main/services/account-service.ts@@ -5,6 +5,7 @@ import {LoginSuccessOutput,} from '@colanode/core';+import { app } from 'electron';import fs from 'fs';import { createDebugger } from '@/main/debugger';@@ -131,8 +132,12 @@ class AccountService {}try {- const { data, status } = await httpClient.get<AccountSyncOutput>(+ const { data, status } = await httpClient.post<AccountSyncOutput>('/v1/accounts/sync',+ {+ platform: process.platform,+ version: app.getVersion(),+ },{domain: server.domain,token: account.token,diff --git a/apps/server/src/controllers/client/accounts/account-sync.ts b/apps/server/src/controllers/client/accounts/account-sync.tsindex 4a7558fc..4211d0b0 100644--- a/apps/server/src/controllers/client/accounts/account-sync.ts+++ b/apps/server/src/controllers/client/accounts/account-sync.ts@@ -4,13 +4,14 @@ import {WorkspaceOutput,WorkspaceRole,ApiErrorCode,+ AccountSyncInput,} from '@colanode/core';import { database } from '@/data/database';import { ResponseBuilder } from '@/lib/response-builder';export const accountSyncHandler = async (- _: Request,+ req: Request,res: Response): Promise<void> => {const account = await database@@ -39,11 +40,15 @@ export const accountSyncHandler = async (});}+ const input: AccountSyncInput = req.body;+await database.updateTable('devices').set({synced_at: new Date(),ip: res.locals.ip,+ platform: input.platform,+ version: input.version,}).where('id', '=', device.id).execute();diff --git a/apps/server/src/routes/client.ts b/apps/server/src/routes/client.tsindex 9fc3b865..038fbc53 100644--- a/apps/server/src/routes/client.ts+++ b/apps/server/src/routes/client.ts@@ -43,7 +43,7 @@ clientRouter.put(accountUpdateHandler);-clientRouter.get('/v1/accounts/sync', authMiddleware, accountSyncHandler);+clientRouter.post('/v1/accounts/sync', authMiddleware, accountSyncHandler);clientRouter.post('/v1/avatars',diff --git a/packages/core/src/types/accounts.ts b/packages/core/src/types/accounts.tsindex 646ba216..982a4de2 100644--- a/packages/core/src/types/accounts.ts+++ b/packages/core/src/types/accounts.ts@@ -64,6 +64,11 @@ export type AccountUpdateOutput = {avatar?: string | null;};+export type AccountSyncInput = {+ platform: string;+ version: string;+};+export type AccountSyncOutput = {account: AccountOutput;workspaces: WorkspaceOutput[];