Skip to content
Snippets Groups Projects
Commit 113e3e0f authored by Eugenij's avatar Eugenij
Browse files

Password reset fix

parent fd02cc75
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !84. Comments created here will be created in the context of that merge request.
...@@ -89,12 +89,13 @@ export async function getPasswordResetToken(nickname, authHost, token) { ...@@ -89,12 +89,13 @@ export async function getPasswordResetToken(nickname, authHost, token) {
}) })
} }
export async function requirePasswordReset(nickname, authHost, token) { export async function requirePasswordReset(nicknames, authHost, token) {
return await request({ return await request({
baseURL: baseName(authHost), baseURL: baseName(authHost),
url: `/api/pleroma/admin/users/${nickname}/force_password_reset`, url: `/api/pleroma/admin/users/force_password_reset`,
method: 'patch', method: 'patch',
headers: authHeaders(token) headers: authHeaders(token),
data: { nicknames }
}) })
} }
......
const isLocalhost = (instanceName) => const isLocalhost = (instanceName) =>
instanceName.startsWith('localhost:') || instanceName.startsWith('127.0.0.1:') instanceName.startsWith('localhost:') || instanceName.startsWith('127.0.0.1:')
export const baseName = (instanceName = 'localhost') => { export const baseName = () => `http://localhost:4000`
export const baseName2 = (instanceName = 'localhost') => {
if (instanceName.match(/https?:\/\//)) { if (instanceName.match(/https?:\/\//)) {
return instanceName return instanceName
} else { } else {
......
...@@ -240,9 +240,9 @@ const users = { ...@@ -240,9 +240,9 @@ const users = {
} }
dispatch('SuccessMessage') dispatch('SuccessMessage')
}, },
async RequirePasswordReset({ dispatch, getters }, user) { async RequirePasswordReset({ dispatch, getters }, { nicknames }) {
try { try {
await requirePasswordReset(user.nickname, getters.authHost, getters.token) await requirePasswordReset(nicknames, getters.authHost, getters.token)
} catch (_e) { } catch (_e) {
return return
} }
......
...@@ -216,7 +216,8 @@ export default { ...@@ -216,7 +216,8 @@ export default {
}, },
requirePasswordReset: () => { requirePasswordReset: () => {
const filtered = this.selectedUsers.filter(user => user.local) const filtered = this.selectedUsers.filter(user => user.local)
filtered.map(user => this.$store.dispatch('RequirePasswordReset', user)) const nicknames = filtered.map(u => u.nickname)
this.$store.dispatch('RequirePasswordReset', { nicknames })
this.$emit('apply-action') this.$emit('apply-action')
}, },
confirmAccounts: () => { confirmAccounts: () => {
......
...@@ -277,7 +277,7 @@ export default { ...@@ -277,7 +277,7 @@ export default {
return return
} }
this.$store.dispatch('RequirePasswordReset', { nickname }) this.$store.dispatch('RequirePasswordReset', { nicknames: [nickname] })
}, },
toggleActivation(user) { toggleActivation(user) {
user.deactivated user.deactivated
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment