Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FEAT] #233 - UserDefault 토큰으로 헤더 변경 #234

Merged
merged 4 commits into from
Dec 26, 2021
Merged

[FEAT] #233 - UserDefault 토큰으로 헤더 변경 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3d6d77
[CHORE] #233 - Const.UserDefaults - > Const.UserDefaultsKeys 로 변경
dlwns33 Dec 26, 2021
f5acaf6
[FEAT] #233 - 헤더 진짜 토큰값으로 변경
dlwns33 Dec 26, 2021
975d58a
Merge branch 'release1.0/2' into release/#233
dlwns33 Dec 26, 2021
230b0d4
[CHORE] #233 - CardService 헤더 변경
dlwns33 Dec 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions NADA-iOS-forRelease/Resouces/Constants/Header.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import Foundation

extension Const {
struct Header {
// static let bearerHeader = ["Content-Type": "application/json",
// "Authorization": "Bearer " + Const.UserDefaults.accessToken]
static let bearerHeader = ["Authorization": "Bearer " + "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJuYWRhMiIsImF1dGgiOiJST0xFX1VTRVIiLCJleHAiOjE2NDEwMDQ0ODJ9.qNYjBirHaJ03ST2vSKNDspzm7nDXuLdCkl6vxCQxC29W0yJgMvp14Wq2ATOR5mCBrIUAaP0w4c7qx7kXZ4U2Gg"]
static let basicHeader = ["Content-Type": "application/json",
"Authorization": "Bearer " + "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJuYWRhMiIsImF1dGgiOiJST0xFX1VTRVIiLCJleHAiOjE2NDEwMDQ0ODJ9.qNYjBirHaJ03ST2vSKNDspzm7nDXuLdCkl6vxCQxC29W0yJgMvp14Wq2ATOR5mCBrIUAaP0w4c7qx7kXZ4U2Gg"]
static var bearerHeader = ["Authorization": "Bearer " + UserDefaults.standard.string(forKey: Const.UserDefaultsKey.accessToken)!]

static var basicHeader = ["Content-Type": "application/json",
"Authorization": "Bearer " + UserDefaults.standard.string(forKey: Const.UserDefaultsKey.accessToken)!]
}
}
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

extension Const {
struct UserDefaults {
struct UserDefaultsKey {
static let darkModeState = "darkModeState"
static let accessToken = "accessToken"
static let refreshToken = "refreshToken"
Expand Down
3 changes: 1 addition & 2 deletions NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ extension CardService: TargetType {
var headers: [String: String]? {
switch self {
case .cardDetailFetch, .cardListFetch, .cardDelete, .cardListEdit:
return ["Content-Type": "application/json",
"Authorization": "Bearer " + UserDefaults.standard.string(forKey: Const.UserDefaults.accessToken)!]
return Const.Header.basicHeader
case .cardCreation:
return Const.Header.basicHeader
}
Expand Down
10 changes: 5 additions & 5 deletions NADA-iOS-forRelease/Sources/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
IQKeyboardManager.shared.enableAutoToolbar = false
IQKeyboardManager.shared.shouldResignOnTouchOutside = true

let isDark = defaults.bool(forKey: Const.UserDefaults.darkModeState)
let isDark = defaults.bool(forKey: Const.UserDefaultsKey.darkModeState)

// 시스템 무시하고 UserDefault 상태에 따라 화면 전체에 다크/라이트 모드를 결정
if let window = UIApplication.shared.windows.first {
Expand All @@ -39,8 +39,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {

// 스플래시 지연시간동안 자동 로그인 작업처리
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 1) {
let acToken = self.defaults.string(forKey: Const.UserDefaults.accessToken)
let rfToken = self.defaults.string(forKey: Const.UserDefaults.refreshToken)
let acToken = self.defaults.string(forKey: Const.UserDefaultsKey.accessToken)
let rfToken = self.defaults.string(forKey: Const.UserDefaultsKey.refreshToken)

self.postUserTokenReissue(request: UserTokenReissueRequset(accessToken: acToken ?? "", refreshToken: rfToken ?? ""))
}
Expand All @@ -65,7 +65,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
var rootViewController = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil)
.instantiateViewController(identifier: Const.ViewController.Identifier.loginViewController)

if self.defaults.string(forKey: Const.UserDefaults.accessToken) != "" {
if self.defaults.string(forKey: Const.UserDefaultsKey.accessToken) != "" {
rootViewController = UIStoryboard(name: Const.Storyboard.Name.tabBar, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.tabBarViewController)
} else {
rootViewController = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil)
Expand All @@ -90,7 +90,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
// MARK: - Methods

private func presentToLoginViewController() {
if UserDefaults.standard.object(forKey: Const.UserDefaults.isOnboarding) != nil {
if UserDefaults.standard.object(forKey: Const.UserDefaultsKey.isOnboarding) != nil {
let rootViewController = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil).instantiateViewController(identifier: Const.ViewController.Identifier.loginViewController)
self.window?.rootViewController = rootViewController
self.window?.makeKeyAndVisible()
Expand Down
2 changes: 1 addition & 1 deletion ...OS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ extension AddGroupBottomSheetViewController {
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
textField.resignFirstResponder()
hideBottomSheetAndGoBack()
groupAddWithAPI(groupRequest: GroupAddRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupName: addGroupTextField.text ?? ""))
groupAddWithAPI(groupRequest: GroupAddRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", groupName: addGroupTextField.text ?? ""))
returnToGroupEditViewController?()

return true
Expand Down
2 changes: 1 addition & 1 deletion ...S-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ extension AddWithIdBottomSheetViewController {
switch response {
case .success(let data):
if let card = data as? CardClass {
if UserDefaults.standard.string(forKey: Const.UserDefaults.userID) == card.card.author {
if UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) == card.card.author {
self.errorImageView.isHidden = false
self.explainLabel.isHidden = false
self.explainLabel.text = "자신의 명함은 추가할 수 없습니다."
Expand Down
2 changes: 1 addition & 1 deletion ...-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class CardResultBottomSheetViewController: CommonBottomSheetViewController {
}

@objc func presentGroupSelectBottomSheet() {
groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "")
groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "")
}

}
Expand Down
4 changes: 2 additions & 2 deletions ...forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ class SelectGroupBottomSheetViewController: CommonBottomSheetViewController {
switch status {
case .detail:
changeGroupWithAPI(request: ChangeGroupRequest(cardID: cardDataModel?.cardID ?? "",
userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "",
userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "",
groupID: groupId ?? 0,
newGroupID: selectedGroup))
case .add, .addWithQR:
cardAddInGroupWithAPI(cardRequest: CardAddInGroupRequest(cardId: cardDataModel?.cardID ?? "",
userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "",
userId: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "",
groupId: selectedGroup))
case .group:
return
Expand Down
6 changes: 3 additions & 3 deletions ...S-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class CardCreationPreviewViewController: UIViewController {
@IBAction func touchCompleteButton(_ sender: Any) {
guard let frontCardDataModel = frontCardDataModel, let backCardDataModel = backCardDataModel else { return }

guard let userID = UserDefaults.standard.string(forKey: Const.UserDefaults.userID) else { return }
guard let userID = UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) else { return }

cardCreationRequest = CardCreationRequest(userID: userID, frontCard: frontCardDataModel, backCard: backCardDataModel)
guard let cardCreationRequest = cardCreationRequest,
Expand Down Expand Up @@ -197,7 +197,7 @@ extension CardCreationPreviewViewController {
guard let presentingVC = self.presentingViewController else { return }

self.dismiss(animated: true) {
if UserDefaults.standard.object(forKey: Const.UserDefaults.isFirstCard) == nil {
if UserDefaults.standard.object(forKey: Const.UserDefaultsKey.isFirstCard) == nil {
let nextVC = FirstCardAlertBottomSheetViewController()
.setTitle("""
🎉
Expand All @@ -206,7 +206,7 @@ extension CardCreationPreviewViewController {
.setHeight(587)
nextVC.modalPresentationStyle = .overFullScreen
presentingVC.present(nextVC, animated: true) {
UserDefaults.standard.set(false, forKey: Const.UserDefaults.isFirstCard)
UserDefaults.standard.set(false, forKey: Const.UserDefaultsKey.isFirstCard)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class CardDetailViewController: UIViewController {
}

@IBAction func presentHarmonyViewController(_ sender: Any) {
cardHarmonyFetchWithAPI(myCard: UserDefaults.standard.string(forKey: Const.UserDefaults.firstCardID) ?? "",
cardHarmonyFetchWithAPI(myCard: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.firstCardID) ?? "",
yourCard: cardDataModel?.cardID ?? "")

}
Expand Down
4 changes: 2 additions & 2 deletions NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class CardListViewController: UIViewController {
cardListTableView.delegate = self
cardListTableView.dataSource = self

cardListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", isList: true)
cardListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", isList: true)
}

override func viewWillAppear(_ animated: Bool) {
Expand Down Expand Up @@ -191,7 +191,7 @@ extension CardListViewController {
switch response {
case .success(let data):
print(data)
self.cardListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", isList: true)
self.cardListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", isList: true)
self.cardListTableView.reloadData()
case .requestErr(let message):
print("deleteGroupWithAPI - requestErr", message)
Expand Down
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class GroupViewController: UIViewController {
// 그룹 리스트 조회 서버 테스트
super.viewWillAppear(true)
NotificationCenter.default.addObserver(self, selector: #selector(didRecieveDataNotification(_:)), name: Notification.Name.passDataToGroup, object: nil)
groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "")
groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "")

}

Expand Down Expand Up @@ -124,7 +124,7 @@ extension GroupViewController {
self.groupCollectionView.reloadData()
self.groupId = group.groups[self.selectedRow].groupID
if !group.groups.isEmpty {
self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupId: group.groups[self.selectedRow].groupID, offset: 0))
self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", groupId: group.groups[self.selectedRow].groupID, offset: 0))
}
}
case .requestErr(let message):
Expand Down Expand Up @@ -254,7 +254,7 @@ extension GroupViewController: UICollectionViewDataSource {
selectedRow = indexPath.row
groupId = serverGroups?.groups[indexPath.row].groupID
cardListInGroupWithAPI(cardListInGroupRequest:
CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "",
CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "",
groupId: serverGroups?.groups[indexPath.row].groupID ?? 0,
offset: 0))
case cardsCollectionView:
Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ extension QRScanViewController {
switch response {
case .success(let data):
if let card = data as? CardClass {
if UserDefaults.standard.string(forKey: Const.UserDefaults.userID) == card.card.author {
if UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) == card.card.author {
self.showToast(message: "자신의 명함은 추가할 수 없습니다.", font: UIFont.button02, view: "wrongCard")
} else {
let nextVC = CardResultBottomSheetViewController()
Expand Down
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Sources/ViewControllers/GroupEdit/GroupEditViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class GroupEditViewController: UIViewController {
.setTitle("그룹 추가")
.setHeight(184)
nextVC.returnToGroupEditViewController = {
self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "")
self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "")
}
nextVC.modalPresentationStyle = .overFullScreen
self.present(nextVC, animated: false, completion: nil)
Expand Down Expand Up @@ -85,7 +85,7 @@ extension GroupEditViewController: UITableViewDelegate {
nextVC.modalPresentationStyle = .overFullScreen
nextVC.text = serverGroups?.groups[indexPath.row].groupName ?? ""
nextVC.returnToGroupEditViewController = {
self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "")
self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "")
}
nextVC.nowGroup = serverGroups?.groups[indexPath.row]
self.present(nextVC, animated: false, completion: nil)
Expand Down Expand Up @@ -143,7 +143,7 @@ extension GroupEditViewController {
switch response {
case .success:
print("groupDeleteWithAPI - success")
self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "")
self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "")
self.groupEditTableView.reloadData()
case .requestErr(let message):
print("groupDeleteWithAPI - requestErr: \(message)")
Expand Down
10 changes: 5 additions & 5 deletions NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class LoginViewController: UIViewController {
authorizationButton.heightAnchor.constraint(equalToConstant: 48)
])

let isDark = UserDefaults.standard.bool(forKey: Const.UserDefaults.darkModeState)
let isDark = UserDefaults.standard.bool(forKey: Const.UserDefaultsKey.darkModeState)

if let window = UIApplication.shared.windows.first {
if #available(iOS 13.0, *) {
Expand All @@ -69,7 +69,7 @@ class LoginViewController: UIViewController {
let nextVC = UIStoryboard(name: Const.Storyboard.Name.tabBar, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.tabBarViewController)
nextVC.modalPresentationStyle = .overFullScreen
self.present(nextVC, animated: true) {
UserDefaults.standard.set(false, forKey: Const.UserDefaults.isOnboarding)
UserDefaults.standard.set(false, forKey: Const.UserDefaultsKey.isOnboarding)
}
}

Expand Down Expand Up @@ -210,10 +210,10 @@ extension LoginViewController {
case .success(let loginData):
print("postUserSignUpWithAPI - success")
if let userData = loginData as? UserWithTokenRequest {
UserDefaults.standard.set(userData.user.userID, forKey: Const.UserDefaults.userID)
UserDefaults.standard.set(userData.user.userID, forKey: Const.UserDefaultsKey.userID)
if let tokenData = userData.user.token as? Token {
UserDefaults.standard.set(tokenData.accessToken, forKey: Const.UserDefaults.accessToken)
UserDefaults.standard.set(tokenData.refreshToken, forKey: Const.UserDefaults.refreshToken)
UserDefaults.standard.set(tokenData.accessToken, forKey: Const.UserDefaultsKey.accessToken)
UserDefaults.standard.set(tokenData.refreshToken, forKey: Const.UserDefaultsKey.refreshToken)
}
}
case .requestErr(let message):
Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ extension FrontViewController: VerticalCardSwiperDatasource {
if cardDataList?.count != 0 {
guard let cell = verticalCardSwiperView.dequeueReusableCell(withReuseIdentifier: Const.Xib.mainCardCell, for: index) as? MainCardCell else { return CardCell() }
guard let cardDataList = cardDataList else { return CardCell() }
UserDefaults.standard.set(cardDataList[0].cardID, forKey: Const.UserDefaults.firstCardID)
UserDefaults.standard.set(cardDataList[0].cardID, forKey: Const.UserDefaultsKey.firstCardID)
cell.initCell(cardDataModel: cardDataList[index])
cell.isShareable = true
cell.setFrontCard()
Expand Down
Loading