Skip to content

[FIX] Deleting own account asks for the username in the UI instead of the password #22405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 3 commits into from
Jun 28, 2021
Merged

[FIX] Deleting own account asks for the username in the UI instead of the password #22405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49d07b3
[FIX] Deleting own account asks for the username in the UI instead of…
pierre-lehnen-rc Jun 18, 2021
a1f8fe4
Use a separate attribute to indicate if the user has a password or not
pierre-lehnen-rc Jun 28, 2021
1b1987b
Merge branch 'develop' into fix.deleting-an-account-asks-for-username…
pierre-lehnen-rc Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions app/api/server/v1/misc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,16 @@ API.v1.addRoute('info', { authRequired: false }, {

API.v1.addRoute('me', { authRequired: true }, {
get() {
const { 'services.password.bcrypt': password, ...fields } = getDefaultUserFields();
return API.v1.success(this.getUserInfo(Users.findOneById(this.userId, { fields })));
const fields = getDefaultUserFields();
const user = Users.findOneById(this.userId, { fields });

// The password hash shouldn't be leaked but the client may need to know if it exists.
if (user?.services?.password?.bcrypt) {
user.services.password.exists = true;
delete user.services.password.bcrypt;
}

return API.v1.success(this.getUserInfo(user));
},
});

Expand Down
4 changes: 2 additions & 2 deletions client/views/account/AccountProfilePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const AccountProfilePage = () => {

const closeModal = useCallback(() => setModal(null), [setModal]);

const localPassword = Boolean(user?.services?.password?.bcrypt?.trim());
const localPassword = Boolean(user?.services?.password?.exists);

const erasureType = useSetting('Message_ErasureType');
const allowRealNameChange = useSetting('Accounts_AllowRealNameChange');
Expand All @@ -67,7 +67,7 @@ const AccountProfilePage = () => {
const namesRegexSetting = useSetting('UTF8_Names_Validation');

if (allowPasswordChange && !allowOAuthPasswordChange) {
allowPasswordChange = Boolean(user?.services?.password?.bcrypt);
allowPasswordChange = localPassword;
}

const namesRegex = useMemo(() => new RegExp(`^${namesRegexSetting}$`), [namesRegexSetting]);
Expand Down
2 changes: 1 addition & 1 deletion tests/end-to-end/api/00-miscellaneous.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ describe('miscellaneous', function() {
expect(res.body).to.have.nested.property('emails[0].address', adminEmail);
expect(res.body).to.have.nested.property('settings.preferences').and.to.be.an('object');
expect(res.body.settings.preferences).to.have.all.keys(allUserPreferencesKeys);
expect(res.body.services).to.not.have.property('password');
expect(res.body.services).to.not.have.nested.property('password.bcrypt');
})
.end(done);
});
Expand Down