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
Fix a bug in login and register mutation
Hakan Shehua1a0d98c0fda
diff --git a/desktop/src/main/handlers/mutations/email-login.ts b/desktop/src/main/handlers/mutations/email-login.tsindex 1ea49b59..afc4e762 100644--- a/desktop/src/main/handlers/mutations/email-login.ts+++ b/desktop/src/main/handlers/mutations/email-login.ts@@ -68,7 +68,6 @@ export class EmailLoginMutationHandleravatar: workspace.avatar,role: workspace.user.role,description: workspace.description,- synced: 0,user_id: workspace.user.id,version_id: workspace.versionId,})),@@ -79,38 +78,38 @@ export class EmailLoginMutationHandlertype: 'app',table: 'workspaces',});+ });- for (const workspace of data.workspaces) {- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(- workspace.id,- );+ for (const workspace of data.workspaces) {+ const workspaceDatabase = await databaseManager.getWorkspaceDatabase(+ workspace.user.id,+ );- const user = workspace.user.node;- await workspaceDatabase- .insertInto('nodes')- .values({- id: user.id,- attributes: JSON.stringify(user.attributes),- state: user.state,- created_at: user.createdAt,- created_by: user.createdBy,- updated_at: user.updatedAt,- updated_by: user.updatedBy,- server_created_at: user.serverCreatedAt,- server_updated_at: user.serverUpdatedAt,- version_id: user.versionId,- server_version_id: user.versionId,- })- .onConflict((cb) => cb.doNothing())- .execute();+ const user = workspace.user.node;+ await workspaceDatabase+ .insertInto('nodes')+ .values({+ id: user.id,+ attributes: JSON.stringify(user.attributes),+ state: user.state,+ created_at: user.createdAt,+ created_by: user.createdBy,+ updated_at: user.updatedAt,+ updated_by: user.updatedBy,+ server_created_at: user.serverCreatedAt,+ server_updated_at: user.serverUpdatedAt,+ version_id: user.versionId,+ server_version_id: user.versionId,+ })+ .onConflict((cb) => cb.doNothing())+ .execute();- changedTables.push({- type: 'workspace',- table: 'nodes',- userId: workspace.user.id,- });- }- });+ changedTables.push({+ type: 'workspace',+ table: 'nodes',+ userId: workspace.user.id,+ });+ }return {output: {diff --git a/desktop/src/main/handlers/mutations/email-register.ts b/desktop/src/main/handlers/mutations/email-register.tsindex f5e53d07..1af60eb8 100644--- a/desktop/src/main/handlers/mutations/email-register.ts+++ b/desktop/src/main/handlers/mutations/email-register.ts@@ -72,7 +72,6 @@ export class EmailRegisterMutationHandleravatar: workspace.avatar,role: workspace.user.role,description: workspace.description,- synced: 0,user_id: workspace.user.id,version_id: workspace.versionId,})),@@ -83,38 +82,38 @@ export class EmailRegisterMutationHandlertype: 'app',table: 'workspaces',});+ });- for (const workspace of data.workspaces) {- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(- workspace.id,- );+ for (const workspace of data.workspaces) {+ const workspaceDatabase = await databaseManager.getWorkspaceDatabase(+ workspace.user.id,+ );- const user = workspace.user.node;- await workspaceDatabase- .insertInto('nodes')- .values({- id: user.id,- attributes: JSON.stringify(user.attributes),- state: user.state,- created_at: user.createdAt,- created_by: user.createdBy,- updated_at: user.updatedAt,- updated_by: user.updatedBy,- server_created_at: user.serverCreatedAt,- server_updated_at: user.serverUpdatedAt,- version_id: user.versionId,- server_version_id: user.versionId,- })- .onConflict((cb) => cb.doNothing())- .execute();+ const user = workspace.user.node;+ await workspaceDatabase+ .insertInto('nodes')+ .values({+ id: user.id,+ attributes: JSON.stringify(user.attributes),+ state: user.state,+ created_at: user.createdAt,+ created_by: user.createdBy,+ updated_at: user.updatedAt,+ updated_by: user.updatedBy,+ server_created_at: user.serverCreatedAt,+ server_updated_at: user.serverUpdatedAt,+ version_id: user.versionId,+ server_version_id: user.versionId,+ })+ .onConflict((cb) => cb.doNothing())+ .execute();- changedTables.push({- type: 'workspace',- table: 'nodes',- userId: workspace.user.id,- });- }- });+ changedTables.push({+ type: 'workspace',+ table: 'nodes',+ userId: workspace.user.id,+ });+ }return {output: {