Merge pull request #90 from smswithoutborders/staging

Staging

Author: PromiseFru

content_parser.py

@@ -245,6 +245,8 @@ def extract_content_v1(service_type: str, content: bytes) -> tuple:
                 result["from"],
                 result["to"],
                 result["body"],
+                result.get("access_token"),
+                result.get("refresh_token"),
             ), None
 
         if service_type == "test":
@@ -324,6 +326,8 @@ def extract_content_v2(service_type: str, content: bytes) -> tuple:
                 result["from"],
                 result["to"],
                 result["body"],
+                result.get("access_token"),
+                result.get("refresh_token"),
             ), None
 
         if service_type == "test":

grpc_publisher_service.py

@@ -645,6 +645,13 @@ def handle_oauth2_publication(
                     "access_token": parts[2],
                     "refresh_token": parts[3],
                 },
+                "message": lambda parts: {
+                    "sender_id": parts[0],
+                    "recipient": parts[1],
+                    "message": parts[2],
+                    "access_token": parts[3],
+                    "refresh_token": parts[4],
+                },
             }
 
             if service_type not in service_handlers:

requirements.txt

@@ -1,11 +1,11 @@
 fastapi[standard]==0.116.1
-GitPython==3.1.44
+GitPython==3.1.45
 grpc-interceptor==0.15.4
-grpcio==1.73.1
-grpcio-testing==1.73.1
-grpcio-tools==1.73.1
+grpcio==1.74.0
+grpcio-testing==1.74.0
+grpcio-tools==1.74.0
 peewee>=3.17.8
 pymysql==1.1.1
-sentry-sdk[grpcio]==2.32.0
+sentry-sdk[grpcio]==2.33.2
 tqdm==4.67.1
-twilio==9.6.5
+twilio==9.7.0

tests/test_auth_and_publish.py

@@ -235,6 +235,7 @@ def create_message_v1(platform, config):
         "telegram": ["from", "to", "body"],
         "reliability": ["from"],
         "bluesky": ["from", "body", "access_token", "refresh_token"],
+        "slack": ["from", "to", "body", "access_token", "refresh_token"],
     }
 
     if platform not in platform_specific_params:
@@ -296,6 +297,7 @@ def create_message_v2(platform, config):
         "telegram": ["from", "to", "body"],
         "reliability": ["from"],
         "bluesky": ["from", "body", "access_token", "refresh_token"],
+        "slack": ["from", "to", "body", "access_token", "refresh_token"],
     }
 
     if platform not in platform_specific_params:
@@ -458,7 +460,8 @@ def test_auth_and_publish_v0(
         # ("telegram", b"T", True),
         # ("reliability", b"r", False),
         # ("reliability", b"r", True),
-        ("bluesky", b"b", True),
+        # ("bluesky", b"b", True),
+        ("slack", b"s", True),
     ],
 )
 def test_auth_and_publish_v1(
@@ -505,7 +508,8 @@ def test_auth_and_publish_v1(
         # ("telegram", b"T", True),
         # ("reliability", b"r", False),
         # ("reliability", b"r", True),
-        ("bluesky", b"b", True),
+        # ("bluesky", b"b", True),
+        ("slack", b"s", True),
     ],
 )
 def test_auth_and_publish_v2(

tests/test_config_template.ini

@@ -51,3 +51,9 @@ bluesky_from =
 bluesky_body = Offline communication ensures that information can be shared and exchanged without relying on internet connectivity, fostering direct and uninterrupted interactions.
 bluesky_access_token =
 bluesky_refresh_token =
+
+slack_from = 
+slack_to = 
+slack_body = Offline communication ensures that information can be shared and exchanged without relying on internet connectivity, fostering direct and uninterrupted interactions.
+slack_access_token =
+slack_refresh_token =