dataflow-core 2.1.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

authenticator/dataflowsupersetauthenticator.py

@@ -15,50 +15,60 @@ class DataflowAuthDBView(AuthDBView):
     def __init__(self):
         self.dataflow = Dataflow()
 
-    @expose('/login/', methods=['GET'])
-    def login_redirect(self):
-        try:
+    def create_user(self, user_details):
+        """
+        Create a new user in Superset with the given details.
+
+        Returns:
+            User object: The newly created user instance
+        """
+        return self.appbuilder.sm.add_user(
+            username=user_details['user_name'], 
+            first_name=user_details.get("first_name", ""),
+            last_name=user_details.get("last_name", ""), 
+            email=user_details.get("email", ""), 
+            role=self.appbuilder.sm.find_role('Admin')
+        )
+
+    @expose('/login/', methods=['GET', "POST"])
+    def login(self):
+        """
+        Handles both GET and POST login requests.
+
+        - GET: Used for browser-based login. Authenticates using session cookie and redirects to home.
+        - POST: Used for API-based login. Returns JWT access token for programmatic access.
+
+        Returns:
+            - Redirect to home page (GET)
+            - JSON response with access token (POST)
+        """
+        if request.method == "GET":
             session_id = request.cookies.get('dataflow_session')
-            
             user_details = self.dataflow.auth(session_id)
             user = self.appbuilder.sm.find_user(username=user_details['user_name'])
+            try:
+                if user:
+                    login_user(user, remember=False)
+                else:
+                    user = self.create_user(user_details)
+                login_user(user, remember=False)
+                return redirect(self.appbuilder.get_url_for_index)
+            except Exception as e:
+                return super().login()
+        else:
+            user_details = request.get_json()
+            user = self.appbuilder.sm.find_user(username=user_details["user_name"])
             if user:
                 login_user(user, remember=False)
             else:
-                user = self.appbuilder.sm.add_user(
-                    username=user_details['user_name'], 
-                    first_name=user_details.get("first_name", ""),
-                    last_name=user_details.get("last_name", ""), 
-                    email=user_details.get("email", ""), 
-                    role=self.appbuilder.sm.find_role('Admin')
+                user = self.create_user(user_details)
+                login_user(user, remember=False)
+            resp = {
+                API_SECURITY_ACCESS_TOKEN_KEY: create_access_token(
+                    identity=str(user.id), fresh=True
                 )
-                if user:
-                    login_user(user, remember=False)
-                    
-            return redirect(self.appbuilder.get_url_for_index)
-
-        except Exception as e:
-            return super().login()
-
-    @expose("/login", methods=["POST"])
-    def login_token(self):
-        login_payload = request.get_json()
-        user = self.appbuilder.sm.find_user(username=login_payload["user_name"])
-
-        if not user:
-            user = self.appbuilder.sm.add_user(
-                username=login_payload["user_name"], 
-                first_name=login_payload.get("first_name", ""),
-                last_name=login_payload.get("last_name", ""), 
-                email=login_payload.get("email", ""), 
-                role=self.appbuilder.sm.find_role('Admin')
-            )
-        
-        resp = dict()
-        resp[API_SECURITY_ACCESS_TOKEN_KEY] = create_access_token(
-            identity=str(user.id), fresh=True
-        )
-        return jsonify(resp)
+            }
+            return jsonify(resp)
     
 class DataflowSecurityManager(SupersetSecurityManager):
     authdbview = DataflowAuthDBView

{dataflow_core-2.1.0.dist-info → dataflow_core-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataflow-core
-Version: 2.1.0
+Version: 2.1.1
 Summary: Dataflow core package
 Author: Dataflow
 Author-email: 

{dataflow_core-2.1.0.dist-info → dataflow_core-2.1.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 authenticator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 authenticator/dataflowairflowauthenticator.py,sha256=gEdCiL2yJQ7lYvAwbrjcAkccVMfehoMJldw9eU7cc2s,2243
 authenticator/dataflowhubauthenticator.py,sha256=A0S0_PJVCPiTfuoLormmO0xNDqjIh00Cf93P0-mF0cw,2913
-authenticator/dataflowsupersetauthenticator.py,sha256=Qx8hUGSOfUTgffRCaVf88vmE9bFGNBvd9mEMHcpD488,2463
+authenticator/dataflowsupersetauthenticator.py,sha256=NkAmDaIc-ui-qEolu4xz_UY7P_2g8111hwNjPvAOW1Q,2839
 dataflow/__init__.py,sha256=WTRg8HMpMWSgxYJ9ZGVldx4k07fAbta3mBmZ1hG9mWE,30
 dataflow/configuration.py,sha256=7To6XwH1eESiYp39eqPcswXWwrdBUdPF6xN6WnazOF0,663
 dataflow/database_manager.py,sha256=tJHMuOZ9Muskrh9t4uLRlTuFU0VkHAzoHlGP5DORIC4,899
@@ -36,8 +36,8 @@ dataflow/utils/aws_secrets_manager.py,sha256=A_fNs9VNah9dDdl9NhqizJamYU7xr2v_GXl
 dataflow/utils/get_current_user.py,sha256=akjcUyTpmMdAZj9LFGSTs76hjBRjltNk9hLUqC_BdkA,1140
 dataflow/utils/json_handler.py,sha256=5_7WdypegRBDe2HSqBXyrJAdd92wsha8qRcmQvCj1TA,782
 dataflow/utils/logger.py,sha256=7BFrOq5Oiqn8P4XZbgJzMP5O07d2fpdECbbfsjrUuHw,1213
-dataflow_core-2.1.0.dist-info/METADATA,sha256=x9qvy7PPIKQCRyYEnGRP47R1yMpicivWON4Re7rWj6w,301
-dataflow_core-2.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dataflow_core-2.1.0.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
-dataflow_core-2.1.0.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
-dataflow_core-2.1.0.dist-info/RECORD,,
+dataflow_core-2.1.1.dist-info/METADATA,sha256=WdN8Xh9UGcvgYnv-i-CB9fANkjBlUjcw_NawSc2_EcY,301
+dataflow_core-2.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dataflow_core-2.1.1.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
+dataflow_core-2.1.1.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
+dataflow_core-2.1.1.dist-info/RECORD,,