[FIX] mail, crm, hr_holidays: fix redirection for custom mail routes

Like fixed in previous commits, we now correctly fallback on web,
my or login depending on user type. It is going to generate a
valid /mail/view route when token is wrong for some reason instead
of randomly redirecting everyone to Inbox.

Task-4685166

X-original-commit: odoo/odoo@4209c17
Part-of: odoo#213889
Signed-off-by: Thibault Delavallee (tde) <[email protected]>

Author: tde-banana-odoo

addons/crm/controllers/main.py

@@ -4,7 +4,6 @@
 
 from odoo.addons.mail.controllers.mail import MailController
 from odoo import http
-from odoo.http import request
 
 _logger = logging.getLogger(__name__)
 
@@ -19,7 +18,7 @@ def crm_lead_case_mark_won(self, res_id, token):
                 record.action_set_won_rainbowman()
             except Exception:
                 _logger.exception("Could not mark crm.lead as won")
-                return MailController._redirect_to_messaging()
+                return MailController._redirect_to_generic_fallback('crm.lead', res_id)
         return redirect
 
     @http.route('/lead/case_mark_lost', type='http', auth='user', methods=['GET'])
@@ -30,7 +29,7 @@ def crm_lead_case_mark_lost(self, res_id, token):
                 record.action_set_lost()
             except Exception:
                 _logger.exception("Could not mark crm.lead as lost")
-                return MailController._redirect_to_messaging()
+                return MailController._redirect_to_generic_fallback('crm.lead', res_id)
         return redirect
 
     @http.route('/lead/convert', type='http', auth='user', methods=['GET'])
@@ -41,5 +40,5 @@ def crm_lead_convert(self, res_id, token):
                 record.convert_opportunity(record.partner_id)
             except Exception:
                 _logger.exception("Could not convert crm.lead to opportunity")
-                return MailController._redirect_to_messaging()
+                return MailController._redirect_to_generic_fallback('crm.lead', res_id)
         return redirect

addons/hr_holidays/controllers/main.py

@@ -24,7 +24,7 @@ def hr_holidays_request_validate(self, res_id, token):
             try:
                 record.action_validate()
             except Exception:
-                return MailController._redirect_to_messaging()
+                return MailController._redirect_to_generic_fallback('hr.leave', res_id)
         return redirect
 
     @http.route('/leave/refuse', type='http', auth='user', methods=['GET'])
@@ -34,7 +34,7 @@ def hr_holidays_request_refuse(self, res_id, token):
             try:
                 record.action_refuse()
             except Exception:
-                return MailController._redirect_to_messaging()
+                return MailController._redirect_to_generic_fallback('hr.leave', res_id)
         return redirect
 
     @http.route('/allocation/validate', type='http', auth='user', methods=['GET'])
@@ -44,7 +44,7 @@ def hr_holidays_allocation_validate(self, res_id, token):
             try:
                 record.action_approve()
             except Exception:
-                return MailController._redirect_to_messaging()
+                return MailController._redirect_to_generic_fallback('hr.leave.allocation', res_id)
         return redirect
 
     @http.route('/allocation/refuse', type='http', auth='user', methods=['GET'])
@@ -54,5 +54,5 @@ def hr_holidays_allocation_refuse(self, res_id, token):
             try:
                 record.action_refuse()
             except Exception:
-                return MailController._redirect_to_messaging()
+                return MailController._redirect_to_generic_fallback('hr.leave.allocation', res_id)
         return redirect

addons/mail/controllers/mail.py

@@ -59,12 +59,12 @@ def _check_token_and_record_or_redirect(cls, model, res_id, token):
         comparison = cls._check_token(token)
         if not comparison:
             _logger.warning('Invalid token in route %s', request.httprequest.url)
-            return comparison, None, cls._redirect_to_messaging()
+            return comparison, None, cls._redirect_to_generic_fallback(model, res_id)
         try:
             record = request.env[model].browse(res_id).exists()
         except Exception:
             record = None
-            redirect = cls._redirect_to_messaging()
+            redirect = cls._redirect_to_generic_fallback(model, res_id)
         else:
             redirect = cls._redirect_to_record(model, res_id)
         return comparison, record, redirect