Skip to content

Commit 47851fa

Browse files
Nightsd01Nightsd01
authored
Refactored REST Requests (#320)
* Refactored Networking Requests * Instead of having to manually build an HTTP request every time the app needs to make a request with the backend, this commit simplifies the process by encapsulating all of this code in a few classes. * Also fixes an issue with registerUser where location data was not being sent. The location data was being added to 'dataDic' after it got serialized into JSON data * Fixed broken test * Forgot to import appropriate headers breaking a test. * Added NSURLSession attachment download code * Closed the url_session branch since it is now obsolete * Removed old header method declarations * Due to the fact that we've switched to a new rest model, the old enqueueRequest:onSuccess... method is no longer needed and has been removed from the project * Also removed the overrider for this method from unit test shadows * PR Fixes, Adds correct copyright to header, fixes typos * Fixes some typos * Accesses OneSignalClient sharedClient using a property accessor instead of a method getter for cleaner syntax * Moves JSON parser method to OneSignalClient class for logical consistency * Removes unnecessary log statements
1 parent 5dabfb7 commit 47851fa

19 files changed

+1114
-510
lines changed

‎iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj‎

Lines changed: 55 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
4529DEDB1FA8284E00CEAB1D /* NSDataOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4529DEDA1FA8284E00CEAB1D /* NSDataOverrider.m */; };
2525
4529DEDE1FA828E500CEAB1D /* NSDateOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4529DEDD1FA828E500CEAB1D /* NSDateOverrider.m */; };
2626
4529DEE11FA82AB300CEAB1D /* NSBundleOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4529DEE01FA82AB300CEAB1D /* NSBundleOverrider.m */; };
27-
4529DEE41FA82C6200CEAB1D /* NSURLConnectionOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4529DEE31FA82C6200CEAB1D /* NSURLConnectionOverrider.m */; };
27+
4529DEE41FA82C6200CEAB1D /* NSURLSessionOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4529DEE31FA82C6200CEAB1D /* NSURLSessionOverrider.m */; };
2828
4529DEE71FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4529DEE61FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.m */; };
2929
4529DEEA1FA8360C00CEAB1D /* UIApplicationOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4529DEE91FA8360C00CEAB1D /* UIApplicationOverrider.m */; };
3030
4529DEED1FA83C5D00CEAB1D /* OneSignalHelperOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4529DEEC1FA83C5D00CEAB1D /* OneSignalHelperOverrider.m */; };
@@ -124,6 +124,18 @@
124124
91F58D8A1E7C9A240017D24D /* OneSignalNotificationSettingsIOS7.m in Sources */ = {isa = PBXBuildFile; fileRef = 91F58D881E7C9A240017D24D /* OneSignalNotificationSettingsIOS7.m */; };
125125
91F58D8B1E7C9A240017D24D /* OneSignalNotificationSettingsIOS7.m in Sources */ = {isa = PBXBuildFile; fileRef = 91F58D881E7C9A240017D24D /* OneSignalNotificationSettingsIOS7.m */; };
126126
91F60F7D1E80E4E400706E60 /* UncaughtExceptionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 91F60F7C1E80E4E400706E60 /* UncaughtExceptionHandler.m */; };
127+
CA08FC731FE99AFD004C445F /* OneSignalClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC721FE99AFD004C445F /* OneSignalClient.m */; };
128+
CA08FC741FE99AFF004C445F /* OneSignalClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC721FE99AFD004C445F /* OneSignalClient.m */; };
129+
CA08FC751FE99B00004C445F /* OneSignalClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC721FE99AFD004C445F /* OneSignalClient.m */; };
130+
CA08FC781FE99B13004C445F /* OneSignalRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = CA08FC761FE99B13004C445F /* OneSignalRequest.h */; };
131+
CA08FC791FE99B13004C445F /* OneSignalRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC771FE99B13004C445F /* OneSignalRequest.m */; };
132+
CA08FC7A1FE99B13004C445F /* OneSignalRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC771FE99B13004C445F /* OneSignalRequest.m */; };
133+
CA08FC7B1FE99B13004C445F /* OneSignalRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC771FE99B13004C445F /* OneSignalRequest.m */; };
134+
CA08FC7E1FE99B25004C445F /* Requests.h in Headers */ = {isa = PBXBuildFile; fileRef = CA08FC7C1FE99B25004C445F /* Requests.h */; };
135+
CA08FC7F1FE99B25004C445F /* Requests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC7D1FE99B25004C445F /* Requests.m */; };
136+
CA08FC801FE99B25004C445F /* Requests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC7D1FE99B25004C445F /* Requests.m */; };
137+
CA08FC811FE99B25004C445F /* Requests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC7D1FE99B25004C445F /* Requests.m */; };
138+
CA08FC871FE99BB4004C445F /* OneSignalClientOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = CA08FC831FE99BB4004C445F /* OneSignalClientOverrider.m */; };
127139
/* End PBXBuildFile section */
128140

129141
/* Begin PBXContainerItemProxy section */
@@ -172,8 +184,8 @@
172184
4529DEDD1FA828E500CEAB1D /* NSDateOverrider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NSDateOverrider.m; sourceTree = "<group>"; };
173185
4529DEDF1FA82AB300CEAB1D /* NSBundleOverrider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSBundleOverrider.h; sourceTree = "<group>"; };
174186
4529DEE01FA82AB300CEAB1D /* NSBundleOverrider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NSBundleOverrider.m; sourceTree = "<group>"; };
175-
4529DEE21FA82C6200CEAB1D /* NSURLConnectionOverrider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSURLConnectionOverrider.h; sourceTree = "<group>"; };
176-
4529DEE31FA82C6200CEAB1D /* NSURLConnectionOverrider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NSURLConnectionOverrider.m; sourceTree = "<group>"; };
187+
4529DEE21FA82C6200CEAB1D /* NSURLSessionOverrider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSURLSessionOverrider.h; sourceTree = "<group>"; };
188+
4529DEE31FA82C6200CEAB1D /* NSURLSessionOverrider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NSURLSessionOverrider.m; sourceTree = "<group>"; };
177189
4529DEE51FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UNUserNotificationCenterOverrider.h; sourceTree = "<group>"; };
178190
4529DEE61FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UNUserNotificationCenterOverrider.m; sourceTree = "<group>"; };
179191
4529DEE81FA8360C00CEAB1D /* UIApplicationOverrider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIApplicationOverrider.h; sourceTree = "<group>"; };
@@ -240,6 +252,14 @@
240252
91F58D881E7C9A240017D24D /* OneSignalNotificationSettingsIOS7.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OneSignalNotificationSettingsIOS7.m; sourceTree = "<group>"; };
241253
91F60F7B1E80E49A00706E60 /* UncaughtExceptionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UncaughtExceptionHandler.h; sourceTree = "<group>"; };
242254
91F60F7C1E80E4E400706E60 /* UncaughtExceptionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UncaughtExceptionHandler.m; sourceTree = "<group>"; };
255+
CA08FC711FE99AFD004C445F /* OneSignalClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalClient.h; sourceTree = "<group>"; };
256+
CA08FC721FE99AFD004C445F /* OneSignalClient.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalClient.m; sourceTree = "<group>"; };
257+
CA08FC761FE99B13004C445F /* OneSignalRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalRequest.h; sourceTree = "<group>"; };
258+
CA08FC771FE99B13004C445F /* OneSignalRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalRequest.m; sourceTree = "<group>"; };
259+
CA08FC7C1FE99B25004C445F /* Requests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Requests.h; sourceTree = "<group>"; };
260+
CA08FC7D1FE99B25004C445F /* Requests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Requests.m; sourceTree = "<group>"; };
261+
CA08FC821FE99BB4004C445F /* OneSignalClientOverrider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalClientOverrider.h; sourceTree = "<group>"; };
262+
CA08FC831FE99BB4004C445F /* OneSignalClientOverrider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalClientOverrider.m; sourceTree = "<group>"; };
243263
/* End PBXFileReference section */
244264

245265
/* Begin PBXFrameworksBuildPhase section */
@@ -279,6 +299,7 @@
279299
isa = PBXGroup;
280300
children = (
281301
912411EE1E73342200E41FD7 /* Source */,
302+
CA08FC701FE99AE6004C445F /* API */,
282303
911E2CBB1E398AB3003112A4 /* UnitTests */,
283304
37747F9519147D6500558FAD /* Frameworks */,
284305
3E2400391D4FFC31008BDE70 /* OneSignal-Dynamic */,
@@ -328,12 +349,14 @@
328349
4529DEEF1FA8433500CEAB1D /* NSLocaleOverrider.m */,
329350
4529DED01FA81EA800CEAB1D /* NSObjectOverrider.h */,
330351
4529DED11FA81EA800CEAB1D /* NSObjectOverrider.m */,
331-
4529DEE21FA82C6200CEAB1D /* NSURLConnectionOverrider.h */,
332-
4529DEE31FA82C6200CEAB1D /* NSURLConnectionOverrider.m */,
352+
4529DEE21FA82C6200CEAB1D /* NSURLSessionOverrider.h */,
353+
4529DEE31FA82C6200CEAB1D /* NSURLSessionOverrider.m */,
333354
4529DED61FA8253D00CEAB1D /* NSUserDefaultsOverrider.h */,
334355
4529DED71FA8253D00CEAB1D /* NSUserDefaultsOverrider.m */,
335356
4529DEEB1FA83C5D00CEAB1D /* OneSignalHelperOverrider.h */,
336357
4529DEEC1FA83C5D00CEAB1D /* OneSignalHelperOverrider.m */,
358+
CA08FC821FE99BB4004C445F /* OneSignalClientOverrider.h */,
359+
CA08FC831FE99BB4004C445F /* OneSignalClientOverrider.m */,
337360
03389F671FB548A0006537F0 /* OneSignalTrackFirebaseAnalyticsOverrider.h */,
338361
03389F681FB548A0006537F0 /* OneSignalTrackFirebaseAnalyticsOverrider.m */,
339362
4529DEF11FA8440A00CEAB1D /* UIAlertViewOverrider.h */,
@@ -459,6 +482,20 @@
459482
name = NotificationSettings;
460483
sourceTree = "<group>";
461484
};
485+
CA08FC701FE99AE6004C445F /* API */ = {
486+
isa = PBXGroup;
487+
children = (
488+
CA08FC711FE99AFD004C445F /* OneSignalClient.h */,
489+
CA08FC721FE99AFD004C445F /* OneSignalClient.m */,
490+
CA08FC761FE99B13004C445F /* OneSignalRequest.h */,
491+
CA08FC771FE99B13004C445F /* OneSignalRequest.m */,
492+
CA08FC7C1FE99B25004C445F /* Requests.h */,
493+
CA08FC7D1FE99B25004C445F /* Requests.m */,
494+
);
495+
name = API;
496+
path = Source;
497+
sourceTree = "<group>";
498+
};
462499
/* End PBXGroup section */
463500

464501
/* Begin PBXHeadersBuildPhase section */
@@ -467,11 +504,13 @@
467504
buildActionMask = 2147483647;
468505
files = (
469506
9124124B1E7337A800E41FD7 /* OneSignal.h in Headers */,
507+
CA08FC781FE99B13004C445F /* OneSignalRequest.h in Headers */,
470508
912412211E73342200E41FD7 /* OneSignalLocation.h in Headers */,
471509
912412291E73342200E41FD7 /* OneSignalReachability.h in Headers */,
472510
912412251E73342200E41FD7 /* OneSignalMobileProvision.h in Headers */,
473511
91F58D7A1E7C7D3F0017D24D /* OneSignalNotificationSettings.h in Headers */,
474512
91F58D811E7C80C30017D24D /* OneSignalNotificationSettingsIOS8.h in Headers */,
513+
CA08FC7E1FE99B25004C445F /* Requests.h in Headers */,
475514
912412411E73342200E41FD7 /* UNUserNotificationCenter+OneSignal.h in Headers */,
476515
91B6EA451E86555200B5CF01 /* OSObservable.h in Headers */,
477516
912412351E73342200E41FD7 /* OneSignalTrackIAP.h in Headers */,
@@ -629,8 +668,10 @@
629668
buildActionMask = 2147483647;
630669
files = (
631670
9124120E1E73342200E41FD7 /* OneSignal.m in Sources */,
671+
CA08FC731FE99AFD004C445F /* OneSignalClient.m in Sources */,
632672
91F58D831E7C80DA0017D24D /* OneSignalNotificationSettingsIOS8.m in Sources */,
633673
9124121E1E73342200E41FD7 /* OneSignalJailbreakDetection.m in Sources */,
674+
CA08FC791FE99B13004C445F /* OneSignalRequest.m in Sources */,
634675
912412471E73369600E41FD7 /* OneSignalHelper.m in Sources */,
635676
9124122E1E73342200E41FD7 /* OneSignalSelectorHelpers.m in Sources */,
636677
9124122A1E73342200E41FD7 /* OneSignalReachability.m in Sources */,
@@ -652,6 +693,7 @@
652693
454F94F51FAD2E5A00D74CCF /* OSNotificationPayload.m in Sources */,
653694
9129C6BE1E89E7AB009CB6A0 /* OSSubscription.m in Sources */,
654695
912412361E73342200E41FD7 /* OneSignalTrackIAP.m in Sources */,
696+
CA08FC7F1FE99B25004C445F /* Requests.m in Sources */,
655697
);
656698
runOnlyForDeploymentPostprocessing = 0;
657699
};
@@ -660,8 +702,10 @@
660702
buildActionMask = 2147483647;
661703
files = (
662704
9124120F1E73342200E41FD7 /* OneSignal.m in Sources */,
705+
CA08FC741FE99AFF004C445F /* OneSignalClient.m in Sources */,
663706
91F58D861E7C88250017D24D /* OneSignalNotificationSettingsIOS8.m in Sources */,
664707
9124121F1E73342200E41FD7 /* OneSignalJailbreakDetection.m in Sources */,
708+
CA08FC7A1FE99B13004C445F /* OneSignalRequest.m in Sources */,
665709
912412481E73369700E41FD7 /* OneSignalHelper.m in Sources */,
666710
9124122F1E73342200E41FD7 /* OneSignalSelectorHelpers.m in Sources */,
667711
9124122B1E73342200E41FD7 /* OneSignalReachability.m in Sources */,
@@ -683,6 +727,7 @@
683727
1AF75EB01E8569720097B315 /* NSString+OneSignal.m in Sources */,
684728
9129C6BF1E89E7AB009CB6A0 /* OSSubscription.m in Sources */,
685729
912412371E73342200E41FD7 /* OneSignalTrackIAP.m in Sources */,
730+
CA08FC801FE99B25004C445F /* Requests.m in Sources */,
686731
);
687732
runOnlyForDeploymentPostprocessing = 0;
688733
};
@@ -701,17 +746,20 @@
701746
91F58D851E7C88230017D24D /* OneSignalNotificationSettingsIOS10.m in Sources */,
702747
912412241E73342200E41FD7 /* OneSignalLocation.m in Sources */,
703748
912412491E73369800E41FD7 /* OneSignalHelper.m in Sources */,
704-
4529DEE41FA82C6200CEAB1D /* NSURLConnectionOverrider.m in Sources */,
749+
4529DEE41FA82C6200CEAB1D /* NSURLSessionOverrider.m in Sources */,
705750
4529DED21FA81EA800CEAB1D /* NSObjectOverrider.m in Sources */,
706751
912412341E73342200E41FD7 /* OneSignalTracker.m in Sources */,
707752
912412101E73342200E41FD7 /* OneSignal.m in Sources */,
708753
9124122C1E73342200E41FD7 /* OneSignalReachability.m in Sources */,
709754
03389F691FB548A0006537F0 /* OneSignalTrackFirebaseAnalyticsOverrider.m in Sources */,
755+
CA08FC811FE99B25004C445F /* Requests.m in Sources */,
756+
CA08FC7B1FE99B13004C445F /* OneSignalRequest.m in Sources */,
710757
4529DED51FA823B900CEAB1D /* TestHelperFunctions.m in Sources */,
711758
911E2CBD1E398AB3003112A4 /* UnitTests.m in Sources */,
712759
91B6EA431E85D38F00B5CF01 /* OSObservable.m in Sources */,
713760
9124121C1E73342200E41FD7 /* OneSignalHTTPClient.m in Sources */,
714761
4529DEDE1FA828E500CEAB1D /* NSDateOverrider.m in Sources */,
762+
CA08FC871FE99BB4004C445F /* OneSignalClientOverrider.m in Sources */,
715763
912412401E73342200E41FD7 /* UIApplicationDelegate+OneSignal.m in Sources */,
716764
1AF75EAF1E8569710097B315 /* NSString+OneSignal.m in Sources */,
717765
4529DEE71FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.m in Sources */,
@@ -725,6 +773,7 @@
725773
912412441E73342200E41FD7 /* UNUserNotificationCenter+OneSignal.m in Sources */,
726774
9124123C1E73342200E41FD7 /* OneSignalWebView.m in Sources */,
727775
4529DEF01FA8433500CEAB1D /* NSLocaleOverrider.m in Sources */,
776+
CA08FC751FE99B00004C445F /* OneSignalClient.m in Sources */,
728777
9129C6BA1E89E59B009CB6A0 /* OSPermission.m in Sources */,
729778
91F58D871E7C88250017D24D /* OneSignalNotificationSettingsIOS8.m in Sources */,
730779
);

0 commit comments

Comments
 (0)