Fix bug where submitted_by property of request did not type-check when user mgmt was enabled

Author: AndrewEckart

servicex/resources/servicex_resource.py

@@ -33,7 +33,7 @@
 from flask_jwt_extended import get_jwt_identity
 from flask_restful import Resource
 
-from servicex.models import TransformationResult
+from servicex.models import TransformationResult, UserModel
 
 
 class ServiceXResource(Resource):
@@ -42,14 +42,17 @@ def _generate_advertised_endpoint(cls, endpoint):
         return "http://" + current_app.config['ADVERTISED_HOSTNAME'] + "/" + endpoint
 
     @staticmethod
-    def get_requesting_user_sub() -> Optional[str]:
+    def get_requesting_user() -> Optional[UserModel]:
         """
         :return: User who submitted request for resource.
         If auth is enabled, this cannot be None for JWT-protected resources
         which are decorated with @auth_required or @admin_required.
         """
-        if current_app.config.get('ENABLE_AUTH'):
-            return get_jwt_identity()
+        user = None
+        cfg = current_app.config
+        if cfg.get('ENABLE_AUTH') and not cfg.get('DISABLE_USER_MGMT'):
+            user = UserModel.find_by_sub(get_jwt_identity())
+        return user
 
     @staticmethod
     def _generate_file_status_record(dataset_file, status):

servicex/resources/submit_transformation_request.py

@@ -149,9 +149,9 @@ def post(self):
                 app_version=self._get_app_version(),
                 code_gen_image=current_app.config['CODE_GEN_IMAGE']
             )
-            if current_app.config.get('ENABLE_AUTH') and \
-                    not current_app.config.get('DISABLE_USER_MGMT'):
-                request_rec.submitted_by = self.get_requesting_user_sub()
+            user = self.get_requesting_user()
+            if user is not None:
+                request_rec.submitted_by = user.id
 
             # If we are doing the xaod_cpp workflow, then the first thing to do is make
             # sure the requested selection is correct, and generate the C++ files