diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac8ad27071d92cecc9af68134adcff70a3925287..be0fb97102c08b3e03cd538cbb7383a82c4eee7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased
+### Changed
+
+- `mailerEnabled` must be set to `true` in order to require password reset (password reset currently only works via email)
+
## [1.2.0] - 2019-09-27
### Added
diff --git a/src/api/__mocks__/nodeInfo.js b/src/api/__mocks__/nodeInfo.js
new file mode 100644
index 0000000000000000000000000000000000000000..6daf074ee6595f03504408317c019a45fbb58976
--- /dev/null
+++ b/src/api/__mocks__/nodeInfo.js
@@ -0,0 +1,9 @@
+export async function getNodeInfo(authHost) {
+ const data = {
+ metadata: {
+ mailerEnabled: true
+ }
+ }
+
+ return Promise.resolve({ data })
+}
diff --git a/src/api/nodeInfo.js b/src/api/nodeInfo.js
new file mode 100644
index 0000000000000000000000000000000000000000..c67df01b544b83c79105317cc3b4a1b82e8a9355
--- /dev/null
+++ b/src/api/nodeInfo.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import { baseName } from './utils'
+
+export async function getNodeInfo(authHost) {
+ return await request({
+ baseURL: baseName(authHost),
+ url: `/nodeinfo/2.0.json`,
+ method: 'get'
+ })
+}
diff --git a/src/api/utils.js b/src/api/utils.js
index 1346a204cbb4c539f65a91edc8fcb388dd3eacc2..9f47a1f8570a87ebcdacb63060661b8f7ce50715 100644
--- a/src/api/utils.js
+++ b/src/api/utils.js
@@ -1,7 +1,7 @@
const isLocalhost = (instanceName) =>
instanceName.startsWith('localhost:') || instanceName.startsWith('127.0.0.1:')
-export const baseName = (instanceName) => {
+export const baseName = (instanceName = 'localhost') => {
if (instanceName.match(/https?:\/\//)) {
return instanceName
} else {
diff --git a/src/lang/en.js b/src/lang/en.js
index 5d705cdfad481a71d692c4d268873c0fe5069a82..8088e441a16560462b82279ed32cf49c1263e992 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -215,6 +215,7 @@ export default {
addTagForMultipleUsersConfirmation: 'Are you sure you want to apply tag to all selected users?',
removeTagFromMultipleUsersConfirmation: 'Are you sure you want to remove tag from all selected users?',
requirePasswordResetConfirmation: 'Are you sure you want to require password reset for all selected users?',
+ mailerMustBeEnabled: 'To require user\'s password reset you must enable mailer.',
ok: 'Okay',
completed: 'Completed',
cancel: 'Cancel',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 18ff54196742f809b2d49f677bbcb87a121535c1..3ab9339d356b209284a35edfc9da5646b13d75c1 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,5 @@
import { loginByUsername, getUserInfo } from '@/api/login'
+import { getNodeInfo } from '@/api/nodeInfo'
import { getToken, setToken, removeToken, getAuthHost, setAuthHost, removeAuthHost } from '@/utils/auth'
const user = {
@@ -15,7 +16,8 @@ const user = {
roles: [],
setting: {
articlePlatform: []
- }
+ },
+ nodeInfo: {}
},
mutations: {
@@ -48,6 +50,9 @@ const user = {
},
SET_AUTH_HOST: (state, authHost) => {
state.authHost = authHost
+ },
+ SET_NODE_INFO: (state, nodeInfo) => {
+ state.nodeInfo = nodeInfo
}
},
@@ -67,7 +72,11 @@ const user = {
})
})
},
+ async GetNodeInfo({ commit, state }) {
+ const nodeInfo = await getNodeInfo(state.authHost)
+ commit('SET_NODE_INFO', nodeInfo.data)
+ },
GetUserInfo({ commit, state }) {
return new Promise((resolve, reject) => {
getUserInfo(state.token, state.authHost).then(response => {
diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index 36a7f507432d82103c619706c3d6df7678f1a9c0..b3d351082ed9a0c4023c8a5b552a99fc8a079eaf 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -98,10 +98,11 @@ const users = {
async RequirePasswordReset({ commit, getters, state }, user) {
await requirePasswordReset(user.nickname, getters.authHost, getters.token)
},
- async FetchUsers({ commit, state, getters }, { page }) {
+ async FetchUsers({ commit, state, getters, dispatch }, { page }) {
commit('SET_LOADING', true)
const filters = Object.keys(state.filters).filter(filter => state.filters[filter]).join()
const response = await fetchUsers(filters, getters.authHost, getters.token, page)
+ await dispatch('GetNodeInfo')
loadUsers(commit, page, response.data)
},
async GetPasswordResetToken({ commit, state, getters }, nickname) {
diff --git a/src/utils/request.js b/src/utils/request.js
index 271fe5918a1830c2dfc13d839e60b446daf993f7..bbed6501121b6760a69f8d8a3fd8a74195f18ba4 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,7 +10,7 @@ const service = axios.create({
service.interceptors.response.use(
response => response,
error => {
- console.log('Error ' + error)
+ console.log(`Error ${error}`)
console.log(error.response.data)
// If there's an "error" property in the json, use it
diff --git a/src/views/users/components/MultipleUsersMenu.vue b/src/views/users/components/MultipleUsersMenu.vue
index ff016f51a2eb440bf4704d87f57a1f7ebfe5dcf7..ecd2baf2373f37937d8e2c7b99b9bce444e70ca7 100644
--- a/src/views/users/components/MultipleUsersMenu.vue
+++ b/src/views/users/components/MultipleUsersMenu.vue
@@ -273,6 +273,14 @@ export default {
)
},
requirePasswordReset() {
+ const mailerEnabled = this.$store.state.user.nodeInfo.metadata.mailerEnabled
+
+ if (!mailerEnabled) {
+ this.$alert(this.$t('users.mailerMustBeEnabled'), 'Error', { type: 'error' })
+
+ return
+ }
+
const { requirePasswordReset } = this.mappers()
this.confirmMessage(
this.$t('users.requirePasswordResetConfirmation'),
diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index 16160a97bf3195c5acbe90903e717a93a5dd2f40..062b23c813b92e385b96022590ac9148878929e2 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -265,6 +265,14 @@ export default {
this.$store.dispatch('GetPasswordResetToken', nickname)
},
requirePasswordReset(nickname) {
+ const mailerEnabled = this.$store.state.user.nodeInfo.metadata.mailerEnabled
+
+ if (!mailerEnabled) {
+ this.$alert(this.$t('users.mailerMustBeEnabled'), 'Error', { type: 'error' })
+
+ return
+ }
+
this.$store.dispatch('RequirePasswordReset', { nickname })
},
handleDeactivation({ nickname }) {
diff --git a/test/views/login/index.test.js b/test/views/login/index.test.js
index b2986b5d2e3124e0295a20b6c2da0c79bc382a95..03e4566792faf67ca1cb02cd5474525fbc6fdf2c 100644
--- a/test/views/login/index.test.js
+++ b/test/views/login/index.test.js
@@ -16,6 +16,7 @@ localVue.use(Vuex)
localVue.use(VueRouter)
localVue.use(Element)
+jest.mock('@/api/nodeInfo')
jest.mock('@/api/login')
describe('Login', () => {
diff --git a/test/views/users/index.test.js b/test/views/users/index.test.js
index 863186f3953e2ee3c44fa573bd2b8225e6a15f65..d435e1ce900f788548182fe7f38224b2016a2a10 100644
--- a/test/views/users/index.test.js
+++ b/test/views/users/index.test.js
@@ -14,6 +14,7 @@ const localVue = createLocalVue()
localVue.use(Vuex)
localVue.use(Element)
+jest.mock('@/api/nodeInfo')
jest.mock('@/api/users')
describe('Search and filter users', () => {
diff --git a/test/views/users/multipleUsersMenu.test.js b/test/views/users/multipleUsersMenu.test.js
index 355430e19dc622d23f3badd512f04ade8c884726..c92232bf49d447d34ddfc3f89647a69cef2b7cc0 100644
--- a/test/views/users/multipleUsersMenu.test.js
+++ b/test/views/users/multipleUsersMenu.test.js
@@ -13,6 +13,7 @@ const localVue = createLocalVue()
localVue.use(Vuex)
localVue.use(Element)
+jest.mock('@/api/nodeInfo')
jest.mock('@/api/users')
describe('Apply users actions to multiple users', () => {
diff --git a/test/views/users/usersFilters.test.js b/test/views/users/usersFilters.test.js
index 9cf14c66138c1b25338510558d94eb368f4758e0..e56822ca5a6f1e1840abc38c6a4595a54b713b51 100644
--- a/test/views/users/usersFilters.test.js
+++ b/test/views/users/usersFilters.test.js
@@ -13,6 +13,7 @@ const localVue = createLocalVue()
localVue.use(Vuex)
localVue.use(Element)
+jest.mock('@/api/nodeInfo')
jest.mock('@/api/users')
describe('Filters users', () => {