Merge d349f68 into b2c6cfc

bin/mytest.txt

@@ -0,0 +1 @@
+zope.interface==4.3.2

bin/setup-ckan.bash

@@ -26,10 +26,9 @@ then
     pip install -r requirement-setuptools.txt
 fi
 
-if [ $CKANVERSION == '2.7' ]
+if [ $CKANVERSION == '2.9' ]
 then
-    echo "Installing setuptools"
-    pip install setuptools==39.0.1
+    sed -i 's/zope.interface==4.3.2/zope.interface>5.0.0/g' requirements.txt
 fi
 
 python setup.py develop

ckanext/saml2auth/plugin.py

@@ -95,6 +95,16 @@ def update_config(self, config_):
 
     # IAuthenticator
 
+    def identify(self):
+        try:
+            if g.userobj and not session.get('last_active'):
+                log.info('User {0}<{1}> logged in successfully{2}.'.format(
+                    g.userobj.name, g.userobj.email,
+                    ' via saml' if session.get('_saml_session_info') else ''
+                ))
+        except AttributeError:
+            log.info(u'No user defined!')
+
     def logout(self):
 
         response = _perform_slo()

ckanext/saml2auth/tests/test_helpers.py

@@ -30,7 +30,7 @@
 def test_generate_password():
     password = h.generate_password()
     assert len(password) == 8
-    assert type(password) == str
+    assert isinstance(password, str)
 
 
 def test_default_login_disabled_by_default():

ckanext/saml2auth/views/saml2auth.py

@@ -295,8 +295,6 @@ def _log_user_into_ckan(resp):
         user_id = g.userobj.name
     set_repoze_user(user_id, resp)
 
-    log.info(u'User {0}<{1}> logged in successfully'.format(g.userobj.name, g.userobj.email))
-
 
 def saml2login():
     u'''Redirects the user to the