Merge branch 'release/0.2.0'

Author: connorpower

Example/Example/AppDelegate.swift

@@ -13,10 +13,43 @@ import Quartz
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
 
+    let keyPairName = "My Test Keypair"
     let fileURL = Bundle.main.url(forResource: "The Cathedral and the Bazaar", withExtension: ".pdf")!
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
-        testUpload(of: fileURL)
+        testKeyPairCreation()
+    }
+
+    private func testKeyPairCreation() {
+        print("Creating IPNS keypair...\n")
+
+        DefaultAPI.keygen(arg: keyPairName, type: .rsa, size: 2048) { (response, error) in
+            if let error = error {
+                fatalError("\(error)")
+            } else if let response = response {
+                print("Keypair created.\n")
+                print("  Type: rsa\n  Size: 2048 bits\n  Name: \(response.name!)\n  ID: \(response.id!)\n")
+                self.testKeyPairRetrieval()
+            }
+        }
+    }
+
+    private func testKeyPairRetrieval() {
+        print("Retrieving list of local keypairs...\n")
+
+        DefaultAPI.listKeys { (response, error) in
+            if let error = error {
+                fatalError("\(error)")
+            } else if let response = response {
+                print("Keypairs found.")
+                for key in response.keys! {
+                    print("  \"\(key.name!)\": \(key.id!)")
+                }
+                print("")
+
+                self.testUpload(of: self.fileURL)
+            }
+        }
     }
 
     private func testUpload(of file: URL) {
@@ -33,9 +66,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     private func testPublish(of hash: String) {
-        print("Publishing file...\n")
+        print("Publishing file under key \"\(keyPairName)\"...\n")
 
-        DefaultAPI.publish(arg: hash) { (response, error) in
+        DefaultAPI.publish(arg: hash, key: keyPairName) { (response, error) in
             if let error = error {
                 fatalError("\(error)")
             } else if let response = response {
@@ -85,6 +118,24 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         } else {
             print("File compared to local counterpart.\n  Is PDF with same number of pages: ❌\n")
         }
+
+        testKeyPairRemoval()
+    }
+
+    private func testKeyPairRemoval() {
+        print("Removing keypair \"\(keyPairName)\"...\n")
+
+        DefaultAPI.removeKey(arg: keyPairName) { (response, error) in
+            if let error = error {
+                fatalError("\(error)")
+            } else if let response = response {
+                print("Keypair removed.")
+                for key in response.keys! {
+                    print("  \"\(key.name!)\": \(key.id!)")
+                }
+                print("")
+            }
+        }
     }
 
 }

Example/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - Alamofire (4.5.1)
-  - IPFSWebService (0.0.1):
+  - IPFSWebService (0.1.0):
     - Alamofire (~> 4.5)
 
 DEPENDENCIES:
@@ -13,7 +13,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
-  IPFSWebService: 071512e3f63435706f5a56c19576d67962a4a157
+  IPFSWebService: 0854391521e5f506aa2b716a54fb0cc0a6a357ed
 
 PODFILE CHECKSUM: 61ed0b4ea744697cba534ae39b8006c4b4575530
 

Example/Pods/Local Podspecs/IPFSWebService.podspec.json

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name        = 'IPFSWebService'
-  s.version     = '0.1.0'
+  s.version     = '0.2.0'
   s.summary     = 'Defines and versions the HTTP based IPFS interface.'
   s.description = <<-DESC
   The API for communication with an IPFS server is defined and versioned by

Example/Pods/Manifest.lock

@@ -93,6 +93,90 @@ open class DefaultAPI: APIBase {
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
 
+    /**
+     * enum for parameter type
+     */
+    public enum ModelType_keygen: String { 
+        case rsa = "rsa"
+        case ed25519 = "ed25519"
+    }
+
+    /**
+     Create a new keypair
+     
+     - parameter arg: (query) Name of key to create. 
+     - parameter type: (query) Type of the key to create. 
+     - parameter size: (query) Size of the key to generate 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func keygen(arg: String, type: ModelType_keygen, size: Int32, completion: @escaping ((_ data: KeygenResponse?,_ error: Error?) -> Void)) {
+        keygenWithRequestBuilder(arg: arg, type: type, size: size).execute { (response, error) -> Void in
+            completion(response?.body, error);
+        }
+    }
+
+
+    /**
+     Create a new keypair
+     - GET /key/gen
+     - examples: [{contentType=application/json, example=""}]
+     
+     - parameter arg: (query) Name of key to create. 
+     - parameter type: (query) Type of the key to create. 
+     - parameter size: (query) Size of the key to generate 
+
+     - returns: RequestBuilder<KeygenResponse> 
+     */
+    open class func keygenWithRequestBuilder(arg: String, type: ModelType_keygen, size: Int32) -> RequestBuilder<KeygenResponse> {
+        let path = "/key/gen"
+        let URLString = SwaggerClientAPI.basePath + path
+        let parameters: [String:Any]? = nil
+
+        let url = NSURLComponents(string: URLString)
+        url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
+            "arg": arg, 
+            "type": type.rawValue, 
+            "size": size.encodeToJSON()
+        ])
+        
+
+        let requestBuilder: RequestBuilder<KeygenResponse>.Type = SwaggerClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
+    /**
+     List all local keypairs
+     
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func listKeys(completion: @escaping ((_ data: ListKeysResponse?,_ error: Error?) -> Void)) {
+        listKeysWithRequestBuilder().execute { (response, error) -> Void in
+            completion(response?.body, error);
+        }
+    }
+
+
+    /**
+     List all local keypairs
+     - GET /key/list
+     - examples: [{contentType=application/json, example=""}]
+
+     - returns: RequestBuilder<ListKeysResponse> 
+     */
+    open class func listKeysWithRequestBuilder() -> RequestBuilder<ListKeysResponse> {
+        let path = "/key/list"
+        let URLString = SwaggerClientAPI.basePath + path
+        let parameters: [String:Any]? = nil
+
+        let url = NSURLComponents(string: URLString)
+
+
+        let requestBuilder: RequestBuilder<ListKeysResponse>.Type = SwaggerClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
     /**
      IPNS is a PKI namespace, where names are the hashes of public keys, and the private key enables publishing new (signed) values. In both publish and resolve, the default name used is the node's own PeerID, which is the hash of its public key.
 
@@ -137,6 +221,44 @@ open class DefaultAPI: APIBase {
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
 
+    /**
+     List all local keypairs
+     
+     - parameter arg: (query) Name of key to remove. 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func removeKey(arg: String, completion: @escaping ((_ data: RemoveKeyResponse?,_ error: Error?) -> Void)) {
+        removeKeyWithRequestBuilder(arg: arg).execute { (response, error) -> Void in
+            completion(response?.body, error);
+        }
+    }
+
+
+    /**
+     List all local keypairs
+     - GET /key/rm
+     - examples: [{contentType=application/json, example=""}]
+     
+     - parameter arg: (query) Name of key to remove. 
+
+     - returns: RequestBuilder<RemoveKeyResponse> 
+     */
+    open class func removeKeyWithRequestBuilder(arg: String) -> RequestBuilder<RemoveKeyResponse> {
+        let path = "/key/rm"
+        let URLString = SwaggerClientAPI.basePath + path
+        let parameters: [String:Any]? = nil
+
+        let url = NSURLComponents(string: URLString)
+        url?.queryItems = APIHelper.mapValuesToQueryItems(values:[
+            "arg": arg
+        ])
+        
+
+        let requestBuilder: RequestBuilder<RemoveKeyResponse>.Type = SwaggerClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
     /**
      IPNS is a PKI namespace, where names are the hashes of public keys, and the private key enables publishing new (signed) values. In both publish and resolve, the default name used is the node's own PeerID, which is the hash of its public key.
 

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -166,6 +166,35 @@ class Decoders {
         }
 
 
+        // Decoder for [Key]
+        Decoders.addDecoder(clazz: [Key].self) { (source: AnyObject, instance: AnyObject?) -> [Key] in
+            return Decoders.decode(clazz: [Key].self, source: source)
+        }
+        // Decoder for Key
+        Decoders.addDecoder(clazz: Key.self) { (source: AnyObject, instance: AnyObject?) -> Key in
+            let sourceDictionary = source as! [AnyHashable: Any]
+            let result = instance == nil ? Key() : instance as! Key
+            
+            result.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["Name"] as AnyObject?)
+            result.id = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["Id"] as AnyObject?)
+            return result
+        }
+
+
+        // Decoder for [KeyList]
+        Decoders.addDecoder(clazz: [KeyList].self) { (source: AnyObject, instance: AnyObject?) -> [KeyList] in
+            return Decoders.decode(clazz: [KeyList].self, source: source)
+        }
+        // Decoder for KeyList
+        Decoders.addDecoder(clazz: KeyList.self) { (source: AnyObject, instance: AnyObject?) -> KeyList in
+            let sourceDictionary = source as! [AnyHashable: Any]
+            let result = instance == nil ? KeyList() : instance as! KeyList
+            
+            result.keys = Decoders.decodeOptional(clazz: Array.self, source: sourceDictionary["Keys"] as AnyObject?)
+            return result
+        }
+
+
         // Decoder for [PublishResponse]
         Decoders.addDecoder(clazz: [PublishResponse].self) { (source: AnyObject, instance: AnyObject?) -> [PublishResponse] in
             return Decoders.decode(clazz: [PublishResponse].self, source: source)
@@ -193,6 +222,49 @@ class Decoders {
             result.path = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["Path"] as AnyObject?)
             return result
         }
+
+
+        // Decoder for [KeygenResponse]
+        Decoders.addDecoder(clazz: [KeygenResponse].self) { (source: AnyObject, instance: AnyObject?) -> [KeygenResponse] in
+            return Decoders.decode(clazz: [KeygenResponse].self, source: source)
+        }
+        // Decoder for KeygenResponse
+        Decoders.addDecoder(clazz: KeygenResponse.self) { (source: AnyObject, instance: AnyObject?) -> KeygenResponse in
+            let sourceDictionary = source as! [AnyHashable: Any]
+            let result = instance == nil ? KeygenResponse() : instance as! KeygenResponse
+            
+            result.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["Name"] as AnyObject?)
+            result.id = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["Id"] as AnyObject?)
+            return result
+        }
+
+
+        // Decoder for [ListKeysResponse]
+        Decoders.addDecoder(clazz: [ListKeysResponse].self) { (source: AnyObject, instance: AnyObject?) -> [ListKeysResponse] in
+            return Decoders.decode(clazz: [ListKeysResponse].self, source: source)
+        }
+        // Decoder for ListKeysResponse
+        Decoders.addDecoder(clazz: ListKeysResponse.self) { (source: AnyObject, instance: AnyObject?) -> ListKeysResponse in
+            let sourceDictionary = source as! [AnyHashable: Any]
+            let result = instance == nil ? ListKeysResponse() : instance as! ListKeysResponse
+            
+            result.keys = Decoders.decodeOptional(clazz: Array.self, source: sourceDictionary["Keys"] as AnyObject?)
+            return result
+        }
+
+
+        // Decoder for [RemoveKeyResponse]
+        Decoders.addDecoder(clazz: [RemoveKeyResponse].self) { (source: AnyObject, instance: AnyObject?) -> [RemoveKeyResponse] in
+            return Decoders.decode(clazz: [RemoveKeyResponse].self, source: source)
+        }
+        // Decoder for RemoveKeyResponse
+        Decoders.addDecoder(clazz: RemoveKeyResponse.self) { (source: AnyObject, instance: AnyObject?) -> RemoveKeyResponse in
+            let sourceDictionary = source as! [AnyHashable: Any]
+            let result = instance == nil ? RemoveKeyResponse() : instance as! RemoveKeyResponse
+            
+            result.keys = Decoders.decodeOptional(clazz: Array.self, source: sourceDictionary["Keys"] as AnyObject?)
+            return result
+        }
     }()
 
     static fileprivate func initialize() {

Example/Pods/Target Support Files/IPFSWebService/Info.plist

@@ -8,7 +8,6 @@
 import Foundation
 
 
-/** The object which represents a response from the server. */
 open class AddResponse: JSONEncodable {
 
     public var name: String?