[Story]: failed to replace oauth_keys in connector discover - fixed.

valmi-io · Mar 4, 2024 · 88a07f2 · 88a07f2
1 parent 96fa951
commit 88a07f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/api.py b/core/api.py
@@ -94,8 +94,11 @@ def connector_check(request, workspace_id, connector_type, payload: ConnectorCon
 
     if queryset.exists():
         keys = queryset.first()
+
+        logger.debug("connector spec keys:-", keys)
         # Replacing oauth keys with db values
         payload.config = replace_values_in_json(payload.config, keys.oauth_config)
+
     else:
         # Replacing oauth keys with .env values
         oauth_proxy_keys = config("OAUTH_SECRETS", default="", cast=Csv(str))
@@ -123,7 +126,7 @@ def connector_discover(request, workspace_id, connector_type, payload: Connector
         keys = queryset.first()
 
         # Replacing oauth keys with db values
-        replace_values_in_json(payload.config, keys.oauth_config)
+        payload.config = replace_values_in_json(payload.config, keys.oauth_config)
 
     else:
         # Replacing oauth keys with .env values

diff --git a/core/engine_api.py b/core/engine_api.py
@@ -49,9 +49,11 @@ def get_all_syncs(request):
 
         # Replacing Oauth keys
         oauth_proxy_keys = config("OAUTH_SECRETS", default="", cast=Csv(str))
+
         if len(oauth_proxy_keys) > 0:
             for sync in syncs:
                 src_dst = [sync.source, sync.destination]
+
                 for obj in src_dst:
                     workspace = obj.credential.workspace
                     connector_type = obj.credential.connector.type
@@ -63,11 +65,13 @@ def get_all_syncs(request):
                         keys = queryset.first()
 
                         # Replacing oauth keys with db values
-                        replace_values_in_json(obj.credential.connector_config, keys.oauth_config)
+                        obj.credential.connector_config = replace_values_in_json(
+                            obj.credential.connector_config, keys.oauth_config)
                     else:
 
                         # Replacing oauth keys with .env values
                         config_str = json.dumps(obj.credential.connector_config)
+
                         for key in oauth_proxy_keys:
                             config_str = config_str.replace(key, config(key))
                         obj.credential.connector_config = json.loads(config_str)