diff --git a/pms/__manifest__.py b/pms/__manifest__.py index b048ea5ac..0089a1265 100644 --- a/pms/__manifest__.py +++ b/pms/__manifest__.py @@ -42,6 +42,7 @@ "data/pms_precheckin_invitation_email_template.xml", "data/pms_data.xml", "data/traveller_report_paperformat.xml", + "data/pms_reset_password_email.xml", "report/pms_folio.xml", "report/pms_folio_templates.xml", "report/traveller_report_action.xml", diff --git a/pms/data/pms_reset_password_email.xml b/pms/data/pms_reset_password_email.xml new file mode 100644 index 000000000..d54926c56 --- /dev/null +++ b/pms/data/pms_reset_password_email.xml @@ -0,0 +1,109 @@ + + + + + Pms Reset Password + + Restablecer Contraseña + "${object.company_id.name | safe}" <${(object.company_id.email or user.email) | safe}> + ${object.email_formatted | safe} + + + + +
+ + + + + + + + + + + + + + + +
+ + + +
+ Tu Cuenta en Roomdoo
+ + ${object.name} + + 		+ ${object.company_id.name} +
+
+
+
+ + + +
+
+ ${object.name},

+ Se solicitó un restablecimiento de contraseña para la cuenta de Roomdoo vinculada a este correo electrónico. + Puede cambiar su contraseña siguiendo este enlace que permanecerá válido durante 15 minutos:
+ + + + + + + + + + + Puede ignorar este correo electrónico si no lo esperaba.

+ Gracias, + % if user.signature: +
+ ${user.signature | safe} + % endif +
+
+
+
+
+ + + +
+ ${object.company_id.name} +
+ ${object.company_id.phone} + % if object.company_id.email + | ${object.company_id.email} + % endif + % if object.company_id.website + | + ${object.company_id.website} + + % endif +
+
+
+ + +
+ Powered by Odoo +
+
+ + ${object.lang} + + + + + diff --git a/pms_api_rest/__manifest__.py b/pms_api_rest/__manifest__.py index e884b0fbe..5e13a3abb 100644 --- a/pms_api_rest/__manifest__.py +++ b/pms_api_rest/__manifest__.py @@ -24,6 +24,7 @@ "data/auth_jwt_validator.xml", "views/pms_property_views.xml", "views/res_users_views.xml", + "views/res_company_views.xml", ], "demo": [ "demo/pms_api_rest_master_data.xml", diff --git a/pms_api_rest/datamodels/pms_user.py b/pms_api_rest/datamodels/pms_user.py index eda442713..446b67bc2 100644 --- a/pms_api_rest/datamodels/pms_user.py +++ b/pms_api_rest/datamodels/pms_user.py @@ -9,6 +9,8 @@ class PmsApiRestUserInput(Datamodel): password = fields.String(required=False, allow_none=True) newPassword = fields.String(required=False, allow_none=True) userId = fields.Integer(required=False, allow_none=True) + userEmail = fields.String(required=False, allow_none=True) + resetToken = fields.String(required=False, allow_none=True) class PmsApiRestUserOutput(Datamodel): diff --git a/pms_api_rest/models/__init__.py b/pms_api_rest/models/__init__.py index 4713a4d6b..66a2c1003 100644 --- a/pms_api_rest/models/__init__.py +++ b/pms_api_rest/models/__init__.py @@ -1,3 +1,4 @@ +from . import res_company from . import pms_property from . import res_users from . import account_payment diff --git a/pms_api_rest/models/res_company.py b/pms_api_rest/models/res_company.py new file mode 100644 index 000000000..abe5b0df5 --- /dev/null +++ b/pms_api_rest/models/res_company.py @@ -0,0 +1,7 @@ +from odoo import fields, models + + +class ResCompany(models.Model): + _inherit = "res.company" + + url_app = fields.Char(string="Url App", help="Url to identify the app") diff --git a/pms_api_rest/services/pms_user_service.py b/pms_api_rest/services/pms_user_service.py index 5979eea09..55e5fc284 100644 --- a/pms_api_rest/services/pms_user_service.py +++ b/pms_api_rest/services/pms_user_service.py @@ -1,9 +1,14 @@ import base64 import tempfile import os +import werkzeug.exceptions + from odoo.addons.base_rest import restapi from odoo.addons.base_rest_datamodel.restapi import Datamodel from odoo.addons.component.core import Component +from odoo.exceptions import AccessDenied +from datetime import datetime, timedelta + from odoo import _ @@ -113,8 +118,8 @@ class PmsRoomTypeClassService(Component): if user: try: user.with_user(user)._check_credentials(input_data.password, None) - except: - raise MissingError(_("Wrong password")) + except AccessDenied: + raise werkzeug.exceptions.Unauthorized(_("Wrong password")) user.change_password(input_data.password, input_data.newPassword) @@ -124,3 +129,71 @@ class PmsRoomTypeClassService(Component): login=user.login, ) + @restapi.method( + [ + ( + [ + "/p/reset-password", + ], + "PATCH", + ) + ], + input_param=Datamodel("pms.api.rest.user.input", is_list=False), + auth="public", + cors="*", + ) + def reset_password(self, input_data): + values = { + "password": input_data.password, + } + self.env["res.users"].sudo().signup(values, input_data.resetToken) + return True + + + @restapi.method( + [ + ( + [ + "/send-mail-reset-password", + ], + "POST", + ) + ], + input_param=Datamodel("pms.api.rest.user.input", is_list=False), + auth="public", + cors="*", + ) + def send_mail_to_reset_password(self, input_data): + user = self.env["res.users"].sudo().search([("email", "=", input_data.userEmail)]) + if user: + template_id = self.env.ref("pms.pms_reset_password_email").id + template = self.env['mail.template'].sudo().browse(template_id) + if not template: + return False + expiration_datetime = datetime.now() + timedelta(minutes=15) + user.partner_id.sudo().signup_prepare(expiration=expiration_datetime) + template.send_mail(user.id, force_send=True) + return True + return False + + + @restapi.method( + [ + ( + [ + "/check-reset-password-token/", + ], + "GET", + ) + ], + auth="public", + cors="*", + ) + def check_reset_password_token(self, reset_token): + user = self.env["res.partner"].sudo().search([("signup_token", "=", reset_token)]) + is_token_expired = False + if not user: + return True + if user.sudo().signup_expiration < datetime.now(): + is_token_expired = True + return is_token_expired diff --git a/pms_api_rest/views/res_company_views.xml b/pms_api_rest/views/res_company_views.xml new file mode 100644 index 000000000..c0a833342 --- /dev/null +++ b/pms_api_rest/views/res_company_views.xml @@ -0,0 +1,12 @@ + + + + res.company + + + + + + + +