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 device creation on login/register
Hakan Shehufce5bdc60dc2
diff --git a/apps/desktop/src/main/mutations/accounts/email-login.ts b/apps/desktop/src/main/mutations/accounts/email-login.tsindex b0266924..2633c2ed 100644--- a/apps/desktop/src/main/mutations/accounts/email-login.ts+++ b/apps/desktop/src/main/mutations/accounts/email-login.ts@@ -1,4 +1,6 @@-import { LoginOutput } from '@colanode/core';+import { EmailLoginInput, LoginOutput } from '@colanode/core';++import { app } from 'electron';import { databaseService } from '@/main/data/database-service';import { MutationHandler } from '@/main/types';@@ -26,12 +28,16 @@ export class EmailLoginMutationHandler}try {+ const emailLoginInput: EmailLoginInput = {+ email: input.email,+ password: input.password,+ platform: process.platform,+ version: app.getVersion(),+ };+const { data } = await httpClient.post<LoginOutput>('/v1/accounts/emails/login',- {- email: input.email,- password: input.password,- },+ emailLoginInput,{domain: server.domain,}diff --git a/apps/desktop/src/main/mutations/accounts/email-register.ts b/apps/desktop/src/main/mutations/accounts/email-register.tsindex 3c932f12..7e3f583b 100644--- a/apps/desktop/src/main/mutations/accounts/email-register.ts+++ b/apps/desktop/src/main/mutations/accounts/email-register.ts@@ -1,4 +1,6 @@-import { LoginOutput } from '@colanode/core';+import { EmailRegisterInput, LoginOutput } from '@colanode/core';++import { app } from 'electron';import { databaseService } from '@/main/data/database-service';import { MutationHandler } from '@/main/types';@@ -28,13 +30,17 @@ export class EmailRegisterMutationHandler}try {+ const emailRegisterInput: EmailRegisterInput = {+ name: input.name,+ email: input.email,+ password: input.password,+ platform: process.platform,+ version: app.getVersion(),+ };+const { data } = await httpClient.post<LoginOutput>('/v1/accounts/emails/register',- {- name: input.name,- email: input.email,- password: input.password,- },+ emailRegisterInput,{domain: server.domain,}diff --git a/apps/desktop/src/main/mutations/accounts/email-verify.ts b/apps/desktop/src/main/mutations/accounts/email-verify.tsindex 7e7149ee..9ab1541d 100644--- a/apps/desktop/src/main/mutations/accounts/email-verify.ts+++ b/apps/desktop/src/main/mutations/accounts/email-verify.ts@@ -1,4 +1,6 @@-import { LoginOutput } from '@colanode/core';+import { EmailVerifyInput, LoginOutput } from '@colanode/core';++import { app } from 'electron';import { databaseService } from '@/main/data/database-service';import { MutationHandler } from '@/main/types';@@ -26,12 +28,16 @@ export class EmailVerifyMutationHandler}try {+ const emailVerifyInput: EmailVerifyInput = {+ id: input.id,+ otp: input.otp,+ platform: process.platform,+ version: app.getVersion(),+ };+const { data } = await httpClient.post<LoginOutput>('/v1/accounts/emails/verify',- {- id: input.id,- otp: input.otp,- },+ emailVerifyInput,{domain: server.domain,}diff --git a/apps/server/src/controllers/client/accounts/email-login.ts b/apps/server/src/controllers/client/accounts/email-login.tsindex 6354e9f4..932a8b85 100644--- a/apps/server/src/controllers/client/accounts/email-login.ts+++ b/apps/server/src/controllers/client/accounts/email-login.ts@@ -68,9 +68,10 @@ export const emailLoginHandler = async (});}- const output = await accountService.buildLoginSuccessOutput(- account,- res.locals.ip- );+ const output = await accountService.buildLoginSuccessOutput(account, {+ ip: res.locals.ip,+ platform: input.platform,+ version: input.version,+ });return ResponseBuilder.success(res, output);};diff --git a/apps/server/src/controllers/client/accounts/email-register.ts b/apps/server/src/controllers/client/accounts/email-register.tsindex b60394aa..e4c0c7cc 100644--- a/apps/server/src/controllers/client/accounts/email-register.ts+++ b/apps/server/src/controllers/client/accounts/email-register.ts@@ -113,9 +113,10 @@ export const emailRegisterHandler = async (});}- const output = await accountService.buildLoginSuccessOutput(- account,- res.locals.ip- );+ const output = await accountService.buildLoginSuccessOutput(account, {+ ip: res.locals.ip,+ platform: input.platform,+ version: input.version,+ });return ResponseBuilder.success(res, output);};diff --git a/apps/server/src/controllers/client/accounts/email-verify.ts b/apps/server/src/controllers/client/accounts/email-verify.tsindex f0651e34..f0acb13d 100644--- a/apps/server/src/controllers/client/accounts/email-verify.ts+++ b/apps/server/src/controllers/client/accounts/email-verify.ts@@ -32,9 +32,10 @@ export const emailVerifyHandler = async (req: Request, res: Response) => {});}- const output = await accountService.buildLoginSuccessOutput(- account,- res.locals.ip- );+ const output = await accountService.buildLoginSuccessOutput(account, {+ ip: res.locals.ip,+ platform: input.platform,+ version: input.version,+ });return ResponseBuilder.success(res, output);};diff --git a/apps/server/src/controllers/client/accounts/login-google.ts b/apps/server/src/controllers/client/accounts/login-google.tsindex eccae5f4..44b70110 100644--- a/apps/server/src/controllers/client/accounts/login-google.ts+++ b/apps/server/src/controllers/client/accounts/login-google.ts@@ -78,7 +78,11 @@ export const loginWithGoogleHandler = async (const output = await accountService.buildLoginSuccessOutput(existingAccount,- res.locals.ip+ {+ ip: res.locals.ip,+ platform: input.platform,+ version: input.version,+ });return ResponseBuilder.success(res, output);}@@ -104,9 +108,10 @@ export const loginWithGoogleHandler = async (});}- const output = await accountService.buildLoginSuccessOutput(- newAccount,- res.locals.ip- );+ const output = await accountService.buildLoginSuccessOutput(newAccount, {+ ip: res.locals.ip,+ platform: input.platform,+ version: input.version,+ });return ResponseBuilder.success(res, output);};diff --git a/apps/server/src/services/account-service.ts b/apps/server/src/services/account-service.tsindex eec62cb5..01766a71 100644--- a/apps/server/src/services/account-service.ts+++ b/apps/server/src/services/account-service.ts@@ -23,10 +23,16 @@ import { emailService } from '@/services/email-service';const OTP_DIGITS = '0123456789';const OTP_LENGTH = 6;+interface DeviceMetadata {+ ip: string | undefined;+ platform: string;+ version: string;+}+class AccountService {public async buildLoginSuccessOutput(account: SelectAccount,- ip: string | undefined+ metadata: DeviceMetadata): Promise<LoginSuccessOutput> {const users = await database.selectFrom('users')@@ -81,9 +87,10 @@ class AccountService {token_salt: salt,token_generated_at: new Date(),type: 1,- ip,+ ip: metadata.ip,+ platform: metadata.platform,+ version: metadata.version,created_at: new Date(),- version: '0.1.0',}).returningAll().executeTakeFirst();diff --git a/packages/core/src/types/accounts.ts b/packages/core/src/types/accounts.tsindex 982a4de2..2e39f088 100644--- a/packages/core/src/types/accounts.ts+++ b/packages/core/src/types/accounts.ts@@ -4,17 +4,23 @@ export type GoogleLoginInput = {access_token: string;token_type: string;expires_in: number;+ platform: string;+ version: string;};export type EmailRegisterInput = {name: string;email: string;password: string;+ platform: string;+ version: string;};export type EmailLoginInput = {email: string;password: string;+ platform: string;+ version: string;};export type GoogleUserInfo = {@@ -78,4 +84,6 @@ export type AccountSyncOutput = {export type EmailVerifyInput = {id: string;otp: string;+ platform: string;+ version: string;};