From 685b939a74feddc60c64fbe59c4ce097912a33b0 Mon Sep 17 00:00:00 2001 From: Riley Date: Mon, 27 Jan 2025 10:56:55 -0700 Subject: [PATCH 1/3] Remove userLogout AILTN event --- .../SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m index 250770b376..4bf83b1691 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m @@ -254,7 +254,6 @@ - (void)send:(SFRestRequest *)request requestDelegate:(id NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init]; attributes[@"errorCode"] = [NSNumber numberWithInteger:error.code]; attributes[@"errorDescription"] = error.localizedDescription; - [SFSDKEventBuilderHelper createAndStoreEvent:@"userLogout" userAccount:nil className:NSStringFromClass([strongSelf class]) attributes:attributes]; [[SFUserAccountManager sharedInstance] logout:SFLogoutReasonUnexpected]; }]; } else { @@ -494,7 +493,6 @@ - (void)createAndStoreLogoutEvent:(NSError *)error user:(SFUserAccount*)user { NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init]; attributes[@"errorCode"] = [NSNumber numberWithInteger:error.code]; attributes[@"errorDescription"] = error.localizedDescription; - [SFSDKEventBuilderHelper createAndStoreEvent:@"userLogout" userAccount:user className:NSStringFromClass([self class]) attributes:attributes]; } #pragma mark - SFRestRequest factory methods From c23149d56b4f6b514ab6705185f625cdd27c3ae5 Mon Sep 17 00:00:00 2001 From: Riley Date: Tue, 28 Jan 2025 11:12:30 -0700 Subject: [PATCH 2/3] remove no longer needed containing method --- .../SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m index 4bf83b1691..5c5e5f86e8 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m @@ -446,7 +446,6 @@ - (void)replayRequest:(SFRestRequest *)request response:(NSURLResponse *)respons // Make sure we call logout on the main thread. dispatch_async(dispatch_get_main_queue(), ^{ - [strongSelf createAndStoreLogoutEvent:refreshError user:strongSelf.user]; [[SFUserAccountManager sharedInstance] logoutUser:strongSelf.user reason:SFLogoutReasonTokenExpired]; }); } @@ -489,12 +488,6 @@ - (void)notifyDelegateOfFailure:(id)delegate request:(SFR [self removeActiveRequestObject:request]; } -- (void)createAndStoreLogoutEvent:(NSError *)error user:(SFUserAccount*)user { - NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init]; - attributes[@"errorCode"] = [NSNumber numberWithInteger:error.code]; - attributes[@"errorDescription"] = error.localizedDescription; -} - #pragma mark - SFRestRequest factory methods - (SFRestRequest *)requestForUserInfo { From 4a90a3b6f2df600b0b358eaf2b6f0faee7c2ca6a Mon Sep 17 00:00:00 2001 From: Riley Date: Tue, 28 Jan 2025 13:30:39 -0700 Subject: [PATCH 3/3] Remove unneeded attributes --- .../SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m index 5c5e5f86e8..b9d7a1ad9d 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m @@ -251,9 +251,6 @@ - (void)send:(SFRestRequest *)request requestDelegate:(id } failure:^(SFOAuthInfo *authInfo, NSError *error) { __strong typeof(weakSelf) strongSelf = weakSelf; [SFSDKCoreLogger e:[strongSelf class] format:@"Authentication failed in SFRestAPI: %@. Logging out.", error]; - NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init]; - attributes[@"errorCode"] = [NSNumber numberWithInteger:error.code]; - attributes[@"errorDescription"] = error.localizedDescription; [[SFUserAccountManager sharedInstance] logout:SFLogoutReasonUnexpected]; }]; } else {