Merge pull request #3 from nomadj/main

Allow Basic Auth

Author: pexavc

README.md

@@ -23,7 +23,13 @@ import IPFSKit
 let client: IPFSClient?
 
 public init() {
-    client = try? IPFSClient.init(host: "ipfs.infura.io", port: 5001, ssl: true)
+    client = try? IPFSClient.init(
+        host: "ipfs.infura.io", 
+        port: 5001, 
+        ssl: true, 
+        id: "INFURA-PROJECT-ID", 
+        secret: "INFURA-SECRET"
+    )
 }
 ```
 

Sources/IPFSKit/HttpIo.swift

@@ -16,6 +16,7 @@ enum HttpIoError : Error {
 }
 
 public struct HttpIo : NetworkIo {
+    let auth: String
 
     public func receiveFrom(_ source: String, completionHandler: @escaping (Data) throws -> Void) throws {
         guard let url = URL(string: source) else { throw HttpIoError.urlError("Invalid URL") }
@@ -55,15 +56,15 @@ public struct HttpIo : NetworkIo {
 
     public func sendTo(_ target: String, content: Data, completionHandler: @escaping (Data) -> Void) throws {
 
-        var multipart = try Multipart(targetUrl: target, encoding: .utf8)
+        var multipart = try Multipart(targetUrl: target, encoding: .utf8, auth: self.auth)
         multipart = try Multipart.addFilePart(multipart, fileName: nil , fileData: content)
         Multipart.finishMultipart(multipart, completionHandler: completionHandler)
     }
 
 
     public func sendTo(_ target: String, filePath: String, completionHandler: @escaping (Data) -> Void) throws {
 
-        var multipart = try Multipart(targetUrl: target, encoding: .utf8)
+        var multipart = try Multipart(targetUrl: target, encoding: .utf8, auth: self.auth)
 
         multipart = try handle(oldMultipart: multipart, files: [filePath])
 

Sources/IPFSKit/IPFSClient.swift

@@ -17,6 +17,8 @@ extension Multihash : Hashable {
 
 public protocol IPFSBase {
     var baseUrl:    String { get }
+    var projectId:  String { get }
+    var secret:     String { get }
 
     /// Second Tier commands
     var refs:       Refs { get }
@@ -160,6 +162,8 @@ enum IpfsCmdString : String {
 public class IPFSClient: IPFSBase {
 
     public var baseUrl: String = ""
+    public var projectId: String = ""
+    public var secret: String = ""
 
     public let scheme: String
     public let host: String
@@ -190,7 +194,7 @@ public class IPFSClient: IPFSBase {
         if  protoComponents[0].hasPrefix("ip") == true &&
             protoComponents[2].hasPrefix("tcp") == true {
 
-            try self.init(host: protoComponents[1],port: Int(protoComponents[3])!)
+            try self.init(host: protoComponents[1],port: Int(protoComponents[3])!, id: "", secret: "")
         } else {
             throw IpfsApiError.initError
         }
@@ -200,16 +204,17 @@ public class IPFSClient: IPFSBase {
         try self.init(addr: newMultiaddr(addr))
     }
 
-    public init(host: String, port: Int, version: String = "/api/v0/", ssl: Bool = false) throws {
+    public init(host: String, port: Int, version: String = "/api/v0/", ssl: Bool = false, id: String, secret: String) throws {
         self.scheme = ssl ? "https://" : "http://"
         self.host = host
         self.port = port
         self.version = version
-        
+	self.projectId = id
+	self.secret = secret
 
         /// No https yet as TLS1.2 in OS X 10.11 is not allowing comms with the node.
         baseUrl = "\(scheme)\(host):\(port)\(version)"
-        net = HttpIo()
+        net = HttpIo(auth: authData(projectId: self.projectId, secret: self.secret))
 
         /** All of IPFSApi's properties need to be set before we can use self which
             is why we can't just init the sub commands with self (unless we make 
@@ -511,3 +516,9 @@ func buildArgString(_ args: [String]) -> String {
     return outString
 }
 
+public func authData(projectId: String, secret: String) -> String {
+    let authString = projectId + ":" + secret
+    let authD = authString.data(using: .utf8)!.base64EncodedString()
+    return authD
+}
+

Sources/IPFSKit/Multipart.swift

@@ -23,7 +23,7 @@ public struct Multipart {
     var body = NSMutableData()
     let request: NSMutableURLRequest
 
-    init(targetUrl: String, encoding: String.Encoding) throws {
+    init(targetUrl: String, encoding: String.Encoding, auth: String) throws {
 
         // Eg. UTF8
         self.encoding = encoding
@@ -35,6 +35,7 @@ public struct Multipart {
 
         guard let url = URL(string: targetUrl) else { throw MultipartError.failedURLCreation }
         request = NSMutableURLRequest(url: url)
+	request.addValue("Basic \(auth)", forHTTPHeaderField: "Authorization")
         request.httpMethod = "POST"
         request.setValue("multipart/form-data; boundary="+boundary, forHTTPHeaderField: "content-type")
         request.setValue("Swift IPFS Client", forHTTPHeaderField: "user-agent")