Skip to content

Commit 0ae106d

Browse files
Added getIdentityFlags method (#59)
* Implemented getting flags by identity and setting traits at the same time * Fix formatting * Removed getIdentityFlags method and added traits variable to getFeatureFlags method
1 parent 31e9be3 commit 0ae106d

File tree

4 files changed

+47
-19
lines changed

4 files changed

+47
-19
lines changed

FlagsmithClient/Classes/Flagsmith.swift

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,36 +83,52 @@ public final class Flagsmith: @unchecked Sendable {
8383
/// - identity: ID of the user (optional)
8484
/// - completion: Closure with Result which contains array of Flag objects in case of success or Error in case of failure
8585
public func getFeatureFlags(forIdentity identity: String? = nil,
86+
traits: [Trait]? = nil,
8687
completion: @Sendable @escaping (Result<[Flag], any Error>) -> Void)
8788
{
8889
if let identity = identity {
89-
getIdentity(identity) { result in
90-
switch result {
91-
case let .success(thisIdentity):
92-
completion(.success(thisIdentity.flags))
93-
case let .failure(error):
94-
if self.defaultFlags.isEmpty {
95-
completion(.failure(error))
96-
} else {
97-
completion(.success(self.defaultFlags))
90+
if let traits = traits {
91+
apiManager.request(.postTraits(identity: identity, traits: traits)) { (result: Result<Traits, Error>) in
92+
switch result {
93+
case let .success(result):
94+
completion(.success(result.flags))
95+
case let .failure(error):
96+
self.handleFlagsError(error, completion: completion)
97+
}
98+
}
99+
} else {
100+
getIdentity(identity) { result in
101+
switch result {
102+
case let .success(thisIdentity):
103+
completion(.success(thisIdentity.flags))
104+
case let .failure(error):
105+
self.handleFlagsError(error, completion: completion)
98106
}
99107
}
100108
}
101109
} else {
102-
apiManager.request(.getFlags) { (result: Result<[Flag], Error>) in
103-
switch result {
104-
case let .success(flags):
105-
completion(.success(flags))
106-
case let .failure(error):
107-
if self.defaultFlags.isEmpty {
108-
completion(.failure(error))
109-
} else {
110-
completion(.success(self.defaultFlags))
110+
if let _ = traits {
111+
completion(.failure(FlagsmithError.invalidArgument("You must provide an identity to set traits")))
112+
} else {
113+
apiManager.request(.getFlags) { (result: Result<[Flag], Error>) in
114+
switch result {
115+
case let .success(flags):
116+
completion(.success(flags))
117+
case let .failure(error):
118+
self.handleFlagsError(error, completion: completion)
111119
}
112120
}
113121
}
114122
}
115123
}
124+
125+
private func handleFlagsError(_ error: any Error, completion: @Sendable @escaping (Result<[Flag], any Error>) -> Void) {
126+
if self.defaultFlags.isEmpty {
127+
completion(.failure(error))
128+
} else {
129+
completion(.success(self.defaultFlags))
130+
}
131+
}
116132

117133
/// Check feature exists and is enabled optionally for a specific identity
118134
///

FlagsmithClient/Classes/FlagsmithError.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ public enum FlagsmithError: LocalizedError, Sendable {
2121
case decoding(DecodingError)
2222
/// Unknown or unhandled error was encountered.
2323
case unhandled(any Error)
24+
/// Invalid argument error
25+
case invalidArgument(String)
2426

2527
public var errorDescription: String? {
2628
switch self {
@@ -36,6 +38,8 @@ public enum FlagsmithError: LocalizedError, Sendable {
3638
return "API Response could not be decoded: \(error.localizedDescription)"
3739
case let .unhandled(error):
3840
return "An unknown or unhandled error was encountered: \(error.localizedDescription)"
41+
case let .invalidArgument(error):
42+
return "Invalid argument error: \(error)"
3943
}
4044
}
4145

FlagsmithClient/Classes/Traits.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,11 @@ import Foundation
1313
public struct Traits: Codable, Sendable {
1414
public let traits: [Trait]
1515
public let identifier: String?
16+
public let flags: [Flag]
17+
18+
init(traits: [Trait], identifier: String?, flags: [Flag] = []) {
19+
self.traits = traits
20+
self.identifier = identifier
21+
self.flags = flags
22+
}
1623
}

FlagsmithClient/Tests/RouterTests.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ final class RouterTests: FlagsmithClientTestCase {
7676
"trait_value" : 42
7777
}
7878
],
79-
"identifier" : "A1B2C3D4"
79+
"identifier" : "A1B2C3D4",
80+
"flags": []
8081
}
8182
""".json(using: .utf8)
8283
let body = try request.httpBody.json()

0 commit comments

Comments
 (0)