admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-16 09:36:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix typeorm .save usage (no-changelog) (#8678)

Browse Source
This commit is contained in:
Tomi Turtiainen
2024-02-20 17:34:54 +02:00
committed by GitHub
parent afd2eb1f4a
commit 05e13a68ea
14 changed files with 96 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/cli/src/controllers/me.controller.ts
View File

@@ -104,12 +104,13 @@ export class MeController {
*/
@Patch('/password')
async updatePassword(req: MeRequest.Password, res: Response) {
const { user } = req;
const { currentPassword, newPassword } = req.body;
// If SAML is enabled, we don't allow the user to change their email address
if (isSamlLicensedAndEnabled()) {
this.logger.debug('Attempted to change password for user, while SAML is enabled', {
userId: req.user?.id,
userId: user.id,
});
throw new BadRequestError(
'With SAML enabled, users need to use their SAML provider to change passwords',
@@ -120,33 +121,30 @@ export class MeController {
throw new BadRequestError('Invalid payload.');
}
if (!req.user.password) {
if (!user.password) {
throw new BadRequestError('Requesting user not set up.');
}
const isCurrentPwCorrect = await this.passwordUtility.compare(
currentPassword,
req.user.password,
);
const isCurrentPwCorrect = await this.passwordUtility.compare(currentPassword, user.password);
if (!isCurrentPwCorrect) {
throw new BadRequestError('Provided current password is incorrect.');
}
const validPassword = this.passwordUtility.validate(newPassword);
req.user.password = await this.passwordUtility.hash(validPassword);
user.password = await this.passwordUtility.hash(validPassword);
const user = await this.userRepository.save(req.user);
const updatedUser = await this.userRepository.save(user, { transaction: false });
this.logger.info('Password updated successfully', { userId: user.id });
await issueCookie(res, user);
await issueCookie(res, updatedUser);
void this.internalHooks.onUserUpdate({
user,
user: updatedUser,
fields_changed: ['password'],
});
await this.externalHooks.run('user.password.update', [user.email, req.user.password]);
await this.externalHooks.run('user.password.update', [updatedUser.email, updatedUser.password]);
return { success: true };
}
@@ -168,11 +166,13 @@ export class MeController {
throw new BadRequestError('Personalization answers are mandatory');
}
await this.userRepository.save({
id: req.user.id,
// @ts-ignore
personalizationAnswers,
});
await this.userRepository.save(
{
id: req.user.id,
personalizationAnswers,
},
{ transaction: false },
);
this.logger.info('User survey updated successfully', { userId: req.user.id });