Guillaume (gdi)
1b77b3c214
When a new user is created from the website, the company id was always set to the first company of the database even if the website was the one of another company. This flow has been already fixed if there is the "Specific User Account" setting activated (see [this other commit]). This commit fixes the same issue but for every case. Steps to reproduce the issue: - Create 2 companies A & B - For each company, create a website linked to a different URL - Activate 'Free sign up' for company B - As a public user, go to website of company B - Go to 'Sign in > Don't have an account?' and create an account => If as an admin you check the company of the created user, it is company A instead of company B. [this other commit]: https://github.com/odoo/odoo/commit/77c708c516beb322df37220634e178ba82e894c9 task-3277317 closes odoo/odoo#121834 X-original-commit: 3fbfb5301c7583583e4f46c9b4ef16e048e5800c Signed-off-by: Benoit Socias (bso) <bso@odoo.com> Signed-off-by: Dieleman Guillaume (gdi) <gdi@odoo.com>
93 lines
4.0 KiB
Python
93 lines
4.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
import logging
|
|
|
|
from odoo import api, fields, models, _, Command
|
|
from odoo.exceptions import ValidationError
|
|
from odoo.http import request
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
class ResUsers(models.Model):
|
|
_inherit = 'res.users'
|
|
|
|
website_id = fields.Many2one('website', related='partner_id.website_id', store=True, related_sudo=False, readonly=False)
|
|
|
|
_sql_constraints = [
|
|
# Partial constraint, complemented by a python constraint (see below).
|
|
('login_key', 'unique (login, website_id)', 'You can not have two users with the same login!'),
|
|
]
|
|
|
|
@api.constrains('login', 'website_id')
|
|
def _check_login(self):
|
|
""" Do not allow two users with the same login without website """
|
|
self.flush_model(['login', 'website_id'])
|
|
self.env.cr.execute(
|
|
"""SELECT login
|
|
FROM res_users
|
|
WHERE login IN (SELECT login FROM res_users WHERE id IN %s AND website_id IS NULL)
|
|
AND website_id IS NULL
|
|
GROUP BY login
|
|
HAVING COUNT(*) > 1
|
|
""",
|
|
(tuple(self.ids),)
|
|
)
|
|
if self.env.cr.rowcount:
|
|
raise ValidationError(_('You can not have two users with the same login!'))
|
|
|
|
@api.model
|
|
def _get_login_domain(self, login):
|
|
website = self.env['website'].get_current_website()
|
|
return super(ResUsers, self)._get_login_domain(login) + website.website_domain()
|
|
|
|
@api.model
|
|
def _get_login_order(self):
|
|
return 'website_id, ' + super(ResUsers, self)._get_login_order()
|
|
|
|
@api.model
|
|
def _signup_create_user(self, values):
|
|
current_website = self.env['website'].get_current_website()
|
|
# Note that for the moment, portal users can connect to all websites of
|
|
# all companies as long as the specific_user_account setting is not
|
|
# activated.
|
|
values['company_id'] = current_website.company_id.id
|
|
values['company_ids'] = [Command.link(current_website.company_id.id)]
|
|
if request and current_website.specific_user_account:
|
|
values['website_id'] = current_website.id
|
|
new_user = super(ResUsers, self)._signup_create_user(values)
|
|
return new_user
|
|
|
|
@api.model
|
|
def _get_signup_invitation_scope(self):
|
|
current_website = self.env['website'].get_current_website()
|
|
return current_website.auth_signup_uninvited or super(ResUsers, self)._get_signup_invitation_scope()
|
|
|
|
@classmethod
|
|
def authenticate(cls, db, login, password, user_agent_env):
|
|
""" Override to link the logged in user's res.partner to website.visitor.
|
|
If a visitor already exists for that user, assign it data from the
|
|
current anonymous visitor (if exists).
|
|
Purpose is to try to aggregate as much sub-records (tracked pages,
|
|
leads, ...) as possible. """
|
|
visitor_pre_authenticate_sudo = None
|
|
if request and request.env:
|
|
visitor_pre_authenticate_sudo = request.env['website.visitor']._get_visitor_from_request()
|
|
uid = super(ResUsers, cls).authenticate(db, login, password, user_agent_env)
|
|
if uid and visitor_pre_authenticate_sudo:
|
|
env = api.Environment(request.env.cr, uid, {})
|
|
user_partner = env.user.partner_id
|
|
visitor_current_user_sudo = env['website.visitor'].sudo().search([
|
|
('partner_id', '=', user_partner.id)
|
|
], limit=1)
|
|
if visitor_current_user_sudo:
|
|
# A visitor exists for the logged in user, link public
|
|
# visitor records to it.
|
|
if visitor_pre_authenticate_sudo != visitor_current_user_sudo:
|
|
visitor_pre_authenticate_sudo._merge_visitor(visitor_current_user_sudo)
|
|
visitor_current_user_sudo._update_visitor_last_visit()
|
|
else:
|
|
visitor_pre_authenticate_sudo.access_token = user_partner.id
|
|
visitor_pre_authenticate_sudo._update_visitor_last_visit()
|
|
return uid
|