fix: query object been encoded again on iOS side (#739)

* fix: query object been encoded again on iOS side * chore: add changeset * fix: use a cleaner way to prevent double encoding, and format codes. --------- Co-authored-by: Rain_Jiang <[email protected]>
callstack · Sep 12, 2024 · 300524b · 300524b
1 parent 014a981
commit 300524b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.changeset/proud-ants-protect.md b/.changeset/proud-ants-protect.md
@@ -0,0 +1,5 @@
+---
+'@callstack/repack': patch
+---
+
+Fix url encoded twice issue on iOS side
diff --git a/packages/repack/ios/ScriptConfig.mm b/packages/repack/ios/ScriptConfig.mm
@@ -21,7 +21,9 @@ + (ScriptConfig *)fromConfig:(JS::NativeScriptManager::NormalizedScriptLocator &
 {
   NSDictionary *_Nullable headers = (NSDictionary *)config.headers();
   NSURLComponents *urlComponents = [NSURLComponents componentsWithString:config.url()];
-  urlComponents.query = config.query();
+  if (config.query() != nil) {
+    urlComponents.percentEncodedQuery = config.query();
+  }
   NSURL *url = urlComponents.URL;
 
   return [[ScriptConfig alloc] initWithScript:scriptId
@@ -40,7 +42,9 @@ + (ScriptConfig *)fromConfig:(JS::NativeScriptManager::NormalizedScriptLocator &
 + (ScriptConfig *)fromConfig:(NSDictionary *)config withScriptId:(nonnull NSString *)scriptId
 {
   NSURLComponents *urlComponents = [NSURLComponents componentsWithString:config[@"url"]];
-  urlComponents.query = config[@"query"];
+  if (config[@"query"] != nil) {
+    urlComponents.percentEncodedQuery = config[@"query"];
+  }
   NSURL *url = urlComponents.URL;
 
   return [[ScriptConfig alloc] initWithScript:scriptId