admarty · pull · May 10, 2025 · May 10, 2025 · May 10, 2025
diff --git a/flutter/lib/common/hbbs/hbbs.dart b/flutter/lib/common/hbbs/hbbs.dart
@@ -27,13 +27,15 @@ class UserPayload {
   String name = '';
   String email = '';
   String note = '';
+  String? verifier;
   UserStatus status;
   bool isAdmin = false;
 
   UserPayload.fromJson(Map<String, dynamic> json)
       : name = json['name'] ?? '',
         email = json['email'] ?? '',
         note = json['note'] ?? '',
+        verifier = json['verifier'],
         status = json['status'] == 0
             ? UserStatus.kDisabled
             : json['status'] == -1

diff --git a/flutter/lib/models/ab_model.dart b/flutter/lib/models/ab_model.dart
@@ -775,7 +775,10 @@ abstract class BaseAb {
 
   final pullError = "".obs;
   final pushError = "".obs;
-  final abLoading = false.obs;
+  final abLoading = false
+      .obs; // Indicates whether the UI should show a loading state for the address book.
+  var abPulling =
+      false; // Tracks whether a pull operation is currently in progress to prevent concurrent pulls. Unlike abLoading, this is not tied to UI updates.
   bool initialized = false;
 
   String name();
@@ -790,17 +793,22 @@ abstract class BaseAb {
   }
 
   Future<void> pullAb({quiet = false}) async {
-    debugPrint("pull ab \"${name()}\"");
-    if (abLoading.value) return;
+    if (abPulling) return;
+    abPulling = true;
     if (!quiet) {
       abLoading.value = true;
       pullError.value = "";
     }
     initialized = false;
+    debugPrint("pull ab \"${name()}\"");
     try {
       initialized = await pullAbImpl(quiet: quiet);
-    } catch (_) {}
-    abLoading.value = false;
+    } catch (e) {
+      debugPrint("Error occurred while pulling address book: $e");
+    } finally {
+      abLoading.value = false;
+      abPulling = false;
+    }
   }
 
   Future<bool> pullAbImpl({quiet = false});

diff --git a/flutter/lib/models/user_model.dart b/flutter/lib/models/user_model.dart
@@ -116,6 +116,10 @@ class UserModel {
     userName.value = user.name;
     isAdmin.value = user.isAdmin;
     bind.mainSetLocalOption(key: 'user_info', value: jsonEncode(user));
+    if (isWeb) {
+      // ugly here, tmp solution
+      bind.mainSetLocalOption(key: 'verifier', value: user.verifier ?? '');
+    }
   }
 
   // update ab and group status

diff --git a/flutter/lib/models/web_model.dart b/flutter/lib/models/web_model.dart
@@ -8,6 +8,7 @@ import 'dart:html';
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
+import 'package:flutter_hbb/common/widgets/login.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 
 import 'package:flutter_hbb/web/bridge.dart';
@@ -113,6 +114,13 @@ class PlatformFFI {
     context["onInitFinished"] = () {
       completer.complete();
     };
+    context['loginDialog'] = () {
+      loginDialog();
+    };
+    context['closeConnection'] = () {
+      gFFI.dialogManager.dismissAll();
+      closeConnection();
+    };
     context.callMethod('init');
     version = getByName('version');
     window.onContextMenu.listen((event) {

diff --git a/flutter/lib/web/bridge.dart b/flutter/lib/web/bridge.dart
@@ -267,6 +267,16 @@ class RustdeskImpl {
         ]));
   }
 
+  Future<int?> sessionGetTrackpadSpeed(
+      {required UuidValue sessionId, dynamic hint}) {
+    throw UnimplementedError("sessionGetTrackpadSpeed");
+  }
+
+  Future<void> sessionSetTrackpadSpeed(
+      {required UuidValue sessionId, required int value, dynamic hint}) {
+    throw UnimplementedError("sessionSetTrackpadSpeed");
+  }
+
   Future<String?> sessionGetScrollStyle(
       {required UuidValue sessionId, dynamic hint}) {
     return Future(() =>