Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Implement account logout in server

Hakan Shehuaecca3e36067
diff --git a/desktop/src/components/app.tsx b/desktop/src/components/app.tsx
index 388245ae..f8f99a9c 100644
--- a/desktop/src/components/app.tsx
+++ b/desktop/src/components/app.tsx
@@ -34,7 +34,11 @@ export const App = () => {
const accountsQuery = useQuery({
queryKey: ['accounts'],
queryFn: async ({ queryKey }) => {
- const query = appDatabase.selectFrom('accounts').selectAll().compile();
+ const query = appDatabase
+ .selectFrom('accounts')
+ .where('status', '=', 'active')
+ .selectAll()
+ .compile();
return await window.neuron.executeAppQueryAndSubscribe({
key: queryKey,
query: query,
@@ -45,7 +49,18 @@ export const App = () => {
const workspacesQuery = useQuery({
queryKey: ['workspaces'],
queryFn: async ({ queryKey }) => {
- const query = appDatabase.selectFrom('workspaces').selectAll().compile();
+ const query = appDatabase
+ .selectFrom('workspaces')
+ .where(
+ 'account_id',
+ 'in',
+ appDatabase
+ .selectFrom('accounts')
+ .where('status', '=', 'active')
+ .select('id'),
+ )
+ .selectAll()
+ .compile();
return await window.neuron.executeAppQueryAndSubscribe({
key: queryKey,
query: query,
@@ -100,6 +115,7 @@ export const App = () => {
token: account.token,
email: account.email,
deviceId: account.device_id,
+ status: account.status,
workspaces: workspacesQuery.data?.rows.map((row) => {
return {
id: row.id,
diff --git a/desktop/src/data/account-manager.ts b/desktop/src/data/account-manager.ts
index 1d6e60e7..3686dfd7 100644
--- a/desktop/src/data/account-manager.ts
+++ b/desktop/src/data/account-manager.ts
@@ -11,7 +11,7 @@ import { AppDatabaseSchema } from '@/data/schemas/app';
const SERVER_URL = 'http://localhost:3000';
export class AccountManager {
- private readonly account: Account;
+ public readonly account: Account;
private readonly accountPath: string;
private readonly socket: SocketManager;
private readonly axios: AxiosInstance;
@@ -87,7 +87,15 @@ export class AccountManager {
this.workspaces.set(workspace.id, workspaceManager);
}
- public async logout(): Promise<void> {
+ public async logout(): Promise<boolean> {
+ const { status } = await this.axios.delete(
+ `v1/accounts/logout/${this.account.deviceId}`,
+ );
+
+ if (status !== 200) {
+ return false;
+ }
+
if (fs.existsSync(this.accountPath)) {
fs.rm(this.accountPath, { recursive: true, force: true }, (err) => {
if (err) {
@@ -99,6 +107,8 @@ export class AccountManager {
if (this.socket) {
this.socket.close();
}
+
+ return true;
}
public async executeEventLoop(): Promise<void> {
diff --git a/desktop/src/data/app-manager.ts b/desktop/src/data/app-manager.ts
index 4b174b71..df4dba40 100644
--- a/desktop/src/data/app-manager.ts
+++ b/desktop/src/data/app-manager.ts
@@ -186,21 +186,16 @@ class AppManager {
throw new Error(`Account not found: ${accountId}`);
}
- await accountManager.logout();
- this.accounts.delete(accountId);
-
- const deleteAccountQuery = this.database
- .deleteFrom('accounts')
+ accountManager.account.status = 'logout';
+ const markAccountLoggedOutQuery = this.database
+ .updateTable('accounts')
+ .set({
+ status: 'logout',
+ })
.where('id', '=', accountId)
.compile();
- const deleteWorkspacesQuery = this.database
- .deleteFrom('workspaces')
- .where('account_id', '=', accountId)
- .compile();
-
- await this.executeMutation(deleteAccountQuery);
- await this.executeMutation(deleteWorkspacesQuery);
+ await this.executeMutation(markAccountLoggedOutQuery);
}
private async waitForInit(): Promise<void> {
@@ -237,7 +232,19 @@ class AppManager {
private async executeEventLoop(): Promise<void> {
try {
for (const accountManager of this.accounts.values()) {
- await accountManager.executeEventLoop();
+ if (accountManager.account.status === 'logout') {
+ const loggedOut = await accountManager.logout();
+ if (loggedOut) {
+ await this.database
+ .deleteFrom('accounts')
+ .where('id', '=', accountManager.account.id)
+ .execute();
+
+ this.accounts.delete(accountManager.account.id);
+ }
+ } else {
+ await accountManager.executeEventLoop();
+ }
}
} catch (error) {
console.error('Error in event loop:', error);
@@ -271,6 +278,7 @@ class AppManager {
avatar: account.avatar,
token: account.token,
deviceId: account.device_id,
+ status: account.status,
}));
}
diff --git a/desktop/src/data/migrations/app.ts b/desktop/src/data/migrations/app.ts
index 50e20608..4d19c20d 100644
--- a/desktop/src/data/migrations/app.ts
+++ b/desktop/src/data/migrations/app.ts
@@ -10,8 +10,7 @@ const createAccountsTable: Migration = {
.addColumn('email', 'text', (col) => col.notNull())
.addColumn('avatar', 'text')
.addColumn('token', 'text', (col) => col.notNull())
- .addColumn('last_update_id', 'text')
- .addColumn('last_update_at', 'text')
+ .addColumn('status', 'text', (col) => col.defaultTo('active').notNull())
.execute();
},
down: async (db) => {
@@ -24,7 +23,9 @@ const createWorkspacesTable: Migration = {
await db.schema
.createTable('workspaces')
.addColumn('id', 'text', (col) => col.notNull())
- .addColumn('account_id', 'text', (col) => col.notNull())
+ .addColumn('account_id', 'text', (col) =>
+ col.notNull().references('accounts.id').onDelete('cascade'),
+ )
.addColumn('name', 'text', (col) => col.notNull())
.addColumn('description', 'text')
.addColumn('avatar', 'text')
diff --git a/desktop/src/data/schemas/app.ts b/desktop/src/data/schemas/app.ts
index 64bc247c..0d2ddc6c 100644
--- a/desktop/src/data/schemas/app.ts
+++ b/desktop/src/data/schemas/app.ts
@@ -7,6 +7,7 @@ interface AccountTable {
avatar: ColumnType<string | null, string | null, string | null>;
token: ColumnType<string, string, string>;
device_id: ColumnType<string, string, never>;
+ status: ColumnType<string, string, string>;
}
export type SelectAccount = Selectable<AccountTable>;
diff --git a/desktop/src/data/socket-manager.ts b/desktop/src/data/socket-manager.ts
index bd8a9049..c1ae1672 100644
--- a/desktop/src/data/socket-manager.ts
+++ b/desktop/src/data/socket-manager.ts
@@ -75,6 +75,14 @@ export class SocketManager {
}
public checkConnection(): void {
+ if (this.account.status === 'logout') {
+ if (this.isConnected()) {
+ this.close();
+ }
+
+ return;
+ }
+
if (this.isConnected()) {
return;
}
diff --git a/desktop/src/data/workspace-manager.ts b/desktop/src/data/workspace-manager.ts
index b21a7d87..0e760ace 100644
--- a/desktop/src/data/workspace-manager.ts
+++ b/desktop/src/data/workspace-manager.ts
@@ -291,15 +291,44 @@ export class WorkspaceManager {
return false;
}
- for (const node of data.nodes) {
- await this.syncNodeFromServer(node);
- }
+ await this.database
+ .insertInto('nodes')
+ .values(
+ data.nodes.map((node) => {
+ return {
+ id: node.id,
+ attributes: JSON.stringify(node.attributes),
+ state: node.state,
+ created_at: node.createdAt,
+ created_by: node.createdBy,
+ updated_by: node.updatedBy,
+ updated_at: node.updatedAt,
+ version_id: node.versionId,
+ server_created_at: node.serverCreatedAt,
+ server_updated_at: node.serverUpdatedAt,
+ server_version_id: node.versionId,
+ };
+ }),
+ )
+ .execute();
- for (const nodeReaction of data.nodeReactions) {
- await this.syncNodeReactionFromServer(nodeReaction);
- }
+ await this.database
+ .insertInto('node_reactions')
+ .values(
+ data.nodeReactions.map((nodeReaction) => {
+ return {
+ node_id: nodeReaction.nodeId,
+ reactor_id: nodeReaction.reactorId,
+ reaction: nodeReaction.reaction,
+ created_at: nodeReaction.createdAt,
+ server_created_at: nodeReaction.serverCreatedAt,
+ };
+ }),
+ )
+ .execute();
this.workspace.synced = true;
+ this.debouncedNotifyQuerySubscribers(['nodes', 'node_reactions']);
return true;
}
diff --git a/desktop/src/types/accounts.ts b/desktop/src/types/accounts.ts
index 51460ea2..5eb32e28 100644
--- a/desktop/src/types/accounts.ts
+++ b/desktop/src/types/accounts.ts
@@ -12,4 +12,5 @@ export type Account = {
avatar?: string | null;
token: string;
deviceId: string;
+ status: string;
};
diff --git a/server/src/lib/utils.ts b/server/src/lib/utils.ts
new file mode 100644
index 00000000..ff6ec16a
--- /dev/null
+++ b/server/src/lib/utils.ts
@@ -0,0 +1,19 @@
+export const compareString = (a?: string | null, b?: string | null): number => {
+ if (a === b) {
+ return 0;
+ }
+
+ if (a === undefined || a === null) {
+ return -1;
+ }
+
+ if (b === undefined || b === null) {
+ return 1;
+ }
+
+ if (a > b) {
+ return 1;
+ }
+
+ return -1;
+};
diff --git a/server/src/routes/accounts.ts b/server/src/routes/accounts.ts
index 8c426a57..e1b7355d 100644
--- a/server/src/routes/accounts.ts
+++ b/server/src/routes/accounts.ts
@@ -8,12 +8,13 @@ import {
LoginOutput,
} from '@/types/accounts';
import axios from 'axios';
-import { ApiError } from '@/types/api';
+import { ApiError, NeuronRequest, NeuronResponse } from '@/types/api';
import { NeuronId } from '@/lib/id';
import { database } from '@/data/database';
import bcrypt from 'bcrypt';
import { WorkspaceOutput } from '@/types/workspaces';
import { createJwtToken } from '@/lib/jwt';
+import { authMiddleware } from '@/middlewares/auth';
const GoogleUserInfoUrl = 'https://www.googleapis.com/oauth2/v1/userinfo';
const SaltRounds = 10;
@@ -196,6 +197,52 @@ accountsRouter.post('/login/google', async (req: Request, res: Response) => {
return res.status(200).json(output);
});
+accountsRouter.delete(
+ '/logout/:deviceId',
+ authMiddleware,
+ async (req: NeuronRequest, res: NeuronResponse) => {
+ console.log('logout endpoint called', req.params.deviceId);
+ if (!req.accountId) {
+ return res.status(401).json({
+ code: ApiError.Unauthorized,
+ message: 'Unauthorized.',
+ });
+ }
+
+ const deviceId = req.params.deviceId as string;
+ if (!deviceId) {
+ return res.status(401).json({
+ code: ApiError.Unauthorized,
+ message: 'Unauthorized.',
+ });
+ }
+
+ const accountDevice = await database
+ .selectFrom('account_devices')
+ .selectAll()
+ .where('id', '=', deviceId)
+ .executeTakeFirst();
+
+ if (!accountDevice) {
+ return res.status(200).end();
+ }
+
+ if (accountDevice.account_id != req.accountId) {
+ return res.status(403).json({
+ code: ApiError.Forbidden,
+ message: 'Forbidden',
+ });
+ }
+
+ await database
+ .deleteFrom('account_devices')
+ .where('id', '=', deviceId)
+ .execute();
+
+ return res.status(200).end();
+ },
+);
+
const buildLoginOutput = async (
id: string,
name: string,
diff --git a/server/src/routes/sync.ts b/server/src/routes/sync.ts
index a1aabca7..c4098666 100644
--- a/server/src/routes/sync.ts
+++ b/server/src/routes/sync.ts
@@ -2,6 +2,7 @@ import { NeuronRequest, NeuronResponse } from '@/types/api';
import { database } from '@/data/database';
import { Router } from 'express';
import { ServerNode, ServerNodeReaction } from '@/types/nodes';
+import { compareString } from '@/lib/utils';
export const syncRouter = Router();
@@ -21,24 +22,26 @@ syncRouter.get(
.where('workspace_id', '=', workspaceId)
.execute();
- const nodes: ServerNode[] = nodeRows.map((node) => {
- return {
- id: node.id,
- parentId: node.parent_id,
- workspaceId: node.workspace_id,
- type: node.type,
- index: node.index,
- attributes: node.attributes,
- state: node.state,
- createdAt: node.created_at.toISOString(),
- createdBy: node.created_by,
- versionId: node.version_id,
- updatedAt: node.updated_at?.toISOString(),
- updatedBy: node.updated_by,
- serverCreatedAt: node.server_created_at.toISOString(),
- serverUpdatedAt: node.server_updated_at?.toISOString(),
- };
- });
+ const nodes: ServerNode[] = nodeRows
+ .map((node) => {
+ return {
+ id: node.id,
+ parentId: node.parent_id,
+ workspaceId: node.workspace_id,
+ type: node.type,
+ index: node.index,
+ attributes: node.attributes,
+ state: node.state,
+ createdAt: node.created_at.toISOString(),
+ createdBy: node.created_by,
+ versionId: node.version_id,
+ updatedAt: node.updated_at?.toISOString(),
+ updatedBy: node.updated_by,
+ serverCreatedAt: node.server_created_at.toISOString(),
+ serverUpdatedAt: node.server_updated_at?.toISOString(),
+ };
+ })
+ .sort((a, b) => compareString(a.id, b.id));
const nodeReactions: ServerNodeReaction[] = nodeReactionRows.map(
(nodeReaction) => {