Merge pull request #13 from johannes-schliephake/bugfix/clear-keychain

Clear keychain only when launching app for the first time
johannes-schliephake · Feb 13, 2021 · c7863e4 · c7863e4
2 parents 01b3ab0 + f0ef11e
commit c7863e4
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/Shared/Utilities/Keychain.swift b/Shared/Utilities/Keychain.swift
@@ -14,15 +14,17 @@ final class Keychain {
         self.accessGroup = accessGroup
 
         /// This section will be improved in a future version
-        if load(key: "clearKeychain") == nil {
+        if !Configuration.userDefaults.bool(forKey: "appDidLaunch") {
             Configuration.userDefaults.set(true, forKey: "appDidLaunch")
-            store(key: "clearKeychain", value: "true")
-        }
-        else if !Configuration.userDefaults.bool(forKey: "appDidLaunch") {
-            remove(key: "server")
-            remove(key: "user")
-            remove(key: "password")
-            remove(key: "acceptedCertificateHash")
+            if load(key: "clearKeychain") == nil {
+                store(key: "clearKeychain", value: "true")
+            }
+            else {
+                remove(key: "server")
+                remove(key: "user")
+                remove(key: "password")
+                remove(key: "acceptedCertificateHash")
+            }
         }
     }