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.

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

[HOTFIX] - Commits fixes #7261

Merged
merged 6 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 4 additions & 7 deletions app/api/users/specs/users.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -587,16 +587,13 @@ describe('Users', () => {
});

describe('when the user does not exist with that email', () => {
it('should not create the entry in the database, should not send a mail, and return an error.', async () => {
it('should not create the entry in the database, should not send a mail, and return nothing', async () => {
jest.spyOn(Date, 'now').mockReturnValue(1000);
const key = unlockCode.generateUnlockCode();
let response;
try {
response = await users.recoverPassword('false@email.com');
} catch (error) {
expect(error.code).toBe(403);
response = await passwordRecoveriesModel.get({ key });
}
response = await users.recoverPassword('false@email.com');
expect(response).toBe(undefined);
response = await passwordRecoveriesModel.get({ key });
expect(response.length).toBe(0);
});
});
Expand Down
2 changes: 1 addition & 1 deletion app/api/users/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ export default {
});
}

return Promise.reject(createError('User not found', 403));
return undefined;
});
},

Expand Down
2 changes: 1 addition & 1 deletion contents/ui-translations/ar.csv
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ Install browser extension (dynamic link),Install browser extension (dynamic link
Install Language(s),Install Language(s)
INSTALL the browser extension,INSTALL the browser extension
"Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation.","Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation."
Instructions to reset password,If the email address supplied is correct
Instructions to reset password,"If the email address supplied is correct, we will send instructions to reset the password."
Instructions to reset the password were sent to the user,Instructions to reset the password were sent to the user
Invalid captcha,حروف التحقق غير صحيحة
Invalid csv: all the values for a row must be either nested or non-nested,Invalid csv: all the values for a row must be either nested or non-nested
Expand Down
2 changes: 1 addition & 1 deletion contents/ui-translations/en.csv
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ Install browser extension (dynamic link),Install browser extension (dynamic link
Install Language(s),Install Language(s)
INSTALL the browser extension,INSTALL the browser extension
"Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation.","Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation."
Instructions to reset password,If the email address supplied is correct
Instructions to reset password,"If the email address supplied is correct, we will send instructions to reset the password."
Instructions to reset the password were sent to the user,Instructions to reset the password were sent to the user
Invalid captcha,Invalid captcha
Invalid csv: all the values for a row must be either nested or non-nested,Invalid csv: all the values for a row must be either nested or non-nested
Expand Down
2 changes: 1 addition & 1 deletion contents/ui-translations/fr.csv
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ Install browser extension (dynamic link),Install browser extension (dynamic link
Install Language(s),Install Language(s)
INSTALL the browser extension,INSTALL the browser extension
"Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation.","Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation."
Instructions to reset password,If the email address supplied is correct
Instructions to reset password,"If the email address supplied is correct, we will send instructions to reset the password."
Instructions to reset the password were sent to the user,Instructions to reset the password were sent to the user
Invalid captcha,Captcha invalide
Invalid csv: all the values for a row must be either nested or non-nested,Invalid csv: all the values for a row must be either nested or non-nested
Expand Down
2 changes: 1 addition & 1 deletion contents/ui-translations/ko.csv
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Install browser extension (dynamic link),Install browser extension (dynamic link
Install Language(s),Install Language(s)
INSTALL the browser extension,INSTALL the browser extension
"Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation.","Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation."
Instructions to reset password,If the email address supplied is correct
Instructions to reset password,"If the email address supplied is correct, we will send instructions to reset the password."
Instructions to reset the password were sent to the user,Instructions to reset the password were sent to the user
Invalid captcha,잘못된 보안문자
Invalid csv: all the values for a row must be either nested or non-nested,Invalid csv: all the values for a row must be either nested or non-nested
Expand Down
2 changes: 1 addition & 1 deletion contents/ui-translations/my.csv
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Install browser extension (dynamic link),Install browser extension (dynamic link
Install Language(s),Install Language(s)
INSTALL the browser extension,INSTALL the browser extension
"Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation.","Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation."
Instructions to reset password,If the email address supplied is correct
Instructions to reset password,"If the email address supplied is correct, we will send instructions to reset the password."
Instructions to reset the password were sent to the user,Instructions to reset the password were sent to the user
Invalid captcha,ကက်ပ်ချာ မှားနေသည်
Invalid csv: all the values for a row must be either nested or non-nested,Invalid csv: all the values for a row must be either nested or non-nested
Expand Down
2 changes: 1 addition & 1 deletion contents/ui-translations/ru.csv
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ Install browser extension (dynamic link),Install browser extension (dynamic link
Install Language(s),Install Language(s)
INSTALL the browser extension,INSTALL the browser extension
"Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation.","Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation."
Instructions to reset password,If the email address supplied is correct
Instructions to reset password,"If the email address supplied is correct, we will send instructions to reset the password."
Instructions to reset the password were sent to the user,Instructions to reset the password were sent to the user
Invalid captcha,Неверная Captcha
Invalid csv: all the values for a row must be either nested or non-nested,Invalid csv: all the values for a row must be either nested or non-nested
Expand Down
2 changes: 1 addition & 1 deletion contents/ui-translations/th.csv
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Install browser extension (dynamic link),Install browser extension (dynamic link
Install Language(s),Install Language(s)
INSTALL the browser extension,INSTALL the browser extension
"Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation.","Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation."
Instructions to reset password,If the email address supplied is correct
Instructions to reset password,"If the email address supplied is correct, we will send instructions to reset the password."
Instructions to reset the password were sent to the user,Instructions to reset the password were sent to the user
Invalid captcha,captcha ไม่ถูกต้อง
Invalid csv: all the values for a row must be either nested or non-nested,Invalid csv: all the values for a row must be either nested or non-nested
Expand Down
2 changes: 1 addition & 1 deletion contents/ui-translations/tr.csv
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Install browser extension (dynamic link),Install browser extension (dynamic link
Install Language(s),Install Language(s)
INSTALL the browser extension,INSTALL the browser extension
"Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation.","Instructions on how to achieve this will vary according to the app used, please refer to the app's documentation."
Instructions to reset password,If the email address supplied is correct
Instructions to reset password,"If the email address supplied is correct, we will send instructions to reset the password."
Instructions to reset the password were sent to the user,Instructions to reset the password were sent to the user
Invalid captcha,Geçersiz güvenlik kodu
Invalid csv: all the values for a row must be either nested or non-nested,Invalid csv: all the values for a row must be either nested or non-nested
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "uwazi",
"version": "1.185.1",
"version": "1.185.2",
"description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
"keywords": [
"react"
Expand Down
Loading