pyramid-fullauth 0.3.2__py2.7.egg → 0.6.0__py2.7.egg

pyramid_fullauth/models/mixins/email.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT
@@ -7,40 +7,88 @@
 import re
 import uuid
 
-from sqlalchemy import Column
-from sqlalchemy import Unicode
-from sqlalchemy import String
+from sqlalchemy import Column, Unicode, String
 from sqlalchemy.orm import validates
+from sqlalchemy.ext.hybrid import hybrid_property
 
 
 from pyramid_fullauth.exceptions import EmptyError, EmailValidationError
+from pyramid_fullauth.models.extensions import CaseInsensitive
 
 pattern_mail = re.compile(
     r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]{0,256}(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+){0,256}"  # dot-atom
     # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5
     r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177 ]|\\[\001-\011\013\014\016-\177 ]){0,256}"'
     r')@((?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2}\.?)$)'  # domain
-    r'|\[(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}\]$', re.IGNORECASE)  # literal form, ipv4 address (SMTP 4.1.3)
+    # literal form, ipv4 address (SMTP 4.1.3)
+    r'|\[(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}\]$', re.IGNORECASE)
 
 
 class UserEmailMixin(object):
-
     """User email fields and functionality."""
 
     __pattern_mail = pattern_mail
 
-    email = Column(Unicode(254), unique=True, nullable=False)  # RFC5321 and RFC3696(errata)
-    new_email = Column(Unicode(254), unique=True, nullable=True)  # RFC5321 and RFC3696(errata)
+    _email = Column('email', Unicode(254), unique=True, nullable=False)  # RFC5321 and RFC3696(errata)
+    _new_email = Column('new_email', Unicode(254), unique=True, nullable=True)  # RFC5321 and RFC3696(errata)
     email_change_key = Column(String(255), default=None, unique=True)
 
-    @validates('email', 'new_email')
+    def __init__(self, *args, **kwargs):
+        """Switch possible email and new_email kwarg into new column attribute names."""
+        if 'email' in kwargs:
+            kwargs['_email'] = kwargs.pop('email')
+        if 'new_email' in kwargs:
+            kwargs['_new_email'] - kwargs.pop('new_email')
+
+        super(UserEmailMixin, self).__init__(*args, **kwargs)
+
+    @hybrid_property
+    def email(self):
+        """Email field getter."""
+        if self._email:
+            return self._email.lower()
+        return self._email
+
+    @email.setter
+    def email(self, value):
+        """Email field setter."""
+        if value:
+            value = value.lower()
+        self._email = value
+
+    @email.comparator
+    def email(cls):
+        """Email field comparator."""
+        return CaseInsensitive(cls._email)
+
+    @hybrid_property
+    def new_email(self):
+        """New email field getter."""
+        if self._new_email:
+            return self._new_email.lower()
+        return self._new_email
+
+    @new_email.setter
+    def new_email(self, value):
+        """New email field setter."""
+        if value:
+            value = value.lower()
+        self._new_email = value
+
+    @new_email.comparator
+    def new_email(cls):
+        """New email field comparator."""
+        return CaseInsensitive(cls._new_email)
+
+    @validates('_email', '_new_email')
     def validate_email(self, key, address):
         """
         Validate email addresses.
 
         .. note::
 
-            See pyramid docs about `simple validators <http://docs.sqlalchemy.org/en/latest/orm/mapper_config.html#simple-validators>`_
+            See pyramid docs about
+            `simple validators <http://docs.sqlalchemy.org/en/latest/orm/mapper_config.html#simple-validators>`_
 
         :param str key: field key
         :param str address: email address

pyramid_fullauth/models/mixins/password.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT
@@ -15,28 +15,22 @@ from sqlalchemy import String
 from sqlalchemy.orm import validates
 from pyramid.compat import text_type
 from pyramid_fullauth.exceptions import EmptyError
-
-try:  # pragma: no cover
-    algorithms = hashlib.algorithms
-except AttributeError:  # pragma: no cover
-    # Simple tuple for Python 2.6
-    algorithms = ('md5', 'sha1')
+from pyramid_fullauth.compat import algorithms
 
 
 class UserPasswordMixin(object):
-
     """Authentication field definition along with appropriate methods."""
 
     #: password field
-    password = Column(Unicode(40), nullable=False)
+    password = Column(Unicode(128), nullable=False)
 
     #: hash_algorithm field
     _hash_algorithm = Column('hash_algorithm',
                              Enum(*algorithms, name="hash_algorithms_enum"),
-                             default=text_type('sha1'), nullable=False)
+                             default=text_type('sha256'), nullable=False)
 
     #: salt field
-    _salt = Column('salt', Unicode(50), nullable=False)
+    _salt = Column('salt', Unicode(128), nullable=False)
 
     #: reset key field
     reset_key = Column(String(255), unique=True)

pyramid_fullauth/request.py

@@ -1,11 +1,11 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT
 """These method gets added to each ``pyramid.request.Request`` object."""
 
 from pyramid.httpexceptions import HTTPSeeOther
-from pyramid.security import remember, unauthenticated_userid, forget
+from pyramid.security import remember, forget
 from sqlalchemy.sql.expression import func
 from sqlalchemy.orm.exc import NoResultFound
 import pyramid_basemodel
@@ -49,10 +49,11 @@ def user(request):
     :returns: logged in user object, or None
     :rtype: pyramid_fullauth.models.User
     """
-    userid = unauthenticated_userid(request)
-    if userid:
+    if request.unauthenticated_userid:
         try:
-            user = pyramid_basemodel.Session.query(User).filter(User.id == userid).one()
+            user = pyramid_basemodel.Session.query(User).filter(
+                User.id == request.unauthenticated_userid
+            ).one()
             return user
         except NoResultFound:  # pragma: no cover
             pass

pyramid_fullauth/resources/helpers/social.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2015 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT
@@ -9,9 +9,9 @@ the MIT License (MIT): http://opensource.org/licenses/MIT
 <%def name="social_auth_uri(name, **kw)">
 <%
     from velruse import login_url
-    import urllib
+    from pyramid_fullauth.compat import urlencode
 %>
 % if name in request.registry['config'].fullauth.social:
-${login_url(request, name) + ('?{0}'.format(urllib.urlencode(kw)) if kw else '')}
+${login_url(request, name) + ('?{0}'.format(urlencode(kw)) if kw else '')}
 % endif
 </%def>

pyramid_fullauth/resources/locale/pyramid_fullauth.pot

@@ -1,15 +1,15 @@
 # Translations template for pyramid_fullauth.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the pyramid_fullauth
 # project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pyramid_fullauth 0.2.3\n"
+"Project-Id-Version: pyramid_fullauth 0.4.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-11 23:41+0200\n"
+"POT-Creation-Date: 2015-02-10 00:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: pyramid_fullauth/tools.py:47
+#: pyramid_fullauth/tools.py:50
 msgid "Please enter your password"
 msgstr ""
 
-#: pyramid_fullauth/tools.py:53
+#: pyramid_fullauth/tools.py:56
 msgid "Password is too short"
 msgstr ""
 
-#: pyramid_fullauth/tools.py:61
-#: pyramid_fullauth/views/basic/profile/password.py:124
+#: pyramid_fullauth/tools.py:64
+#: pyramid_fullauth/views/basic/profile/password.py:123
 msgid "password-mismatch"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgid "Change your email"
 msgstr ""
 
 #: pyramid_fullauth/resources/templates/email_change.mako:15
-#: pyramid_fullauth/resources/templates/login.mako:11
+#: pyramid_fullauth/resources/templates/login.mako:12
 #: pyramid_fullauth/resources/templates/register.mako:13
 #: pyramid_fullauth/resources/templates/reset.mako:15
 #: pyramid_fullauth/resources/templates/reset.proceed.mako:14
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Welcome, to pyramid_fullauth!"
 msgstr ""
 
-#: pyramid_fullauth/resources/templates/login.mako:9
+#: pyramid_fullauth/resources/templates/login.mako:10
 msgid "Please, log in"
 msgstr ""
 
@@ -149,23 +149,23 @@ msgstr ""
 msgid "Recover your password - choose new password"
 msgstr ""
 
-#: pyramid_fullauth/views/social.py:134
+#: pyramid_fullauth/views/social.py:139
 msgid "Your account is already connected to other ${provider} account."
 msgstr ""
 
-#: pyramid_fullauth/views/social.py:141
+#: pyramid_fullauth/views/social.py:146
 msgid "Your account has been connected to ${provider} account."
 msgstr ""
 
-#: pyramid_fullauth/views/social.py:147
+#: pyramid_fullauth/views/social.py:152
 msgid "This ${provider} account is already connected with other account."
 msgstr ""
 
-#: pyramid_fullauth/views/basic/forbidden.py:39
+#: pyramid_fullauth/views/basic/forbidden.py:38
 msgid "forbidden-notallowed"
 msgstr ""
 
-#: pyramid_fullauth/views/basic/forbidden.py:44
+#: pyramid_fullauth/views/basic/forbidden.py:43
 msgid "forbidden-login"
 msgstr ""
 
@@ -178,35 +178,35 @@ msgid "Already logged in!"
 msgstr ""
 
 #: pyramid_fullauth/views/basic/login.py:95
-#: pyramid_fullauth/views/basic/login.py:133
+#: pyramid_fullauth/views/basic/login.py:126
 msgid "Wrong e-mail or password."
 msgstr ""
 
-#: pyramid_fullauth/views/basic/register.py:38
+#: pyramid_fullauth/views/basic/register.py:39
 msgid "You have an error in your registration form"
 msgstr ""
 
-#: pyramid_fullauth/views/basic/register.py:51
+#: pyramid_fullauth/views/basic/register.py:52
 msgid "You have successfully registered"
 msgstr ""
 
-#: pyramid_fullauth/views/basic/register.py:75
+#: pyramid_fullauth/views/basic/register.py:76
 msgid "User with given e-mail already exists!"
 msgstr ""
 
-#: pyramid_fullauth/views/basic/profile/email.py:44
+#: pyramid_fullauth/views/basic/profile/email.py:45
 msgid "User with this email exists"
 msgstr ""
 
-#: pyramid_fullauth/views/basic/profile/email.py:60
+#: pyramid_fullauth/views/basic/profile/email.py:61
 msgid "E-mail is empty"
 msgstr ""
 
-#: pyramid_fullauth/views/basic/profile/email.py:66
+#: pyramid_fullauth/views/basic/profile/email.py:67
 msgid "Incorrect e-mail format"
 msgstr ""
 
-#: pyramid_fullauth/views/basic/profile/email.py:73
+#: pyramid_fullauth/views/basic/profile/email.py:74
 msgid "We sent you email to activate your new email address"
 msgstr ""
 

pyramid_fullauth/resources/templates/403.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/_form.login.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/_form.register.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/_social.login.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/activate.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/email_change.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/layout.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/login.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/register.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/reset.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/resources/templates/reset.proceed.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/routing/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/routing/predicates.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT
@@ -47,7 +47,9 @@ def change_email_hash(info, request):
     change_email_hash = info['match'].get('hash', None)
     if change_email_hash:
         try:
-            info['match']['user'] = pyramid_basemodel.Session.query(User).filter(User.email_change_key == change_email_hash).one()
+            info['match']['user'] = pyramid_basemodel.Session.query(User).filter(
+                User.email_change_key == change_email_hash
+            ).one()
             return True
         except NoResultFound:
             pass
@@ -55,7 +57,6 @@ def change_email_hash(info, request):
 
 
 class CSRFCheckPredicate(CheckCSRFTokenPredicate):
-
     """
     Run csrf check dependant on configuration.
 

pyramid_fullauth/tools.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT
@@ -6,12 +6,15 @@
 
 import string
 from random import choice
+
+from pyramid.compat import text_type
+
 from pyramid_fullauth.exceptions import (
     EmptyError, ShortPasswordError, PasswordConfirmMismatchError
 )
 
 
-def password_generator(length, chars=(string.letters + string.digits + string.punctuation)):
+def password_generator(length, chars=(string.ascii_letters + string.digits + string.punctuation)):
     """
     Generate random password.
 
@@ -24,7 +27,7 @@ def password_generator(length, chars=(string.letters + string.digits + string.pu
     :returns: password
     :rtype: str
     """
-    return u''.join([choice(chars) for i in range(length)])
+    return text_type(''.join([choice(chars) for i in range(length)]))
 
 
 def validate_passsword(request, password, user=None):
@@ -55,7 +58,7 @@ def validate_passsword(request, password, user=None):
 
     # here if password doesn't match
     if password_config['confirm']:
-        confirm_password = request.POST.get('confirm_password', u'')
+        confirm_password = request.POST.get('confirm_password', text_type(''))
         if password != confirm_password:
             raise PasswordConfirmMismatchError(
                 request._('password-mismatch',

pyramid_fullauth/views/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT
@@ -6,8 +6,7 @@
 
 
 class BaseView(object):
-
-    """basic view class."""
+    """Basic view class."""
 
     def __init__(self, request):
         """Common init for views."""

pyramid_fullauth/views/basic/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT

pyramid_fullauth/views/basic/activate.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT
@@ -19,7 +19,6 @@ from pyramid_fullauth.events import AfterActivate
 @view_config(route_name='register:activate', permission=NO_PERMISSION_REQUIRED,
              renderer="pyramid_fullauth:resources/templates/activate.mako")
 class ActivateView(BaseView):
-
     """Activate account views."""
 
     def __call__(self):

pyramid_fullauth/views/basic/forbidden.py

@@ -1,18 +1,16 @@
-# Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+# Copyright (c) 2013 - 2016 by pyramid_fullauth authors and contributors <see AUTHORS file>
 #
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT
 """Forbidden views."""
 
 from pyramid.view import forbidden_view_config
-from pyramid.security import authenticated_userid
 from pyramid.httpexceptions import HTTPFound
 
 from pyramid_fullauth.views import BaseView
 
 
 class ForbiddenViews(BaseView):
-
     """Forbidden related views."""
 
     def __init__(self, request):
@@ -24,7 +22,7 @@ class ForbiddenViews(BaseView):
     def forbidden(self):
         """Forbidden page view."""
         # do not allow a user to login if they are already logged in
-        if authenticated_userid(self.request):
+        if self.request.authenticated_userid:
             return {}
 
         loc = self.request.route_path('login', _query=(('after', self.request.path),))
@@ -34,7 +32,7 @@ class ForbiddenViews(BaseView):
     def forbidden_json(self):
         """Forbidden xhr response."""
         # do not allow a user to login if they are already logged in
-        if authenticated_userid(self.request):
+        if self.request.authenticated_userid:
             return {'status': False, 'msg':
                     self.request._('forbidden-notallowed',
                                    default='You are not allowed to use this function',