Skip to content

Commit da9e6e8

Browse files
committed
Implement suggested cleanup and change
1 parent 6e3c1b4 commit da9e6e8

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

Sources/Data Model/DispatchEvents/EventForDispatch.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import Foundation
3333
public let body: Data
3434

3535
public init(url: URL? = nil, body: Data, region: Region = .US) {
36-
let endpoint = region == .US ? Self.eventEndpoint : Self.euEventEndpoint
36+
let endpoint = url?.absoluteString ?? (region == .US ? Self.eventEndpoint : Self.euEventEndpoint)
3737
self.url = URL(string: endpoint)!
3838
self.body = body
3939
}

Sources/Optimizely+Decide/OptimizelyUserContext+ObjC.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ import Foundation
3232
return userContext.optimizely
3333
}
3434

35-
public init(optimizely: OptimizelyClient, userId: String, attributes: [String: Any]? = nil, region: String = "US") {
35+
public init(optimizely: OptimizelyClient, userId: String, attributes: [String: Any]? = nil) {
3636
userContext = OptimizelyUserContext(optimizely: optimizely, userId: userId, attributes: attributes)
3737
}
3838

39-
public init(user: OptimizelyUserContext, region: String = "US") {
39+
public init(user: OptimizelyUserContext) {
4040
self.userContext = user
4141
}
4242

@@ -83,7 +83,7 @@ import Foundation
8383
ruleKey = decision.ruleKey
8484

8585
flagKey = decision.flagKey
86-
userContext = ObjcOptimizelyUserContext(user: decision.userContext, region: "US")
86+
userContext = ObjcOptimizelyUserContext(user: decision.userContext)
8787
reasons = decision.reasons
8888
}
8989
}
@@ -94,14 +94,14 @@ extension OptimizelyClient {
9494
@objc(createUserContextWithUserId:attributes:)
9595
public func objcCreateUserContext(userId: String, attributes: [String: Any]? = nil) -> ObjcOptimizelyUserContext {
9696
let user = createUserContext(userId: userId, attributes: attributes)
97-
return ObjcOptimizelyUserContext(user: user, region: "US")
97+
return ObjcOptimizelyUserContext(user: user)
9898
}
9999

100100
@available(swift, obsoleted: 1.0)
101-
@objc(createUserContextWithUserId:attributes:region:)
102-
public func objcCreateUserContext(userId: String, attributes: [String: Any]? = nil, region: String) -> ObjcOptimizelyUserContext {
101+
@objc(createUserContextWithUserId:attributes:)
102+
public func objcCreateUserContext(userId: String, attributes: [String: Any]? = nil) -> ObjcOptimizelyUserContext {
103103
let user = OptimizelyUserContext(optimizely: self, userId: userId, attributes: attributes)
104-
return ObjcOptimizelyUserContext(user: user, region: region)
104+
return ObjcOptimizelyUserContext(user: user)
105105
}
106106

107107
@available(swift, obsoleted: 1.0)

Sources/Optimizely+Decide/OptimizelyUserContext.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public class OptimizelyUserContext {
7070
/// - optimizely: An instance of OptimizelyClient to be used for decisions.
7171
/// - userId: The user ID to be used for bucketing.
7272
/// - attributes: A map of attribute names to current user attribute values.
73-
/// - region: The region for the user context (optional). Defaults to the region from the project config.
7473
public convenience init(optimizely: OptimizelyClient,
7574
userId: String,
7675
attributes: [String: Any?]? = nil) {

0 commit comments

Comments
 (0)