dana-python 2.1.3__tar.gz → 2.1.5__tar.gz

{dana_python-2.1.3/dana_python.egg-info → dana_python-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 2.1.3
+Version: 2.1.5
 Summary: API Client (SDK) for DANA APIs based on https://dashboard.dana.id/api-docs
 Author-email: DANA Package Manager  <package-manager@dana.id>
 Maintainer-email: DANA Package Manager  <package-manager@dana.id>

{dana_python-2.1.3 → dana_python-2.1.5}/dana/payment_gateway/v1/custom_validation.py

@@ -34,7 +34,7 @@ SANDBOX_ALLOWED_PAY_METHODS: FrozenSet[str] = frozenset({
 })
 
 SANDBOX_ALLOWED_PAY_OPTIONS: FrozenSet[str] = frozenset({
-    'CARD', 'QRIS', 'BRI', 'PANIN', 'CIMB', 'MANDIRI', 'BTPN', 'BSI',
+    'CARD', 'QRIS', 'BRI', 'PANI', 'CIMB', 'MANDIRI', 'BTPN', 'BSI_PAYMENT',
 })
 
 CREDIT_DEBIT_CARD_PAY_METHODS: Set[str] = {'CREDIT_CARD', 'DEBIT_CARD'}

{dana_python-2.1.3 → dana_python-2.1.5}/dana/utils/snap_header.py

@@ -47,7 +47,7 @@ class SnapHeader:
     ]
     SnapApplyTokenRuntimeHeaders: List[str] = [
         X_TIMESTAMP, X_SIGNATURE, 
-        X_CLIENT_KEY, CHANNEL_ID
+        X_CLIENT_KEY, X_PARTNER_ID, CHANNEL_ID
     ]
     SnapApplyOTTRuntimeHeaders: List[str] = [
         AUTHORIZATION_CUSTOMER, X_TIMESTAMP, X_SIGNATURE, 
@@ -76,11 +76,6 @@ class SnapHeader:
         ]
 
         if scenario == "apply_token":
-            # Remove X-PARTNER-ID as it's replaced by X-CLIENT-KEY in apply_token scenario
-            filtered_auth = [
-                auth for auth in filtered_auth 
-                if auth != X_PARTNER_ID  # Explicitly exclude X-PARTNER-ID
-            ]
             return list(set(filtered_auth).union(SnapHeader.SnapApplyTokenRuntimeHeaders))
 
         elif scenario == "apply_ott" or scenario == "unbinding_account":

{dana_python-2.1.3 → dana_python-2.1.5/dana_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 2.1.3
+Version: 2.1.5
 Summary: API Client (SDK) for DANA APIs based on https://dashboard.dana.id/api-docs
 Author-email: DANA Package Manager  <package-manager@dana.id>
 Maintainer-email: DANA Package Manager  <package-manager@dana.id>

{dana_python-2.1.3 → dana_python-2.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dana-python"
-version = "2.1.3"
+version = "2.1.5"
 readme = "README.md"
 description = "API Client (SDK) for DANA APIs based on https://dashboard.dana.id/api-docs"
 license = "Apache-2.0"

{dana_python-2.1.3 → dana_python-2.1.5}/tests/test_widget_with_automation.py

@@ -65,7 +65,7 @@ class TestWidgetWithAutomation:
             redirect_url='https://google.com',
             merchant_id=merchant_id,
             seamless_data={
-                'mobileNumber': '087875849373'
+                'mobileNumber': '083811223355'
             },
             external_id=str(uuid.uuid4())
         )
@@ -101,8 +101,8 @@ class TestWidgetWithAutomation:
             print('Starting OAuth automation process...')
             generated_auth_code = get_auth_code(
                 oauth_url=oauth_url,
-                phone_number='087875849373',  # Optional: override phone number if needed
-                pin=None  # Use default PIN
+                phone_number='083811223355',  # Optional: override phone number if needed
+                pin='181818'
             )
             
             if generated_auth_code:
@@ -208,21 +208,38 @@ class TestWidgetWithAutomation:
         except Exception as e:
             pytest.fail(f'Error during WidgetPayment execution: {e}')
 
-        # Construct full payment URL with OTT from binding process
-        payment_url = Util.generate_complete_payment_url(
-            widget_payment_response=payment_response,
-            apply_ott_response=ott_response
-        )
-        print(f"Payment URL: {payment_url}")
+        # Construct full payment URL with OTT and automate payment.
+        # OTTs are short-lived, so we re-apply OTT on each attempt to avoid
+        # "OTT not valid" errors caused by the time taken by prior test steps.
+        from tests.web_automation import automate_payment_widget
+        max_payment_retries = 3
+        payment_success = False
+        for payment_attempt in range(1, max_payment_retries + 1):
+            try:
+                print(f'Applying fresh OTT for payment attempt {payment_attempt}...')
+                fresh_ott_response = api_instance_widget.apply_ott(apply_ott_request)
+                assert fresh_ott_response.response_code == '2004900', \
+                    f'OTT failed: {fresh_ott_response.response_code}'
+                self.__class__.ott = fresh_ott_response.user_resources[0].value
 
-        try:
-            # Run the payment automation script (this would be implemented separately)
-            from tests.web_automation import automate_payment_widget
-            print("Running payment automation script...")
-            success = automate_payment_widget(payment_url)
-            assert success, "Payment automation failed"
-        except Exception as e:
-            pytest.fail(f'Error during payment automation: {e}')
+                payment_url = Util.generate_complete_payment_url(
+                    widget_payment_response=payment_response,
+                    apply_ott_response=fresh_ott_response
+                )
+                print(f"Payment URL (attempt {payment_attempt}): {payment_url}")
+
+                print("Running payment automation script...")
+                success = automate_payment_widget(payment_url)
+                if success:
+                    payment_success = True
+                    break
+                print(f"Payment automation returned False on attempt {payment_attempt}")
+            except Exception as e:
+                print(f"Payment attempt {payment_attempt} error: {e}")
+            if payment_attempt < max_payment_retries:
+                print(f"Retrying payment in 3 seconds...")
+                time.sleep(3)
+        assert payment_success, f"Payment automation failed after {max_payment_retries} attempts"
 
         time.sleep(5)
 
@@ -255,154 +272,7 @@ class TestWidgetWithAutomation:
             # Query User Profile
             print("Querying user profile...")
             query_user_profile_req = query_user_profile_request(self.__class__.binding_access_token)
-            
-            print("=== QueryUserProfile Request Debug ===")
-            print(f"Request object: {query_user_profile_req}")
-            print(f"User Resources: {query_user_profile_req.user_resources}")
-            print(f"Access Token: {query_user_profile_req.access_token}")
-            print("=== End Request Debug ===")
-            
-            # Add comprehensive HTTP request debugging  
-            import urllib3
-            import json as json_module
-            
-            # Monkey patch urllib3 to log requests and responses
-            original_urlopen = urllib3.poolmanager.PoolManager.urlopen
-            
-            def debug_urlopen(self, method, url, *args, **kwargs):
-                print("\n" + "="*60)
-                print("=== PYTHON HTTP REQUEST DEBUG ===")
-                print("="*60)
-                print(f"Method: {method}")
-                print(f"URL: {url}")
-                
-                # Log all headers
-                headers = kwargs.get('headers', {})
-                if headers:
-                    print("HTTP Headers:")
-                    for key, value in headers.items():
-                        print(f"  {key}: {value}")
-                
-                # Log request body with detailed analysis
-                body = kwargs.get('body')
-                if body:
-                    print("\nRequest Body Analysis:")
-                    print(f"  Body type: {type(body)}")
-                    print(f"  Body length: {len(body) if body else 0}")
-                    
-                    try:
-                        # Handle different body types
-                        if isinstance(body, bytes):
-                            body_str = body.decode('utf-8')
-                        elif isinstance(body, str):
-                            body_str = body
-                        else:
-                            body_str = str(body)
-                        
-                        print(f"  Body (literal): {repr(body_str)}")
-                        
-                        # Try to parse and pretty print JSON
-                        try:
-                            parsed_json = json_module.loads(body_str)
-                            print("  Body (parsed JSON):")
-                            print(json_module.dumps(parsed_json, indent=4))
-                            
-                            # Analyze DANA request structure
-                            if isinstance(parsed_json, dict):
-                                if 'request' in parsed_json:
-                                    print("  ✅ Contains 'request' wrapper")
-                                    request_part = parsed_json['request']
-                                    if 'head' in request_part:
-                                        head = request_part['head']
-                                        print(f"  ✅ Head section with {len(head)} fields:")
-                                        for k, v in head.items():
-                                            if k == 'accessToken':
-                                                print(f"    ✅ {k}: {v}")
-                                            else:
-                                                print(f"    - {k}: {v}")
-                                    if 'body' in request_part:
-                                        body_part = request_part['body']
-                                        print(f"  ✅ Body section: {body_part}")
-                                if 'signature' in parsed_json:
-                                    sig = parsed_json['signature']
-                                    print(f"  ✅ Signature: {sig[:50]}...")
-                                else:
-                                    print("  ❌ Missing signature!")
-                            else:
-                                print(f"  ❌ Unexpected structure: {list(parsed_json.keys())}")
-                                    
-                        except json_module.JSONDecodeError as e:
-                            print(f"  ❌ Failed to parse JSON: {e}")
-                    except Exception as e:
-                        print(f"  ❌ Failed to process body: {e}")
-                else:
-                    print("  No request body")
-                
-                print("="*60)
-                
-                # Make the actual request
-                response = original_urlopen(self, method, url, *args, **kwargs)
-                
-                # Log response details
-                print("=== PYTHON HTTP RESPONSE DEBUG ===")
-                print("="*60)
-                print(f"Status: {response.status}")
-                print(f"Status reason: {getattr(response, 'reason', 'N/A')}")
-                
-                print("Response Headers:")
-                for key, value in response.headers.items():
-                    print(f"  {key}: {value}")
-                
-                # Read response body without consuming it for the client
-                print("\nResponse Body Analysis:")
-                try:
-                    # Get response data
-                    response_data = response.data
-                    if isinstance(response_data, bytes):
-                        response_text = response_data.decode('utf-8')
-                    else:
-                        response_text = str(response_data)
-                    
-                    print(f"Response body type: {type(response_data)}")
-                    print(f"Response body length: {len(response_text)}")
-                    print(f"Response body (literal): {repr(response_text)}")
-                    
-                    # Parse and analyze JSON response
-                    try:
-                        parsed_response = json_module.loads(response_text)
-                        print("Response body (parsed JSON):")
-                        print(json_module.dumps(parsed_response, indent=4))
-                        
-                        # Analyze DANA response structure
-                        if 'response' in parsed_response:
-                            resp = parsed_response['response']
-                            if 'body' in resp and 'resultInfo' in resp['body']:
-                                result = resp['body']['resultInfo']
-                                print(f"\n📊 API Result: {result.get('resultStatus', 'N/A')} - {result.get('resultCode', 'N/A')}")
-                                if result.get('resultMsg'):
-                                    print(f"📋 Message: {result['resultMsg']}")
-                        
-                    except json_module.JSONDecodeError:
-                        print("❌ Response is not valid JSON")
-                        
-                except Exception as e:
-                    print(f"❌ Could not read response body: {e}")
-                    print(f"Response object type: {type(response)}")
-                    print(f"Response attributes: {[attr for attr in dir(response) if not attr.startswith('_')]}")
-                
-                print("="*60)
-                print()
-                
-                return response
-            
-            # Apply the monkey patch
-            urllib3.poolmanager.PoolManager.urlopen = debug_urlopen
-            
-            try:
-                query_user_profile_response = api_instance_widget.query_user_profile(query_user_profile_req)
-            finally:
-                # Restore original method
-                urllib3.poolmanager.PoolManager.urlopen = original_urlopen
+            query_user_profile_response = api_instance_widget.query_user_profile(query_user_profile_req)
             
             assert query_user_profile_response is not None
             assert query_user_profile_response.response is not None