dataflow-core 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

authenticator/dataflowhubauthenticator.py

@@ -4,7 +4,7 @@ from .package.models import (
     user as m_user,
     session as m_session
     )
-
+from datetime import datetime, timedelta, timezone
 import uuid
 from jupyterhub.auth import Authenticator
 
@@ -34,17 +34,26 @@ class DataflowHubAuthenticator(Authenticator):
             query = self.db.query(m_user.User)
             user = query.filter(m_user.User.user_name == username).first()
 
-            if user is not None:
-                # check if password is correct
-                if user.password != password:
-                    return None
-                
-                # generate session_id
+            if user is None or user.password != password:
+                return None
+
+            # Check if the user already has an existing session
+            existing_session = (
+                self.db.query(m_session.Session_table)
+                .filter(m_session.Session_table.user_id == str(user.user_id))
+                .first()
+            )
+
+            if existing_session:
+                # Reuse the existing session_id
+                session_id = existing_session.session_id
+            else:
+                # Generate a new session_id
                 session_id = self.generate_session_id()
                 query = self.db.query(m_session.Session_table)
                 isSession = query.filter(m_session.Session_table.session_id == session_id).first()
 
-                # if session_id is already exists in the database, generate a new one
+                # If session_id(uuid string) already exists in the database, generate a new one
                 while isSession is not None:
                     session_id = self.generate_session_id()
                     isSession = query.filter(m_session.Session_table.session_id == session_id).first()
@@ -55,12 +64,10 @@ class DataflowHubAuthenticator(Authenticator):
                 self.db.commit()
                 self.db.refresh(db_item)
 
-                # return user dictionary and set cookie
-                handler.set_cookie("dataflow_session", session_id)
-                user_dict = {"name": username, "session_id": session_id}
-                return user_dict
-            else:
-                return None
+            expires = datetime.now(timezone.utc) + timedelta(days=365)
+            handler.set_cookie("dataflow_session", session_id, expires=expires)
+            user_dict = {"name": username, "session_id": session_id}
+            return user_dict
 
         except Exception as e:
             return None

{dataflow_core-2.0.0.dist-info → dataflow_core-2.0.2.dist-info}/METADATA

@@ -1,11 +1,17 @@
 Metadata-Version: 2.1
 Name: dataflow-core
-Version: 2.0.0
+Version: 2.0.2
 Summary: Dataflow core package
+Home-page: UNKNOWN
 Author: Dataflow
-Author-email: 
+Author-email: UNKNOWN
+License: UNKNOWN
+Platform: UNKNOWN
 Requires-Dist: sqlalchemy
 Requires-Dist: boto3
 Requires-Dist: psycopg2-binary
 Requires-Dist: pymysql
 
+UNKNOWN
+
+

{dataflow_core-2.0.0.dist-info → dataflow_core-2.0.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 authenticator/__init__.py,sha256=A7EfIoO2e0vyt9TXGHPOeS-THDC0KEiaQHdkdzXUVH8,206
 authenticator/dataflowairflowauthenticator.py,sha256=wzd807UAb5ojIVMO8FVHQnNi3Tc78NjkhbDSfzgo2Qg,4790
-authenticator/dataflowhubauthenticator.py,sha256=jsxpB_NZz3n_FGFJzW0yfXR3i-KK1dsVVIQVIN84Pfc,2540
+authenticator/dataflowhubauthenticator.py,sha256=UgjZiXSP-hlbciyJVb-QIgUjS3_EgX0WIvbhD563rVw,2918
 authenticator/dataflowsupersetauthenticator.py,sha256=UNgem68eg8G-1uAok2yVc6NvUeXaJ-9MPmdpfSyr9Jg,2759
 authenticator/package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 authenticator/package/configuration.py,sha256=7To6XwH1eESiYp39eqPcswXWwrdBUdPF6xN6WnazOF0,663
@@ -17,8 +17,8 @@ dataflow/models/session.py,sha256=C9crPh6ZDFuL27hZ_zhUXDZZ0ZiIDE8ZD19O_4WPw-I,48
 dataflow/models/user.py,sha256=IYogp_vt0yDBG5i936uNPjgTis77VYPzITn9XpQUIyw,788
 dataflow/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dataflow/utils/aws_secrets_manager.py,sha256=FqHm3YRynv580FpFsS0RfI1MSGY5aq-V7t4blpiYsS4,2588
-dataflow_core-2.0.0.dist-info/METADATA,sha256=QkkZH6mxVy1g84_P_yJKosg2sB0l6cDZhOMQzDLvLcQ,222
-dataflow_core-2.0.0.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-dataflow_core-2.0.0.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
-dataflow_core-2.0.0.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
-dataflow_core-2.0.0.dist-info/RECORD,,
+dataflow_core-2.0.2.dist-info/METADATA,sha256=AoFhbUSzibF-_tP491Gr_baKMXM2tChz1o2QUF0RbvE,293
+dataflow_core-2.0.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+dataflow_core-2.0.2.dist-info/entry_points.txt,sha256=lDLG2MMWlKfkqsVWFghF7sx-yEvM2xqMmHE7rMTysE4,118
+dataflow_core-2.0.2.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
+dataflow_core-2.0.2.dist-info/RECORD,,

{dataflow_core-2.0.0.dist-info → dataflow_core-2.0.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{dataflow_core-2.0.0.dist-info → dataflow_core-2.0.2.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [jupyterhub.authenticators]
 dataflow_authenticator = authenticator.dataflowhubauthenticator:DataflowHubAuthenticator
+