Fix linters and tests for new service_id key

Author: AlanCoding

ansible_base/jwt_consumer/common/auth.py

@@ -115,7 +115,10 @@ def parse_jwt_token(self, request):
             # Either the user wasn't cached or the requested user was not in the DB so we need to make a new one
             try:
                 resource = Resource.create_resource(
-                    ResourceType.objects.get(name="shared.user"), resource_data=self.token["user_data"], ansible_id=self.token["sub"], service_id=self.token["service_id"]
+                    ResourceType.objects.get(name="shared.user"),
+                    resource_data=self.token["user_data"],
+                    ansible_id=self.token["sub"],
+                    service_id=self.token["service_id"],
                 )
                 self.user = resource.content_object
                 logger.info(f"New user {self.user.username} created from JWT auth")

test_app/tests/conftest.py

@@ -26,6 +26,7 @@
 from ansible_base.oauth2_provider.fixtures import *  # noqa: F403, F401
 from ansible_base.rbac import permission_registry
 from ansible_base.rbac.models import RoleDefinition
+from ansible_base.resource_registry.models.service_identifier import service_id
 from test_app import models
 
 
@@ -517,6 +518,7 @@ def __init__(self):
                 "exp": int(expiration_date.timestamp()),
                 "aud": "ansible-services",
                 "sub": "1e3de989-5286-48a6-83d4-5de9a6618ffd",
+                "service_id": service_id(),
                 "user_data": {
                     "username": "john.westcott.iv",
                     "first_name": "john",