karrio-server-graph 2025.5rc34__py3-none-any.whl → 2025.5rc36__py3-none-any.whl

karrio/server/graph/schemas/base/inputs.py

@@ -10,6 +10,7 @@ import karrio.server.graph.utils as utils
 
 @strawberry.input
 class LogFilter(utils.Paginated):
+    query: typing.Optional[str] = strawberry.UNSET
     api_endpoint: typing.Optional[str] = strawberry.UNSET
     remote_addr: typing.Optional[str] = strawberry.UNSET
     date_after: typing.Optional[datetime.datetime] = strawberry.UNSET

karrio/server/graph/schemas/base/mutations.py

@@ -868,7 +868,7 @@ class CreateCarrierConnectionMutation(utils.BaseMutation):
     @staticmethod
     @utils.error_wrapper
     @utils.authentication_required
-    @utils.authorization_required(["manage_carriers"])
+    @utils.authorization_required(["write_carriers"])
     def mutate(info: Info, **input) -> "CreateCarrierConnectionMutation":
         data = input.copy()
 
@@ -893,7 +893,7 @@ class UpdateCarrierConnectionMutation(utils.BaseMutation):
     @staticmethod
     @utils.error_wrapper
     @utils.authentication_required
-    @utils.authorization_required(["manage_carriers"])
+    @utils.authorization_required(["write_carriers"])
     def mutate(info: Info, **input) -> "UpdateCarrierConnectionMutation":
         data = input.copy()
         id = data.get("id")

karrio/server/graph/schemas/base/types.py

@@ -1067,7 +1067,6 @@ class PaymentType:
     paid_by: typing.Optional[utils.PaidByEnum] = None
     currency: typing.Optional[utils.CurrencyCodeEnum] = None
 
-
 @strawberry.type
 class ShipmentType:
     id: str
@@ -1316,7 +1315,9 @@ class SystemConnectionType:
         _filter = filter if not utils.is_unset(filter) else inputs.CarrierFilter()
         connections = filters.CarrierFilters(
             _filter.to_dict(),
-            providers.Carrier.system_carriers.filter(
+            providers.Carrier.system_carriers.resolve_config_for(
+                info.context.request
+            ).filter(
                 active=True,
                 test_mode=getattr(info.context.request, "test_mode", False),
             ),
@@ -1368,7 +1369,7 @@ class CarrierConnectionType:
     @staticmethod
     @utils.utils.error_wrapper
     @utils.authentication_required
-    @utils.authorization_required(["manage_carriers"])
+    @utils.authorization_required(["read_carriers"])
     def resolve(
         info,
         id: str,
@@ -1381,7 +1382,7 @@ class CarrierConnectionType:
     @staticmethod
     @utils.utils.error_wrapper
     @utils.authentication_required
-    @utils.authorization_required(["manage_carriers"])
+    @utils.authorization_required(["read_carriers"])
     def resolve_list(
         info,
         filter: typing.Optional[inputs.CarrierFilter] = strawberry.UNSET,

karrio/server/graph/tests/base.py

@@ -25,8 +25,28 @@ class GraphTestCase(BaseAPITestCase):
         self.user = get_user_model().objects.create_superuser(
             "admin@example.com", "test"
         )
+
         self.token = Token.objects.create(user=self.user, test_mode=False)
 
+        # Create organization for multi-org support (if enabled)
+        from django.conf import settings
+        if settings.MULTI_ORGANIZATIONS:
+            from karrio.server.orgs.models import Organization, TokenLink
+            self.organization = Organization.objects.create(
+                name="Test Organization",
+                slug="test-org"
+            )
+            # Add user as owner (triggers permission sync via signals)
+            owner = self.organization.add_user(self.user, is_admin=True)
+            self.organization.change_owner(owner)
+            self.organization.save()
+
+            # Link token to organization
+            TokenLink.objects.create(
+                item=self.token,
+                org=self.organization
+            )
+
         # Setup API client.
         self.client = APIClient()
         self.client.credentials(HTTP_AUTHORIZATION="Token " + self.token.key)

karrio/server/graph/tests/test_registration.py

@@ -6,14 +6,14 @@ User = get_user_model()
 
 
 class TestUserRegistration(GraphTestCase):
-    
-    @patch('karrio.server.conf.settings.ALLOW_SIGNUP', True)
-    @patch('karrio.server.conf.settings.EMAIL_ENABLED', False)
+
+    @patch("karrio.server.conf.settings.ALLOW_SIGNUP", True)
+    @patch("karrio.server.conf.settings.EMAIL_ENABLED", False)
     def test_register_user_mutation(self):
         """Test successful user registration"""
         # Ensure user doesn't exist
         User.objects.filter(email="newuser@example.com").delete()
-        
+
         response = self.query(
             """
             mutation register_user($data: RegisterUserMutationInput!) {
@@ -33,21 +33,26 @@ class TestUserRegistration(GraphTestCase):
                     "full_name": "New Test User",
                     "password1": "TestPassword123!",
                     "password2": "TestPassword123!",
-                    "redirect_url": "http://localhost:3000/email"
+                    "redirect_url": "http://example.com/email",
                 }
-            }
+            },
         )
-        
+
         self.assertResponseNoErrors(response)
-        self.assertIsNotNone(response.data['data']['register_user']['user'])
-        self.assertEqual(response.data['data']['register_user']['user']['email'], "newuser@example.com")
-        self.assertEqual(response.data['data']['register_user']['user']['full_name'], "New Test User")
-        
+        self.assertIsNotNone(response.data["data"]["register_user"]["user"])
+        self.assertEqual(
+            response.data["data"]["register_user"]["user"]["email"],
+            "newuser@example.com",
+        )
+        self.assertEqual(
+            response.data["data"]["register_user"]["user"]["full_name"], "New Test User"
+        )
+
         # Verify user was created in database
         user = User.objects.get(email="newuser@example.com")
         self.assertEqual(user.full_name, "New Test User")
-    
-    @patch('karrio.server.conf.settings.ALLOW_SIGNUP', True)
+
+    @patch("karrio.server.conf.settings.ALLOW_SIGNUP", True)
     def test_register_user_password_mismatch(self):
         """Test registration fails with mismatched passwords"""
         response = self.query(
@@ -67,25 +72,25 @@ class TestUserRegistration(GraphTestCase):
                     "full_name": "Mismatch User",
                     "password1": "TestPassword123!",
                     "password2": "DifferentPassword123!",
-                    "redirect_url": "http://localhost:3000/email"
+                    "redirect_url": "http://example.com/email",
                 }
-            }
+            },
         )
-        
+
         # Should have errors
-        self.assertIsNotNone(response.data.get('errors'))
-        self.assertIn("password", str(response.data['errors'][0]))
-    
-    @patch('karrio.server.conf.settings.ALLOW_SIGNUP', True)
+        self.assertIsNotNone(response.data.get("errors"))
+        self.assertIn("password", str(response.data["errors"][0]))
+
+    @patch("karrio.server.conf.settings.ALLOW_SIGNUP", True)
     def test_register_user_duplicate_email(self):
         """Test registration fails with duplicate email"""
         # First create a user
         User.objects.create_user(
             email="existing@example.com",
             password="ExistingPass123!",
-            full_name="Existing User"
+            full_name="Existing User",
         )
-        
+
         response = self.query(
             """
             mutation register_user($data: RegisterUserMutationInput!) {
@@ -103,15 +108,15 @@ class TestUserRegistration(GraphTestCase):
                     "full_name": "Duplicate User",
                     "password1": "TestPassword123!",
                     "password2": "TestPassword123!",
-                    "redirect_url": "http://localhost:3000/email"
+                    "redirect_url": "http://example.com/email",
                 }
-            }
+            },
         )
-        
+
         # Should have errors about duplicate email
-        self.assertIsNotNone(response.data.get('errors'))
-    
-    @patch('karrio.server.conf.settings.ALLOW_SIGNUP', False)
+        self.assertIsNotNone(response.data.get("errors"))
+
+    @patch("karrio.server.conf.settings.ALLOW_SIGNUP", False)
     def test_register_user_signup_disabled(self):
         """Test registration fails when signup is disabled"""
         response = self.query(
@@ -131,28 +136,28 @@ class TestUserRegistration(GraphTestCase):
                     "full_name": "Disabled User",
                     "password1": "TestPassword123!",
                     "password2": "TestPassword123!",
-                    "redirect_url": "http://localhost:3000/email"
+                    "redirect_url": "http://example.com/email",
                 }
-            }
+            },
         )
-        
+
         # Should have errors about signup not allowed
-        self.assertIsNotNone(response.data.get('errors'))
-        self.assertIn("Signup is not allowed", str(response.data['errors'][0]))
+        self.assertIsNotNone(response.data.get("errors"))
+        self.assertIn("Signup is not allowed", str(response.data["errors"][0]))
 
 
 class TestPasswordReset(GraphTestCase):
-    
+
     def setUp(self):
         super().setUp()
         # Create a test user for password reset
         self.reset_user = User.objects.create_user(
             email="resetuser@example.com",
             password="OldPassword123!",
-            full_name="Reset User"
+            full_name="Reset User",
         )
-    
-    @patch('django.core.mail.send_mail')
+
+    @patch("django.core.mail.send_mail")
     def test_request_password_reset(self, mock_send_mail):
         """Test requesting a password reset"""
         response = self.query(
@@ -168,22 +173,25 @@ class TestPasswordReset(GraphTestCase):
             variables={
                 "data": {
                     "email": "resetuser@example.com",
-                    "redirect_url": "http://localhost:3000/password/reset"
+                    "redirect_url": "http://example.com/password/reset",
                 }
-            }
+            },
         )
-        
+
         self.assertResponseNoErrors(response)
-        self.assertEqual(response.data['data']['request_password_reset']['email'], "resetuser@example.com")
+        self.assertEqual(
+            response.data["data"]["request_password_reset"]["email"],
+            "resetuser@example.com",
+        )
 
 
 class TestEmailConfirmation(GraphTestCase):
-    
-    @patch('karrio.server.graph.schemas.base.mutations.email_verification.verify_token')
+
+    @patch("karrio.server.graph.schemas.base.mutations.email_verification.verify_token")
     def test_confirm_email(self, mock_verify):
         """Test email confirmation"""
         mock_verify.return_value = (True, None)
-        
+
         response = self.query(
             """
             mutation confirm_email($data: ConfirmEmailMutationInput!) {
@@ -193,13 +201,9 @@ class TestEmailConfirmation(GraphTestCase):
             }
             """,
             operation_name="confirm_email",
-            variables={
-                "data": {
-                    "token": "test-confirmation-token"
-                }
-            }
+            variables={"data": {"token": "test-confirmation-token"}},
         )
-        
+
         self.assertResponseNoErrors(response)
-        self.assertTrue(response.data['data']['confirm_email']['success'])
-        mock_verify.assert_called_once_with("test-confirmation-token")
+        self.assertTrue(response.data["data"]["confirm_email"]["success"])
+        mock_verify.assert_called_once_with("test-confirmation-token")

{karrio_server_graph-2025.5rc34.dist-info → karrio_server_graph-2025.5rc36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server_graph
-Version: 2025.5rc34
+Version: 2025.5rc36
 Summary: Multi-carrier shipping API Graph module
 Author-email: karrio <hello@karrio.io>
 License-Expression: Apache-2.0

{karrio_server_graph-2025.5rc34.dist-info → karrio_server_graph-2025.5rc36.dist-info}/RECORD

@@ -16,24 +16,24 @@ karrio/server/graph/migrations/0002_auto_20210512_1353.py,sha256=TnUwR9EP0qp3gJ3
 karrio/server/graph/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 karrio/server/graph/schemas/__init__.py,sha256=Kn-I1j3HP3jwZccpz6FL9r1k6b3UEAMVh2kFPCKNS0w,80
 karrio/server/graph/schemas/base/__init__.py,sha256=nnOfynQW842qOA0qD6bYz8GSHQCQeBW36vbq0sqRkJs,15121
-karrio/server/graph/schemas/base/inputs.py,sha256=QTnNwj8wmaeZrlE1sgIDFl_p2lwHG79j-GN1cJK9WQU,21368
-karrio/server/graph/schemas/base/mutations.py,sha256=Cc8xpix8LT5RmIhikNFf5RutQ2DTiOmKxqlQSRPgOiY,35045
-karrio/server/graph/schemas/base/types.py,sha256=G9oaksnqF6K1ml155AoRokuGpyvfg_33YUu_KUzLH-M,47547
+karrio/server/graph/schemas/base/inputs.py,sha256=p6_u4sG1cbd18CpPjkyG3CD4cbvf4gBa3De4RDgCZ80,21419
+karrio/server/graph/schemas/base/mutations.py,sha256=6ljP3_2UpUHpYIl06I7n-owQjUp2TT5jDgZ_fEzvB6o,35043
+karrio/server/graph/schemas/base/types.py,sha256=FBayGYWlqcHK0tm43xFA6ZkUFlr1htM7-TutRKPmTkc,47613
 karrio/server/graph/templates/graphql/graphiql.html,sha256=MQjQbBqoRE0QLsOUck8SaXo6B2oJO8dT6YZzUqbDan0,3786
 karrio/server/graph/templates/karrio/email_change_email.html,sha256=gr55F97GYzY27TVKGl49037yd60eSYD0b0GXRlyoco4,552
 karrio/server/graph/templates/karrio/email_change_email.txt,sha256=NXXuzLR63hn2F1fVAjzmuguptuuTvujwqI7YLSrQoio,431
 karrio/server/graph/templates/karrio/password_reset_email.html,sha256=dttqYVL73cQNuTFsVdn2GV4Ckee8PTY8oEF53GbDRcg,553
 karrio/server/graph/tests/__init__.py,sha256=dPzsYY5hoO5gmY6fhL8tiz7Bfst8RB3JzsBVHZazHRE,338
-karrio/server/graph/tests/base.py,sha256=AlHWX5rRv7Ylz4OL7qcGTcSBQqalj6zDmagktkFavSg,4354
+karrio/server/graph/tests/base.py,sha256=dzLiva3eTAsbBM5Ga8SI2fxSanBQgAqswS0YVdtTfEg,5122
 karrio/server/graph/tests/test_carrier_connections.py,sha256=qZ1OL8CgZrHuluKJd7cjFXaRZ0VpogN5Srjk2EApLWU,6892
 karrio/server/graph/tests/test_metafield.py,sha256=K7Oon0CLEm_MUMbmcu0t2iAZvFN8Wl7Kp4QAWeUXo_Y,12783
 karrio/server/graph/tests/test_partial_shipments.py,sha256=dPIdIq4wiyovOaIIzbIX69eZnBqCA4ZvBSiGKYADM2g,19031
 karrio/server/graph/tests/test_rate_sheets.py,sha256=cUzPV8dXQFPFh1r7W8bY6Lou3fjh8f9VGpyZrfbMXec,10300
-karrio/server/graph/tests/test_registration.py,sha256=jK8ZCmhtvKZ9L3yqSIK1-JXzYT2PWwxQ3Md1_ff9818,7192
+karrio/server/graph/tests/test_registration.py,sha256=0vCTqlsLc0cl2m78umgfm7grnDgTI_NZJWNUrRUlQBY,7107
 karrio/server/graph/tests/test_templates.py,sha256=WVU6vcfr6tEk917uSn1dECU8bkQtgD7FNuE-GJuFido,21626
 karrio/server/graph/tests/test_user_info.py,sha256=K91BL7SgxLWflCZriSVI8Vt5M5RIqmSCHKrgN2w8GmM,1928
 karrio/server/settings/graph.py,sha256=cz2yQHbp3xCfyFKuUkPEFfkI2fFVggExIY49wGz7mt0,106
-karrio_server_graph-2025.5rc34.dist-info/METADATA,sha256=xFd0le0bef_XRWkn1FGyk1ovliVgFXSPjnb2Wr9A4Mo,744
-karrio_server_graph-2025.5rc34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_graph-2025.5rc34.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_graph-2025.5rc34.dist-info/RECORD,,
+karrio_server_graph-2025.5rc36.dist-info/METADATA,sha256=yn36YEqc52mn_0qvRKPzGOqZDH8H-q64jd4I-goLvgo,744
+karrio_server_graph-2025.5rc36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_graph-2025.5rc36.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_graph-2025.5rc36.dist-info/RECORD,,