chore: apply API v8 changes - WPB-15840

wire-ios-mocktransport/Source/MockTransportSession.m

@@ -469,7 +469,6 @@ - (NSArray *)methodMap
              @[@"/register", @"processRegistrationRequest:"],
              @[@"/activate/send", @"processVerificationCodeRequest:"],
              @[@"/activate", @"processPhoneActivationRequest:"],
-             @[@"/onboarding/v3", @"processOnboardingRequest:"],
              @[@"/invitations", @"processInvitationsRequest:"],
              @[@"/teams", @"processTeamsRequest:"],
              @[@"/broadcast", @"processBroadcastRequest:"],

wire-ios-mocktransport/Source/Search/MockTransportSession+search.h

@@ -22,7 +22,5 @@
 @interface MockTransportSession (Search)
 
 - (ZMTransportResponse *)processSearchRequest:(ZMTransportRequest *)request;
-- (ZMTransportResponse *)processOnboardingRequest:(ZMTransportRequest *)request
-
 
 @end

wire-ios-mocktransport/Source/Search/MockTransportSession+search.m

@@ -66,38 +66,4 @@ - (ZMTransportResponse *)processSearchRequest:(ZMTransportRequest *)request;
     return [self errorResponseWithCode:404 reason:@"no-endpoint" apiVersion:request.apiVersion];
 }
 
-// handles /onboarding
-- (ZMTransportResponse *)processOnboardingRequest:(ZMTransportRequest *)request
-{
-    if(request.method == ZMTransportRequestMethodPost) {
-        NSArray *selfEmailArray = [[request.payload asDictionary] arrayForKey:@"self"];
-        if(selfEmailArray.count == 0) {
-            return [self errorResponseWithCode:400 reason:@"no self email" apiVersion:request.apiVersion];
-        }
-        NSArray *cards = [[request.payload asDictionary] arrayForKey:@"cards"];
-        if(cards == nil) {
-            return [self errorResponseWithCode:400 reason:@"missing contacts" apiVersion:request.apiVersion];
-        }
-
-        NSFetchRequest *fetchRequest = [MockUser sortedFetchRequest];
-        NSArray *users = [self.managedObjectContext executeFetchRequestOrAssert_mt:fetchRequest];
-
-        // This method is just a simulation, it does not do any actual matching, it just returns all users
-        NSMutableArray *results = [NSMutableArray array];
-        for (MockUser *user in users) {
-            if (user == self.selfUser) {
-                continue;
-            }
-            [results addObject:@{
-                                @"id" : user.identifier,
-                                @"cards" : @[]
-                                }];
-        }
-        return [ZMTransportResponse responseWithPayload:@{@"results" : results} HTTPStatus:200 transportSessionError:nil apiVersion:request.apiVersion];
-
-    }
-    return [self errorResponseWithCode:404 reason:@"no-endpoint" apiVersion:request.apiVersion];
-}
-
-
 @end

wire-ios-mocktransport/Tests/Source/Search/MockTransportSessionAddressBookTests.m

@@ -37,77 +37,6 @@ - (void)testThatWhenPostingAddressBookItReturnsAllUserIDsThatAreNotSelf
         user2 = [session insertUserWithName:@"User2 AABB"];
     }];
     WaitForAllGroupsToBeEmpty(0.5);
-
-
-    // WHEN
-    NSDictionary *upstreamPayload = @{
-                                      @"self":@[@"2312rfw32434234"],
-                                      @"cards": @[@{@"contact":@[]}]
-                                      };
-    NSString *path = [NSString pathWithComponents:@[@"/", @"onboarding", @"v3"]];
-    ZMTransportResponse *response = [self responseForPayload:upstreamPayload path:path method:ZMTransportRequestMethodPost apiVersion:0];
-
-    // THEN
-    NSDictionary *expectedPayload = @{
-                                      @"results": @[
-                                              @{@"id": user1.identifier, @"cards": @[]},
-                                              @{@"id": user2.identifier, @"cards": @[]},
-                                              ]
-                                      };
-    XCTAssertEqual(response.HTTPStatus, 200);
-    XCTAssertEqualObjects(response.payload, expectedPayload);
 }
 
-- (void)testThatWhenPostingAddressBookItFailsIfMissingAnySelfElement
-{
-    // GIVEN
-    NSDictionary *upstreamPayload = @{
-                                      @"self":@[],
-                                      @"contacts":@[]
-                                      };
-    NSString *path = [NSString pathWithComponents:@[@"/", @"onboarding", @"v3"]];
-
-    // WHEN
-    ZMTransportResponse *response = [self responseForPayload:upstreamPayload path:path method:ZMTransportRequestMethodPost apiVersion:0];
-
-    // THEN
-    XCTAssertEqual(response.HTTPStatus, 400);
-}
-
-- (void)testThatWhenPostingAddressBookItFailsIfMissingSelf
-{
-    // GIVEN
-    NSDictionary *upstreamPayload = @{
-                                      @"contacts":@[]
-                                      };
-    NSString *path = [NSString pathWithComponents:@[@"/", @"onboarding", @"v3"]];
-
-    // WHEN
-    [self performIgnoringZMLogError:^{
-        ZMTransportResponse *response = [self responseForPayload:upstreamPayload path:path method:ZMTransportRequestMethodPost apiVersion:0];
-
-        // THEN
-        XCTAssertEqual(response.HTTPStatus, 400);
-    }];
-}
-
-
-- (void)testThatWhenPostingAddressBookItFailsIfMissingContacts
-{
-    // GIVEN
-    NSDictionary *upstreamPayload = @{
-                                      @"self":@[@"fooooooooo"]
-                                      };
-    NSString *path = [NSString pathWithComponents:@[@"/", @"onboarding", @"v3"]];
-
-    // WHEN
-    [self performIgnoringZMLogError:^{
-        ZMTransportResponse *response = [self responseForPayload:upstreamPayload path:path method:ZMTransportRequestMethodPost apiVersion:0];
-
-        // THEN
-        XCTAssertEqual(response.HTTPStatus, 400);
-    }];
-}
-
-
 @end

wire-ios-request-strategy/Sources/Request Strategies/MLS/Actions/CountSelfMLSKeyPackagesActionHandler.swift

@@ -39,6 +39,7 @@
             return nil
         }
 
+        // TODO: .v8 requires ciphersuite or ciphersuites!
         return ZMTransportRequest(
             path: "/mls/key-packages/self/\(action.clientID)/count",
             method: .get,

wire-ios-sync-engine/Source/Data Model/Conversation+MessageDestructionTimeout.swift

@@ -93,6 +93,14 @@
         guard let identifier = conversation.remoteIdentifier?.transportString()
         else { fatal("conversation inserted on backend") }
 
+        let path: String
+        if apiVersion < .v8 {
+            path = "/conversations/\(identifier)/message-timer"
+        } else {
+            guard let domain = conversation.domain else { fatal("conversation has no domain") } // TODO: unit test?
+            path = "/conversations/\(domain)/\(identifier)/message-timer"
+        }
+
         let payload: [AnyHashable: Any?]
         if timeout == 0 {
             payload = ["message_timer": nil]
@@ -102,7 +110,7 @@
             payload = ["message_timer": timeoutInMS]
         }
         return .init(
-            path: "/conversations/\(identifier)/message-timer",
+            path: path,
             method: .put,
             payload: payload as ZMTransportData,
             apiVersion: apiVersion.rawValue

wire-ios-sync-engine/Source/Data Model/Conversation+ReadReceiptMode.swift

@@ -49,9 +49,17 @@
         guard let conversationId = remoteIdentifier?.transportString()
         else { return completion(.failure(ReadReceiptModeError.noConversation)) }
 
+        let path: String
+        if apiVersion >= .v8 {
+            guard let domain else { return completion(.failure(ReadReceiptModeError.noConversation)) }
+            path = "/conversations/\(domain)/\(conversationId)/receipt-mode" // TODO: unit test?
+        } else {
+            path = "/conversations/\(conversationId)/receipt-mode"
+        }
+
         let payload = ["receipt_mode": enabled ? 1 : 0] as ZMTransportData
         let request = ZMTransportRequest(
-            path: "/conversations/\(conversationId)/receipt-mode",
+            path: path,
             method: .put,
             payload: payload,
             apiVersion: apiVersion.rawValue

wire-ios-sync-engine/Source/Synchronization/Strategies/RegistrationStrategy.swift

@@ -60,7 +60,7 @@
                 userInfoParser?.upgradeToAuthenticatedSession(with: $0)
             }
             registrationStatus.success()
-        } else {
+        } else { // TODO: handle new errors? 400: "invalid-domain" and 403: "condition-failed"
             let error = NSError.blacklistedEmail(with: response) ??
                 NSError.invalidActivationCode(with: response) ??
                 NSError.emailAddressInUse(with: response) ??

wire-ios-sync-engine/Source/Synchronization/Strategies/TeamInvitationRequestStrategy.swift

@@ -77,7 +77,7 @@
         )
 
         request.add(ZMCompletionHandler(on: managedObjectContext, block: { [weak self] response in
-            self?.processResponse(response, for: email)
+            self?.processResponse(response, for: email) // TODO: handle new error? 403 "condition-failed"
         }))
 
         return request