dataflow-core 2.0.0__tar.gz → 2.0.2__tar.gz

dataflow-core-2.0.2/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: dataflow-core
+Version: 2.0.2
+Summary: Dataflow core package
+Home-page: UNKNOWN
+Author: Dataflow
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN

{dataflow_core-2.0.0 → dataflow-core-2.0.2}/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.2/dataflow_core.egg-info/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: dataflow-core
+Version: 2.0.2
+Summary: Dataflow core package
+Home-page: UNKNOWN
+Author: Dataflow
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN

{dataflow_core-2.0.0 → dataflow-core-2.0.2}/dataflow_core.egg-info/entry_points.txt

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

{dataflow_core-2.0.0 → dataflow-core-2.0.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="dataflow-core",
-    version="2.0.0",
+    version="2.0.2",
     packages=find_packages(exclude=["tests", "tests.*"]),
     include_package_data=True,
     package_data={},
@@ -20,4 +20,4 @@ setup(
             'dataflow_authenticator = authenticator.dataflowhubauthenticator:DataflowHubAuthenticator',
         ],
     },
-)
+)

dataflow_core-2.0.0/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 2.1
-Name: dataflow-core
-Version: 2.0.0
-Summary: Dataflow core package
-Author: Dataflow
-Author-email: 
-Requires-Dist: sqlalchemy
-Requires-Dist: boto3
-Requires-Dist: psycopg2-binary
-Requires-Dist: pymysql

dataflow_core-2.0.0/dataflow_core.egg-info/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 2.1
-Name: dataflow-core
-Version: 2.0.0
-Summary: Dataflow core package
-Author: Dataflow
-Author-email: 
-Requires-Dist: sqlalchemy
-Requires-Dist: boto3
-Requires-Dist: psycopg2-binary
-Requires-Dist: pymysql