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

pyramid_fullauth/views/basic/login.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,10 +7,10 @@
 from pyramid.view import view_config
 from pyramid.view import view_defaults
 from pyramid.httpexceptions import HTTPSeeOther, HTTPRedirection
-from pyramid.security import authenticated_userid
 from pyramid.security import NO_PERMISSION_REQUIRED
 
 from sqlalchemy.orm.exc import NoResultFound
+from pyramid.compat import text_type
 import pyramid_basemodel
 
 from pyramid_fullauth.views import BaseView
@@ -23,7 +23,6 @@ from pyramid_fullauth.events import AlreadyLoggedIn
 @view_defaults(route_name='login', permission=NO_PERMISSION_REQUIRED,
                renderer='pyramid_fullauth:resources/templates/login.mako')
 class BaseLoginView(BaseView):
-
     """Basic logic for login views."""
 
     def __init__(self, request):
@@ -43,8 +42,8 @@ class BaseLoginView(BaseView):
         redirect = HTTPSeeOther(location=self.response['after'])
         try:
             self.request.registry.notify(AlreadyLoggedIn(self.request))
-        except HTTPRedirection as redirect:
-            pass
+        except HTTPRedirection as e_redirect:
+            redirect = e_redirect
 
         if self.request.is_xhr:
             self.response['status'] = True
@@ -59,12 +58,11 @@ class BaseLoginView(BaseView):
 
 @view_config(request_method='GET')
 class LoginView(BaseLoginView):
-
     """Login view."""
 
     def __call__(self):
         """Display login page."""
-        if authenticated_userid(self.request):
+        if self.request.authenticated_userid:
             return self._redirect_authenticated_user()
 
         self.request.registry.notify(BeforeLogIn(self.request, None))
@@ -77,52 +75,48 @@ class LoginView(BaseLoginView):
 @view_config(request_method='POST', check_csrf=True)
 @view_config(request_method='POST', check_csrf=True, xhr=True, renderer="json")
 class LoginViewPost(BaseLoginView):
-
     """Login view POST method."""
 
     def __call__(self):
         """Login action."""
-        if authenticated_userid(self.request):
+        if self.request.authenticated_userid:
             return self._redirect_authenticated_user()
 
         email = self.request.POST.get('email', '')
         password = self.request.POST.get('password', '')
         try:
             user = pyramid_basemodel.Session.query(User).filter(User.email == email).one()
+            self.request.registry.notify(BeforeLogIn(self.request, user))
         except NoResultFound:
             self.request.registry.notify(BeforeLogIn(self.request, None))
 
             self.response['msg'] = self.request._('Wrong e-mail or password.',
                                                   domain='pyramid_fullauth')
             return self.response
-
-        try:
-            self.request.registry.notify(BeforeLogIn(self.request, user))
         except AttributeError as e:
-            self.response['msg'] = str(e)
+            self.response['msg'] = text_type(e)
             return self.response
 
-        if user.check_password(password):
-
-            login_kwargs = {'remember_me': self.request.POST.get('remember')}
-            try:
-                # if remember in POST set cookie timeout to one month
-                self.request.registry.notify(AfterLogIn(self.request, user))
-            except AttributeError as e:
-                self.response['msg'] = str(e)
-                return self.response
-            except HTTPRedirection as redirect:
-                login_kwargs['location'] = redirect.location
-
-            redirect = self.request.login_perform(user, **login_kwargs)
-            if self.request.is_xhr:
-                self.response['status'] = True
-                del self.response['msg']
-                self.response['after'] = redirect.location
-                return self.response
-            else:
-                return redirect
-        else:
+        if not user.check_password(password):
             self.response['msg'] = self.request._('Wrong e-mail or password.',
                                                   domain='pyramid_fullauth')
             return self.response
+
+        login_kwargs = {'remember_me': self.request.POST.get('remember')}
+        try:
+            # if remember in POST set cookie timeout to one month
+            self.request.registry.notify(AfterLogIn(self.request, user))
+        except AttributeError as e:
+            self.response['msg'] = text_type(e)
+            return self.response
+        except HTTPRedirection as redirect:
+            login_kwargs['location'] = redirect.location
+
+        redirect = self.request.login_perform(user, **login_kwargs)
+        if self.request.is_xhr:
+            self.response['status'] = True
+            del self.response['msg']
+            self.response['after'] = redirect.location
+            return self.response
+
+        return redirect

pyramid_fullauth/views/basic/logout.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
@@ -13,7 +13,6 @@ from pyramid_fullauth.views import BaseView
 
 @view_config(route_name='logout', permission=NO_PERMISSION_REQUIRED)
 class LogoutView(BaseView):
-
     """Logout view."""
 
     def __call__(self):

pyramid_fullauth/views/basic/profile/__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/profile/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
@@ -8,7 +8,7 @@ from pyramid.view import view_config, view_defaults
 from pyramid.httpexceptions import HTTPRedirection, HTTPSeeOther
 from pyramid.security import NO_PERMISSION_REQUIRED
 
-from sqlalchemy.orm.exc import NoResultFound
+from pyramid.compat import text_type
 import pyramid_basemodel
 
 from pyramid_fullauth.views import BaseView
@@ -23,7 +23,6 @@ from pyramid_fullauth.exceptions import EmptyError, EmailValidationError
 @view_defaults(route_name='email:change', permission='email_change',
                renderer='pyramid_fullauth:resources/templates/email_change.mako')
 class EmailChangeViews(BaseView):
-
     """Email change related views."""
 
     @view_config(request_method='GET')
@@ -35,43 +34,14 @@ class EmailChangeViews(BaseView):
     @view_config(request_method='POST', check_csrf='csrf_token', xhr=True, renderer="json")
     def post(self):
         """Process email change request."""
-        csrf_token = self.request.session.get_csrf_token()
-        try:
-            pyramid_basemodel.Session.query(User).filter(
-                User.email == self.request.POST.get('email', '')
-            ).one()
-            return {'status': False,
-                    'msg': self.request._('User with this email exists',
-                                          domain='pyramid_fullauth'),
-                    'csrf_token': csrf_token}
-        except NoResultFound:
-            pass
-
         user = self.request.user
-        try:
-            self.request.registry.notify(BeforeEmailChange(self.request, user))
-        except AttributeError as e:
-            return {'status': False, 'msg': e.message, 'csrf_token': csrf_token}
-
-        try:
-            user.set_new_email(self.request.POST.get('email', ''))
-        except EmptyError:
-            return {'status': False,
-                    'msg': self.request._(
-                        'E-mail is empty',
-                        domain='pyramid_fullauth'),
-                    'csrf_token': csrf_token}
-        except EmailValidationError:
-            return {'status': False,
-                    'msg': self.request._(
-                        'Incorrect e-mail format',
-                        domain='pyramid_fullauth'),
-                    'csrf_token': csrf_token}
+        response = self.validate_email(user)
+        if response:
+            return response
 
         response_values = {
             'status': True,
-            'msg': self.request._('We sent you email to activate your new email address',
-                                  domain='pyramid_fullauth')
+            'msg': self.request._('We sent you email to activate your new email address', domain='pyramid_fullauth')
         }
 
         try:
@@ -88,11 +58,48 @@ class EmailChangeViews(BaseView):
             else:
                 return HTTPSeeOther(location='/')
 
+    def validate_email(self, user):
+        """
+        Validate and set email on a user object.
+
+        :param pyramid_fullauth.models.User user: user to set an email passed on POST arguments.
+
+        :returns: response in case of an invalid email, None otherwise
+        :rtype: dict
+        """
+        csrf_token = self.request.session.get_csrf_token()
+        email = self.request.POST.get('email', text_type(''))
+        if pyramid_basemodel.Session.query(User).filter(User.email == email).first():
+            return {
+                'status': False,
+                'msg': self.request._('User with this email exists', domain='pyramid_fullauth'),
+                'csrf_token': csrf_token
+            }
+
+        try:
+            self.request.registry.notify(BeforeEmailChange(self.request, user))
+        except AttributeError as e:
+            return {'status': False, 'msg': text_type(e), 'csrf_token': csrf_token}
+
+        try:
+            user.set_new_email(email)
+        except EmptyError:
+            return {
+                'status': False,
+                'msg': self.request._('E-mail is empty', domain='pyramid_fullauth'),
+                'csrf_token': csrf_token
+            }
+        except EmailValidationError:
+            return {
+                'status': False,
+                'msg': self.request._('Incorrect e-mail format', domain='pyramid_fullauth'),
+                'csrf_token': csrf_token
+            }
+
 
 @view_config(route_name='email:change:continue', permission=NO_PERMISSION_REQUIRED,
              renderer='pyramid_fullauth:resources/templates/email_change.mako')
 class EmailChangeAccept(BaseView):
-
     """Display email change success."""
 
     def __call__(self):

pyramid_fullauth/views/basic/profile/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
@@ -9,6 +9,7 @@ from pyramid.httpexceptions import HTTPRedirection, HTTPSeeOther
 from pyramid.security import NO_PERMISSION_REQUIRED
 
 from sqlalchemy.orm.exc import NoResultFound
+from pyramid.compat import text_type
 import pyramid_basemodel
 
 from pyramid_fullauth.views import BaseView
@@ -24,7 +25,6 @@ from pyramid_fullauth.tools import validate_passsword
 @view_defaults(route_name='password:reset', permission=NO_PERMISSION_REQUIRED,
                renderer='pyramid_fullauth:resources/templates/reset.mako')
 class PasswordResetView(BaseView):
-
     """Profile related views."""
 
     @view_config()
@@ -45,7 +45,7 @@ class PasswordResetView(BaseView):
         except NoResultFound:
             return {'status': False,
                     'msg': self.request._('user-not-exists',
-                                          default='User does not exists',
+                                          default='User does not exist',
                                           domain='pyramid_fullauth'),
                     'csrf_token': csrf_token}
 
@@ -61,7 +61,6 @@ class PasswordResetView(BaseView):
 @view_defaults(route_name='password:reset:continue', permission=NO_PERMISSION_REQUIRED,
                renderer='pyramid_fullauth:resources/templates/reset.proceed.mako')
 class PasswordResetContinueView(BaseView):
-
     """
     Password reset views.
 
@@ -94,12 +93,12 @@ class PasswordResetContinueView(BaseView):
                 try:
                     pyramid_basemodel.Session.query(AuthenticationProvider).filter(
                         AuthenticationProvider.user_id == user.id,
-                        AuthenticationProvider.provider == u'email'
+                        AuthenticationProvider.provider == text_type('email')
                     ).one()
                 except NoResultFound:
                     user.providers.append(
                         AuthenticationProvider(
-                            provider=u'email',
+                            provider=text_type('email'),
                             provider_id=user.id
                         )
                     )
@@ -108,7 +107,7 @@ class PasswordResetContinueView(BaseView):
             except (ValidateError, AttributeError) as e:
                 return {
                     'status': False,
-                    'msg': str(e),
+                    'msg': text_type(e),
                     'csrf_token': self.request.session.get_csrf_token()
                 }
 

pyramid_fullauth/views/basic/register.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
@@ -8,6 +8,7 @@ from pyramid.view import view_config, view_defaults
 from pyramid.httpexceptions import HTTPRedirection
 from pyramid.security import NO_PERMISSION_REQUIRED
 
+from pyramid.compat import text_type
 import pyramid_basemodel
 
 from pyramid_fullauth.views import BaseView
@@ -20,7 +21,6 @@ from pyramid_fullauth.exceptions import ValidateError
 @view_defaults(route_name='register', permission=NO_PERMISSION_REQUIRED,
                renderer="pyramid_fullauth:resources/templates/register.mako")
 class RegisterView(BaseView):
-
     """Registration views."""
 
     @view_config(request_method='GET')
@@ -68,43 +68,69 @@ class RegisterView(BaseView):
         :returns: response
         :rtype: dict
         """
-        email = self.request.POST.get('email', u'')
+        email = self.request.POST.get('email', text_type(''))
+        password = self.request.POST.get('password', text_type(''))
         # here if e-mail is already in database
 
-        if pyramid_basemodel.Session.query(User).filter(User.email == email).count() != 0:
-            response['errors']['email'] = self.request._(
-                'User with given e-mail already exists!',
-                domain='pyramid_fullauth')
-        try:
-            try:
-                user.email = email
-            except ValidateError as e:
-                # do not overwrite existing error
-                if 'email' not in response['errors']:
-                    response['errors']['email'] = str(e)
-
-            if self.config.register.password.require:
-                try:
-                    tools.validate_passsword(self.request,
-                                             self.request.POST.get('password', u''),
-                                             user)
-                except ValidateError as e:
-                    response['errors']['password'] = e.message
-            else:
-                user.password = tools.password_generator(
-                    self.config.register.password.length_min)
+        email_error = self._set_email(email, user)
+        if email_error:
+            response['errors']['email'] = email_error
 
+        password_error = self._set_password(password, user)
+        if password_error:
+            response['errors']['password'] = password_error
+
+        try:
             self.request.registry.notify(BeforeRegister(self.request, user, response['errors']))
+
             if not response['errors']:
                 pyramid_basemodel.Session.add(user)
                 pyramid_basemodel.Session.flush()
 
                 # lets add AuthenticationProvider as email!
                 user.providers.append(
-                    AuthenticationProvider(provider=u'email', provider_id=user.id))
+                    AuthenticationProvider(provider=text_type('email'), provider_id=user.id))
             else:
                 return response
         except AttributeError as e:
-            response['errors']['msg'] = str(e)
+            response['errors']['msg'] = text_type(e)
 
         return response
+
+    def _set_password(self, password, user):
+        """
+        Set password on a User object.
+
+        :param str password: email address
+        :param pyramid_fullauth.models.User user: user object
+
+        :returns: error or None if no error occured.
+        :rtype: str
+        """
+        if self.config.register.password.require:
+            try:
+                tools.validate_passsword(self.request, password, user)
+            except ValidateError as e:
+                return text_type(e)
+        else:
+            user.password = tools.password_generator(
+                self.config.register.password.length_min)
+
+    def _set_email(self, email, user):
+        """
+        Set email on a User object.
+
+        :param str email: email address
+        :param pyramid_fullauth.models.User user: user object
+
+        :returns: error or None if no error occured.
+        :rtype: str
+        """
+        if pyramid_basemodel.Session.query(User).filter(User.email == email).count() != 0:
+            return self.request._('User with given e-mail already exists!', domain='pyramid_fullauth')
+
+        try:
+            user.email = email
+        except ValidateError as e:
+            # do not overwrite existing error
+            return text_type(e)

pyramid_fullauth/views/social.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
@@ -11,6 +11,7 @@ from pyramid.security import NO_PERMISSION_REQUIRED
 
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.exc import IntegrityError
+from pyramid.compat import text_type
 import pyramid_basemodel
 
 from pyramid_fullauth.views import BaseView
@@ -29,7 +30,6 @@ logger = logging.getLogger(__name__)
              permission=NO_PERMISSION_REQUIRED,
              renderer="pyramid_fullauth:resources/templates/register.mako")
 class SocialLoginViews(BaseView):
-
     """Social login views definition."""
 
     def set_provider(self, user, provider_name, user_provider_id):
@@ -212,7 +212,9 @@ class SocialLoginViews(BaseView):
             return context.profile['emails'][0]['value']
         # generating some random email address based on social userid and provider domain
         else:
-            return u'{0}@{1}'.format(
-                context.profile['accounts'][0]['userid'],
-                context.profile['accounts'][0]['domain']
+            return text_type(
+                '{0}@{1}'.format(
+                    context.profile['accounts'][0]['userid'],
+                    context.profile['accounts'][0]['domain']
+                )
             )

tests/conftest.py

@@ -37,21 +37,22 @@ def web_request():
 
 @pytest.fixture(scope='function', params=['sqlite', 'mysql', 'postgresql'])
 def db_session(request):
-    """SQLAlchemy session."""
+    """Session for SQLAlchemy."""
     from pyramid_fullauth.models import Base
 
     if request.param == 'sqlite':
         connection = 'sqlite:///fullauth.sqlite'
     elif request.param == 'mysql':
-        request.getfuncargvalue('mysqldb')  # takes care of creating database
+        request.getfixturevalue('mysql')  # takes care of creating database
         connection = 'mysql+mysqldb://root:@127.0.0.1:3307/tests?charset=utf8'
     elif request.param == 'postgresql':
-        request.getfuncargvalue('postgresql')  # takes care of creating database
+        request.getfixturevalue('postgresql')  # takes care of creating database
         connection = 'postgresql+psycopg2://postgres:@127.0.0.1:5433/tests'
 
     engine = create_engine(connection, echo=False, poolclass=NullPool)
     pyramid_basemodel.Session = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
-    pyramid_basemodel.bind_engine(engine, pyramid_basemodel.Session, should_drop=True)
+    pyramid_basemodel.bind_engine(
+        engine, pyramid_basemodel.Session, should_create=True, should_drop=True)
 
     def destroy():
         transaction.commit()
@@ -114,6 +115,9 @@ default_config = factories.pyramid_config({
 })
 
 
+default_app = factories.pyramid_app('default_config')
+
+
 extended_config = factories.pyramid_config({
     'pyramid.includes': [
         'pyramid_tm',
@@ -123,6 +127,9 @@ extended_config = factories.pyramid_config({
 })
 
 
+extended_app = factories.pyramid_app('extended_config')
+
+
 short_config = factories.pyramid_config({
     'yml.location': 'tests:config/short_memory.yaml',
     'pyramid.includes': [
@@ -134,6 +141,9 @@ short_config = factories.pyramid_config({
 })
 
 
+short_app = factories.pyramid_app('short_config')
+
+
 social_config = factories.pyramid_config({
     'yml.location': 'tests:config/social.yaml',
     'pyramid.includes': [
@@ -145,6 +155,9 @@ social_config = factories.pyramid_config({
 })
 
 
+social_app = factories.pyramid_app('social_config')
+
+
 authable_config = factories.pyramid_config({
     'yml.location': 'tests:config',
     'env': 'login',
@@ -157,6 +170,9 @@ authable_config = factories.pyramid_config({
 })
 
 
+authable_app = factories.pyramid_app('authable_config')
+
+
 nopassconfirm_config = factories.pyramid_config({
     'yml.location': 'tests:config/no_password_confirm.yaml',
     'env': 'login',
@@ -169,6 +185,9 @@ nopassconfirm_config = factories.pyramid_config({
 })
 
 
+nopassconfirm_app = factories.pyramid_app('nopassconfirm_config')
+
+
 nopassregister_config = factories.pyramid_config({
     'yml.location': 'tests:config/no_password_register.yaml',
     'env': 'login',
@@ -181,10 +200,4 @@ nopassregister_config = factories.pyramid_config({
 })
 
 
-default_app = factories.pyramid_app('default_config')
-extended_app = factories.pyramid_app('extended_config')
-short_app = factories.pyramid_app('short_config')
-social_app = factories.pyramid_app('social_config')
-authable_app = factories.pyramid_app('authable_config')
-nopassconfirm_app = factories.pyramid_app('nopassconfirm_config')
 nopassregister_app = factories.pyramid_app('nopassregister_config')