Skip to content
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

added setting/resetting password after socail login #2457

Merged
merged 11 commits into from
May 13, 2024
Merged

added setting/resetting password after socail login #2457

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e36a3f3
added setting/resetting password after socail login
Akhilbisht798 Sep 18, 2023
ac6bcf6
Merge branch 'develop' into PasswordSetting
Akhilbisht798 Sep 23, 2023
16f2091
Merge branch 'develop' into PasswordSetting
Akhilbisht798 Oct 19, 2023
ec803fb
Merge branch 'develop' into PasswordSetting
Akhilbisht798 Oct 28, 2023
4318e30
Merge branch 'develop' into PasswordSetting
Akhilbisht798 Nov 10, 2023
854ffdc
Merge branch 'develop' into PasswordSetting
Akhilbisht798 Nov 16, 2023
e76a1cf
Merge branch 'develop' into PasswordSetting
Akhilbisht798 Nov 20, 2023
c210c3c
Merge branch 'develop' into PasswordSetting
raclim Nov 30, 2023
ffa1c05
Merge branch 'develop' into PasswordSetting
Akhilbisht798 Dec 14, 2023
43cb4fe
Merge branch 'develop' into PasswordSetting
Akhilbisht798 Jan 26, 2024
3e9a151
Merge branch 'develop' into PasswordSetting
Akhilbisht798 May 12, 2024
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
10 changes: 10 additions & 0 deletions server/controllers/user.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,16 @@ export async function updateSettings(req, res) {
}
user.username = req.body.username;

if (req.body.newPassword) {
if (user.password === undefined) {
user.password = req.body.newPassword;
saveUser(res, user);
}
if (!req.body.currentPassword) {
res.status(401).json({ error: 'Current password is not provided.' });
return;
}
}
if (req.body.currentPassword) {
const isMatch = await user.comparePassword(req.body.currentPassword);
if (!isMatch) {
Expand Down
Loading