Skip to content

Commit d90f0d2

Browse files
nan-linan-li
committed
[nit] run swiftlint
Run swiftlint and make a log more helpful
1 parent 3542d34 commit d90f0d2

13 files changed

+272
-282
lines changed

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSIdentityOperationExecutor.swift‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
3434
// To simplify uncaching, we maintain separate request queues for each type
3535
var addRequestQueue: [OSRequestAddAliases] = []
3636
var removeRequestQueue: [OSRequestRemoveAlias] = []
37-
var pendingAuthRequests: [String: [OSUserRequest]] = [String:[OSUserRequest]]()
37+
var pendingAuthRequests: [String: [OSUserRequest]] = [String: [OSUserRequest]]()
3838
let newRecordsState: OSNewRecordsState
3939
let jwtConfig: OSUserJwtConfig
4040

@@ -228,14 +228,14 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
228228
}
229229
}
230230
}
231-
231+
232232
func handleUnauthorizedError(externalId: String, error: NSError, request: OSUserRequest) {
233-
if (jwtConfig.isRequired ?? false) {
234-
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
233+
if jwtConfig.isRequired ?? false {
234+
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
235235
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId, error: error)
236236
}
237237
}
238-
238+
239239
func pendRequestUntilAuthUpdated(_ request: OSUserRequest, externalId: String?) {
240240
self.dispatchQueue.async {
241241
self.addRequestQueue.removeAll(where: { $0 == request})
@@ -258,7 +258,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
258258
return
259259
}
260260
guard request.addJWTHeaderIsValid(identityModel: request.identityModel) else {
261-
pendRequestUntilAuthUpdated(request, externalId:request.identityModel.externalId)
261+
pendRequestUntilAuthUpdated(request, externalId: request.identityModel.externalId)
262262
return
263263
}
264264
guard request.prepareForExecution(newRecordsState: newRecordsState) else {
@@ -325,7 +325,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
325325
return
326326
}
327327
guard request.addJWTHeaderIsValid(identityModel: request.identityModel) else {
328-
pendRequestUntilAuthUpdated(request, externalId:request.identityModel.externalId)
328+
pendRequestUntilAuthUpdated(request, externalId: request.identityModel.externalId)
329329
return
330330
}
331331
guard request.prepareForExecution(newRecordsState: newRecordsState) else {
@@ -360,8 +360,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
360360
self.handleUnauthorizedError(externalId: externalId, error: nsError, request: request)
361361
}
362362
request.sentToClient = false
363-
}
364-
else if responseType != .retryable {
363+
} else if responseType != .retryable {
365364
// Fail, no retry, remove from cache and queue
366365
// A response of .missing could mean the alias doesn't exist on this user OR this user has been deleted
367366
self.removeRequestQueue.removeAll(where: { $0 == request})
@@ -389,7 +388,7 @@ extension OSIdentityOperationExecutor: OSUserJwtConfigListener {
389388
print("❌ OSIdentityOperationExecutor onJwtUpdated for \(externalId) to \(String(describing: token))")
390389
reQueuePendingRequestsForExternalId(externalId: externalId)
391390
}
392-
391+
393392
private func reQueuePendingRequestsForExternalId(externalId: String) {
394393
self.dispatchQueue.async {
395394
guard let requests = self.pendingAuthRequests[externalId] else {

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSPropertyOperationExecutor.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private struct OSCombinedProperties {
6363
class OSPropertyOperationExecutor: OSOperationExecutor {
6464
var supportedDeltas: [String] = [OS_UPDATE_PROPERTIES_DELTA]
6565
var deltaQueue: [OSDelta] = []
66-
var pendingAuthRequests: [String: [OSRequestUpdateProperties]] = [String:[OSRequestUpdateProperties]]()
66+
var pendingAuthRequests: [String: [OSRequestUpdateProperties]] = [String: [OSRequestUpdateProperties]]()
6767
var updateRequestQueue: [OSRequestUpdateProperties] = []
6868
let newRecordsState: OSNewRecordsState
6969
let jwtConfig: OSUserJwtConfig
@@ -268,14 +268,14 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
268268
executeUpdatePropertiesRequest(request, inBackground: inBackground)
269269
}
270270
}
271-
271+
272272
func handleUnauthorizedError(externalId: String, error: NSError, request: OSRequestUpdateProperties) {
273-
if (jwtConfig.isRequired ?? false) {
274-
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
273+
if jwtConfig.isRequired ?? false {
274+
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
275275
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId, error: error)
276276
}
277277
}
278-
278+
279279
func pendRequestUntilAuthUpdated(_ request: OSRequestUpdateProperties, externalId: String?) {
280280
self.dispatchQueue.async {
281281
self.updateRequestQueue.removeAll(where: { $0 == request})
@@ -296,16 +296,16 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
296296
guard !request.sentToClient else {
297297
return
298298
}
299-
299+
300300
guard request.addJWTHeaderIsValid(identityModel: request.identityModel) else {
301-
pendRequestUntilAuthUpdated(request, externalId:request.identityModel.externalId)
301+
pendRequestUntilAuthUpdated(request, externalId: request.identityModel.externalId)
302302
return
303303
}
304-
304+
305305
guard request.prepareForExecution(newRecordsState: newRecordsState) else {
306306
return
307307
}
308-
308+
309309
print("ECM executing properties request: %@", request.identityModel.externalId)
310310
request.sentToClient = true
311311

@@ -375,7 +375,7 @@ extension OSPropertyOperationExecutor: OSUserJwtConfigListener {
375375
print("❌ OSPropertyOperationExecutor onJwtUpdated for \(externalId) to \(String(describing: token))")
376376
reQueuePendingRequestsForExternalId(externalId: externalId)
377377
}
378-
378+
379379
private func reQueuePendingRequestsForExternalId(externalId: String) {
380380
self.dispatchQueue.async {
381381
guard let requests = self.pendingAuthRequests[externalId] else {

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSSubscriptionOperationExecutor.swift‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
3535
var addRequestQueue: [OSRequestCreateSubscription] = []
3636
var removeRequestQueue: [OSRequestDeleteSubscription] = []
3737
var updateRequestQueue: [OSRequestUpdateSubscription] = []
38-
var pendingAuthRequests: [String: [OSUserRequest]] = [String:[OSUserRequest]]()
38+
var pendingAuthRequests: [String: [OSUserRequest]] = [String: [OSUserRequest]]()
3939
var subscriptionModels: [String: OSSubscriptionModel] = [:]
4040
let newRecordsState: OSNewRecordsState
4141
let jwtConfig: OSUserJwtConfig
@@ -279,15 +279,14 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
279279
}
280280
}
281281
}
282-
282+
283283
func handleUnauthorizedError(externalId: String, error: NSError, request: OSUserRequest) {
284-
if (jwtConfig.isRequired ?? false) {
285-
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
284+
if jwtConfig.isRequired ?? false {
285+
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
286286
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId, error: error)
287287
}
288288
}
289-
290-
289+
291290
func pendRequestUntilAuthUpdated(_ request: OSUserRequest, externalId: String?) {
292291
self.dispatchQueue.async {
293292
self.addRequestQueue.removeAll(where: { $0 == request})
@@ -311,7 +310,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
311310
return
312311
}
313312
guard request.addJWTHeaderIsValid(identityModel: request.identityModel) else {
314-
pendRequestUntilAuthUpdated(request, externalId:request.identityModel.externalId)
313+
pendRequestUntilAuthUpdated(request, externalId: request.identityModel.externalId)
315314
return
316315
}
317316
guard request.prepareForExecution(newRecordsState: newRecordsState) else {
@@ -494,12 +493,12 @@ extension OSSubscriptionOperationExecutor: OSUserJwtConfigListener {
494493
print("❌ OSSubscriptionOperationExecutor onUserAuthChanged from \(String(describing: from)) to \(String(describing: to))")
495494
// ECM TODO If auth changed from false or unknown to true, process requests
496495
}
497-
496+
498497
func onJwtUpdated(externalId: String, token: String?) {
499498
print("❌ OSSubscriptionOperationExecutor onJwtUpdated for \(externalId) to \(String(describing: token))")
500499
reQueuePendingRequestsForExternalId(externalId: externalId)
501500
}
502-
501+
503502
private func reQueuePendingRequestsForExternalId(externalId: String) {
504503
self.dispatchQueue.async {
505504
guard let requests = self.pendingAuthRequests[externalId] else {

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSUserExecutor.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import OneSignalOSCore
3535
*/
3636
class OSUserExecutor {
3737
var userRequestQueue: [OSUserRequest] = []
38-
var pendingAuthRequests: [String: [OSUserRequest]] = [String:[OSUserRequest]]()
38+
var pendingAuthRequests: [String: [OSUserRequest]] = [String: [OSUserRequest]]()
3939
private let newRecordsState: OSNewRecordsState
4040
let jwtConfig: OSUserJwtConfig
4141

@@ -290,7 +290,7 @@ extension OSUserExecutor {
290290
appendToQueue(request)
291291
executePendingRequests()
292292
}
293-
293+
294294
func pendRequestUntilAuthUpdated(_ request: OSUserRequest, externalId: String?) {
295295
self.dispatchQueue.async {
296296
self.userRequestQueue.removeAll(where: { $0 == request})
@@ -318,9 +318,9 @@ extension OSUserExecutor {
318318
request.pushSubscriptionModel = pushSubscriptionModel
319319
request.updatePushSubscriptionModel(pushSubscriptionModel)
320320
}
321-
321+
322322
guard request.addJWTHeaderIsValid(identityModel: request.identityModel) else {
323-
pendRequestUntilAuthUpdated(request, externalId:request.identityModel.externalId)
323+
pendRequestUntilAuthUpdated(request, externalId: request.identityModel.externalId)
324324
return
325325
}
326326

@@ -372,7 +372,7 @@ extension OSUserExecutor {
372372
// A failed create user request would leave the SDK in a bad state
373373
// Don't remove the request from cache and pause the operation repo
374374
// We will retry this request on a new session
375-
375+
376376
// We can't do this anymore for 401s
377377
OneSignalUserManagerImpl.sharedInstance.operationRepo.paused = true
378378
request.sentToClient = false
@@ -382,10 +382,10 @@ extension OSUserExecutor {
382382
}
383383
}
384384
}
385-
385+
386386
func handleUnauthorizedError(externalId: String, error: NSError, request: OSUserRequest) {
387-
if (jwtConfig.isRequired ?? false) {
388-
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
387+
if jwtConfig.isRequired ?? false {
388+
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
389389
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId, error: error)
390390
}
391391
}
@@ -509,7 +509,7 @@ extension OSUserExecutor {
509509
// This will hydrate the OneSignal ID for any pending requests
510510
self.createUser(aliasLabel: request.aliasLabel, aliasId: request.aliasId, identityModel: request.identityModelToUpdate)
511511
}
512-
} else if responseType == .invalid || responseType == .unauthorized { //Identify User should never be called with identity verification on
512+
} else if responseType == .invalid || responseType == .unauthorized { // Identify User should never be called with identity verification on
513513
// Failed, no retry
514514
self.removeFromQueue(request)
515515
self.executePendingRequests()
@@ -734,7 +734,7 @@ extension OSUserExecutor: OSUserJwtConfigListener {
734734
reQueuePendingRequestsForExternalId(externalId: externalId)
735735
print("❌ OSUserExecutor onJwtUpdated for \(externalId) to \(String(describing: token))")
736736
}
737-
737+
738738
private func reQueuePendingRequestsForExternalId(externalId: String) {
739739
self.dispatchQueue.async {
740740
guard let requests = self.pendingAuthRequests[externalId] else {

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModelRepo.swift‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,9 @@ extension OSIdentityModelRepo: OSModelChangedHandler {
108108

109109
extension OSIdentityModelRepo: OSLoggable {
110110
func logSelf() {
111-
print(
112-
"""
113-
💛 OSIdentityModelRepo has the following models:
114-
models: \(self.models)
115-
"""
116-
)
111+
print("OSIdentityModelRepo has the following models: ")
112+
for model in models.values {
113+
print(" modelID: \(model.modelId), alises: \(model.aliases) token: \(model.jwtBearerToken ?? "nil")")
114+
}
117115
}
118116
}

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSJwtInvalidatedEvent.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
THE SOFTWARE.
2626
*/
2727

28-
2928
import Foundation
3029

3130
@objc public class OSJwtInvalidatedEvent: NSObject {

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ extension OneSignalUserManagerImpl {
671671
public func subscribeToJwtConfig(_ listener: OSUserJwtConfigListener, key: String) {
672672
jwtConfig.subscribe(listener, key: key)
673673
}
674-
674+
675675
@objc
676676
public func invalidateJwtForExternalId(externalId: String, error: NSError) {
677677
guard jwtConfig.isRequired == true else {
@@ -685,20 +685,19 @@ extension OneSignalUserManagerImpl {
685685

686686
fireJwtExpired(externalId: externalId)
687687
}
688-
689-
688+
690689
private func fireJwtExpired(externalId: String) {
691690
guard let jwtInvalidatedHandler = self.jwtInvalidatedHandler else {
692691
return
693692
}
694693
let invalidatedEvent = OSJwtInvalidatedEvent(externalId: externalId)
695-
694+
696695
jwtInvalidatedHandler(invalidatedEvent)
697696
}
698-
697+
699698
private func getMessageFromJwtError(_ error: NSError) -> String {
700-
if let returnedObject = error.userInfo["returned"] as? Dictionary<String, AnyObject> {
701-
if let errors = returnedObject["errors"] as? Array<Dictionary<String, AnyObject>> {
699+
if let returnedObject = error.userInfo["returned"] as? [String: AnyObject] {
700+
if let errors = returnedObject["errors"] as? [[String: AnyObject]] {
702701
return errors[0]["title"] as? String ?? error.localizedDescription
703702
}
704703
}

‎iOS_SDK/OneSignalSDK/OneSignalUserMocks/MockUserDefines.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ public let userB_ValidJwtToken = "fyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiO
1515
public let userA_email = "[email protected]"
1616

1717
public let userA_AliasLabel = "testAliasLabel"
18-
public let userA_Aliases = [userA_AliasLabel : "userAValue"]
19-
18+
public let userA_Aliases = [userA_AliasLabel: "userAValue"]

‎iOS_SDK/OneSignalSDK/OneSignalUserMocks/MockUserRequests.swift‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ public class MockUserRequests: NSObject {
5959
"properties": properties
6060
]
6161
}
62-
62+
6363
public static func testUnauthorizedailureError() -> NSError {
6464
let userInfo = ["returned": [
65-
"errors": [["title":"token has invalid claims: token is expired", "code":"auth-0"]],
66-
"httpStatusCode": 401,
65+
"errors": [["title": "token has invalid claims: token is expired", "code": "auth-0"]],
66+
"httpStatusCode": 401
6767
]]
6868
return NSError(domain: "not-important", code: 401, userInfo: userInfo)
6969
}
@@ -105,53 +105,53 @@ extension MockUserRequests {
105105
response: userResponse
106106
)
107107
}
108-
108+
109109
public static func setUnauthorizedCreateUserFailureResponses(with client: MockOneSignalClient, externalId: String) {
110110
let error = testUnauthorizedailureError()
111-
client.setMockFailureResponseForRequest(request:"<OSRequestCreateUser with external_id: \(externalId)>", error: error)
111+
client.setMockFailureResponseForRequest(request: "<OSRequestCreateUser with external_id: \(externalId)>", error: error)
112112
}
113-
113+
114114
public static func setUnauthorizedFetchUserFailureResponses(with client: MockOneSignalClient, onesignalId: String) {
115115
let error = testUnauthorizedailureError()
116-
client.setMockFailureResponseForRequest(request:"<OSRequestFetchUser with onesignal_id: \(onesignalId)>", error: error)
116+
client.setMockFailureResponseForRequest(request: "<OSRequestFetchUser with onesignal_id: \(onesignalId)>", error: error)
117117
}
118-
118+
119119
public static func setUnauthorizedUpdatePropertiesFailureResponses(with client: MockOneSignalClient, tags: [String: String]) {
120120
let error = testUnauthorizedailureError()
121-
121+
122122
let params: NSDictionary = [
123123
"properties": [
124124
"tags": tags
125125
],
126126
"refresh_device_metadata": false
127127
]
128-
129-
client.setMockFailureResponseForRequest(request:"<OSRequestUpdateProperties with parameters: \(params.toSortedString())>", error: error)
128+
129+
client.setMockFailureResponseForRequest(request: "<OSRequestUpdateProperties with parameters: \(params.toSortedString())>", error: error)
130130
}
131-
131+
132132
public static func setUnauthorizedAddEmailFailureResponse(with client: MockOneSignalClient, email: String) {
133133
let error = testUnauthorizedailureError()
134-
client.setMockFailureResponseForRequest(request:"<OSRequestCreateSubscription with token: \(email)>", error: error)
134+
client.setMockFailureResponseForRequest(request: "<OSRequestCreateSubscription with token: \(email)>", error: error)
135135
}
136-
136+
137137
public static func setUnauthorizedRemoveEmailFailureResponse(with client: MockOneSignalClient, email: String) {
138138
let error = testUnauthorizedailureError()
139-
client.setMockFailureResponseForRequest(request:"<OSRequestDeleteSubscription with subscriptionModel: \(email)>", error: error)
139+
client.setMockFailureResponseForRequest(request: "<OSRequestDeleteSubscription with subscriptionModel: \(email)>", error: error)
140140
}
141-
141+
142142
public static func setUnauthorizedUpdateSubscriptionFailureResponse(with client: MockOneSignalClient, token: String) {
143143
let error = testUnauthorizedailureError()
144-
client.setMockFailureResponseForRequest(request:"OSRequestUpdateSubscription with subscriptionObject: [\"token\": \"\(token)\"]", error: error)
144+
client.setMockFailureResponseForRequest(request: "OSRequestUpdateSubscription with subscriptionObject: [\"token\": \"\(token)\"]", error: error)
145145
}
146-
146+
147147
public static func setUnauthorizedAddAliasFailureResponse(with client: MockOneSignalClient, aliases: [String: String]) {
148148
let error = testUnauthorizedailureError()
149-
client.setMockFailureResponseForRequest(request:"<OSRequestAddAliases with aliases: \(aliases)>", error: error)
149+
client.setMockFailureResponseForRequest(request: "<OSRequestAddAliases with aliases: \(aliases)>", error: error)
150150
}
151-
151+
152152
public static func setUnauthorizedRemoveAliasFailureResponse(with client: MockOneSignalClient, aliasLabel: String) {
153153
let error = testUnauthorizedailureError()
154-
client.setMockFailureResponseForRequest(request:"OSRequestRemoveAlias with aliasLabel: \(aliasLabel)", error: error)
154+
client.setMockFailureResponseForRequest(request: "OSRequestRemoveAlias with aliasLabel: \(aliasLabel)", error: error)
155155
}
156156

157157
public static func setDefaultIdentifyUserResponses(with client: MockOneSignalClient, externalId: String, conflicted: Bool = false) {

0 commit comments

Comments
 (0)