Use SyncUser internally

realm · Apr 29, 2024 · 26cca78 · 26cca78
1 parent 286f341
commit 26cca78
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 23 deletions.
diff --git a/integration-tests/tests/src/tests/queries.ts b/integration-tests/tests/src/tests/queries.ts
@@ -1052,11 +1052,9 @@ describe("Queries", () => {
         expect(aged14Or15.length).to.equal(2);
 
         const aged17 = persons.filtered("age IN $0", [17]);
-        console.log({ aged17 });
         expect(aged17.length).to.equal(1);
 
         const dennis = persons.filtered("name in {'Dennis'}");
-        console.log({ dennis });
         expect(dennis.length).to.equal(0);
 
         const bobs = persons.filtered("name in $0", ["Bob"]);

diff --git a/packages/realm/bindgen/js_opt_in_spec.yml b/packages/realm/bindgen/js_opt_in_spec.yml
@@ -264,6 +264,7 @@ classes:
       - feed_buffer
       - make_ssl_verify_callback
       - needs_file_format_upgrade
+      - sync_user_as_app_user
 
   LogCategoryRef:
     methods:
@@ -445,7 +446,31 @@ classes:
       - api_key
 
   SyncUser:
+    methods: []
+  #     - is_logged_in
+  #     - user_id
+  #     - app_id
+  #     - legacy_identities
+  #     - access_token
+  #     - refresh_token
+  #     - state
+  #     - access_token_refresh_required
+  #     - request_refresh_user
+  #     - request_refresh_location
+  #     - request_access_token
+  #     - track_realm
+
+  User:
     methods:
+      - has_device_id
+      - device_id
+      - user_profile
+      - identities
+      - custom_data
+      - subscribe
+      - unsubscribe
+      - path_for_realm
+      - app
       - is_logged_in
       - user_id
       - app_id
@@ -459,18 +484,6 @@ classes:
       - request_access_token
       - track_realm
 
-  User:
-    methods:
-      - has_device_id
-      - device_id
-      - user_profile
-      - identities
-      - custom_data
-      - subscribe
-      - unsubscribe
-      - path_for_realm
-      - app
-
   UserProfile:
     methods:
       - data
@@ -563,6 +576,7 @@ classes:
       - revive_if_needed
       - force_close
       - handle_reconnect
+      - user
       # JS-specific
       - DOLLAR_resetSharedPtr
 

diff --git a/packages/realm/bindgen/vendor/realm-core b/packages/realm/bindgen/vendor/realm-core
diff --git a/packages/realm/src/app-services/App.ts b/packages/realm/src/app-services/App.ts
@@ -279,11 +279,6 @@ export class App<
       assert.function(fetch, "fetch");
     }
 
-    const syncClientConfig: binding.SyncClientConfig_Relaxed = {
-      multiplexSessions,
-      userAgentBindingInfo: App.userAgent,
-    };
-
     fs.ensureDirectoryForFile(fs.joinPaths(baseFilePath || fs.getDefaultDirectoryPath(), "mongodb-realm"));
     // TODO: This used getSharedApp in the legacy SDK, but it's failing AppTests
     this.internal = binding.App.getApp(binding.AppCacheMode.Disabled, {
@@ -298,7 +293,7 @@ export class App<
       syncClientConfig: {
         multiplexSessions,
         userAgentBindingInfo: App.userAgent,
-      }
+      },
     });
   }
 

diff --git a/packages/realm/src/app-services/SyncSession.ts b/packages/realm/src/app-services/SyncSession.ts
@@ -305,7 +305,7 @@ export class SyncSession {
    */
   get config(): SyncConfiguration {
     return this.withInternal((internal) => {
-      const user = new User(internal.config.user, mockApp);
+      const user = new User(binding.Helpers.syncUserAsAppUser(internal.user), mockApp);
       const { partitionValue, flxSyncRequested, customHttpHeaders, clientValidateSsl, sslTrustCertificatePath } =
         internal.config;
       if (flxSyncRequested) {
@@ -349,7 +349,7 @@ export class SyncSession {
    * Gets the User that this session was created with.
    */
   get user() {
-    return User.get(this.withInternal((internal) => internal.config.user));
+    return User.get(this.withInternal((internal) => binding.Helpers.syncUserAsAppUser(internal.user)));
   }
 
   /**