From e7167b88f353f88f5ec4d9118d6a6ecd076f739d Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Thu, 26 Mar 2020 22:29:41 +0300
Subject: [PATCH] Make error message more user-friendly when non-admin user
tries to log in
---
src/permission.js | 6 +++++-
src/store/modules/user.js | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 764c666e..892f487f 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,11 @@ export const beforeEachRoute = (to, from, next) => {
})
}).catch((err) => {
store.dispatch('FedLogOut').then(() => {
- Message.error(err)
+ Message({
+ message: err,
+ type: 'error',
+ duration: 7 * 1000
+ })
next({ path: '/' })
})
})
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3ab9339d..762826c7 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -89,7 +89,7 @@ const user = {
if (data.pleroma && data.pleroma.is_admin) {
commit('SET_ROLES', ['admin'])
} else {
- reject('getInfo: roles must be a non-null array!')
+ reject('This user doesn\`t have admin rights. Try another credentials or run `MIX_ENV=prod mix pleroma.user set NICKNAME --admin`')
}
commit('SET_NAME', data.username)
--
GitLab