Revert "[ios, macos] Include SKU token for offline requests (#16130)" (…

…#16191) * Revert "[ios, macos] Include SKU token for offline requests (#16130) (#16133)" This reverts commit d85ce77. * [ios] Keep skipping docs for ios-release
mapbox · Feb 11, 2020 · 44a350b · 44a350b
1 parent 541a8ec
commit 44a350b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm
@@ -207,9 +207,10 @@ BOOL isValidMapboxEndpoint(NSURL *url) {
 
         if (resource.usage == Resource::Usage::Offline) {
             [queryItems addObject:[NSURLQueryItem queryItemWithName:@"offline" value:@"true"]];
+        } else {
+            // Only add SKU token to requests not tagged as "offline" usage.
+            [queryItems addObject:[NSURLQueryItem queryItemWithName:@"sku" value:MGLNativeNetworkManager.sharedManager.skuToken]];
         }
-
-        [queryItems addObject:[NSURLQueryItem queryItemWithName:@"sku" value:MGLNativeNetworkManager.sharedManager.skuToken]];
 
         if (components.queryItems) {
             [queryItems addObjectsFromArray:components.queryItems];

diff --git a/platform/darwin/test/MGLResourceTests.mm b/platform/darwin/test/MGLResourceTests.mm
@@ -60,12 +60,13 @@ - (void)testOfflineQueryParameterIsAddedForOfflineResource {
         for (NSURLQueryItem *item in components.queryItems) {
             if (([item.name isEqualToString:@"offline"] && [item.value isEqualToString:@"true"]) ||
                 ([item.name isEqualToString:@"a"] && [item.value isEqualToString:@"one"]) ||
-                ([item.name isEqualToString:@"b"] && [item.value isEqualToString:@"two"]) || [item.name isEqualToString:@"sku"]) {
+                ([item.name isEqualToString:@"b"] && [item.value isEqualToString:@"two"])) {
                 foundCount++;
             }
+            XCTAssertFalse([item.name isEqualToString:@"sku"]);
         }
 
-        XCTAssert(foundCount == 4);
+        XCTAssert(foundCount == 3);
 #else
         // NOTE: Currently the macOS SDK does not supply the sku or offline query parameters
         for (NSURLQueryItem *item in components.queryItems) {