Merge pull request #1 from microcmsio/feature/api-key

新しいAPIキーに対応

Author: himaratsu

README.md

@@ -23,8 +23,7 @@ Next, create a client.
 ```swift
 let client = MicrocmsClient(
     serviceDomain: "YOUR_DOMAIN", // YOUR_DOMAIN is the XXXX part of XXXX.microcms.io
-    apiKey: "YOUR_API_KEY",
-    globalDraftKey: "YOUR_GLOBAL_DRAFT_KEY" // if needed
+    apiKey: "YOUR_API_KEY"
     )
 ```
 

Sources/MicrocmsSDK/MicrocmsSDK.swift

@@ -7,14 +7,11 @@ public struct MicrocmsClient {
 
     private let serviceDomain: String
     private let apiKey: String
-    private let globalDrafyKey: String?
 
     public init(serviceDomain: String,
-         apiKey: String,
-         globalDraftKey: String? = nil) {
+         apiKey: String) {
         self.serviceDomain = serviceDomain
         self.apiKey = apiKey
-        self.globalDrafyKey = globalDraftKey
     }
 
     var baseUrl: String {
@@ -51,10 +48,7 @@ public struct MicrocmsClient {
 
         var request = URLRequest(url: components.url!)
         request.httpMethod = "GET"
-        request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
-        if let globalDraftKey = globalDrafyKey {
-            request.setValue(globalDraftKey, forHTTPHeaderField: "X-GLOBAL-DRAFT-KEY")
-        }
+        request.setValue(apiKey, forHTTPHeaderField: "X-MICROCMS-API-KEY")
 
         return request
     }

Tests/MicrocmsSDKTests/MicrocmsSDKTests.swift

@@ -63,32 +63,15 @@ final class MicrocmsSDKTests: XCTestCase {
     }
 
     func testMakeRequest_headers() {
-        XCTContext.runActivity(named: "normal") { _ in
-            let client = MicrocmsClient(
-                serviceDomain: "test-service",
-                apiKey: "test-api-key")
-            
-            let request = client.makeRequest(endpoint: "endpoint",
-                                             contentId: nil,
-                                             params: nil)
-            
-            XCTAssertEqual(request?.allHTTPHeaderFields, ["X-API-KEY": "test-api-key"])
-        }
+        let client = MicrocmsClient(
+            serviceDomain: "test-service",
+            apiKey: "test-api-key")
+        
+        let request = client.makeRequest(endpoint: "endpoint",
+                                         contentId: nil,
+                                         params: nil)
 
-        XCTContext.runActivity(named: "with_draft") { _ in
-            let client = MicrocmsClient(
-                serviceDomain: "test-service",
-                apiKey: "test-api-key",
-                globalDraftKey: "test-global-draft-key")
-            
-            let request = client.makeRequest(endpoint: "endpoint",
-                                             contentId: nil,
-                                             params: nil)
-            
-            XCTAssertEqual(request?.allHTTPHeaderFields,
-                           ["X-API-KEY": "test-api-key",
-                            "X-GLOBAL-DRAFT-KEY": "test-global-draft-key"])
-        }   
+        XCTAssertEqual(request?.allHTTPHeaderFields, ["X-MICROCMS-API-KEY": "test-api-key"])
     }
 
     func testGet() {