From 85907951c52b40c6dfdaeffa68ce43ccc8bfe0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Lef=C3=A8vre?= Date: Tue, 7 Jan 2020 14:02:26 +0100 Subject: [REF] calendar: Remove useless new env Why is a new env created ? It's already in the request. Task 2126717 PR #42031 PR Enterprise odoo/enterprise#8006 --- addons/calendar/models/ir_http.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'addons/calendar/models') diff --git a/addons/calendar/models/ir_http.py b/addons/calendar/models/ir_http.py index 07441f15135..224cd0f0de3 100644 --- a/addons/calendar/models/ir_http.py +++ b/addons/calendar/models/ir_http.py @@ -3,7 +3,6 @@ from odoo import models from odoo.http import request -from odoo.api import Environment from werkzeug.exceptions import BadRequest @@ -13,22 +12,18 @@ class IrHttp(models.AbstractModel): @classmethod def _auth_method_calendar(cls): - token = request.params['token'] - dbname = request.params['db'] + token = request.params.get('token', '') - registry = odoo.registry(dbname) error_message = False - with registry.cursor() as cr: - env = Environment(cr, SUPERUSER_ID, {}) - - attendee = env['calendar.attendee'].sudo().search([('access_token', '=', token)], limit=1) - if not attendee: - error_message = """Invalid Invitation Token.""" - elif request.session.uid and request.session.login != 'anonymous': - # if valid session but user is not match - user = env['res.users'].sudo().browse(request.session.uid) - if attendee.partner_id != user.partner_id: - error_message = """Invitation cannot be forwarded via email. This event/meeting belongs to %s and you are logged in as %s. Please ask organizer to add you.""" % (attendee.email, user.email) + + attendee = request.env['calendar.attendee'].sudo().search([('access_token', '=', token)], limit=1) + if not attendee: + error_message = """Invalid Invitation Token.""" + elif request.session.uid and request.session.login != 'anonymous': + # if valid session but user is not match + user = request.env['res.users'].sudo().browse(request.session.uid) + if attendee.partner_id != user.partner_id: + error_message = """Invitation cannot be forwarded via email. This event/meeting belongs to %s and you are logged in as %s. Please ask organizer to add you.""" % (attendee.email, user.email) if error_message: raise BadRequest(error_message) -- cgit v1.2.3