App_id in url check

Author: fhboswell

iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.m

@@ -72,10 +72,6 @@ + (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId {
 
     return request;
 }
-
--(BOOL)missingAppId {
-    return false; //this request doesn't have an app ID parameter
-}
 @end
 
 @implementation OSRequestSendTagsToServer

iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalRequest.m

@@ -91,7 +91,13 @@ -(NSMutableURLRequest *)urlRequest {
 }
 
 -(BOOL)missingAppId {
-    return self.parameters[@"app_id"] == nil || [self.parameters[@"app_id"] length] == 0;
+  if ([self.path containsString:@"apps/"]) {
+    NSArray *pathComponents = [self.path componentsSeparatedByString:@"/"];
+    NSUInteger x = [pathComponents indexOfObject:@"apps"] + 1; // Find the index that follows "apps" in the path
+    return ([pathComponents count] <= x || [[pathComponents objectAtIndex:x] length] == 0 || [[pathComponents objectAtIndex:x] isEqual: @"(null)"]);
+  }
+   
+  return (self.parameters[@"app_id"] == nil || [self.parameters[@"app_id"] length] == 0);
 }
 
 -(void)attachBodyToRequest:(NSMutableURLRequest *)request withParameters:(NSDictionary *)parameters {

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserInternalImpl.swift

@@ -75,7 +75,6 @@ class OSUserInternalImpl: NSObject, OSUserInternal {
         pushSubscriptionModel = OSSubscriptionModel(type: .push, address: token, subscriptionId: subscriptionId, accepted: true, isDisabled: false, changeNotifier: OSEventProducer())
         print("🔥 OSUserInternalImpl has set pushSubcription for testing")
         return pushSubscriptionModel
-        
     }
 
     init(identityModel: OSIdentityModel, propertiesModel: OSPropertiesModel, pushSubscriptionModel: OSSubscriptionModel) {

iOS_SDK/OneSignalSDK/UnitTests/Shadows/OneSignalClientOverrider.m

@@ -214,8 +214,15 @@ + (void)finishExecutingRequest:(OneSignalRequest *)request onSuccess:(OSResultSu
 
         NSMutableDictionary *parameters = [request.parameters mutableCopy];
 
-        if (!parameters[@"app_id"] && ![request.urlRequest.URL.absoluteString containsString:@"/apps/"])
-            _XCTPrimitiveFail(currentTestInstance, @"All request should include an app_id");
+        if ([request.urlRequest.URL.absoluteString containsString:@"apps/"]) {
+          NSArray *pathComponents = [request.urlRequest.URL.absoluteString componentsSeparatedByString:@"/"];
+          NSUInteger x = [pathComponents indexOfObject:@"apps"] + 1; // Find the index that follows "apps" in the path
+            if ([pathComponents count] <= x || [[pathComponents objectAtIndex:x] length] == 0 || [[pathComponents objectAtIndex:x] isEqual: @"(null)"]) {
+                _XCTPrimitiveFail(currentTestInstance, @"All request must include an app_id");
+            }
+        } else if (!parameters[@"app_id"]) {
+            _XCTPrimitiveFail(currentTestInstance, @"All request must include an app_id");
+        }
 
         [self didCompleteRequest:request];