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

pyramid_fullauth/views/basic/login.py

@@ -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
@@ -43,8 +43,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
@@ -64,7 +64,7 @@ class LoginView(BaseLoginView):
 
     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))
@@ -82,7 +82,7 @@ class LoginViewPost(BaseLoginView):
 
     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', '')
@@ -99,7 +99,7 @@ class LoginViewPost(BaseLoginView):
         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):
@@ -109,7 +109,7 @@ class LoginViewPost(BaseLoginView):
                 # 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)
+                self.response['msg'] = text_type(e)
                 return self.response
             except HTTPRedirection as redirect:
                 login_kwargs['location'] = redirect.location

pyramid_fullauth/views/basic/profile/email.py

@@ -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
@@ -51,7 +52,7 @@ class EmailChangeViews(BaseView):
         try:
             self.request.registry.notify(BeforeEmailChange(self.request, user))
         except AttributeError as e:
-            return {'status': False, 'msg': e.message, 'csrf_token': csrf_token}
+            return {'status': False, 'msg': text_type(e), 'csrf_token': csrf_token}
 
         try:
             user.set_new_email(self.request.POST.get('email', ''))

pyramid_fullauth/views/basic/profile/password.py

@@ -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
@@ -45,7 +46,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}
 
@@ -94,12 +95,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 +109,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

@@ -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
@@ -68,7 +69,7 @@ class RegisterView(BaseView):
         :returns: response
         :rtype: dict
         """
-        email = self.request.POST.get('email', u'')
+        email = self.request.POST.get('email', text_type(''))
         # here if e-mail is already in database
 
         if pyramid_basemodel.Session.query(User).filter(User.email == email).count() != 0:
@@ -81,15 +82,15 @@ class RegisterView(BaseView):
             except ValidateError as e:
                 # do not overwrite existing error
                 if 'email' not in response['errors']:
-                    response['errors']['email'] = str(e)
+                    response['errors']['email'] = text_type(e)
 
             if self.config.register.password.require:
                 try:
                     tools.validate_passsword(self.request,
-                                             self.request.POST.get('password', u''),
+                                             self.request.POST.get('password', text_type('')),
                                              user)
                 except ValidateError as e:
-                    response['errors']['password'] = e.message
+                    response['errors']['password'] = text_type(e)
             else:
                 user.password = tools.password_generator(
                     self.config.register.password.length_min)
@@ -101,10 +102,10 @@ class RegisterView(BaseView):
 
                 # 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

pyramid_fullauth/views/social.py

@@ -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
@@ -212,7 +213,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

@@ -51,7 +51,8 @@ def db_session(request):
 
     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()

tests/unit/test_social_view.py

@@ -1,7 +1,7 @@
 """Unittest for social login view."""
 import pytest
 import mock
-from velruse import AuthenticationComplete
+from pyramid.compat import text_type
 
 from pyramid_fullauth.views.social import SocialLoginViews
 
@@ -9,57 +9,59 @@ from pyramid_fullauth.views.social import SocialLoginViews
 @pytest.mark.parametrize('profile, email', [
     (
         {
-            'accounts': [{'domain': u'facebook.com', 'userid': u'2343'}],
-            'displayName': u'teddy',
-            'verifiedEmail': 'verified@email.co.uk',
-            'preferredUsername': u'teddy',
-            'emails': [{'value': u'aasd@bwwqwe.pl'}],
-            'name': u'ted'
+            'accounts': [{'domain': text_type('facebook.com'), 'userid': text_type('2343')}],
+            'displayName': text_type('teddy'),
+            'verifiedEmail': text_type('verified@email.co.uk'),
+            'preferredUsername': text_type('teddy'),
+            'emails': [{'value': text_type('aasd@bwwqwe.pl')}],
+            'name': text_type('ted')
         },
         'verified@email.co.uk'
     ), (
         {
-            'accounts': [{'domain': u'facebook.com', 'userid': u'2343'}],
-            'displayName': u'teddy',
-            'preferredUsername': u'teddy',
-            'emails': [{'value': u'aasd@bwwqwe.pl'}],
-            'name': u'ted'
+            'accounts': [{'domain': text_type('facebook.com'), 'userid': text_type('2343')}],
+            'displayName': text_type('teddy'),
+            'preferredUsername': text_type('teddy'),
+            'emails': [{'value': text_type('aasd@bwwqwe.pl')}],
+            'name': text_type('ted')
         },
         'aasd@bwwqwe.pl'
     ), (
         {
-            'accounts': [{'domain': u'facebook.com', 'userid': u'2343'}],
-            'displayName': u'teddy',
-            'preferredUsername': u'teddy',
+            'accounts': [{'domain': text_type('facebook.com'), 'userid': text_type('2343')}],
+            'displayName': text_type('teddy'),
+            'preferredUsername': text_type('teddy'),
             'emails': [{}],
-            'name': u'ted'
+            'name': text_type('ted')
         },
         '2343@facebook.com'
     ), (
         {
-            'accounts': [{'domain': u'facebook.com', 'userid': u'2343'}],
-            'displayName': u'teddy',
-            'preferredUsername': u'teddy',
+            'accounts': [{'domain': text_type('facebook.com'), 'userid': text_type('2343')}],
+            'displayName': text_type('teddy'),
+            'preferredUsername': text_type('teddy'),
             'emails': [],
-            'name': u'ted'
+            'name': text_type('ted')
         },
         '2343@facebook.com'
     ), (
         {
-            'accounts': [{'domain': u'facebook.com', 'userid': u'2343'}],
-            'displayName': u'teddy',
-            'preferredUsername': u'teddy',
-            'name': u'ted'
+            'accounts': [{'domain': text_type('facebook.com'), 'userid': text_type('2343')}],
+            'displayName': text_type('teddy'),
+            'preferredUsername': text_type('teddy'),
+            'name': text_type('ted')
         },
         '2343@facebook.com'
     ),
 ])
 def test_email_from_context(profile, email):
     """Test email_from_context email getting method."""
+    from velruse import AuthenticationComplete
     context = AuthenticationComplete(
         profile,
         {'oauthAccessToken': '7897048593434'},
-        u'facebook',
-        u'facebook')
+        text_type('facebook'),
+        text_type('facebook')
+    )
     view = SocialLoginViews(mock.MagicMock())
     assert view._email_from_context(context) == email

tests/unit/test_user_password.py

@@ -45,7 +45,7 @@ def test_password_empty(db_session, user):
 
 
 def test_set_reset(db_session, user):
-    """User.set_reset - generates reset key for those who forgot their password. """
+    """User.set_reset - generates reset key for those who forgot their password."""
     user = db_session.merge(user)
     assert not user.reset_key
     user.set_reset()

tests/unit/test_user_repr.py

@@ -25,5 +25,5 @@ def test_introduce_username():
     user.username = text_type('testowy')
     # To string should return username
     assert str(user) == 'testowy'
-    # User should be represented by "<User (\'1\', \'testowy\')>"
-    assert user.__repr__() == "<User ('1', 'testowy')>"
+    # User should be represented by "<User (\'1\')>"
+    assert user.__repr__() == "<User ('1')>"

tests/unit/test_validators.py

@@ -41,4 +41,4 @@ def test_email_invalid_formats(db_session, user, invalid_email):
 
     with pytest.raises(EmailValidationError):
         user.email = invalid_email
-        db_session.commit()
+        transaction.commit()

tests/views/conftest.py

@@ -5,6 +5,11 @@ import transaction
 from pyramid_fullauth.models import AuthenticationProvider
 
 
+def mock_translate(msg, *args, **kwargs):
+    """Mock translate function (simply returns message)."""
+    return msg
+
+
 @pytest.fixture
 def facebook_user(active_user, db_session):
     """Facebook user."""

tests/views/test_activation.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 """Account activation related tests."""
-from urllib import quote
+try:
+    from urllib import quote
+    # python3
+except ImportError:
+    from urllib.parse import quote
 
 import transaction
 
@@ -31,7 +35,7 @@ def test_account_activation_wrong_key(user, db_session, default_app):
     res = default_app.get('/register/activate/' + activate_key[:-5], status=200)
     transaction.commit()
 
-    assert 'Invalid activation code' in res.body
+    assert 'Invalid activation code' in res.body.decode('unicode_escape')
 
     user = db_session.query(User).filter(User.email == user.email).one()
     assert user.activate_key == activate_key
@@ -46,13 +50,16 @@ def test_account_activation_key_with_trash_chars(user, db_session, default_app):
     user = db_session.merge(user)
 
     activate_key = user.activate_key
-    res = default_app.get('/register/activate/' + quote(
-        u'ąśðłĸ곶→łęóħó³→←śðđ[]}³½ĸżćŋðń→↓ŧ¶ħ→ĸł¼²³↓←ħ@ĸđśðĸ@ł¼ęłśħđó[³²½łðśđħ'.encode('utf-8')),
+    res = default_app.get(
+        '/register/activate/' + quote(
+            # ąśðłĸ곶→łęóħó³→←śðđ[]}³½ĸżćŋðń→↓ŧ¶ħ→ĸł¼²³↓←ħ@ĸđśðĸ@ł¼ęłśħđó[³²½łðśđħ - already decoded
+            '\xc4\x85\xc5\x9b\xc3\xb0\xc5\x82\xc4\xb8\xc4\x99\xc5\x82\xc2\xb6\xe2\x86\x92\xc5\x82\xc4\x99\xc3\xb3\xc4\xa7\xc3\xb3\xc2\xb3\xe2\x86\x92\xe2\x86\x90\xc5\x9b\xc3\xb0\xc4\x91[]}\xc2\xb3\xc2\xbd\xc4\xb8\xc5\xbc\xc4\x87\xc5\x8b\xc3\xb0\xc5\x84\xe2\x86\x92\xe2\x86\x93\xc5\xa7\xc2\xb6\xc4\xa7\xe2\x86\x92\xc4\xb8\xc5\x82\xc2\xbc\xc2\xb2\xc2\xb3\xe2\x86\x93\xe2\x86\x90\xc4\xa7@\xc4\xb8\xc4\x91\xc5\x9b\xc3\xb0\xc4\xb8@\xc5\x82\xc2\xbc\xc4\x99\xc5\x82\xc5\x9b\xc4\xa7\xc4\x91\xc3\xb3[\xc2\xb3\xc2\xb2\xc2\xbd\xc5\x82\xc3\xb0\xc5\x9b\xc4\x91\xc4\xa7'
+        ),
         status=200
     )
     transaction.commit()
 
-    assert 'Invalid activation code' in res.body
+    assert 'Invalid activation code' in res.body.decode('unicode_escape')
     user = db_session.query(User).filter(User.email == user.email).one()
 
     assert user.activate_key == activate_key
@@ -76,4 +83,4 @@ def test_account_activation_twice(user, db_session, default_app):
     assert user.activated_at
 
     res = default_app.get('/register/activate/' + activate_key, status=200)
-    assert 'Invalid activation code' in res.body
+    assert 'Invalid activation code' in res.body.decode('unicode_escape')

tests/views/test_email.py

@@ -140,7 +140,7 @@ def test_email_proceed(db_session, active_user, default_app):
     email = DEFAULT_USER['email']
     user = db_session.query(User).filter(User.email == email).one()
 
-    new_email = u'email2@email.com'
+    new_email = text_type('email2@email.com')
     user.set_new_email(new_email)
     transaction.commit()
 
@@ -165,7 +165,7 @@ def test_email_proceed_wrong_key(db_session, active_user, default_app):
     email = DEFAULT_USER['email']
     user = db_session.query(User).filter(User.email == email).one()
 
-    new_email = u'email2@email.com'
+    new_email = text_type('email2@email.com')
     user.set_new_email(new_email)
     transaction.commit()
 

tests/views/test_events.py

@@ -3,11 +3,12 @@ import pytest
 import transaction
 from mock import MagicMock
 from pyramid import testing
+from pyramid.compat import text_type
 from pyramid.view import view_config
 from pyramid.httpexceptions import HTTPFound
-from velruse import AuthenticationComplete
 from sqlalchemy.orm.exc import NoResultFound
 from pytest_pyramid import factories
+from velruse import AuthenticationComplete
 
 
 from pyramid_fullauth.models import User
@@ -21,6 +22,7 @@ from pyramid_fullauth.events import (
     BeforeRegister, AfterRegister
 )
 from tests.tools import authenticate, is_user_logged, DEFAULT_USER
+from tests.views.conftest import mock_translate
 
 EVENT_PATH = '/event?event={0.__name__}'
 EVENT_URL = 'http://localhost' + EVENT_PATH
@@ -244,7 +246,7 @@ def test_afteremailchangeactivation(db_session, active_user, afteremailchange_ap
     email = DEFAULT_USER['email']
     user = db_session.query(User).filter(User.email == email).one()
 
-    new_email = u'email2@email.com'
+    new_email = text_type('email2@email.com')
     user.set_new_email(new_email)
     transaction.commit()
 
@@ -327,7 +329,7 @@ def test_beforereset(user, db_session, beforereset_app):
     res.form['password'] = 'YouShallPass'
     res.form['confirm_password'] = 'YouShallPass'
     res = res.form.submit()
-    assert 'Error! BeforeReset' in res.body
+    assert 'Error! BeforeReset' in res.body.decode('unicode_escape')
 
 
 @pytest.fixture
@@ -342,20 +344,20 @@ aftersocialregister_app = factories.pyramid_app('aftersocialregister_config')
 def test_aftersocialregister(aftersocialregister_config, aftersocialregister_app, db_session):
     """Register fresh user and logs him in and check response if redirect from AfterSocialRegister."""
     profile = {
-        'accounts': [{'domain': u'facebook.com', 'userid': u'2343'}],
-        'displayName': u'teddy',
-        'verifiedEmail': u'we@po.pl',
-        'preferredUsername': u'teddy',
-        'emails': [{'value': u'aasd@bwwqwe.pl'}],
-        'name': u'ted'
+        'accounts': [{'domain': text_type('facebook.com'), 'userid': text_type('2343')}],
+        'displayName': text_type('teddy'),
+        'verifiedEmail': text_type('we@po.pl'),
+        'preferredUsername': text_type('teddy'),
+        'emails': [{'value': text_type('aasd@bwwqwe.pl')}],
+        'name': text_type('ted')
     }
     credentials = {'oauthAccessToken': '7897048593434'}
-    provider_name = u'facebook'
-    provider_type = u'facebook'
+    provider_name = text_type('facebook')
+    provider_type = text_type('facebook')
     request = testing.DummyRequest()
     request.user = None
     request.registry = aftersocialregister_config.registry
-    request.remote_addr = u'127.0.0.123'
+    request.remote_addr = text_type('127.0.0.123')
     request.context = AuthenticationComplete(profile, credentials, provider_name, provider_type)
 
     request.login_perform = MagicMock(name='login_perform')
@@ -383,20 +385,20 @@ aftersociallogin_app = factories.pyramid_app('aftersociallogin_config')
 def test_aftersociallogin(aftersociallogin_config, aftersociallogin_app, db_session):
     """Register fresh user and logs him in and check response if redirect from AfterSocialLogIn."""
     profile = {
-        'accounts': [{'domain': u'facebook.com', 'userid': u'2343'}],
-        'displayName': u'teddy',
-        'verifiedEmail': u'we@po.pl',
-        'preferredUsername': u'teddy',
-        'emails': [{'value': u'aasd@bwwqwe.pl'}],
-        'name': u'ted'
+        'accounts': [{'domain': text_type('facebook.com'), 'userid': text_type('2343')}],
+        'displayName': text_type('teddy'),
+        'verifiedEmail': text_type('we@po.pl'),
+        'preferredUsername': text_type('teddy'),
+        'emails': [{'value': text_type('aasd@bwwqwe.pl')}],
+        'name': text_type('ted')
     }
     credentials = {'oauthAccessToken': '7897048593434'}
-    provider_name = u'facebook'
-    provider_type = u'facebook'
+    provider_name = text_type('facebook')
+    provider_type = text_type('facebook')
     request = testing.DummyRequest()
     request.user = None
     request.registry = aftersociallogin_config.registry
-    request.remote_addr = u'127.0.0.123'
+    request.remote_addr = text_type('127.0.0.123')
     request.context = AuthenticationComplete(profile, credentials, provider_name, provider_type)
 
     def login_perform(*args, **kwargs):
@@ -426,9 +428,10 @@ def test_alreadyconnected(alreadyconnected_config, alreadyconnected_app, faceboo
     """Try to connect facebook account to logged in user used by other user check redirect from SocialAccountAlreadyConnected."""
     # this user will be logged and trying to connect facebook's user account.
     fresh_user = User(
-        email='new@user.pl',
-        password='somepassword',
-        address_ip='127.0.0.1')
+        email=text_type('new@user.pl'),
+        password=text_type('somepassword'),
+        address_ip=text_type('127.0.0.1')
+    )
     db_session.add(fresh_user)
     transaction.commit()
     user = db_session.merge(facebook_user)
@@ -436,21 +439,21 @@ def test_alreadyconnected(alreadyconnected_config, alreadyconnected_app, faceboo
 
     # mock request
     profile = {
-        'accounts': [{'domain': u'facebook.com', 'userid': user.provider_id('facebook')}],
-        'displayName': u'teddy',
-        'preferredUsername': u'teddy',
-        'emails': [{'value': u'aasd@basd.pl'}],
-        'name': u'ted'
+        'accounts': [{'domain': text_type('facebook.com'), 'userid': user.provider_id('facebook')}],
+        'displayName': text_type('teddy'),
+        'preferredUsername': text_type('teddy'),
+        'emails': [{'value': text_type('aasd@basd.pl')}],
+        'name': text_type('ted')
     }
     credentials = {'oauthAccessToken': '7897048593434'}
-    provider_name = u'facebook'
-    provider_type = u'facebook'
+    provider_name = text_type('facebook')
+    provider_type = text_type('facebook')
     request = testing.DummyRequest()
     request.user = fresh_user
     request.registry = alreadyconnected_config.registry
-    request.remote_addr = u'127.0.0.123'
+    request.remote_addr = text_type('127.0.0.123')
     request.context = AuthenticationComplete(profile, credentials, provider_name, provider_type)
-    request._ = lambda msg, *args, **kwargs: msg
+    request._ = mock_translate
 
     request.login_perform = MagicMock(name='login_perform')
     request.login_perform.return_value = {'status': True}