[FEAT] #235 마이페이지 유저디폴트 수정, 유저디폴트 수정

TeamChaRo · Jun 24, 2022 · b9a247b · b9a247b
1 parent d22ce76
commit b9a247b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/MyPageScene/MyPageVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/MyPageScene/MyPageVC.swift
@@ -18,8 +18,7 @@ class MyPageVC: UIViewController {
     let userheight = UIScreen.main.bounds.height
     var tabbarBottomConstraint: Int = 0
 
-//    var isLogin: Bool = UserDefaults.standard.bool(forKey: "isLogin") ?? true
-    var isLogin: Bool = true
+    var isLogin: Bool = UserDefaults.standard.bool(forKey: Constants.UserDefaultsKey.isLogin) ?? false
 
     private var userProfileData: [UserInformation] = []
     //var writenPostData: [MyPagePost] = []
@@ -31,7 +30,7 @@ class MyPageVC: UIViewController {
     var currentState: String = "인기순"
 
     //무한스크롤을 위함
-    var myId: String = UserDefaults.standard.string(forKey: "userId") ?? "[email protected]"
+    var myId: String = UserDefaults.standard.string(forKey: Constants.UserDefaultsKey.userEmail) ?? "[email protected]"
     var lastId: Int = 0
     var lastFavorite: Int = 0
     var isLast: Bool = false

diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift
@@ -91,6 +91,7 @@ class SNSLoginVC: UIViewController {
 
     @objc func lookAroundButtonClicked() {
         //isLogin 값을 false로 설정 - 둘러보기이므로 계정 없음
+        Constants.removeAllUserDefaults()
         UserDefaults.standard.set(false, forKey: Constants.UserDefaultsKey.isLogin)
         self.goToHomeVC()
     }
@@ -118,7 +119,14 @@ class SNSLoginVC: UIViewController {
         snsType = "G"
         GIDSignIn.sharedInstance.signIn(with: signInConfig, presenting: self) { user, error in
             guard error == nil else { return }
-            let userEmail = user?.profile?.email
+
+            guard let userEmail = user?.profile?.email else {
+                self.makeAlert(title: "로그인 오류",
+                               message: "선택된 구글 아이디가 없습니다.")
+                return
+            }
+
+            self.socialLogin(email: userEmail, profileImage: nil, nickname: nil)
             //여기 유저 이미지 ... String 으로 변환 모루겟다
             //            do {
             //                var userProfileImageString = try String(contentsOf: URL(string: (user?.profile?.imageURL(withDimension: 320)!)!)!)
@@ -128,7 +136,6 @@ class SNSLoginVC: UIViewController {
             //            }
 
             //로그인
-            self.socialLogin(email: userEmail!, profileImage: nil, nickname: nil)
         }
     }