refactor Password class

pass/Controllers/PasswordDetailTableViewController.swift

@@ -13,7 +13,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     var passwordEntity: PasswordEntity?
     var passwordCategoryEntities: [PasswordCategoryEntity]?
     var passwordCategoryText = ""
-    var password = Password()
+    var password: Password?
     var passwordImage: UIImage?
 
     struct TableCell {
@@ -86,27 +86,27 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
             
             var tableDataIndex = 1
             self.tableData.append(TableSection(title: "", item: []))
-            if self.password.username != "" {
+            let password = self.password!
-                self.tableData[tableDataIndex].item.append(TableCell(title: "username", content: self.password.username))
+            if let username = password.getUsername() {
+                self.tableData[tableDataIndex].item.append(TableCell(title: "username", content: username))
             }
-            self.tableData[tableDataIndex].item.append(TableCell(title: "password", content: self.password.password))
+            self.tableData[tableDataIndex].item.append(TableCell(title: "password", content: password.password))
-            
+            if password.additions.count > 0 {
-            if self.password.additions.count > 0 {
                 self.tableData.append(TableSection(title: "additions", item: []))
                 tableDataIndex += 1
-                for addition in self.password.additions {
+                for additionKey in password.additionKeys {
-                    self.tableData[tableDataIndex].item.append(TableCell(title: addition.title, content: addition.content))
+                    self.tableData[tableDataIndex].item.append(TableCell(title: additionKey, content: password.additions[additionKey]!))
-                    if addition.title.lowercased() == "url" {
+
-                        self.password.url = addition.content
-                    }
                 }
             }
             DispatchQueue.main.async { [weak self] in
                 self?.tableView.reloadData()
                 indicator.stopAnimating()
                 indicatorLable.isHidden = true
-                if self?.password.url != ""  && self?.passwordEntity?.image == nil{
+                if let url = password.getURL() {
-                    self?.updatePasswordImage(url: self?.password.url ?? "")
+                    if let _ = self?.passwordEntity?.image {
+                        self?.updatePasswordImage(url: url)
+                    }
                 }
             }
         }

pass/Models/Password.swift

@@ -16,23 +16,65 @@ struct AdditionField {
 
 class Password {
     var name = ""
-    var username = ""
     var password = ""
-    var url = ""
+    var additions = [String: String]()
-    var additions = [AdditionField]()
+    var additionKeys = [String]()
     
-    init() { }
+    convenience init(name: String, plainText: String) {
-    
+        var i = 0
-    convenience init(name: String, username: String, password: String, additions: [AdditionField]) {
+        var additionFieldsArray = [AdditionField]()
-        self.init(name: name, username: username, password: password, url: "", additions: additions)
+        var password  = ""
+        var unkownIndex = 0
+        plainText.enumerateLines() { line, _ in
+            if i == 0 {
+                password = line
+            } else {
+                let items = line.characters.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true).map(String.init)
+                var key = ""
+                var value = ""
+                if items.count == 1 {
+                    unkownIndex += 1
+                    key = "unkown \(unkownIndex)"
+                    value = items[0]
+                } else {
+                    key = items[0]
+                    value = items[1].trimmingCharacters(in: .whitespaces)
+                }
+                additionFieldsArray.append(AdditionField(title: key, content: value))
+            }
+            i += 1
+        }
+        self.init(name: name, password: password, additionsArray: additionFieldsArray)
     }
     
-    init(name: String, username: String, password: String, url: String, additions: [AdditionField]) {
+    init(name: String, password: String, additionsArray: [AdditionField]) {
         self.name = name
-        self.username = username
         self.password = password
-        self.url = url
+        for additionField in additionsArray {
-        self.additions = additions
+            self.additions[additionField.title] = additionField.content
+            self.additionKeys.append(additionField.title)
+        }
+    }
+    
+    func getUsername() -> String? {
+        return getAdditionValue(withKey: "Username") ?? getAdditionValue(withKey: "username")
+    }
+    
+    func getURL() -> String? {
+        return getAdditionValue(withKey: "URL") ?? getAdditionValue(withKey: "url") ?? getAdditionValue(withKey: "Url")
+    }
+    
+    func getPlainText() -> String {
+        let plainAdditionsText = self.additionKeys.map { "\($0): \(self.additions[$0]!)" }.joined(separator: "\n")
+        return "\(self.password)\n\(plainAdditionsText)"
+    }
+    
+    func getPlainData() -> Data {
+        return getPlainText().data(using: .ascii)!
+    }
+    
+    private func getAdditionValue(withKey key: String) -> String? {
+        return self.additions[key]
     }
 }
 
@@ -42,43 +84,15 @@ extension PasswordEntity {
         let encryptedDataPath = URL(fileURLWithPath: "\(Globals.repositoryPath)/\(rawPath!)")
         let encryptedData = try Data(contentsOf: encryptedDataPath)
         let decryptedData = try PasswordStore.shared.pgp.decryptData(encryptedData, passphrase: Defaults[.pgpKeyPassphrase])
-        let plain = String(data: decryptedData, encoding: .ascii) ?? ""
+        let plainText = String(data: decryptedData, encoding: .ascii) ?? ""
-        var decrypted_password = ""
+        password = Password(name: name!, plainText: plainText)
-        var username = ""
-        var decrypted_addtions = [AdditionField]()
-        var i = 0
-        plain.enumerateLines(invoking: { line, _ in
-            if i == 0 {
-                decrypted_password = line
-            } else {
-                let items = line.characters.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true).map(String.init)
-                if items.count == 2 && items[0].lowercased() == "username"  {
-                    username = items[1].trimmingCharacters(in: .whitespaces)
-                } else {
-                    var key = ""
-                    var value = ""
-                    if items.count == 1 {
-                        key = "unknown"
-                        value = items[0]
-                    } else {
-                        key = items[0]
-                        value = items[1].trimmingCharacters(in: .whitespaces)
-                    }
-                    decrypted_addtions.append(AdditionField(title: key, content: value))
-                }
-            }
-            i += 1
-        })
-        password = Password(name: name!, username: username, password: decrypted_password, additions: decrypted_addtions)
         return password
     }
     
     func encrypt(password: Password) throws -> Data {
         name = password.name
         rawPath = ""
-        let plainPassword = password.password
+        let plainData = password.getPlainData()
-//        let plainAdditions = password.additions.map { "\($0.title): \($0.content)" }.joined(separator: "\n")
-        let plainData = "\(plainPassword)\n".data(using: .ascii)!
         let pgp = PasswordStore.shared.pgp
         let encryptedData = try pgp.encryptData(plainData, usingPublicKey: pgp.getKeysOf(.public)[0], armored: false)
         return encryptedData