Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

Fix errors messages

Smaug673913c82248d5ff
diff --git a/backend/classes/UsersManager.ts b/backend/classes/UsersManager.ts
index 78ee42ef..7ad62d9a 100644
--- a/backend/classes/UsersManager.ts
+++ b/backend/classes/UsersManager.ts
@@ -20,11 +20,10 @@ export class UsersManager extends Base {
updated_timestamp: { maxLength: 50, type: 'string', error: 'user updated timestamp invalid' },
});
- public get(username: string): Promise<UserDB> {
+ public get(username: string): Promise<UserDB | undefined> {
return new Promise((resolve, reject) => {
this.app.db.query<UserDB[]>('SELECT * FROM users WHERE username = ? LIMIT 1', [username], async (err, results) => {
if (err) return reject('Internal database error.');
- if (!results[0]) return reject('Bad username or password.');
resolve(results[0]);
});
});
diff --git a/backend/controllers/auth.controller.ts b/backend/controllers/auth.controller.ts
index d54d19cd..6e3b4949 100644
--- a/backend/controllers/auth.controller.ts
+++ b/backend/controllers/auth.controller.ts
@@ -19,8 +19,8 @@ export default class Authentification extends BaseController<UsersManager> {
public async login(req: Request, res: Response) {
try {
const user = await this.manager.get(req.body.username);
- if (!user) throw new Error('Bad username/password.');
- if (!(await this.check_password(user, req.body.password))) throw new Error('Bad username/password.');
+ if (!user) throw 'Bad username or password.';
+ if (!(await this.check_password(user, req.body.password))) throw 'Bad username or password.';
const session: Session = {
id: this.app.snowflake.generate().toString(),
user_id: user.id,
diff --git a/frontend/pages/signup.vue b/frontend/pages/signup.vue
index 49bedf40..7502fb66 100644
--- a/frontend/pages/signup.vue
+++ b/frontend/pages/signup.vue
@@ -99,8 +99,6 @@ async function createAccount(username: string, email: string, password: string)
router.push('/login');
})
.catch(error => {
- console.log('---------------', error);
-
errors.value.general = error;
});
}
diff --git a/frontend/stores/user.store.ts b/frontend/stores/user.store.ts
index 10c518a6..ee7c849e 100644
--- a/frontend/stores/user.store.ts
+++ b/frontend/stores/user.store.ts
@@ -15,7 +15,7 @@ export const useUserStore = defineStore('user', {
if (response.status == 'success' && response.result?.auth) {
if (import.meta.client) localStorage.setItem('isLoggedIn', 'true');
return true;
- }
+ } else throw response.message;
} catch (e) {
return e;
}