From 018af75258a49a4d0e5592cbef09fcf918ceee54 Mon Sep 17 00:00:00 2001
From: blagoja <blagojabozinovski@gmail.com>
Date: Thu, 12 Dec 2024 12:59:24 +0100
Subject: [PATCH 1/6] Clear flask session on logout

---
 ckanext/saml2auth/plugin.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ckanext/saml2auth/plugin.py b/ckanext/saml2auth/plugin.py
index 8e0ed57..74c72bf 100644
--- a/ckanext/saml2auth/plugin.py
+++ b/ckanext/saml2auth/plugin.py
@@ -113,6 +113,8 @@ def logout(self):
         else:
             log.info(u'No user was logged in!')
 
+        session.clear()
+        
         return response
 
 

From a85b06633fbdffd53d313099ffa071aaf9557e7c Mon Sep 17 00:00:00 2001
From: blagoja <blagojabozinovski@gmail.com>
Date: Thu, 12 Dec 2024 13:39:06 +0100
Subject: [PATCH 2/6] Clear Flask session on logout for CKAN 2.10 or up

---
 ckanext/saml2auth/plugin.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ckanext/saml2auth/plugin.py b/ckanext/saml2auth/plugin.py
index 74c72bf..ff05ec4 100644
--- a/ckanext/saml2auth/plugin.py
+++ b/ckanext/saml2auth/plugin.py
@@ -112,8 +112,9 @@ def logout(self):
             log.info(u'User {0}<{1}> logged out successfully'.format(g.userobj.name, g.userobj.email))
         else:
             log.info(u'No user was logged in!')
-
-        session.clear()
+        
+        if toolkit.check_ckan_version("2.10"):
+            session.clear()
         
         return response
 

From abf3f597e42064f452964147be93f8970f357820 Mon Sep 17 00:00:00 2001
From: blagoja <blagojabozinovski@gmail.com>
Date: Thu, 19 Dec 2024 15:35:30 +0100
Subject: [PATCH 3/6] Update CKAN version check on logout

---
 ckanext/saml2auth/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/saml2auth/plugin.py b/ckanext/saml2auth/plugin.py
index ff05ec4..eaea679 100644
--- a/ckanext/saml2auth/plugin.py
+++ b/ckanext/saml2auth/plugin.py
@@ -113,7 +113,7 @@ def logout(self):
         else:
             log.info(u'No user was logged in!')
         
-        if toolkit.check_ckan_version("2.10"):
+        if toolkit.check_ckan_version(min_version="2.10"):
             session.clear()
         
         return response

From 083a42b0a84ac5531d5c1eee08f6ccc05dd90e5b Mon Sep 17 00:00:00 2001
From: blagoja <blagojabozinovski@gmail.com>
Date: Thu, 19 Dec 2024 16:03:40 +0100
Subject: [PATCH 4/6] Flake8 fixes

---
 ckanext/saml2auth/plugin.py             | 4 ++--
 ckanext/saml2auth/tests/test_helpers.py | 2 +-
 setup.py                                | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ckanext/saml2auth/plugin.py b/ckanext/saml2auth/plugin.py
index eaea679..95e0c8f 100644
--- a/ckanext/saml2auth/plugin.py
+++ b/ckanext/saml2auth/plugin.py
@@ -112,10 +112,10 @@ def logout(self):
             log.info(u'User {0}<{1}> logged out successfully'.format(g.userobj.name, g.userobj.email))
         else:
             log.info(u'No user was logged in!')
-        
+
         if toolkit.check_ckan_version(min_version="2.10"):
             session.clear()
-        
+
         return response
 
 
diff --git a/ckanext/saml2auth/tests/test_helpers.py b/ckanext/saml2auth/tests/test_helpers.py
index 46d692e..c43481c 100644
--- a/ckanext/saml2auth/tests/test_helpers.py
+++ b/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 type(password) is str
 
 
 def test_default_login_disabled_by_default():
diff --git a/setup.py b/setup.py
index cc2da1c..e905d59 100644
--- a/setup.py
+++ b/setup.py
@@ -41,8 +41,7 @@
     long_description_content_type='text/markdown',
 
     # The project's main homepage.
-    url='https://github.com/keitaroinc/'\
-            'ckanext-saml2auth',
+    url='https://github.com/keitaroinc/ckanext-saml2auth',
 
     # Author details
     author='''Keitaro Inc''',

From c5f2e16ab91444f15309feae3b94964d5430d03e Mon Sep 17 00:00:00 2001
From: blagoja <blagojabozinovski@gmail.com>
Date: Mon, 23 Dec 2024 14:09:48 +0100
Subject: [PATCH 5/6] Update tests

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c7d2a8f..0916278 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,6 +85,8 @@ jobs:
         env:
           PGPASSWORD: postgres
         run: |
+        if: ${{ matrix.ckan-version == 2.9 }}
+            pip install "setuptools>=44.1.0,<71"
           export CKANVERSION=${{matrix.ckan-version}}
           bash bin/setup-ckan.bash
 

From b5dc5648a6f328dd8152c12dd2c3c5b98bd70d1d Mon Sep 17 00:00:00 2001
From: blagoja <blagojabozinovski@gmail.com>
Date: Mon, 23 Dec 2024 14:19:26 +0100
Subject: [PATCH 6/6] Change setuptools version for ckan 2.9

---
 .github/workflows/ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0916278..50e1be3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,8 +85,6 @@ jobs:
         env:
           PGPASSWORD: postgres
         run: |
-        if: ${{ matrix.ckan-version == 2.9 }}
-            pip install "setuptools>=44.1.0,<71"
           export CKANVERSION=${{matrix.ckan-version}}
           bash bin/setup-ckan.bash
 
@@ -114,6 +112,10 @@ jobs:
       - name: Install setup requirements
         run: |
           python -m pip install --upgrade setuptools wheel twine
+      
+      - name: Pin setuptools for ckan 2.9 only
+        if: ${{ matrix.ckan-version == 2.9 }}
+        run: pip install "setuptools>=44.1.0,<71"
 
       - name: Build and package
         run: |