Access the shared client via OneSignalCore

nan-li · nan-li · commit a7e495821f91 · 2024-02-13T09:54:17.000-08:00
- Change all `OneSignalClient.sharedClient` calls to `OneSignalCore.sharedClient`
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
@@ -97,7 +97,7 @@ - (void)sendReceiveReceiptWithPlayerId:(nonnull NSString *)playerId
     dispatch_time_t dispatchTime = dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC);
     dispatch_after(dispatchTime, dispatch_get_main_queue(), ^{
         [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal sendReceiveReceiptWithPlayerId now sending confirmed delievery after: %i second delay", delay]];
-        [OneSignalClient.sharedClient executeRequest:request onSuccess:^(NSDictionary *result) {
+        [OneSignalCore.sharedClient executeRequest:request onSuccess:^(NSDictionary *result) {
             if (success) {
                 success(result);
             }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m
@@ -46,13 +46,13 @@ - (void)loadMessageHTMLContentWithResult:(OSResultSuccessBlock _Nullable)success
     
     let request = [OSRequestLoadInAppMessageContent withAppId:[OneSignalConfigManager getAppId] withMessageId:self.messageId withVariantId:variantId];
     
-    [OneSignalClient.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
+    [OneSignalCore.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
 }
 
 - (void)loadPreviewMessageHTMLContentWithUUID:(NSString * _Nonnull)previewUUID success:(OSResultSuccessBlock _Nullable)successBlock failure:(OSFailureBlock _Nullable)failureBlock {
     let request = [OSRequestLoadInAppMessagePreviewContent withAppId:[OneSignalConfigManager getAppId] previewUUID:previewUUID];
     
-    [OneSignalClient.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
+    [OneSignalCore.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
 }
 
 /**
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m
@@ -245,7 +245,7 @@ - (void)getInAppMessagesFromServer:(NSString *)subscriptionId {
     }
     
     OSRequestGetInAppMessages *request = [OSRequestGetInAppMessages withSubscriptionId:subscriptionId];
-    [OneSignalClient.sharedClient executeRequest:request onSuccess:^(NSDictionary *result) {
+    [OneSignalCore.sharedClient executeRequest:request onSuccess:^(NSDictionary *result) {
         dispatch_async(dispatch_get_main_queue(), ^{
             [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"getInAppMessagesFromServer success"];
             if (result[@"in_app_messages"]) { // when there are no IAMs, will this still be there?
@@ -510,7 +510,7 @@ - (void)messageViewPageImpressionRequest:(OSInAppMessageInternal *)message withP
                                                          withPageId:pageId
                                                        forVariantId:message.variantId];
 
-    [OneSignalClient.sharedClient executeRequest:metricsRequest
+    [OneSignalCore.sharedClient executeRequest:metricsRequest
                                        onSuccess:^(NSDictionary *result) {
         NSString *successMessage = [NSString stringWithFormat:@"In App Message with message id: %@ and page id: %@, successful POST page impression update with result: %@", message.messageId, pageId, result];
                                            [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:successMessage];
@@ -549,7 +549,7 @@ - (void)messageViewImpressionRequest:(OSInAppMessageInternal *)message {
                                                   withMessageId:message.messageId
                                                    forVariantId:message.variantId];
     
-    [OneSignalClient.sharedClient executeRequest:metricsRequest
+    [OneSignalCore.sharedClient executeRequest:metricsRequest
                                        onSuccess:^(NSDictionary *result) {
                                            NSString *successMessage = [NSString stringWithFormat:@"In App Message with id: %@, successful POST impression update with result: %@", message.messageId, result];
                                            [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:successMessage];
@@ -951,7 +951,7 @@ - (void)sendClickRESTCall:(OSInAppMessageInternal *)message withAction:(OSInAppM
                                                     forVariantId:message.variantId
                                                       withAction:action];
 
-   [OneSignalClient.sharedClient executeRequest:metricsRequest
+   [OneSignalCore.sharedClient executeRequest:metricsRequest
                                       onSuccess:^(NSDictionary *result) {
                                           NSString *successMessage = [NSString stringWithFormat:@"In App Message with id: %@, successful POST click update for click id: %@, with result: %@", message.messageId, action.clickId,  result];
                                           [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:successMessage];
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
@@ -716,7 +716,7 @@ + (void)submitNotificationOpened:(NSString*)messageId {
     NSString* lastMessageId = [standardUserDefaults getSavedStringForKey:OSUD_LAST_MESSAGE_OPENED defaultValue:nil];
     //Only submit request if messageId not nil and: (lastMessage is nil or not equal to current one)
     if(messageId && (!lastMessageId || ![lastMessageId isEqualToString:messageId])) {
-        [OneSignalClient.sharedClient executeRequest:[OSRequestSubmitNotificationOpened withUserId:[self pushSubscriptionId]
+        [OneSignalCore.sharedClient executeRequest:[OSRequestSubmitNotificationOpened withUserId:[self pushSubscriptionId]
                                                                                              appId:[OneSignalConfigManager getAppId]
                                                                                          wasOpened:YES
                                                                                          messageId:messageId
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Controller/V1/OSOutcomeEventsV1Repository.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Controller/V1/OSOutcomeEventsV1Repository.m
@@ -65,7 +65,7 @@ - (void)requestMeasureOutcomeEventWithAppId:(NSString *)appId
             return;
     }
 
-    [OneSignalClient.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
+    [OneSignalCore.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
 }
 
 @end
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Controller/V2/OSOutcomeEventsV2Repository.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Controller/V2/OSOutcomeEventsV2Repository.m
@@ -43,7 +43,7 @@ - (void)requestMeasureOutcomeEventWithAppId:(NSString *)appId
                                                                  appId:appId
                                                             deviceType:deviceType];
 
-    [OneSignalClient.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
+    [OneSignalCore.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
 }
 
 @end
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OneSignalOutcomeEventsController.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OneSignalOutcomeEventsController.m
@@ -111,7 +111,7 @@ - (void)sendSessionEndOutcomes:(NSNumber * _Nonnull)timeElapsed
                influenceParams:(NSArray<OSFocusInfluenceParam *> * _Nonnull)influenceParams
                      onSuccess:(OSResultSuccessBlock _Nonnull)successBlock
                      onFailure:(OSFailureBlock _Nonnull)failureBlock {
-    [OneSignalClient.sharedClient executeRequest:[OSRequestSendSessionEndOutcomes
+    [OneSignalCore.sharedClient executeRequest:[OSRequestSendSessionEndOutcomes
                                                   withActiveTime:timeElapsed
                                                   appId:appId
                                                   pushSubscriptionId:pushSubscriptionId
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSIdentityOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSIdentityOperationExecutor.swift
@@ -179,7 +179,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
             OSBackgroundTaskManager.beginBackgroundTask(backgroundTaskIdentifier)
         }
 
-        OneSignalClient.shared().execute(request) { _ in
+        OneSignalCore.sharedClient().execute(request) { _ in
             // No hydration from response
             // On success, remove request from cache
             self.addRequestQueue.removeAll(where: { $0 == request})
@@ -234,7 +234,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
             OSBackgroundTaskManager.beginBackgroundTask(backgroundTaskIdentifier)
         }
 
-        OneSignalClient.shared().execute(request) { _ in
+        OneSignalCore.sharedClient().execute(request) { _ in
             // There is nothing to hydrate
             // On success, remove request from cache
             self.removeRequestQueue.removeAll(where: { $0 == request})
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSPropertyOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSPropertyOperationExecutor.swift
@@ -138,7 +138,7 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
             OSBackgroundTaskManager.beginBackgroundTask(backgroundTaskIdentifier)
         }
 
-        OneSignalClient.shared().execute(request) { _ in
+        OneSignalCore.sharedClient().execute(request) { _ in
             // On success, remove request from cache, and we do need to hydrate
             // TODO: We need to hydrate after all ? What why ?
             self.updateRequestQueue.removeAll(where: { $0 == request})
@@ -191,7 +191,7 @@ extension OSPropertyOperationExecutor {
 
         if sendImmediately {
             // Bypass the request queues
-            OneSignalClient.shared().execute(request) { _ in
+            OneSignalCore.sharedClient().execute(request) { _ in
                 if let onSuccess = onSuccess {
                     onSuccess()
                 }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSSubscriptionOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSSubscriptionOperationExecutor.swift
@@ -246,7 +246,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
         }
 
         OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSSubscriptionOperationExecutor: executeCreateSubscriptionRequest making request: \(request)")
-        OneSignalClient.shared().execute(request) { result in
+        OneSignalCore.sharedClient().execute(request) { result in
             // On success, remove request from cache (even if not hydrating model), and hydrate model
             self.addRequestQueue.removeAll(where: { $0 == request})
             OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_ADD_REQUEST_QUEUE_KEY, withValue: self.addRequestQueue)
@@ -308,7 +308,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
 
         // This request can be executed as-is.
         OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSSubscriptionOperationExecutor: executeDeleteSubscriptionRequest making request: \(request)")
-        OneSignalClient.shared().execute(request) { _ in
+        OneSignalCore.sharedClient().execute(request) { _ in
             // On success, remove request from cache. No model hydration occurs.
             // For example, if app restarts and we read in operations between sending this off and getting the response
             self.removeRequestQueue.removeAll(where: { $0 == request})
@@ -347,7 +347,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
             OSBackgroundTaskManager.beginBackgroundTask(backgroundTaskIdentifier)
         }
 
-        OneSignalClient.shared().execute(request) { _ in
+        OneSignalCore.sharedClient().execute(request) { _ in
             // On success, remove request from cache. No model hydration occurs.
             // For example, if app restarts and we read in operations between sending this off and getting the response
             self.updateRequestQueue.removeAll(where: { $0 == request})
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSUserExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSUserExecutor.swift
@@ -206,7 +206,7 @@ class OSUserExecutor {
             request.updatePushSubscriptionModel(pushSubscriptionModel)
         }
 
-        OneSignalClient.shared().execute(request) { response in
+        OneSignalCore.sharedClient().execute(request) { response in
             removeFromQueue(request)
 
             // TODO: Differentiate if we need to fetch the user based on response code of 200, 201, 202
@@ -263,7 +263,7 @@ class OSUserExecutor {
         }
         request.sentToClient = true
 
-        OneSignalClient.shared().execute(request) { response in
+        OneSignalCore.sharedClient().execute(request) { response in
             removeFromQueue(request)
 
             if let identityObject = parseIdentityObjectResponse(response),
@@ -316,7 +316,7 @@ class OSUserExecutor {
         }
         request.sentToClient = true
 
-        OneSignalClient.shared().execute(request) { _ in
+        OneSignalCore.sharedClient().execute(request) { _ in
             removeFromQueue(request)
 
             // the anonymous user has been identified, still need to Fetch User as we cleared local data
@@ -386,7 +386,7 @@ class OSUserExecutor {
             return
         }
         request.sentToClient = true
-        OneSignalClient.shared().execute(request) { _ in
+        OneSignalCore.sharedClient().execute(request) { _ in
             removeFromQueue(request)
 
             // TODO: ... hydrate with returned identity object?
@@ -422,7 +422,7 @@ class OSUserExecutor {
             return
         }
         request.sentToClient = true
-        OneSignalClient.shared().execute(request) { response in
+        OneSignalCore.sharedClient().execute(request) { response in
             removeFromQueue(request)
 
             if let response = response {
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignal.m b/iOS_SDK/OneSignalSDK/Source/OneSignal.m
@@ -601,7 +601,7 @@ + (void)downloadIOSParamsWithAppId:(NSString *)appId {
     // NSString *userId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId;
     NSString *userId = nil;
 
-    [OneSignalClient.sharedClient executeRequest:[OSRequestGetIosParams withUserId:userId appId:appId] onSuccess:^(NSDictionary *result) {
+    [OneSignalCore.sharedClient executeRequest:[OSRequestGetIosParams withUserId:userId appId:appId] onSuccess:^(NSDictionary *result) {
 
         if (result[IOS_REQUIRES_USER_ID_AUTHENTICATION]) {
             OneSignalUserManagerImpl.sharedInstance.requiresUserAuth = [result[IOS_REQUIRES_USER_ID_AUTHENTICATION] boolValue];
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalLiveActivityController.m b/iOS_SDK/OneSignalSDK/Source/OneSignalLiveActivityController.m
@@ -126,7 +126,7 @@ + (void)enterLiveActivity:(NSString * _Nonnull)activityId appId:(NSString *)appI
     }
 
     if(subscriptionId) {
-        [OneSignalClient.sharedClient executeRequest:[OSRequestLiveActivityEnter withSubscriptionId:subscriptionId appId:appId activityId:activityId token:token]
+        [OneSignalCore.sharedClient executeRequest:[OSRequestLiveActivityEnter withSubscriptionId:subscriptionId appId:appId activityId:activityId token:token]
                                            onSuccess:^(NSDictionary *result) {
             [self callSuccessBlockOnMainThread:successBlock withResult:result];
         } onFailure:^(NSError *error) {
@@ -169,7 +169,7 @@ + (void)exitLiveActivity:(NSString * _Nonnull)activityId appId:(NSString *)appId
     }
     
     if(subscriptionId) {
-        [OneSignalClient.sharedClient executeRequest:[OSRequestLiveActivityExit withSubscriptionId:subscriptionId appId:appId activityId:activityId]
+        [OneSignalCore.sharedClient executeRequest:[OSRequestLiveActivityExit withSubscriptionId:subscriptionId appId:appId activityId:activityId]
                                            onSuccess:^(NSDictionary *result) {
             [self callSuccessBlockOnMainThread:successBlock withResult:result];
         } onFailure:^(NSError *error) {
@@ -221,7 +221,7 @@ + (void)executePendingLiveActivityUpdates {
     OSPendingLiveActivityUpdate * updateToProcess = [pendingLiveActivityUpdates objectAtIndex:0];
     [pendingLiveActivityUpdates removeObjectAtIndex: 0];
     if (updateToProcess.isEnter) {
-        [OneSignalClient.sharedClient executeRequest:[OSRequestLiveActivityEnter withSubscriptionId:subscriptionId appId:updateToProcess.appId activityId:updateToProcess.activityId token:updateToProcess.token]
+        [OneSignalCore.sharedClient executeRequest:[OSRequestLiveActivityEnter withSubscriptionId:subscriptionId appId:updateToProcess.appId activityId:updateToProcess.activityId token:updateToProcess.token]
                                            onSuccess:^(NSDictionary *result) {
             [self callSuccessBlockOnMainThread:updateToProcess.successBlock withResult:result];
             [self executePendingLiveActivityUpdates];
@@ -230,7 +230,7 @@ + (void)executePendingLiveActivityUpdates {
             [self executePendingLiveActivityUpdates];
         }];
     } else {
-        [OneSignalClient.sharedClient executeRequest:[OSRequestLiveActivityExit withSubscriptionId:subscriptionId appId:updateToProcess.appId activityId:updateToProcess.activityId]
+        [OneSignalCore.sharedClient executeRequest:[OSRequestLiveActivityExit withSubscriptionId:subscriptionId appId:updateToProcess.appId activityId:updateToProcess.activityId]
                                            onSuccess:^(NSDictionary *result) {
             [self callSuccessBlockOnMainThread:updateToProcess.successBlock withResult:result];
             [self executePendingLiveActivityUpdates];
diff --git a/iOS_SDK/OneSignalSDK/UnitTests/EmailTests.m b/iOS_SDK/OneSignalSDK/UnitTests/EmailTests.m
@@ -277,7 +277,7 @@ of this software and associated documentation files (the "Software"), to deal
 //    
 //    expectation.expectedFulfillmentCount = 1;
 //    
-//    [OneSignalClient.sharedClient executeSimultaneousRequests:@{@"first" : first, @"second" : second} withSuccess:^(NSDictionary<NSString *,NSDictionary *> *results) {
+//    [OneSignalCore.sharedClient executeSimultaneousRequests:@{@"first" : first, @"second" : second} withSuccess:^(NSDictionary<NSString *,NSDictionary *> *results) {
 //        [expectation fulfill];
 //    } onFailure:^(NSDictionary<NSString *,NSError *> *errors) {
 //        XCTFail("Failed with error: %@", errors);
diff --git a/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OneSignalClientOverrider.m b/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OneSignalClientOverrider.m
@@ -145,7 +145,7 @@
 //    __block NSMutableDictionary<NSString *, NSDictionary *> *results = [NSMutableDictionary new];
 //
 //    for (NSString *key in requests.allKeys) {
-//        [OneSignalClient.sharedClient executeRequest:requests[key] onSuccess:^(NSDictionary *result) {
+//        [OneSignalCore.sharedClient executeRequest:requests[key] onSuccess:^(NSDictionary *result) {
 //            results[key] = result;
 //            dispatch_semaphore_signal(semaphore);
 //        } onFailure:^(NSError *error) {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ - (void)sendReceiveReceiptWithPlayerId:(nonnull NSString *)playerId`
`97`	`97`	`dispatch_time_t dispatchTime = dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC);`
`98`	`98`	`dispatch_after(dispatchTime, dispatch_get_main_queue(), ^{`
`99`	`99`	`[OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal sendReceiveReceiptWithPlayerId now sending confirmed delievery after: %i second delay", delay]];`
`100`		`- [OneSignalClient.sharedClient executeRequest:request onSuccess:^(NSDictionary *result) {`
	`100`	`+ [OneSignalCore.sharedClient executeRequest:request onSuccess:^(NSDictionary *result) {`
`101`	`101`	`if (success) {`
`102`	`102`	`success(result);`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,13 @@ - (void)loadMessageHTMLContentWithResult:(OSResultSuccessBlock _Nullable)success`
`46`	`46`
`47`	`47`	`let request = [OSRequestLoadInAppMessageContent withAppId:[OneSignalConfigManager getAppId] withMessageId:self.messageId withVariantId:variantId];`
`48`	`48`
`49`		`- [OneSignalClient.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
	`49`	`+ [OneSignalCore.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`- (void)loadPreviewMessageHTMLContentWithUUID:(NSString * _Nonnull)previewUUID success:(OSResultSuccessBlock _Nullable)successBlock failure:(OSFailureBlock _Nullable)failureBlock {`
`53`	`53`	`let request = [OSRequestLoadInAppMessagePreviewContent withAppId:[OneSignalConfigManager getAppId] previewUUID:previewUUID];`
`54`	`54`
`55`		`- [OneSignalClient.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
	`55`	`+ [OneSignalCore.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ - (void)requestMeasureOutcomeEventWithAppId:(NSString *)appId`
`65`	`65`	`return;`
`66`	`66`	`}`
`67`	`67`
`68`		`- [OneSignalClient.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
	`68`	`+ [OneSignalCore.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ - (void)requestMeasureOutcomeEventWithAppId:(NSString *)appId`
`43`	`43`	`appId:appId`
`44`	`44`	`deviceType:deviceType];`
`45`	`45`
`46`		`- [OneSignalClient.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
	`46`	`+ [OneSignalCore.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@end`