Skip to content
Snippets Groups Projects
Commit bcd11c9d1587 authored by Houzefa Abbasbhay's avatar Houzefa Abbasbhay :slight_smile:
Browse files

Don't bork other auth addons when using this one

parent 715ccc1ac22d
No related branches found
No related tags found
No related merge requests found
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
import passlib import passlib
import openerp import openerp
from openerp import _
from openerp import api from openerp import api
from openerp import models from openerp import models
from openerp import fields from openerp import fields
from openerp import SUPERUSER_ID from openerp import SUPERUSER_ID
from openerp.exceptions import ValidationError from openerp.exceptions import ValidationError
...@@ -9,13 +10,9 @@ ...@@ -9,13 +10,9 @@
from openerp import api from openerp import api
from openerp import models from openerp import models
from openerp import fields from openerp import fields
from openerp import SUPERUSER_ID from openerp import SUPERUSER_ID
from openerp.exceptions import ValidationError from openerp.exceptions import ValidationError
# import real addons name of base.res.res_users in order to call it without
# user the super() call
from openerp.addons.base.res.res_users import res_users as baseuser
from openerp import _
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
...@@ -18,8 +15,11 @@ ...@@ -18,8 +15,11 @@
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
class res_users(models.Model): class ResUser(models.Model):
"""Add SAML login capabilities to Odoo users.
"""
_inherit = 'res.users' _inherit = 'res.users'
saml_provider_id = fields.Many2one( saml_provider_id = fields.Many2one(
...@@ -232,12 +232,7 @@ ...@@ -232,12 +232,7 @@
token_osv = self.pool.get('auth_saml.token') token_osv = self.pool.get('auth_saml.token')
try: try:
baseuser.check_credentials( super(ResUser, self).check_credentials(cr, uid, token)
self,
cr,
uid,
token
)
except ( except (
openerp.exceptions.AccessDenied, openerp.exceptions.AccessDenied,
...@@ -279,7 +274,7 @@ ...@@ -279,7 +274,7 @@
'password_crypt': False, 'password_crypt': False,
}) })
return super(res_users, self).write(vals) return super(ResUser, self).write(vals)
@api.model @api.model
def _allow_saml_and_password(self): def _allow_saml_and_password(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment