Merge pull request #28 from smswithoutborders/feature/grpc-api

feat: return encrypted publisher response
smswithoutborders · Jun 26, 2024 · 549234c · 549234c
2 parents ca6fdcf + 5858fb0
commit 549234c
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/grpc_publisher_service.py b/grpc_publisher_service.py
@@ -484,7 +484,7 @@ def decrypt_message(device_id, encrypted_content):
 
         def encrypt_message(device_id, plaintext):
             encrypt_payload_response, encrypt_payload_error = encrypt_payload(
-                device_id, plaintext
+                device_id.hex(), plaintext
             )
             if encrypt_payload_error:
                 return None, error_response(
@@ -516,7 +516,7 @@ def handle_oauth2_email(device_id, platform_name, payload, token):
                 platform_name,
                 json.loads(token),
                 create_update_token_context(
-                    device_id, from_email, platform_name, response, context
+                    device_id.hex(), from_email, platform_name, response, context
                 ),
             )
             return oauth2_client.send_message(from_email, email_message)
@@ -555,21 +555,21 @@ def handle_oauth2_email(device_id, platform_name, payload, token):
                 and platform_info["service_type"] == "email"
             ):
                 message_response = handle_oauth2_email(
-                    device_id.hex(),
+                    device_id,
                     platform_info["name"],
                     decrypted_content,
                     access_token,
                 )
 
-            # payload_ciphertext, encrypt_payload_error = encrypt_message(
-            #     device_id, message_response
-            # )
-            # if encrypt_payload_error:
-            #     return encrypt_payload_error
+            payload_ciphertext, encrypt_payload_error = encrypt_message(
+                device_id, message_response
+            )
+            if encrypt_payload_error:
+                return encrypt_payload_error
 
             return response(
                 message=f"Successfully published {platform_info['name']} message",
-                publisher_response=message_response,
+                publisher_response=payload_ciphertext,
                 success=True,
             )