Skip to content

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

Refactor login mutations

Hakan Shehu884b4cbb352d
diff --git a/desktop/src/components/accounts/email-login.tsx b/desktop/src/components/accounts/email-login.tsx
index 01658839..7a3c6966 100644
--- a/desktop/src/components/accounts/email-login.tsx
+++ b/desktop/src/components/accounts/email-login.tsx
@@ -12,11 +12,11 @@ import {
import { z } from 'zod';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
-import { LoginOutput } from '@/types/accounts';
import { toast } from '@/components/ui/use-toast';
import { parseApiError } from '@/lib/axios';
import { Icon } from '@/components/ui/icon';
-import axios from 'axios';
+import { Server } from '@/types/servers';
+import { useEmailLoginMutation } from '@/mutations/use-email-login-mutation';
const formSchema = z.object({
email: z.string().min(2).email(),
@@ -24,12 +24,11 @@ const formSchema = z.object({
});
interface EmailLoginProps {
- serverUrl: string;
- onLogin: (output: LoginOutput) => void;
+ server: Server;
}
-export const EmailLogin = ({ serverUrl, onLogin }: EmailLoginProps) => {
- const [isPending, setIsPending] = React.useState(false);
+export const EmailLogin = ({ server }: EmailLoginProps) => {
+ const { mutate, isPending } = useEmailLoginMutation();
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
defaultValues: {
@@ -39,24 +38,26 @@ export const EmailLogin = ({ serverUrl, onLogin }: EmailLoginProps) => {
});
const handleSubmit = async (values: z.infer<typeof formSchema>) => {
- setIsPending(true);
- try {
- const { data } = await axios.post<LoginOutput>(
- `${serverUrl}/v1/accounts/login/email`,
- values,
- );
-
- onLogin(data);
- } catch (error) {
- const apiError = parseApiError(error);
- toast({
- title: 'Failed to login',
- description: apiError.message,
- variant: 'destructive',
- });
- } finally {
- setIsPending(false);
- }
+ mutate(
+ {
+ email: values.email,
+ password: values.password,
+ server: server,
+ },
+ {
+ onSuccess: () => {
+ window.location.href = '/';
+ },
+ onError: (error) => {
+ const apiError = parseApiError(error);
+ toast({
+ title: 'Failed to login',
+ description: apiError.message,
+ variant: 'destructive',
+ });
+ },
+ },
+ );
};
return (
diff --git a/desktop/src/components/accounts/email-register.tsx b/desktop/src/components/accounts/email-register.tsx
index 67220f32..16208597 100644
--- a/desktop/src/components/accounts/email-register.tsx
+++ b/desktop/src/components/accounts/email-register.tsx
@@ -12,11 +12,11 @@ import {
import { z } from 'zod';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
-import { LoginOutput } from '@/types/accounts';
import { toast } from '@/components/ui/use-toast';
import { parseApiError } from '@/lib/axios';
import { Icon } from '@/components/ui/icon';
-import axios from 'axios';
+import { useEmailRegisterMutation } from '@/mutations/use-email-register-mutation';
+import { Server } from '@/types/servers';
const formSchema = z.object({
name: z.string().min(2),
@@ -25,16 +25,11 @@ const formSchema = z.object({
});
interface EmailRegisterProps {
- serverUrl: string;
- onRegister: (output: LoginOutput) => void;
+ server: Server;
}
-export const EmailRegister = ({
- serverUrl,
- onRegister,
-}: EmailRegisterProps) => {
- const [isPending, setIsPending] = React.useState(false);
-
+export const EmailRegister = ({ server }: EmailRegisterProps) => {
+ const { mutate, isPending } = useEmailRegisterMutation();
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
defaultValues: {
@@ -45,24 +40,27 @@ export const EmailRegister = ({
});
const onSubmit = async (values: z.infer<typeof formSchema>) => {
- setIsPending(true);
- try {
- const { data } = await axios.post<LoginOutput>(
- `${serverUrl}/v1/accounts/register/email`,
- values,
- );
-
- onRegister(data);
- } catch (error) {
- const apiError = parseApiError(error);
- toast({
- title: 'Failed to register',
- description: apiError.message,
- variant: 'destructive',
- });
- } finally {
- setIsPending(false);
- }
+ mutate(
+ {
+ name: values.name,
+ email: values.email,
+ password: values.password,
+ server: server,
+ },
+ {
+ onSuccess: () => {
+ window.location.href = '/';
+ },
+ onError: (error) => {
+ const apiError = parseApiError(error);
+ toast({
+ title: 'Failed to login',
+ description: apiError.message,
+ variant: 'destructive',
+ });
+ },
+ },
+ );
};
return (
diff --git a/desktop/src/components/accounts/login-form.tsx b/desktop/src/components/accounts/login-form.tsx
index f012fc18..4b041844 100644
--- a/desktop/src/components/accounts/login-form.tsx
+++ b/desktop/src/components/accounts/login-form.tsx
@@ -1,6 +1,4 @@
import React from 'react';
-import { useAppDatabase } from '@/contexts/app-database';
-import { LoginOutput } from '@/types/accounts';
import { Server } from '@/types/servers';
import { EmailRegister } from '@/components/accounts/email-register';
import { EmailLogin } from '@/components/accounts/email-login';
@@ -18,50 +16,8 @@ interface LoginFormProps {
}
export const LoginForm = ({ servers }: LoginFormProps) => {
- const appDatabase = useAppDatabase();
const [showRegister, setShowRegister] = React.useState(false);
const [server, setServer] = React.useState(servers[0]);
- const serverUrl = `http://${server.domain}`;
-
- const handleLogin = async (output: LoginOutput) => {
- const insertAccountQuery = appDatabase.database
- .insertInto('accounts')
- .values({
- id: output.account.id,
- name: output.account.name,
- avatar: output.account.avatar,
- device_id: output.account.deviceId,
- email: output.account.email,
- token: output.account.token,
- server: server.domain,
- })
- .compile();
-
- await appDatabase.mutate(insertAccountQuery);
-
- if (output.workspaces.length > 0) {
- const insertWorkspacesQuery = appDatabase.database
- .insertInto('workspaces')
- .values(
- output.workspaces.map((workspace) => ({
- id: workspace.id,
- name: workspace.name,
- account_id: output.account.id,
- avatar: workspace.avatar,
- role: workspace.role,
- description: workspace.description,
- synced: 0,
- user_id: workspace.userId,
- version_id: workspace.versionId,
- })),
- )
- .compile();
-
- await appDatabase.mutate(insertWorkspacesQuery);
- }
-
- window.location.href = '/';
- };
return (
<div className="flex flex-col gap-4">
@@ -103,9 +59,9 @@ export const LoginForm = ({ servers }: LoginFormProps) => {
</DropdownMenu>
</div>
{showRegister ? (
- <EmailRegister serverUrl={serverUrl} onRegister={handleLogin} />
+ <EmailRegister server={server} />
) : (
- <EmailLogin serverUrl={serverUrl} onLogin={handleLogin} />
+ <EmailLogin server={server} />
)}
<p
className="text-center text-sm text-muted-foreground hover:cursor-pointer hover:underline"
diff --git a/desktop/src/contexts/app-database.ts b/desktop/src/contexts/app-database.ts
index 13586091..ba861265 100644
--- a/desktop/src/contexts/app-database.ts
+++ b/desktop/src/contexts/app-database.ts
@@ -5,7 +5,7 @@ import { SubscribedQueryContext } from '@/types/queries';
interface AppDatabaseContext {
database: Kysely<AppDatabaseSchema>;
- mutate: (mutation: CompiledQuery) => Promise<void>;
+ mutate: (mutation: CompiledQuery | CompiledQuery[]) => Promise<void>;
query: <R>(query: CompiledQuery<R>) => Promise<QueryResult<R>>;
queryAndSubscribe: <R>(
context: SubscribedQueryContext<R>,
diff --git a/desktop/src/electron/app-manager.ts b/desktop/src/electron/app-manager.ts
index 6c7ab403..b8e12f7f 100644
--- a/desktop/src/electron/app-manager.ts
+++ b/desktop/src/electron/app-manager.ts
@@ -102,18 +102,44 @@ class AppManager {
return result;
}
- public async executeMutation(mutation: CompiledQuery): Promise<void> {
- const result = await this.database.executeQuery(mutation);
- if (result.numAffectedRows === 0n) {
+ public async executeMutation(
+ mutation: CompiledQuery | CompiledQuery[],
+ ): Promise<void> {
+ const affectedTables = new Set<string>();
+ let numAffectedRows = 0n;
+
+ if (Array.isArray(mutation)) {
+ // Execute multiple queries as a transaction
+ await this.database.transaction().execute(async (trx) => {
+ for (const query of mutation) {
+ const result = await trx.executeQuery(query);
+ if (result.numAffectedRows > 0n) {
+ numAffectedRows += result.numAffectedRows;
+ extractTablesFromSql(query.sql).forEach((table) =>
+ affectedTables.add(table),
+ );
+ }
+ }
+ });
+ } else {
+ // Execute single query
+ const result = await this.database.executeQuery(mutation);
+ numAffectedRows = result.numAffectedRows;
+ if (numAffectedRows > 0n) {
+ extractTablesFromSql(mutation.sql).forEach((table) =>
+ affectedTables.add(table),
+ );
+ }
+ }
+ if (numAffectedRows === 0n) {
return;
}
- const affectedTables = extractTablesFromSql(mutation.sql);
- if (affectedTables.length === 0) {
+ if (affectedTables.size === 0) {
return;
}
- if (affectedTables.includes('accounts')) {
+ if (affectedTables.has('accounts')) {
const accounts = await this.getAccounts();
for (const account of accounts) {
if (this.accounts.has(account.id)) {
@@ -132,7 +158,7 @@ class AppManager {
}
}
- if (affectedTables.includes('workspaces')) {
+ if (affectedTables.has('workspaces')) {
const workspaces = await this.getWorkspaces();
for (const workspace of workspaces) {
const accountManager = this.accounts.get(workspace.accountId);
@@ -149,7 +175,7 @@ class AppManager {
for (const subscriber of this.subscribers.values()) {
const hasAffectedTables = subscriber.tables.some((table) =>
- affectedTables.includes(table),
+ affectedTables.has(table),
);
if (!hasAffectedTables) {
diff --git a/desktop/src/lib/accounts.ts b/desktop/src/lib/accounts.ts
new file mode 100644
index 00000000..fc8f3a67
--- /dev/null
+++ b/desktop/src/lib/accounts.ts
@@ -0,0 +1,48 @@
+import { AppDatabaseSchema } from '@/electron/schemas/app';
+import { LoginOutput } from '@/types/accounts';
+import { Server } from '@/types/servers';
+import { CompiledQuery, Kysely } from 'kysely';
+
+export const buildLoginMutationQueries = (
+ database: Kysely<AppDatabaseSchema>,
+ output: LoginOutput,
+ server: Server,
+): CompiledQuery[] => {
+ const insertAccountQuery = database
+ .insertInto('accounts')
+ .values({
+ id: output.account.id,
+ name: output.account.name,
+ avatar: output.account.avatar,
+ device_id: output.account.deviceId,
+ email: output.account.email,
+ token: output.account.token,
+ server: server.domain,
+ })
+ .compile();
+
+ const queries: CompiledQuery[] = [insertAccountQuery];
+
+ if (output.workspaces.length > 0) {
+ const insertWorkspacesQuery = database
+ .insertInto('workspaces')
+ .values(
+ output.workspaces.map((workspace) => ({
+ id: workspace.id,
+ name: workspace.name,
+ account_id: output.account.id,
+ avatar: workspace.avatar,
+ role: workspace.role,
+ description: workspace.description,
+ synced: 0,
+ user_id: workspace.userId,
+ version_id: workspace.versionId,
+ })),
+ )
+ .compile();
+
+ queries.push(insertWorkspacesQuery);
+ }
+
+ return queries;
+};
diff --git a/desktop/src/main.ts b/desktop/src/main.ts
index 568ba843..275c6a93 100644
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -71,7 +71,7 @@ ipcMain.handle('logout', async (_, accountId) => appManager.logout(accountId));
ipcMain.handle(
'execute-app-mutation',
- async (_, mutation: CompiledQuery): Promise<void> => {
+ async (_, mutation: CompiledQuery | CompiledQuery[]): Promise<void> => {
await appManager.executeMutation(mutation);
},
);
diff --git a/desktop/src/mutations/use-email-login-mutation.tsx b/desktop/src/mutations/use-email-login-mutation.tsx
new file mode 100644
index 00000000..25996362
--- /dev/null
+++ b/desktop/src/mutations/use-email-login-mutation.tsx
@@ -0,0 +1,36 @@
+import axios from 'axios';
+import { useAppDatabase } from '@/contexts/app-database';
+import { LoginOutput } from '@/types/accounts';
+import { useMutation } from '@tanstack/react-query';
+import { Server } from '@/types/servers';
+import { buildLoginMutationQueries } from '@/lib/accounts';
+
+interface EmailLoginInput {
+ server: Server;
+ email: string;
+ password: string;
+}
+
+export const useEmailLoginMutation = () => {
+ const appDatabase = useAppDatabase();
+
+ return useMutation({
+ mutationFn: async (input: EmailLoginInput) => {
+ const { data } = await axios.post<LoginOutput>(
+ `http://${input.server.domain}/v1/accounts/login/email`,
+ {
+ email: input.email,
+ password: input.password,
+ },
+ );
+
+ const queries = buildLoginMutationQueries(
+ appDatabase.database,
+ data,
+ input.server,
+ );
+
+ await appDatabase.mutate(queries);
+ },
+ });
+};
diff --git a/desktop/src/mutations/use-email-register-mutation.tsx b/desktop/src/mutations/use-email-register-mutation.tsx
new file mode 100644
index 00000000..7865a69e
--- /dev/null
+++ b/desktop/src/mutations/use-email-register-mutation.tsx
@@ -0,0 +1,38 @@
+import axios from 'axios';
+import { useAppDatabase } from '@/contexts/app-database';
+import { LoginOutput } from '@/types/accounts';
+import { useMutation } from '@tanstack/react-query';
+import { Server } from '@/types/servers';
+import { buildLoginMutationQueries } from '@/lib/accounts';
+
+interface EmailRegisterInput {
+ server: Server;
+ name: string;
+ email: string;
+ password: string;
+}
+
+export const useEmailRegisterMutation = () => {
+ const appDatabase = useAppDatabase();
+
+ return useMutation({
+ mutationFn: async (input: EmailRegisterInput) => {
+ const { data } = await axios.post<LoginOutput>(
+ `http://${input.server.domain}/v1/accounts/register/email`,
+ {
+ name: input.name,
+ email: input.email,
+ password: input.password,
+ },
+ );
+
+ const queries = buildLoginMutationQueries(
+ appDatabase.database,
+ data,
+ input.server,
+ );
+
+ await appDatabase.mutate(queries);
+ },
+ });
+};
diff --git a/desktop/src/preload.ts b/desktop/src/preload.ts
index b85e957f..d9de0cb1 100644
--- a/desktop/src/preload.ts
+++ b/desktop/src/preload.ts
@@ -13,8 +13,9 @@ contextBridge.exposeInMainWorld('neuron', {
): Promise<QueryResult<R>> =>
ipcRenderer.invoke('execute-app-query-and-subscribe', queryId, query),
- executeAppMutation: (mutation: CompiledQuery): Promise<void> =>
- ipcRenderer.invoke('execute-app-mutation', mutation),
+ executeAppMutation: (
+ mutation: CompiledQuery | CompiledQuery[],
+ ): Promise<void> => ipcRenderer.invoke('execute-app-mutation', mutation),
unsubscribeAppQuery: (queryId: string): Promise<void> =>
ipcRenderer.invoke('unsubscribe-app-query', queryId),
diff --git a/desktop/src/types/window.d.ts b/desktop/src/types/window.d.ts
index a66f3867..5e551b79 100644
--- a/desktop/src/types/window.d.ts
+++ b/desktop/src/types/window.d.ts
@@ -6,7 +6,9 @@ import { SubscribedQueryContext } from '@/types/queries';
interface NeuronApi {
init: () => Promise<void>;
logout: (accountId: string) => Promise<void>;
- executeAppMutation: (mutation: CompiledQuery) => Promise<void>;
+ executeAppMutation: (
+ mutation: CompiledQuery | CompiledQuery[],
+ ) => Promise<void>;
executeAppQuery: (query: CompiledQuery<R>) => Promise<QueryResult<R>>;
executeAppQueryAndSubscribe: (
context: SubscribedQueryContext<R>,