fix: admin/accounts: login appears after editing a non-admin account on other than localhost
Massimo Melina committed
Mar 29, 2023 at 14:47 UTC
c251f80858d02249a48b363627143f68d5f6b0e6
2 files changed
+3
-3
admin/src/AccountForm.ts
+1
-1
@@ -69,7 +69,7 @@ export default function AccountForm({ account, done, groups, addToBar, reload }:
69
save: {
70
sx: modifiedSx( !isEqualLax(values, account)),
71
async onClick() {
72
- const { password='', password2, adminActualAccess, ...withoutPassword } = values
72
+ const { password='', password2, adminActualAccess, hasPassword, ...withoutPassword } = values
73
const { username } = values
74
if (add) {
75
const got = await apiCall('add_account', withoutPassword)
src/api.accounts.ts
+2
-2
@@ -54,8 +54,8 @@ const apis: ApiHandlers = {
54
if (!acc)
55
return new ApiError(HTTP_BAD_REQUEST)
56
setAccount(acc, changes)
57
- if (changes.username && ctx.session)
58
- ctx.session.username = changes.username
57
+ if (changes.username && ctx.session?.username === username)
58
+ ctx.session!.username = changes.username
59
return _.pick(acc, 'username')
60
},
61