Update for the app services split branch

Package.swift

@@ -153,7 +153,7 @@ let package = Package(
  targets: ["Realm", "RealmSwift"]),
  ],
  dependencies: [
- .package(url: "https://github.com/realm/realm-core.git", exact: coreVersion)
+ .package(url: "https://github.com/realm/realm-core.git", branch: "tg/rework-metadata-storage")
  ],
  targets: [
  .target(

Realm/ObjectServerTests/ClientResetTests.swift

@@ -102,7 +102,7 @@ class ClientResetTests: SwiftSyncTestCase {
  }
  XCTAssertTrue(path.contains("mongodb-realm/\(app.appId)/recovered-realms/recovered_realm"))
  XCTAssertFalse(FileManager.default.fileExists(atPath: path))
- SyncSession.immediatelyHandleError(token, syncManager: app.syncManager)
+ SyncSession.immediatelyHandleError(token)
  XCTAssertTrue(FileManager.default.fileExists(atPath: path))
  ex.fulfill()
  }

Realm/ObjectServerTests/RLMMongoClientTests.mm

@@ -22,6 +22,7 @@
 #import "RLMBSON_Private.hpp"
 #import "RLMUser_Private.hpp"
 
+#import <realm/object-store/sync/app_user.hpp>
 #import <realm/object-store/sync/sync_manager.hpp>
 #import <realm/util/bson/bson.hpp>
 
@@ -735,8 +736,8 @@ - (void)performMultipleWatchStreamsTest:(nullable dispatch_queue_t)delegateQueue
  s << RLMConvertRLMBSONToBson(partitionValue);
  // Intentionally not passing the correct partition value here as we (accidentally?)
  // don't use the filename generated from the partition value
- realm::SyncConfig config(user._syncUser, "null");
- return @(user._syncUser->sync_manager()->path_for_realm(config, s.str()).c_str());
+ realm::SyncConfig config(user.user, "null");
+ return @(user.user->path_for_realm(config, s.str()).c_str());
 }
 
 - (void)testSyncFilePaths {
@@ -763,10 +764,10 @@ - (void)testSyncFilePaths {
 }
 
 static NSString *oldPathForPartitionValue(RLMUser *user, NSString *oldName) {
- realm::SyncConfig config(user._syncUser, "null");
+ realm::SyncConfig config(user.user, "null");
  return [NSString stringWithFormat:@"%@/%s%@.realm",
- [@(user._syncUser->sync_manager()->path_for_realm(config).c_str()) stringByDeletingLastPathComponent],
- user._syncUser->identity().c_str(), oldName];
+ [@(user.user->path_for_realm(config).c_str()) stringByDeletingLastPathComponent],
+ user.user->user_id().c_str(), oldName];
 }
 
 - (void)testLegacyFilePathsAreUsedIfFilesArePresent {

Realm/ObjectServerTests/RLMObjectServerTests.mm

@@ -37,6 +37,7 @@
 #import "RLMWatchTestUtility.h"
 
 #import <realm/object-store/shared_realm.hpp>
+#import <realm/object-store/sync/app_user.hpp>
 #import <realm/object-store/sync/sync_manager.hpp>
 #import <realm/object-store/thread_safe_reference.hpp>
 #import <realm/util/file.hpp>
@@ -166,7 +167,7 @@ - (void)testRemoveUser {
 }
 
 - (void)testDeleteUser {
- [self createUser];
+ RLMUser *firstUser = [self createUser];
  RLMUser *secondUser = [self createUser];
 
  XCTAssert([self.app.currentUser.identifier isEqualToString:secondUser.identifier]);
@@ -176,7 +177,7 @@ - (void)testDeleteUser {
  [secondUser deleteWithCompletion:^(NSError *error) {
  XCTAssert(!error);
  XCTAssert(self.app.allUsers.count == 1);
- XCTAssertNil(self.app.currentUser);
+ XCTAssertEqualObjects(self.app.currentUser, firstUser);
  XCTAssertEqual(secondUser.state, RLMUserStateRemoved);
  [deleteUserExpectation fulfill];
  }];
@@ -560,7 +561,7 @@ - (void)testSyncErrorHandlerErrorDomain {
 #pragma mark - User Profile
 
 - (void)testUserProfileInitialization {
- RLMUserProfile *profile = [[RLMUserProfile alloc] initWithUserProfile:realm::SyncUserProfile()];
+ RLMUserProfile *profile = [[RLMUserProfile alloc] initWithUserProfile:realm::app::UserProfile()];
  XCTAssertNil(profile.name);
  XCTAssertNil(profile.maxAge);
  XCTAssertNil(profile.minAge);
@@ -572,7 +573,7 @@ - (void)testUserProfileInitialization {
 
  auto metadata = realm::bson::BsonDocument({{"some_key", "some_value"}});
 
- profile = [[RLMUserProfile alloc] initWithUserProfile:realm::SyncUserProfile(realm::bson::BsonDocument({
+ profile = [[RLMUserProfile alloc] initWithUserProfile:realm::app::UserProfile(realm::bson::BsonDocument({
  {"name", "Jane"},
  {"max_age", "40"},
  {"min_age", "30"},
@@ -758,7 +759,10 @@ - (void)testSessionRefresh {
 
  // Should result in an access token error followed by a refresh when we
  // open the Realm which is entirely transparent to the user
- user._syncUser->update_access_token(self.badAccessToken.UTF8String);
+ realm::RealmJWT token(std::string_view(self.badAccessToken));
+ user.user->update_data_for_testing([&](auto& data) {
+ data.access_token = token;
+ });
  RLMRealm *realm = [self openRealmForPartitionValue:self.name user:user];
 
  RLMRealm *realm2 = [self openRealm];
@@ -1367,8 +1371,7 @@ - (void)testClientResetManualInitiation {
  // At this point the Realm should be invalidated and client reset should be possible.
  NSString *pathValue = [theError rlmSync_clientResetBackedUpRealmPath];
  XCTAssertFalse([NSFileManager.defaultManager fileExistsAtPath:pathValue]);
- [RLMSyncSession immediatelyHandleError:theError.rlmSync_errorActionToken
- syncManager:self.app.syncManager];
+ [RLMSyncSession immediatelyHandleError:theError.rlmSync_errorActionToken];
  XCTAssertTrue([NSFileManager.defaultManager fileExistsAtPath:pathValue]);
 }
 
@@ -2016,8 +2019,8 @@ - (void)testWriteCopyForConfigurationLocalRealmForSyncWithExistingData {
  s << RLMConvertRLMBSONToBson(partitionValue);
  // Intentionally not passing the correct partition value here as we (accidentally?)
  // don't use the filename generated from the partition value
- realm::SyncConfig config(user._syncUser, "null");
- return @(user._syncUser->sync_manager()->path_for_realm(config, s.str()).c_str());
+ realm::SyncConfig config(user.user, "null");
+ return @(user.user->path_for_realm(config, s.str()).c_str());
 }
 
 - (void)testSyncFilePaths {
@@ -2044,10 +2047,10 @@ - (void)testSyncFilePaths {
 }
 
 static NSString *oldPathForPartitionValue(RLMUser *user, NSString *oldName) {
- realm::SyncConfig config(user._syncUser, "null");
+ realm::SyncConfig config(user.user, "null");
  return [NSString stringWithFormat:@"%@/%s%@.realm",
- [@(user._syncUser->sync_manager()->path_for_realm(config).c_str()) stringByDeletingLastPathComponent],
- user._syncUser->identity().c_str(), oldName];
+ [@(user.user->path_for_realm(config).c_str()) stringByDeletingLastPathComponent],
+ user.user->user_id().c_str(), oldName];
 }
 
 - (void)testLegacyFilePathsAreUsedIfFilesArePresent {

Realm/ObjectServerTests/RLMSyncTestCase.h

@@ -207,7 +207,7 @@ RLM_HEADER_AUDIT_BEGIN(nullability, sendability)
 
 - (void)resetSyncManager;
 
-- (NSString *)badAccessToken;
+- (const char *)badAccessToken;
 
 - (void)cleanupRemoteDocuments:(RLMMongoCollection *)collection;
 

Realm/ObjectServerTests/RLMSyncTestCase.mm

@@ -22,19 +22,20 @@
 #import <XCTest/XCTest.h>
 #import <Realm/Realm.h>
 
+#import "RLMApp_Private.hpp"
+#import "RLMChildProcessEnvironment.h"
+#import "RLMRealmConfiguration_Private.h"
+#import "RLMRealmUtil.hpp"
 #import "RLMRealm_Dynamic.h"
 #import "RLMRealm_Private.hpp"
-#import "RLMRealmConfiguration_Private.h"
-#import "RLMSyncManager_Private.hpp"
 #import "RLMSyncConfiguration_Private.h"
+#import "RLMSyncManager_Private.hpp"
+#import "RLMUser_Private.hpp"
 #import "RLMUtil.hpp"
-#import "RLMApp_Private.hpp"
-#import "RLMChildProcessEnvironment.h"
-#import "RLMRealmUtil.hpp"
 
+#import <realm/object-store/sync/app_user.hpp>
 #import <realm/object-store/sync/sync_manager.hpp>
 #import <realm/object-store/sync/sync_session.hpp>
-#import <realm/object-store/sync/sync_user.hpp>
 
 #if TARGET_OS_OSX
 
@@ -55,10 +56,6 @@ - (BOOL)waitForUploadCompletionOnQueue:(dispatch_queue_t)queue callback:(void(^)
 - (BOOL)waitForDownloadCompletionOnQueue:(dispatch_queue_t)queue callback:(void(^)(NSError *))callback;
 @end
 
-@interface RLMUser ()
-- (std::shared_ptr<realm::SyncUser>)_syncUser;
-@end
-
 @interface TestNetworkTransport : RLMNetworkTransport
 - (void)waitForCompletion;
 @end
@@ -421,9 +418,11 @@ - (void)waitForDownloadsForRealm:(RLMRealm *)realm error:(NSError **)error {
 }
 
 - (void)setInvalidTokensForUser:(RLMUser *)user {
- auto token = self.badAccessToken.UTF8String;
- user._syncUser->log_out();
- user._syncUser->log_in(token, token);
+ realm::RealmJWT token(std::string_view(self.badAccessToken));
+ user.user->update_data_for_testing([&](auto& data) {
+ data.access_token = token;
+ data.refresh_token = token;
+ });
 }
 
 - (void)writeToPartition:(NSString *)partition block:(void (^)(RLMRealm *))block {
@@ -554,15 +553,13 @@ - (void)resetAppCache {
  [user logOutWithCompletion:^(NSError *) {
  [ex fulfill];
  }];
-
- // Sessions are removed from the user asynchronously after a logout.
- // We need to wait for this to happen before calling resetForTesting as
- // that expects all sessions to be cleaned up first.
- if (user.allSessions.count) {
- [exs addObject:[self expectationForPredicate:[NSPredicate predicateWithFormat:@"allSessions.@count == 0"]
- evaluatedWithObject:user handler:nil]];
- }
  }];
+
+ // Sessions are removed from the user asynchronously after a logout.
+ // We need to wait for this to happen before calling resetForTesting as
+ // that expects all sessions to be cleaned up first.
+ [exs addObject:[self expectationForPredicate:[NSPredicate predicateWithFormat:@"hasAnySessions = false"]
+ evaluatedWithObject:app.syncManager handler:nil]];
  }
 
  if (exs.count) {
@@ -578,8 +575,8 @@ - (void)resetAppCache {
  [RLMApp resetAppCache];
 }
 
-- (NSString *)badAccessToken {
- return @"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJl"
+- (const char *)badAccessToken {
+ return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJl"
  "eHAiOjE1ODE1MDc3OTYsImlhdCI6MTU4MTUwNTk5NiwiaXNzIjoiN"
  "WU0M2RkY2M2MzZlZTEwNmVhYTEyYmRjIiwic3RpdGNoX2RldklkIjo"
  "iMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwIiwic3RpdGNoX2RvbWFpbk"

Realm/ObjectServerTests/SwiftObjectServerTests.swift

@@ -754,6 +754,12 @@ class SwiftObjectServerTests: SwiftSyncTestCase {
  let ex = expectation(description: "Error callback should fire upon receiving an error")
  ex.assertForOverFulfill = false // error handler can legally be called multiple times
  app.syncManager.errorHandler = { @Sendable (error, _) in
+ // Connecting to sync with a deleted user sometimes triggers an
+ // internal server error instead of the desired error
+ if (error as NSError).code == SyncError.clientSessionError.rawValue && error.localizedDescription == "error" {
+ ex.fulfill()
+ return
+ }
  assertSyncError(error, .clientUserError, "Unable to refresh the user access token: invalid session: failed to find refresh token")
  ex.fulfill()
  }

Realm/RLMAPIKeyAuth.mm

@@ -31,7 +31,7 @@ @implementation RLMAPIKeyAuth
  return self.app._realmApp->provider_client<App::UserAPIKeyProviderClient>();
 }
 
-- (std::shared_ptr<realm::SyncUser>)currentUser {
+- (std::shared_ptr<realm::app::User>)currentUser {
  return self.app._realmApp->current_user();
 }