From 6c9218195648e39e9e54105c0755c12d0f32146c Mon Sep 17 00:00:00 2001
From: InKwon James Kim <devikkim@gmail.com>
Date: Tue, 4 Feb 2020 16:03:46 +0900
Subject: [PATCH] Uppercase and remember id

---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 .../View/LoginViewController.swift            |   6 ++++++
 .../Wireframe/MainWireframe.swift             |   2 +-
 .../Database/UserDefaultsWrapper.swift        |  13 +++++++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.DS_Store b/.DS_Store
index 7f27c317c62291e2e466e3e37b10e2274f9043b5..3edc9c9abad5d4f8180a1208a5851271e6952ddd 100644
GIT binary patch
delta 36
scmZn(XbG6$&uF$WU^hRb*=8PrINr%E^0JdT<^OFgXky&VuJD%~0Oi#Ti2wiq

delta 419
zcmZn(XbG6$&uFtTU^hRb&1N2fINo}0hGK?fh9ZVkAj|`@GZ^w2N*IcB(hY-?^K%Or
zz(7t1Na0YKoA2V1l#`zXRKdZ(&@gxM;)9O(RHvY*uE(#uAOqPM3P5vlIisK?$)~iq
zqzI_Of*};>kyN0kiW&47Qh=;7hD?TRAln7#xnzb?hFq{`f!<`O*JmgP3KjvSix~<S
z5`ogGK!r&_Ma4i(c|cw<5b86yGx##N!j02sNCz8|3DgUc#pf(PsI#z!9}`3I<o~h?
OliOwgZDv>a%MJjg3SI{Q

diff --git a/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift b/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift
index 61cfb027..b20dfbae 100644
--- a/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift	
+++ b/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift	
@@ -54,6 +54,7 @@ class LoginViewController: UIViewController {
   
   var presenter: LoginModuleInterface?
   
+  private var isFirst = true
   private var validDic = [
     "id": false,
     "pw": false
@@ -80,6 +81,11 @@ class LoginViewController: UIViewController {
   
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
+    
+    if isFirst {
+      userNameTextField.text = KeyChain.shared.get(key: .id)
+      isFirst = false
+    }
   }
   
   override func viewWillDisappear(_ animated: Bool) {
diff --git a/GME Remit/Modules/Main/User Interface/Wireframe/MainWireframe.swift b/GME Remit/Modules/Main/User Interface/Wireframe/MainWireframe.swift
index 8a5189e2..46cb91d0 100644
--- a/GME Remit/Modules/Main/User Interface/Wireframe/MainWireframe.swift	
+++ b/GME Remit/Modules/Main/User Interface/Wireframe/MainWireframe.swift	
@@ -84,7 +84,7 @@ extension MainWireframe: MainWireframeInput {
   
   static func logout() {
     guard let window = MainWireframe.shared?.window else {return}
-    GMEDB.shared.user.removeAll()
+    GMEDB.shared.user.removeAllWithoutUserID()
     GMEDB.shared.app.removeAll()
     
     KeyChain.shared.save(data: "0", key: .login)
diff --git a/GME Remit/Utilities/Database/UserDefaultsWrapper.swift b/GME Remit/Utilities/Database/UserDefaultsWrapper.swift
index 1f9796c2..0dd73d7e 100644
--- a/GME Remit/Utilities/Database/UserDefaultsWrapper.swift	
+++ b/GME Remit/Utilities/Database/UserDefaultsWrapper.swift	
@@ -78,6 +78,19 @@ extension UserDefaultsWrapper {
   }
 }
 
+extension UserDefaultsWrapper where Keys == GMEDB.UserKeys {
+
+  @discardableResult
+  func removeAllWithoutUserID() -> Self {
+    Keys.allCases.forEach {
+      if $0 != .userId {
+        UserDefaults.standard.removeObject(forKey: $0.rawValue)
+      }
+    }
+    return self
+  }
+}
+
 extension UserDefaultsWrapper {  
   @discardableResult
   func remove(_ key: Keys) -> Self {