fix: resolved conflicts

Author: Vikram Kalta

.github/workflows/secrets-scan.yml

@@ -10,7 +10,7 @@ fileignoreconfig:
 - filename: Sources/Decodable.swift
   checksum: 45760eb1b21207395da2b631bb85049b300d399f20f59a79cfdc181a5d6b07f3
 - filename: Contentstack.xcodeproj/project.pbxproj
-  checksum: 863f60ede1c65e01e4fa8c68029e6045abd3b6ab718447743afd1eb6a3e6f80e
+  checksum: d6e294f366b1360458c31edbfc4601e7e75d3cafbebd594d83221801ee88dc07
 - filename: Sources/ContentstackConfig.swift
   checksum: fdb57e110cb65443e853f0d79ced1e80427d0d1720d21309aa8c87984ea5fac5
 - filename: Tests/DVRRecordings/Asset.json

.talismanrc

@@ -748,6 +748,7 @@
 				0F4A762B241BB0D200E3A024 /* Contentstack.swift */,
 				0FFA5D56241F5085003B3AF5 /* ContentstackConfig.swift */,
 				47C6EFC12C0B5B9400F0D5CF /* Taxonomy.swift */,
+				64F522052BF5C65300AE6E0F /* PrivacyInfo.xcprivacy */,
 			);
 			path = Sources;
 			sourceTree = SOURCE_ROOT;
@@ -1008,6 +1009,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				64F522062BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1021,6 +1023,7 @@
 				0F359991257BE29B00B3DB89 /* Asset.json in Resources */,
 				0F359992257BE2A700B3DB89 /* ContentType.json in Resources */,
 				0F4C0A87243C6990006604B7 /* config.json in Resources */,
+				64F522072BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
 				0F5794C2266A37120082815C /* Paragraph.Json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1029,6 +1032,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				64F522082BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1042,6 +1046,7 @@
 				0F50EA17244ED7F500E5D705 /* QueryOn.json in Resources */,
 				0F796C532449EA8700EA04D5 /* Entry.json in Resources */,
 				0F4C0A88243C6990006604B7 /* config.json in Resources */,
+				64F522092BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
 				0F5794C3266A37120082815C /* Paragraph.Json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1050,6 +1055,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				64F5220A2BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1063,6 +1069,7 @@
 				0F50EA18244ED7F500E5D705 /* QueryOn.json in Resources */,
 				0F796C542449EA8700EA04D5 /* Entry.json in Resources */,
 				0F4C0A89243C6990006604B7 /* config.json in Resources */,
+				64F5220B2BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
 				0F5794C4266A37120082815C /* Paragraph.Json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1071,6 +1078,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				64F5220C2BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Contentstack.xcodeproj/project.pbxproj

@@ -38,6 +38,8 @@ public enum ContentstackRegion: String {
     case azure_na = "azure-na"
     /// This region is for AZURE-EU Cloud
     case azure_eu = "azure-eu"
+    /// This region is for GCP-NA Cloud
+    case gcp_na = "gcp-na"
 }
 /// The cache policies allow you to define the source from where the SDK will retrieve the content.
 public enum CachePolicy {

Sources/CSDefinitions.swift

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict/>
+	</array>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string></string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string></string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>

Sources/PrivacyInfo.xcprivacy

@@ -69,8 +69,6 @@ public class Stack: CachePolicyAccessible {
         }
 
         var contentstackHTTPHeaders: [AnyHashable: Any] = [
-            "api_key": apiKey,
-            "access_token": deliveryToken,
             "X-User-Agent": config.sdkVersionString(),
             "User-Agent": config.userAgentString()
         ]
@@ -178,6 +176,8 @@ public class Stack: CachePolicyAccessible {
     private func fetchUrl(_ url: URL, headers:[String: String], cachePolicy: CachePolicy, then completion: @escaping ResultsHandler<Data>) {
         var dataTask: URLSessionDataTask?
         var request = URLRequest(url: url)
+        request.setValue(self.deliveryToken, forHTTPHeaderField: "access_token")
+        request.setValue(self.apiKey, forHTTPHeaderField: "api_key")
         for header in headers {
             request.addValue(header.value, forHTTPHeaderField: header.key)
         }

Sources/Stack.swift

@@ -35,6 +35,13 @@ final class ContentstackTests: XCTestCase {
         XCTAssertEqual(stack.region, ContentstackRegion.azure_na)
         XCTAssertNil(stack.branch)
     }
+    
+    func testStack_GCP_NAHostRegion_ReturnStackWithGCPValue () {
+        let stack = makeStackSut(region: .gcp_na)
+        XCTAssertEqual(stack.host, "gcp-na-cdn.contentstack.com")
+        XCTAssertEqual(stack.region, ContentstackRegion.gcp_na)
+        XCTAssertNil(stack.branch)
+    }
 
     func testStack_NewHost_ReturnStackWithNewHost () {
         let host = "api.contentstack.com"