dana-python 2.2.1__py3-none-any.whl → 2.2.2__py3-none-any.whl

dana/widget/v1/util.py

@@ -31,7 +31,7 @@ import base64
 import hashlib
 import urllib.parse
 from datetime import datetime, timezone, timedelta
-from typing import Optional, Dict, Any, List, Union
+from typing import Optional, Dict, Any
 from dana.widget.v1.models import WidgetPaymentResponse, ApplyOTTResponse
 from dana.utils.snap_header import SnapHeader
 
@@ -52,7 +52,7 @@ except ImportError:
     class Mode:
         API = "API"
         DEEPLINK = "DEEPLINK"
-    
+
     class TerminalType:
         WEB = "WEB"
 
@@ -61,223 +61,272 @@ class Util:
     """
     Utility class for the Dana Widget API.
     """
-    
 
-    
+    _OAUTH_QUERY_ESCAPE_KEYS = frozenset(
+        {"redirectUrl", "timestamp", "seamlessData", "seamlessSign"}
+    )
+
+    @staticmethod
+    def generate_channel_id() -> str:
+        """Channel ID for widget OAuth URLs (max 5 chars). Matches Go GenerateChannelId."""
+        channel_id = os.environ.get("CHANNEL_ID") or "95221"
+        return channel_id[:5]
+
+    @staticmethod
+    def generate_scopes() -> str:
+        """OAuth scopes based on environment. Matches Go GenerateScopes."""
+        env = os.environ.get("ENV") or os.environ.get("DANA_ENV") or "sandbox"
+        if env.lower() != "production":
+            return "CASHIER,AGREEMENT_PAY,QUERY_BALANCE,DEFAULT_BASIC_PROFILE,MINI_DANA"
+        return "MINI_DANA,CASHIER,QUERY_BALANCE,DEFAULT_BASIC_PROFILE"
+
+    @staticmethod
+    def generate_timestamp() -> str:
+        """Timestamp in Asia/Jakarta RFC3339 format. Matches Go GenerateTimestamp."""
+        try:
+            from zoneinfo import ZoneInfo
+
+            now = datetime.now(ZoneInfo("Asia/Jakarta"))
+        except Exception:
+            now = datetime.now(timezone.utc) + timedelta(hours=7)
+        return now.strftime("%Y-%m-%dT%H:%M:%S+07:00")
+
+    @staticmethod
+    def _get_attr(data, name: str, default=None):
+        if isinstance(data, dict):
+            return data.get(name, default)
+        return getattr(data, name, default)
+
+    @staticmethod
+    def _is_field_set(data, field_name: str) -> bool:
+        fields_set = getattr(data, "model_fields_set", None)
+        if fields_set is None:
+            fields_set = getattr(data, "__fields_set__", None)
+        if fields_set is not None:
+            return field_name in fields_set
+        if isinstance(data, dict):
+            return field_name in data
+        return getattr(data, field_name, None) is not None
+
+    @staticmethod
+    def _normalize_seamless_data(seamless_data) -> Dict[str, Any]:
+        if seamless_data is None:
+            return {}
+
+        if isinstance(seamless_data, dict):
+            raw = dict(seamless_data)
+        elif hasattr(seamless_data, "model_dump"):
+            raw = seamless_data.model_dump(exclude_none=True)
+        elif hasattr(seamless_data, "dict"):
+            raw = seamless_data.dict(exclude_none=True)
+        else:
+            try:
+                raw = vars(seamless_data)
+            except TypeError:
+                raw = json.loads(json.dumps(seamless_data))
+
+        result = {
+            key: value
+            for key, value in raw.items()
+            if value is not None and value != ""
+        }
+
+        if "mobileNumber" in result:
+            result["mobile"] = result.pop("mobileNumber")
+        if "mobile_number" in result:
+            result["mobile"] = result.pop("mobile_number")
+
+        return result
+
+    @staticmethod
+    def _build_oauth_query_string(url_params: Dict[str, str]) -> str:
+        parts = []
+        for key, value in url_params.items():
+            if value is None:
+                continue
+            if key in Util._OAUTH_QUERY_ESCAPE_KEYS:
+                parts.append(f"{key}={urllib.parse.quote(str(value), safe='')}")
+            else:
+                parts.append(f"{key}={value}")
+        return "&".join(parts)
+
     @staticmethod
     def generate_oauth_url(data, private_key: Optional[str] = None, private_key_path: Optional[str] = None) -> str:
         """
         Generate OAuth URL for testing
-        
+
         Args:
             data: OAuth URL data object
             private_key: Optional private key content
             private_key_path: Optional path to private key file
-            
+
         Returns:
             str: The generated OAuth URL
         """
-        # Use environment variable or default to sandbox
-        env = os.environ.get('DANA_ENV') or os.environ.get('ENV') or 'sandbox'
-        
-        # Get mode or default to API
-        mode = getattr(data, 'mode', None) or Mode.API
-        
-        # Set base URL based on environment and mode
+        env = os.environ.get("DANA_ENV") or os.environ.get("ENV") or "sandbox"
+        mode = Util._get_attr(data, "mode") or Mode.API
+
         if mode == Mode.DEEPLINK:
-            base_url = 'https://m.dana.id/n/link/binding' if env.lower() == 'production' else 'https://m.sandbox.dana.id/n/link/binding'
-        elif mode == Mode.API:
-            base_url = 'https://m.dana.id/v1.0/get-auth-code' if env.lower() == 'production' else 'https://m.sandbox.dana.id/v1.0/get-auth-code'
-        
-        # Get partner ID from environment
-        partner_id = os.environ.get('X_PARTNER_ID')
+            base_url = (
+                "https://m.dana.id/n/link/binding"
+                if env.lower() == "production"
+                else "https://m.sandbox.dana.id/n/link/binding"
+            )
+        else:
+            base_url = (
+                "https://m.dana.id/v1.0/get-auth-code"
+                if env.lower() == "production"
+                else "https://m.sandbox.dana.id/v1.0/get-auth-code"
+            )
+
+        partner_id = os.environ.get("X_PARTNER_ID")
         if not partner_id:
-            raise RuntimeError('X_PARTNER_ID is not defined')
-        
-        # Use provided state or generate a new UUID
-        state = getattr(data, 'state', None)
+            raise RuntimeError("X_PARTNER_ID is not defined")
+
+        state = Util._get_attr(data, "state")
         if not state:
             state = str(uuid.uuid4())
-        
-        # Generate channel ID
-        channel_id = os.environ.get('X_PARTNER_ID')
-        
-        # Get scopes based on environment
-        if hasattr(data, 'scopes') and data.scopes:
-            scopes = ','.join(data.scopes) 
+
+        channel_id = Util.generate_channel_id()
+
+        scopes = Util._get_attr(data, "scopes")
+        if scopes:
+            scopes = ",".join(scopes) if isinstance(scopes, (list, tuple)) else scopes
         else:
-            if env.lower() != 'production':
-                scopes = 'CASHIER,AGREEMENT_PAY,QUERY_BALANCE,DEFAULT_BASIC_PROFILE,MINI_DANA'
-            else:
-                scopes = 'MINI_DANA,CASHIER,QUERY_BALANCE,DEFAULT_BASIC_PROFILE'
-        
-        # Use provided external ID or generate a UUID
-        external_id = getattr(data, 'external_id', None)
+            scopes = Util.generate_scopes()
+
+        external_id = Util._get_attr(data, "external_id")
         if not external_id:
             external_id = str(uuid.uuid4())
-            
-        # Get merchant ID
-        merchant_id = getattr(data, 'merchant_id', None)
-        
-        # Generate timestamp in Jakarta time (UTC+7) with RFC3339 format
-        try:
-            # Python's timezone handling is different from PHP
-            now = datetime.now(timezone(timedelta(hours=7)))
-            timestamp = now.strftime('%Y-%m-%dT%H:%M:%S%z')
-            # Format timezone correctly with a colon
-            timestamp = timestamp[:-2] + ':' + timestamp[-2:]
-        except Exception:
-            # Fallback if timezone calculation fails
-            now = datetime.now(timezone.utc)
-            now += timedelta(hours=7)  # Add 7 hours for UTC+7
-            timestamp = now.strftime('%Y-%m-%dT%H:%M:%S+07:00')
-        
-        # Build URL with required parameters
+
+        merchant_id = Util._get_attr(data, "merchant_id") or os.environ.get("MERCHANT_ID", "")
+        timestamp = Util.generate_timestamp()
+        request_id = None
+
         if mode == Mode.DEEPLINK:
             request_id = str(uuid.uuid4())
             url_params = {
-                'partnerId': partner_id,
-                'scopes': scopes,
-                'terminalType': TerminalType.WEB,
-                'externalId': external_id,
-                'requestId': request_id,
-                'redirectUrl': data.redirect_url if hasattr(data, 'redirect_url') else None,
-                'state': state,
+                "partnerId": partner_id,
+                "scopes": scopes,
+                "terminalType": TerminalType.WEB,
+                "externalId": external_id,
+                "requestId": request_id,
+                "redirectUrl": Util._get_attr(data, "redirect_url"),
+                "state": state,
             }
-        elif mode == Mode.API:
+        else:
             url_params = {
-                'partnerId': partner_id,
-                'scopes': scopes,
-                'externalId': external_id,
-                'channelId': channel_id,
-                'redirectUrl': data.redirect_url if hasattr(data, 'redirect_url') else None,
-                'timestamp': timestamp,
-                'state': state,
-                'isSnapBI': 'true'
+                "partnerId": partner_id,
+                "scopes": scopes,
+                "externalId": external_id,
+                "channelId": channel_id,
+                "redirectUrl": Util._get_attr(data, "redirect_url"),
+                "timestamp": timestamp,
+                "state": state,
+                "isSnapBI": "true",
             }
-        
-        # Add merchant ID if provided
-        if merchant_id and mode == Mode.API:
-            url_params['merchantId'] = merchant_id
-        
-        # Add subMerchantId if provided
-        if hasattr(data, 'sub_merchant_id') and data.sub_merchant_id and mode == Mode.API:
-            url_params['subMerchantId'] = data.sub_merchant_id
-        
-        # Add lang if provided
-        if hasattr(data, 'lang') and data.lang and mode == Mode.API:
-            url_params['lang'] = data.lang
-        
-        # Add allowRegistration if provided
-        if hasattr(data, 'allow_registration') and data.allow_registration is not None and mode == Mode.API:
-            url_params['allowRegistration'] = 'true' if data.allow_registration else 'false'
-        
-        # Handle seamless data if provided
-        seamless_data = getattr(data, 'seamless_data', None)
+            if merchant_id:
+                url_params["merchantId"] = merchant_id
+
+            sub_merchant_id = Util._get_attr(data, "sub_merchant_id")
+            if sub_merchant_id:
+                url_params["subMerchantId"] = sub_merchant_id
+
+            if Util._is_field_set(data, "lang"):
+                lang = Util._get_attr(data, "lang")
+                if lang:
+                    url_params["lang"] = lang
+
+            if Util._is_field_set(data, "allow_registration"):
+                allow_registration = Util._get_attr(data, "allow_registration")
+                if allow_registration is not None:
+                    url_params["allowRegistration"] = (
+                        "true" if allow_registration else "false"
+                    )
+
+        seamless_data = Util._normalize_seamless_data(Util._get_attr(data, "seamless_data"))
         if seamless_data:
-            # Convert object to dict if necessary
-            if not isinstance(seamless_data, dict):
-                try:
-                    seamless_data = vars(seamless_data)
-                except TypeError:
-                    seamless_data = json.loads(json.dumps(seamless_data))
-            
-            # Ensure seamless_data is a dict and convert mobileNumber/mobile_number to mobile if needed
-            if isinstance(seamless_data, dict):
-                if 'mobileNumber' in seamless_data:
-                    seamless_data['mobile'] = seamless_data['mobileNumber']
-                    del seamless_data['mobileNumber']
-                if 'mobile_number' in seamless_data:
-                    seamless_data['mobile'] = seamless_data['mobile_number']
-                    del seamless_data['mobile_number']
-                
-                if mode == Mode.DEEPLINK:
-                    seamless_data['externalUid'] = getattr(data, 'external_id', '')
-                    seamless_data['reqTime'] = timestamp
-                    seamless_data['verifiedTime'] = "0"
-                    seamless_data['reqMsgId'] = request_id
-                
-                seamless_data_json = json.dumps(seamless_data)
-                url_params['seamlessData'] = seamless_data_json
-                
-                url_params['seamlessSign'] = Util.generate_seamless_sign(seamless_data, private_key, private_key_path)
-        
-        # Remove None values
-        url_params = {k: v for k, v in url_params.items() if v is not None}
-        
-        # Build the final URL (RFC3986 quote for seamlessData/seamlessSign parity with Go/PHP)
-        return base_url + '?' + urllib.parse.urlencode(url_params, quote_via=urllib.parse.quote)
-    
+            if mode == Mode.DEEPLINK and request_id:
+                seamless_data["externalUid"] = external_id
+                seamless_data["reqTime"] = timestamp
+                seamless_data["verifiedTime"] = "0"
+                seamless_data["reqMsgId"] = request_id
+
+            seamless_data_json = json.dumps(seamless_data, separators=(",", ":"))
+            url_params["seamlessData"] = seamless_data_json
+
+            pk = private_key or os.environ.get("PRIVATE_KEY")
+            pk_path = private_key_path or os.environ.get("PRIVATE_KEY_PATH")
+            seamless_sign = Util.generate_seamless_sign(seamless_data, pk, pk_path)
+            if seamless_sign:
+                url_params["seamlessSign"] = seamless_sign
+
+        query_string = Util._build_oauth_query_string(url_params)
+        return f"{base_url}?{query_string}"
+
     @staticmethod
     def generate_seamless_sign(seamless_data: Dict[str, Any], private_key: Optional[str] = None, private_key_path: Optional[str] = None) -> str:
         """
         Generate seamless sign for OAuth URL
-        
+
         Args:
             seamless_data: The seamless data to sign
             private_key: Optional private key content
             private_key_path: Optional path to private key file
-            
+
         Returns:
             str: The generated signature
         """
         try:
-            # Get properly formatted private key using SnapHeader utility method
             usable_private_key = SnapHeader.get_usable_private_key(private_key, private_key_path)
-            data_to_sign = json.dumps(seamless_data).encode()
-            
-            # Use cryptography library if available
+            data_to_sign = json.dumps(seamless_data, separators=(",", ":")).encode()
+
             if CRYPTOGRAPHY_AVAILABLE:
-                # Load the private key
                 key = load_pem_private_key(usable_private_key.encode(), password=None)
-                
-                # Sign the data
                 signature = key.sign(
                     data_to_sign,
                     padding.PKCS1v15(),
-                    hashes.SHA256()
+                    hashes.SHA256(),
                 )
-                
-                # Return base64 encoded signature
                 return base64.b64encode(signature).decode()
-            else:
-                # Fallback to a simple hash for testing
-                return hashlib.sha256(data_to_sign + str(int(datetime.now().timestamp())).encode()).hexdigest()
-                
-        except Exception as e:
-            # For testing purposes, generate a mock signature if key is not available
-            return hashlib.sha256((json.dumps(seamless_data) + str(int(datetime.now().timestamp()))).encode()).hexdigest()
-    
+
+            return hashlib.sha256(data_to_sign + str(int(datetime.now().timestamp())).encode()).hexdigest()
+
+        except Exception:
+            return hashlib.sha256(
+                (json.dumps(seamless_data, separators=(",", ":")) + str(int(datetime.now().timestamp()))).encode()
+            ).hexdigest()
+
     @staticmethod
     def generate_complete_payment_url(widget_payment_response: WidgetPaymentResponse = None, apply_ott_response: ApplyOTTResponse = None) -> str:
         """
         Combines the webRedirectUrl from WidgetPaymentResponse with the OTT token from ApplyOTTResponse
-        
+
         Args:
             widget_payment_response: The widget payment response
             apply_ott_response: The apply OTT response
-            
+
         Returns:
             str: The generated payment URL or empty string if inputs are invalid
         """
         if widget_payment_response is None or apply_ott_response is None:
-            return ''
-        
-        web_redirect_url = getattr(widget_payment_response, 'web_redirect_url', None)
+            return ""
+
+        web_redirect_url = getattr(widget_payment_response, "web_redirect_url", None)
         if not web_redirect_url:
-            return ''
-        
-        user_resources = getattr(apply_ott_response, 'user_resources', None)
+            return ""
+
+        user_resources = getattr(apply_ott_response, "user_resources", None)
         if not user_resources or len(user_resources) == 0:
             return web_redirect_url
-        
-        ott_value = getattr(user_resources[0], 'value', None) if user_resources else None
+
+        ott_value = getattr(user_resources[0], "value", None) if user_resources else None
         if not ott_value:
             return web_redirect_url
 
         parsed = urllib.parse.urlparse(web_redirect_url)
         q = dict(urllib.parse.parse_qsl(parsed.query, keep_blank_values=True))
-        q['ott'] = str(ott_value)
+        q["ott"] = str(ott_value)
         new_query = urllib.parse.urlencode(q)
         return urllib.parse.urlunparse((
             parsed.scheme,

{dana_python-2.2.1.dist-info → dana_python-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 2.2.1
+Version: 2.2.2
 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.2.1.dist-info → dana_python-2.2.2.dist-info}/RECORD

@@ -168,7 +168,7 @@ dana/widget/__init__.py,sha256=_1fR4wVGZVf1d5G_ogKEEQkJ2fc6z_Zv4qDTlALTCHg,593
 dana/widget/v1/__init__.py,sha256=ibJjQQ3NDAK_UwYZKHZzBVAScX4mkQixi_LD3RGTr4U,5576
 dana/widget/v1/custom_validation.py,sha256=XqQLJu3Dh5XdUpG5eXXSq8dYVymha3vDdpkoKjJ0E7U,7028
 dana/widget/v1/enum.py,sha256=-DS06ZaPG_feTR57fy8hzWeFwPAPsunXvqfisfT7HlI,3507
-dana/widget/v1/util.py,sha256=4hRFry5ROrhahyQ7hlHNj7TT-lS_-CMH750Ed4jVQLw,11957
+dana/widget/v1/util.py,sha256=iMSDdUaLvq0QnjepP_Gor04bO_3HddhxHCyhdjwJ4yA,12588
 dana/widget/v1/api/__init__.py,sha256=0M_z47tKg4vjaHIDSSE7f9COYZd1KmxVl40ZMi1kjog,922
 dana/widget/v1/api/widget_api.py,sha256=WU1Z8-Xo-5oT_PXA5SAJm1pZnYkfKV-VfYNRB_QXp8k,114510
 dana/widget/v1/models/__init__.py,sha256=WpNeouhhZ_NSgCPSnmQ5YYHnQnO7Vo-OKD7gT9gon3s,5469
@@ -229,8 +229,8 @@ dana/widget/v1/models/virtual_account_info.py,sha256=qCFyTqwOFY0KwawiQhRfWYwv0Hv
 dana/widget/v1/models/widget_payment_request.py,sha256=KZPOauNqtDvtETLSAgkfgLagOiX2H5KaOGroSbRKCAg,8469
 dana/widget/v1/models/widget_payment_request_additional_info.py,sha256=Qa4Akl-KxeBdh3ITnb0_LxVmgZA_YJsYgW_MHKTHj1A,6273
 dana/widget/v1/models/widget_payment_response.py,sha256=KNfxpyOeNjyRG8aNRzTCaY1W5i0PgSVj3x2O8I6b_kE,6037
-dana_python-2.2.1.dist-info/licenses/LICENSE,sha256=7CXCr_1HV_P6dPKoffVsU3lk2eVjnRacBDnQIeJMgFc,10232
-dana_python-2.2.1.dist-info/METADATA,sha256=NHzFKUBjO0zVQuPtrtsVh4CXNCtLGYbn0O5Z8-mdsE4,5568
-dana_python-2.2.1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-dana_python-2.2.1.dist-info/top_level.txt,sha256=uvbw-Siay0DC-rXYYx11_k0lqDnrOl5tFeSkE-3Mb8I,5
-dana_python-2.2.1.dist-info/RECORD,,
+dana_python-2.2.2.dist-info/licenses/LICENSE,sha256=7CXCr_1HV_P6dPKoffVsU3lk2eVjnRacBDnQIeJMgFc,10232
+dana_python-2.2.2.dist-info/METADATA,sha256=O2b7-OHIQYqNUTk407-NKW3GqE4v29lWOd_nG6eq3hY,5568
+dana_python-2.2.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+dana_python-2.2.2.dist-info/top_level.txt,sha256=uvbw-Siay0DC-rXYYx11_k0lqDnrOl5tFeSkE-3Mb8I,5
+dana_python-2.2.2.dist-info/RECORD,,

{dana_python-2.2.1.dist-info → dana_python-2.2.2.dist-info}/WHEEL

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