Skip to content

Commit ea16fa8

Browse files
authored
Merge pull request #164 from PopPool/fix/#160-recent-login-duplication
[FIX] ๋กœ๊ทธ์ธ ํˆดํŒ์ด ์ค‘๋ณต์„ ๋ฐœ์ƒํ•˜๋˜ ๋ฌธ์ œ ์ˆ˜์ •
2 parents 8da795b + 5b2fd4e commit ea16fa8

File tree

51 files changed

+2228
-799
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2228
-799
lines changed

โ€ŽPoppool/CoreLayer/Infrastructure/Infrastructure/Service/KeyChainService.swiftโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import Foundation
22
import Security
33

4-
import RxSwift
5-
64
public final class KeyChainService {
75

86
// KeyChain์—์„œ ๋ฐœ์ƒํ•  ์ˆ˜ ์žˆ๋Š” ์˜ค๋ฅ˜๋ฅผ ์ •์˜
@@ -60,6 +58,7 @@ public final class KeyChainService {
6058
/// - Parameter type: ์ €์žฅํ•˜๋ ค๋Š” ํ† ํฐ์˜ ํƒ€์ž… (`accessToken` ๋˜๋Š” `refreshToken`)
6159
/// - Parameter value: ์ €์žฅํ•  ํ† ํฐ์˜ ๊ฐ’
6260
/// - Returns: ์™„๋ฃŒ ์‹œ `Completable`
61+
@discardableResult
6362
public func saveToken(type: TokenType, value: String) -> Result<Void, Error> {
6463
// allowLossyConversion์€ ์ธ์ฝ”๋”ฉ ๊ณผ์ •์—์„œ ์†์‹ค์ด ๋˜๋Š” ๊ฒƒ์„ ํ—ˆ์šฉํ•  ๊ฒƒ์ธ์ง€ ์„ค์ •
6564
guard let convertValue = value.data(using: .utf8, allowLossyConversion: false) else {
@@ -95,6 +94,7 @@ public final class KeyChainService {
9594
/// KeyChain์—์„œ ํŠน์ • ํƒ€์ž…์˜ ํ† ํฐ์„ ์‚ญ์ œํ•˜๋Š” ๋ฉ”์„œ๋“œ
9695
/// - Parameter type: ์‚ญ์ œํ•˜๋ ค๋Š” ํ† ํฐ์˜ ํƒ€์ž… (`accessToken` ๋˜๋Š” `refreshToken`)
9796
/// - Returns: ์™„๋ฃŒ ์‹œ `Completable`
97+
@discardableResult
9898
public func deleteToken(type: TokenType) -> Result<Void, Error> {
9999
// 1. query ์ž‘์„ฑ
100100
let keyChainQuery: NSDictionary = [

โ€ŽPoppool/CoreLayer/Infrastructure/Infrastructure/Service/UserDefaultService.swiftโ€Ž

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,11 @@ public final class UserDefaultService {
6969

7070
// MARK: - Key base
7171
extension UserDefaultService {
72-
public enum Key: String {
72+
public enum Key: String, CaseIterable {
7373
case searchKeyword = "searchList"
74+
case userID = "userID"
75+
case socialType = "socialType"
76+
case lastLogin = "lastLogin"
7477
}
7578

7679
/// Userdefault ๋ฐ์ดํ„ฐ ์ €์žฅ ๋ฉ”์„œ๋“œ

โ€ŽPoppool/Poppool.xcodeproj/project.pbxprojโ€Ž

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
05734C6B2DCE05550093825D /* ReactorKit in Frameworks */ = {isa = PBXBuildFile; productRef = 05734C6A2DCE05550093825D /* ReactorKit */; };
3434
05734C6E2DCE05680093825D /* Tabman in Frameworks */ = {isa = PBXBuildFile; productRef = 05734C6D2DCE05680093825D /* Tabman */; };
3535
05734C712DCE059D0093825D /* Then in Frameworks */ = {isa = PBXBuildFile; productRef = 05734C702DCE059D0093825D /* Then */; };
36+
05A7CBEB2E27D5FB0010F1CD /* LoginFeature.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05A7CBE92E27D5FB0010F1CD /* LoginFeature.framework */; };
37+
05A7CBEC2E27D5FB0010F1CD /* LoginFeature.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 05A7CBE92E27D5FB0010F1CD /* LoginFeature.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
38+
05A7CBED2E27D5FB0010F1CD /* LoginFeatureInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05A7CBEA2E27D5FB0010F1CD /* LoginFeatureInterface.framework */; };
39+
05A7CBEE2E27D5FB0010F1CD /* LoginFeatureInterface.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 05A7CBEA2E27D5FB0010F1CD /* LoginFeatureInterface.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3640
05BBA73E2DB75DA60047A061 /* KakaoSDKUser in Frameworks */ = {isa = PBXBuildFile; productRef = 05BBA73D2DB75DA60047A061 /* KakaoSDKUser */; };
3741
4E15142A2D99480200DFD08F /* NMapsMap in Frameworks */ = {isa = PBXBuildFile; productRef = 4E1514292D99480200DFD08F /* NMapsMap */; };
3842
4E15142E2D994A3A00DFD08F /* KakaoSDKAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 4E15142D2D994A3A00DFD08F /* KakaoSDKAuth */; };
@@ -52,9 +56,11 @@
5256
0543C5DF2DF86C830070BB93 /* SearchFeatureInterface.framework in Embed Frameworks */,
5357
0543C5D92DF86C7F0070BB93 /* Presentation.framework in Embed Frameworks */,
5458
0543C5D72DF86C7E0070BB93 /* Infrastructure.framework in Embed Frameworks */,
59+
05A7CBEE2E27D5FB0010F1CD /* LoginFeatureInterface.framework in Embed Frameworks */,
5560
0543C5DD2DF86C810070BB93 /* SearchFeature.framework in Embed Frameworks */,
5661
0543C5D52DF86C7C0070BB93 /* DomainInterface.framework in Embed Frameworks */,
5762
0543C5D12DF86C790070BB93 /* DesignSystem.framework in Embed Frameworks */,
63+
05A7CBEC2E27D5FB0010F1CD /* LoginFeature.framework in Embed Frameworks */,
5864
);
5965
name = "Embed Frameworks";
6066
runOnlyForDeploymentPostprocessing = 0;
@@ -66,6 +72,8 @@
6672
05734C582DCDFAC20093825D /* SearchFeature.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SearchFeature.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6773
05734C592DCDFAC20093825D /* SearchFeatureInterface.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SearchFeatureInterface.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6874
05734C5E2DCE04CE0093825D /* PresentationInterface.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PresentationInterface.framework; sourceTree = BUILT_PRODUCTS_DIR; };
75+
05A7CBE92E27D5FB0010F1CD /* LoginFeature.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoginFeature.framework; sourceTree = BUILT_PRODUCTS_DIR; };
76+
05A7CBEA2E27D5FB0010F1CD /* LoginFeatureInterface.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoginFeatureInterface.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6977
05BDD3D52DB66E1700C1E192 /* DomainInterface.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DomainInterface.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7078
05C1D6072DB53A4900508FFD /* Data.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Data.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7179
05C1D6082DB53A4900508FFD /* Domain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Domain.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -107,6 +115,7 @@
107115
buildActionMask = 2147483647;
108116
files = (
109117
0543C5D02DF86C790070BB93 /* DesignSystem.framework in Frameworks */,
118+
05A7CBEB2E27D5FB0010F1CD /* LoginFeature.framework in Frameworks */,
110119
05734C662DCE05070093825D /* PanModal in Frameworks */,
111120
0543C5D42DF86C7C0070BB93 /* DomainInterface.framework in Frameworks */,
112121
0543C5D62DF86C7E0070BB93 /* Infrastructure.framework in Frameworks */,
@@ -124,6 +133,7 @@
124133
4EE360FD2D91876300D2441D /* NMapsMap in Frameworks */,
125134
0543C5DA2DF86C800070BB93 /* PresentationInterface.framework in Frameworks */,
126135
05734C682DCE05240093825D /* SnapKit in Frameworks */,
136+
05A7CBED2E27D5FB0010F1CD /* LoginFeatureInterface.framework in Frameworks */,
127137
0543C5CD2DF86C740070BB93 /* Data.framework in Frameworks */,
128138
05734C632DCE04FA0093825D /* Pageboy in Frameworks */,
129139
4E15142A2D99480200DFD08F /* NMapsMap in Frameworks */,
@@ -136,6 +146,8 @@
136146
05C1D6062DB53A4900508FFD /* Frameworks */ = {
137147
isa = PBXGroup;
138148
children = (
149+
05A7CBE92E27D5FB0010F1CD /* LoginFeature.framework */,
150+
05A7CBEA2E27D5FB0010F1CD /* LoginFeatureInterface.framework */,
139151
05734C5E2DCE04CE0093825D /* PresentationInterface.framework */,
140152
05734C582DCDFAC20093825D /* SearchFeature.framework */,
141153
05734C592DCDFAC20093825D /* SearchFeatureInterface.framework */,
@@ -212,7 +224,7 @@
212224
isa = PBXProject;
213225
attributes = {
214226
BuildIndependentTargetsInParallel = 1;
215-
LastSwiftUpdateCheck = 1540;
227+
LastSwiftUpdateCheck = 1640;
216228
LastUpgradeCheck = 1640;
217229
TargetAttributes = {
218230
BDCA41BC2CF35AC0005EECF6 = {

โ€ŽPoppool/Poppool.xcworkspace/contents.xcworkspacedataโ€Ž

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

โ€ŽPoppool/Poppool.xcworkspace/xcshareddata/swiftpm/Package.resolvedโ€Ž

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

โ€ŽPoppool/Poppool/Application/AppDelegate.swiftโ€Ž

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import Data
55
import Domain
66
import DomainInterface
77
import Infrastructure
8+
import LoginFeature
9+
import LoginFeatureInterface
810
import Presentation
911
import PresentationInterface
1012
import SearchFeature
@@ -100,5 +102,9 @@ extension AppDelegate {
100102
DIContainer.register(DetailFactory.self) { return DetailFactoryImpl() }
101103
DIContainer.register(CategorySelectorFactory.self) { return CategorySelectorFactoryImpl() }
102104
DIContainer.register(FilterSelectorFactory.self) { return FilterSelectorFactoryImpl() }
105+
DIContainer.register(LoginFactory.self) { return LoginFactoryImpl() }
106+
DIContainer.register(SignUpFactory.self) { return SignUpFactoryImpl() }
107+
DIContainer.register(WaveTabbarFactory.self) { return WaveTabbarFactoryImpl() }
108+
DIContainer.register(FAQFactory.self) { return FAQFactoryImpl() }
103109
}
104110
}

โ€ŽPoppool/PresentationLayer/DesignSystem/DesignSystem/Components/PPLabel.swiftโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import UIKit
33
public class PPLabel: UILabel {
44

55
public init(
6-
style: UIFont.FontStyle,
7-
fontSize: CGFloat,
6+
style: UIFont.FontStyle = .regular,
7+
fontSize: CGFloat = 12,
88
text: String = "",
99
lineHeight: CGFloat = 1.2
1010
) {

0 commit comments

Comments
ย (0)