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

EGG-INFO/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyramid-fullauth
-Version: 0.3.1
+Version: 0.3.2
 Summary: This package intends to provide full authentication / authorisation
     implementation for pyramid applications
 Home-page: https://github.com/fizyk/pyramid_fullauth
@@ -73,6 +73,13 @@ Description: pyramid_fullauth
         CHANGELOG
         =========
         
+        0.3.2
+        -----
+        
+        - catch all HTTPRedirect instead of just HTTPFound.
+        - redirect with HTTPSeeOther instead of HTTPFound where applicable.
+        
+        
         0.3.1
         -----
         

EGG-INFO/top_level.txt

@@ -1,2 +1,2 @@
-tests
 pyramid_fullauth
+tests

pyramid_fullauth/__init__.py

@@ -17,7 +17,7 @@ from pyramid_fullauth.auth import groupfinder
 from pyramid_fullauth.routing import predicates
 from pyramid_fullauth.request import login_perform, logout, user
 
-__version__ = '0.3.1'
+__version__ = '0.3.2'
 
 
 logger = logging.getLogger(__name__)

pyramid_fullauth/events.py

@@ -60,10 +60,12 @@ class AfterRegister(_BaseRegisterEvent):
         User object is already in a session.
 
     .. note::
-        Action emitting this event, should catch all HTTPFound that might be risen in event listener.
+        Action emitting this event, should catch all HTTPRedirection that might
+        be risen in event listener.
 
     .. warning::
-        If HTTPFound is risen from event listener, then response_values will not be used!
+        If HTTPRedirection is risen from event listener, then response_values
+        will not be used!
 
     """
 
@@ -85,7 +87,8 @@ class AfterActivate(_BaseRegisterEvent):
     Add custom post-processing logic after user gets activated.
 
     .. note::
-        Action emitting this event, should catch all HTTPFound that might be risen in event listener.
+        Action emitting this event, should catch all HTTPRedirection that might
+        be risen in event listener.
     """
 
     pass
@@ -97,7 +100,8 @@ class AfterResetRequest(_BaseRegisterEvent):
     Add custom post-processing after user sends request to reset password.
 
     .. note::
-        Action emitting this event, should catch all HTTPFound that might be risen in event listener.
+        Action emitting this event, should catch all HTTPRedirection that might
+        be risen in event listener.
     """
 
     pass
@@ -116,7 +120,8 @@ class AfterReset(_BaseRegisterEvent):
     Add custom post-processing after the actual reset-password process.
 
     .. note::
-        Action emitting this event, should catch all HTTPFound that might be risen in event listener.
+        Action emitting this event, should catch all HTTPRedirection that might
+        be risen in event listener.
     """
 
     pass
@@ -128,7 +133,8 @@ class AlreadyLoggedIn(object):
     Allow execute custom logic, when logged in user tries to log in again.
 
     .. note::
-        Action emitting this event, should catch all HTTPFound that might be risen in event listener.
+        Action emitting this event, should catch all HTTPRedirection that might
+        be risen in event listener.
 
     """
 
@@ -147,7 +153,8 @@ class BeforeLogIn(_BaseRegisterEvent):
     Add custom logic before user gets logged in.
 
     .. note::
-        Action emitting this event, should catch all AttributeError that might be risen in event listener.
+        Action emitting this event, should catch all AttributeError that might
+        be risen in event listener.
         User param set to None when user is not found or request method is GET.
     """
 
@@ -194,7 +201,8 @@ class AfterSocialRegister(_BaseSocialRegister):
     Add custom logic after user registers through social network.
 
     .. note::
-        Action emitting this event, should catch all HTTPFound that might be risen in event listener.
+        Action emitting this event, should catch all HTTPRedirection that might
+        be risen in event listener.
     """
 
     def __init__(self, request, user, profile, response_values):
@@ -216,7 +224,8 @@ class AfterSocialLogIn(_BaseSocialRegister):
     Custom logic after user logs in through social network.
 
     .. note::
-        Action emitting this event, should catch all HTTPFound that might be risen in event listener.
+        Action emitting this event, should catch all HTTPRedirection that might
+        be risen in event listener.
     """
 
     pass
@@ -225,10 +234,15 @@ class AfterSocialLogIn(_BaseSocialRegister):
 class SocialAccountAlreadyConnected(_BaseSocialRegister):
 
     """
-    Allow to add custom logic, when someone tries to connect social account to second user in application.
+    Event raised when social account is already connected to some other user.
+
+
+    Allow to add custom logic, when someone tries to connect social account to
+    second user in application.
 
     .. note::
-        Action emitting this event, should catch all HTTPFound that might be risen in event listener.
+        Action emitting this event, should catch all HTTPRedirection that might
+        be risen in event listener.
     """
 
     def __init__(self, request, user, profile, response_values):

pyramid_fullauth/request.py

@@ -4,7 +4,7 @@
 # the MIT License (MIT): http://opensource.org/licenses/MIT
 """These method gets added to each ``pyramid.request.Request`` object."""
 
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPSeeOther
 from pyramid.security import remember, unauthenticated_userid, forget
 from sqlalchemy.sql.expression import func
 from sqlalchemy.orm.exc import NoResultFound
@@ -23,7 +23,7 @@ def login_perform(request, user, location=None, remember_me=False):
     :param bool remember_me: if True set cookie max_age to one month (60 * 60 * 24 * 30 seconds)
 
     :returns: redirect exception
-    :rtype: pyramid.httpexceptions.HTTPFound
+    :rtype: pyramid.httpexceptions.HTTPSeeOther
     """
     user.logged_at = func.now()
     if remember_me:  # if remember in POST set cookie timeout to one from configure
@@ -36,7 +36,7 @@ def login_perform(request, user, location=None, remember_me=False):
 
     # this remembers user immediately, without the need to redirect (see below)
     request.response.headers.extend(headers)
-    return HTTPFound(location=location, headers=request.response.headers)
+    return HTTPSeeOther(location=location, headers=request.response.headers)
 
 
 def user(request):

pyramid_fullauth/views/basic/activate.py

@@ -5,7 +5,7 @@
 """Registration related views."""
 
 from pyramid.view import view_config
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPRedirection
 from pyramid.security import NO_PERMISSION_REQUIRED
 
 from sqlalchemy.orm.exc import NoResultFound
@@ -37,7 +37,7 @@ class ActivateView(BaseView):
                 response['status'] = False
         try:
             self.request.registry.notify(AfterActivate(self.request, user))
-        except HTTPFound as e:
+        except HTTPRedirection as e:
             # it's a redirect, let's follow it!
             return e
 

pyramid_fullauth/views/basic/login.py

@@ -6,7 +6,7 @@
 
 from pyramid.view import view_config
 from pyramid.view import view_defaults
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPSeeOther, HTTPRedirection
 from pyramid.security import authenticated_userid
 from pyramid.security import NO_PERMISSION_REQUIRED
 
@@ -40,10 +40,10 @@ class BaseLoginView(BaseView):
 
     def _redirect_authenticated_user(self):
         """Redirect already logged in user away from login page."""
-        redirect = HTTPFound(location=self.response['after'])
+        redirect = HTTPSeeOther(location=self.response['after'])
         try:
             self.request.registry.notify(AlreadyLoggedIn(self.request))
-        except HTTPFound as redirect:
+        except HTTPRedirection as redirect:
             pass
 
         if self.request.is_xhr:
@@ -111,7 +111,7 @@ class LoginViewPost(BaseLoginView):
             except AttributeError as e:
                 self.response['msg'] = str(e)
                 return self.response
-            except HTTPFound as redirect:
+            except HTTPRedirection as redirect:
                 login_kwargs['location'] = redirect.location
 
             redirect = self.request.login_perform(user, **login_kwargs)

pyramid_fullauth/views/basic/logout.py

@@ -5,7 +5,7 @@
 """De-authentication related view."""
 
 from pyramid.view import view_config
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPSeeOther
 from pyramid.security import NO_PERMISSION_REQUIRED
 
 from pyramid_fullauth.views import BaseView
@@ -24,5 +24,5 @@ class LogoutView(BaseView):
         # forget headers
         self.request.logout()
 
-        return HTTPFound(location=location,
-                         headers=self.request.response.headers)
+        return HTTPSeeOther(location=location,
+                            headers=self.request.response.headers)

pyramid_fullauth/views/basic/profile/email.py

@@ -5,7 +5,7 @@
 """Email related views."""
 
 from pyramid.view import view_config, view_defaults
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPRedirection, HTTPSeeOther
 from pyramid.security import NO_PERMISSION_REQUIRED
 
 from sqlalchemy.orm.exc import NoResultFound
@@ -76,7 +76,7 @@ class EmailChangeViews(BaseView):
 
         try:
             self.request.registry.notify(AfterEmailChange(self.request, user))
-        except HTTPFound as redirect:
+        except HTTPRedirection as redirect:
             if self.request.is_xhr:
                 response_values['url'] = redirect.location
                 return response_values
@@ -86,7 +86,7 @@ class EmailChangeViews(BaseView):
             if self.request.is_xhr:
                 return response_values
             else:
-                return HTTPFound(location='/')
+                return HTTPSeeOther(location='/')
 
 
 @view_config(route_name='email:change:continue', permission=NO_PERMISSION_REQUIRED,
@@ -102,6 +102,6 @@ class EmailChangeAccept(BaseView):
 
         try:
             self.request.registry.notify(AfterEmailChangeActivation(self.request, user))
-        except HTTPFound as redirect:
+        except HTTPRedirection as redirect:
             return redirect
-        return HTTPFound(location='/')
+        return HTTPSeeOther(location='/')

pyramid_fullauth/views/basic/profile/password.py

@@ -5,7 +5,7 @@
 """Profile related views."""
 
 from pyramid.view import view_config, view_defaults
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPRedirection, HTTPSeeOther
 from pyramid.security import NO_PERMISSION_REQUIRED
 
 from sqlalchemy.orm.exc import NoResultFound
@@ -52,10 +52,10 @@ class PasswordResetView(BaseView):
         user.set_reset()
         try:
             self.request.registry.notify(AfterResetRequest(self.request, user))
-        except HTTPFound as redirect:
+        except HTTPRedirection as redirect:
             return redirect
 
-        return HTTPFound(location='/')
+        return HTTPSeeOther(location='/')
 
 
 @view_defaults(route_name='password:reset:continue', permission=NO_PERMISSION_REQUIRED,
@@ -114,7 +114,7 @@ class PasswordResetContinueView(BaseView):
 
             try:
                 self.request.registry.notify(AfterReset(self.request, user))
-            except HTTPFound as redirect:
+            except HTTPRedirection as redirect:
                 return redirect
         else:
             return {

pyramid_fullauth/views/basic/register.py

@@ -5,7 +5,7 @@
 """Registration related views."""
 
 from pyramid.view import view_config, view_defaults
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPRedirection
 from pyramid.security import NO_PERMISSION_REQUIRED
 
 import pyramid_basemodel
@@ -53,7 +53,7 @@ class RegisterView(BaseView):
 
         try:
             self.request.registry.notify(AfterRegister(self.request, user, response))
-        except HTTPFound as redirect:
+        except HTTPRedirection as redirect:
             return redirect
 
         return response

pyramid_fullauth/views/social.py

@@ -6,7 +6,7 @@
 import logging
 
 from pyramid.view import view_config
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPRedirection
 from pyramid.security import NO_PERMISSION_REQUIRED
 
 from sqlalchemy.orm.exc import NoResultFound
@@ -106,14 +106,14 @@ class SocialLoginViews(BaseView):
                     self.request.registry.notify(
                         AfterSocialRegister(
                             self.request, user, context.profile, response_values))
-                except HTTPFound as redirect:
+                except HTTPRedirection as redirect:
                     # it's a redirect, let's follow it!
                     return redirect
 
         # if we're here, user exists,
         try:
             self.request.registry.notify(AfterSocialLogIn(self.request, user, context.profile))
-        except HTTPFound as redirect:
+        except HTTPRedirection as redirect:
             # it's a redirect, let's follow it!
             return self.request.login_perform(user, location=redirect.location)
         else:
@@ -126,7 +126,7 @@ class SocialLoginViews(BaseView):
         :param dict response_values:
 
         :returns: response values with any message,
-            or HTTPFound if raised in SocialAccountAlreadyConnected
+            or HTTPRedirection if raised in SocialAccountAlreadyConnected
         :rtype: dict
         """
         context = self.request.context
@@ -157,7 +157,7 @@ class SocialLoginViews(BaseView):
                 self.request.registry.notify(
                     SocialAccountAlreadyConnected(
                         self.request, user, context.profile, response_values))
-            except HTTPFound as redirect:
+            except HTTPRedirection as redirect:
                 # it's a redirect, let's follow it!
                 return redirect
         return response_values

tests/tools.py

@@ -13,7 +13,7 @@ DEFAULT_USER = {
 def authenticate(app, email=DEFAULT_USER['email'],
                  password=DEFAULT_USER['password'],
                  remember=False,
-                 response_code=302):
+                 response_code=303):
     """Authenticate user."""
     res = app.get('/login')
     form = res.form

tests/views/test_email.py

@@ -146,7 +146,7 @@ def test_email_proceed(db_session, active_user, default_app):
 
     user = db_session.merge(user)
     res = app.get('/email/change/' + user.email_change_key)
-    assert res.status_code == 302
+    assert res.status_code == 303
 
     with pytest.raises(NoResultFound):
         # there is no user with old email

tests/views/test_login.py

@@ -67,7 +67,7 @@ def test_login_redirects(active_user, extended_app):
     res = res.form.submit()
 
     assert is_user_logged(extended_app) is True
-    assert res.status_code == 302
+    assert res.status_code == 303
 
 
 @pytest.mark.parametrize('user_kwargs', (
@@ -147,5 +147,5 @@ def test_default_login_forbidden(active_user, authable_app):
 def test_default_login_redirectaway(active_user, authable_app):
     """After successful login, access to login page should result in redirect."""
     authenticate(authable_app)
-    res = authable_app.get('/login', status=302)
+    res = authable_app.get('/login', status=303)
     assert res.location == 'http://localhost/'

tests/views/test_logout.py

@@ -9,7 +9,7 @@ def test_logout(active_user, extended_app):
     authenticate(extended_app)
     assert is_user_logged(extended_app) is True
 
-    extended_app.get('/logout', status=302)
+    extended_app.get('/logout', status=303)
     assert is_user_logged(extended_app) is False
     res = extended_app.get('/secret', status=302)
     assert res.status_code == 302
@@ -21,7 +21,7 @@ def test_logout_login(active_user, extended_config, extended_app):
     authenticate(extended_app)
     assert is_user_logged(extended_app) is True
 
-    res = extended_app.get('/logout', status=302)
+    res = extended_app.get('/logout', status=303)
     assert is_user_logged(extended_app) is False
     # redirection should be done to login page.
     assert '/login' in res.location