some fixes

Author: nicola-cab

src/realm/object-store/c_api/app.cpp

@@ -761,7 +761,7 @@ realm_user_state_change_register_callback(realm_user_t* user, realm_user_changed
             callback(userdata.get(), realm_user_state_e(sync_user.state()));
         };
         auto token = (*user)->subscribe(std::move(cb));
-        return new realm_user_subscription_token_t{*user, token.value()};
+        return new realm_user_subscription_token_t{*user, std::move(token)};
     });
 }
 

src/realm/object-store/c_api/sync.cpp

@@ -42,7 +42,7 @@ realm_sync_session_connection_state_notification_token::~realm_sync_session_conn
 
 realm_user_subscription_token::~realm_user_subscription_token()
 {
-    user->unsubscribe({user.get(), token});
+    user->unsubscribe(token);
 }
 
 namespace realm::c_api {

src/realm/object-store/c_api/types.hpp

@@ -571,14 +571,15 @@ struct realm_results : realm::c_api::WrapC, realm::Results {
 #if REALM_ENABLE_SYNC
 
 struct realm_user_subscription_token : realm::c_api::WrapC {
-    realm_user_subscription_token(std::shared_ptr<realm::SyncUser> user, uint64_t token)
+    using Token = realm::Subscribable<realm::SyncUser>::Token;
+    realm_user_subscription_token(std::shared_ptr<realm::SyncUser> user, Token&& token)
         : user(user)
-        , token(token)
+        , token(std::move(token))
     {
     }
     ~realm_user_subscription_token();
     std::shared_ptr<realm::SyncUser> user;
-    uint64_t token;
+    Token token;
 };
 
 struct realm_async_open_task_progress_notification_token : realm::c_api::WrapC {