karrio-amazon-shipping 2025.5.3__py3-none-any.whl → 2025.5.5__py3-none-any.whl

karrio/providers/amazon_shipping/utils.py

@@ -1,9 +1,9 @@
-import jstruct
 import datetime
 import urllib.parse
 import karrio.lib as lib
 import karrio.core as core
 import karrio.core.errors as errors
+import karrio.core.models as models
 
 
 class Settings(core.Settings):
@@ -45,19 +45,13 @@ class Settings(core.Settings):
         or collect it from the cache if an unexpired access_token exist.
         """
         cache_key = f"{self.carrier_name}|{self.seller_id}|{self.developer_id}"
-        now = datetime.datetime.now() + datetime.timedelta(minutes=30)
 
-        auth = self.connection_cache.get(cache_key) or {}
-        token = auth.get("authorizationCode")
-        expiry = lib.to_date(auth.get("expiry"), current_format="%Y-%m-%d %H:%M:%S")
-
-        if token is not None and expiry is not None and expiry > now:
-            return token
-
-        self.connection_cache.set(cache_key, lambda: login(self))
-        new_auth = self.connection_cache.get(cache_key)
-
-        return new_auth["authorizationCode"]
+        return self.connection_cache.thread_safe(
+            refresh_func=lambda: login(self),
+            cache_key=cache_key,
+            buffer_minutes=30,
+            token_field="authorizationCode",
+        ).get_state()
 
 
 def login(settings: Settings):
@@ -82,6 +76,22 @@ def login(settings: Settings):
     if any(messages):
         raise errors.ParsedMessagesError(messages)
 
+    # Validate that authorizationCode is present in the response payload
+    authorization_code = lib.failsafe(
+        lambda: response.get("payload", {}).get("authorizationCode")
+    )
+    if not authorization_code:
+        raise errors.ParsedMessagesError(
+            messages=[
+                models.Message(
+                    carrier_name=settings.carrier_name,
+                    carrier_id=settings.carrier_id,
+                    message="Authentication failed: No authorization code received",
+                    code="AUTH_ERROR",
+                )
+            ]
+        )
+
     expiry = datetime.datetime.now() + datetime.timedelta(
         seconds=float(response.get("expires_in", 0))
     )
@@ -89,5 +99,5 @@ def login(settings: Settings):
     return {
         **response,
         "expiry": lib.fdatetime(expiry),
-        "authorizationCode": response["payload"]["authorizationCode"],
+        "authorizationCode": authorization_code,
     }

{karrio_amazon_shipping-2025.5.3.dist-info → karrio_amazon_shipping-2025.5.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_amazon_shipping
-Version: 2025.5.3
+Version: 2025.5.5
 Summary: Karrio - Amazon Shipping Extension
 Author-email: karrio <hello@karrio.io>
 License-Expression: LGPL-3.0

{karrio_amazon_shipping-2025.5.3.dist-info → karrio_amazon_shipping-2025.5.5.dist-info}/RECORD

@@ -8,7 +8,7 @@ karrio/providers/amazon_shipping/error.py,sha256=khbjAf7thICwU71ej2n2PgvYEJaUt2B
 karrio/providers/amazon_shipping/rate.py,sha256=7BS9Mn5-eUfVpZkQ0X1fCEoKDpHIuJO3P_t-s1Mn7kY,3625
 karrio/providers/amazon_shipping/tracking.py,sha256=wOZt98U4RenEhX6C0CioJDNXRE986_sFt9_zsfnYdGs,2294
 karrio/providers/amazon_shipping/units.py,sha256=DKT9sHUVfTWD1d46pu68TOfunajj4lGXejKPQIOxWyA,486
-karrio/providers/amazon_shipping/utils.py,sha256=pF2MaT7c6aj9Cz5C9jtMQsiVMtpuP4X2qVRN5ZSU1Qc,2844
+karrio/providers/amazon_shipping/utils.py,sha256=fFU-p-JloDBeiB0JVb_NJuIye6WcvMF4QbSjCSyW5Ys,3135
 karrio/providers/amazon_shipping/shipment/__init__.py,sha256=ZD_QkyZjlp4VThWp5ebDfavYPHTy6lvOJCXmMEUtFZ8,246
 karrio/providers/amazon_shipping/shipment/cancel.py,sha256=Z4JkHPn1tJO8dOiEEf9W47naJXf4W3CKmfLUzxY9S1U,985
 karrio/providers/amazon_shipping/shipment/create.py,sha256=X1CHwOCIcwUg-HDsk38-0XnpYahPAqL8zfMF11cb_LI,4374
@@ -24,8 +24,8 @@ karrio/schemas/amazon_shipping/rate_request.py,sha256=sc0mAjuS2lY_uqQA4Je7Sj59Vb
 karrio/schemas/amazon_shipping/rate_response.py,sha256=P6xypSrTnnrWL0IGWinRY1ZCytKi-c2aqWD9o9C-QuY,938
 karrio/schemas/amazon_shipping/shipping_label.py,sha256=8aLQpIFVv7dPdknjN8S-053zhA9gv2JpVi2F8prGMWo,382
 karrio/schemas/amazon_shipping/tracking_response.py,sha256=RQS_mAYgr0m_BHeEX4jbz4NxB1Kj7SX5_jHGXKLwOcc,854
-karrio_amazon_shipping-2025.5.3.dist-info/METADATA,sha256=-dKbowQRiJNMaSOvRwGHvytLVsRJ2XIELLN-MoS6Odc,1044
-karrio_amazon_shipping-2025.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_amazon_shipping-2025.5.3.dist-info/entry_points.txt,sha256=jwZSXX8ySMgVsTaxzrEf4UMGMDTUAMRcBYLjqTOQnWc,75
-karrio_amazon_shipping-2025.5.3.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
-karrio_amazon_shipping-2025.5.3.dist-info/RECORD,,
+karrio_amazon_shipping-2025.5.5.dist-info/METADATA,sha256=i-O3bMt-yL9LV_fJdkwKAOxE8GfKuQ9JNwcnA-vpen8,1044
+karrio_amazon_shipping-2025.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_amazon_shipping-2025.5.5.dist-info/entry_points.txt,sha256=jwZSXX8ySMgVsTaxzrEf4UMGMDTUAMRcBYLjqTOQnWc,75
+karrio_amazon_shipping-2025.5.5.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
+karrio_amazon_shipping-2025.5.5.dist-info/RECORD,,