Feat/migrate new dart client

lib/config/routes/v2/route_handlers/update_required_handler.dart

@@ -6,14 +6,16 @@ import 'package:thingsboard_app/core/auth/login/provider/oauth_provider.dart';
 import 'package:thingsboard_app/locator.dart';
 import 'package:thingsboard_app/thingsboard_client.dart';
 import 'package:thingsboard_app/utils/services/version_service/i_version_service.dart';
+import 'package:thingsboard_app/utils/services/version_service/version_info.dart';
 
 class UpdateRequiredHandler extends RouteHandler {
   late final ProviderSubscription<AsyncValue<LoginMobileInfo>> _subscription;
   @override
   void subscribe(BuildContext context, WidgetRef ref) {
     _subscription = ref.listenManual(oauthProvider, (prev, next) async  {
-      final versionInfo = next.value?.versionInfo;
-      if (versionInfo != null) {
+      final rawVersionInfo = next.value?.versionInfo;
+      if (rawVersionInfo != null) {
+        final versionInfo = VersionInfo.fromMobileAppVersionInfo(rawVersionInfo);
         if (getIt<IVersionService>().appUpdateRequired(versionInfo)) {
           await ref.read(loginProvider.notifier).logout();
         }

lib/config/routes/v2/routes_config/routes/asset_routes.dart

@@ -1,5 +1,4 @@
 import 'package:go_router/go_router.dart';
-import 'package:thingsboard_app/config/routes/v2/router_2.dart';
 import 'package:thingsboard_app/modules/asset/asset_details_page.dart';
 import 'package:thingsboard_app/modules/asset/assets_page.dart';
 
@@ -14,20 +13,15 @@ final assetRoutes = [
     path: AssetRoutes.assets,
     builder: (context, state) {
       final searchMode = state.uri.queryParameters['search'] == 'true';
-      return AssetsPage( searchMode: searchMode);
+      return AssetsPage(searchMode: searchMode);
     },
-    routes: [
- GoRoute(
-     parentNavigatorKey: globalNavigatorKey,
+  ),
+  GoRoute(
     path: '${AssetRoutes.asset}/:id',
     builder: (context, state) {
       final id = state.pathParameters['id']!;
 
-      return AssetDetailsPage( id);
+      return AssetDetailsPage(id);
     },
   ),
-    ]
-  ),
-
-
 ];

lib/config/routes/v2/routes_config/routes/login_routes.dart

@@ -43,7 +43,7 @@ final loginRoutes = [
           final providerQuery = state.uri.queryParameters['selectedProvider'];
           final providerType =
               providerQuery != null
-                  ? twoFaProviderTypeFromString(providerQuery)
+                  ? _parseTwoFaProviderType(providerQuery)
                   : null;
 
           return TwoFactorAuthenticationPage(
@@ -60,9 +60,9 @@ final loginRoutes = [
         path: LoginRoutes.mfaForceSuccess,
         builder: (context, state) {
           final providerQuery = state.uri.queryParameters['selectedProvider'];
-          final providerType = twoFaProviderTypeFromString(
-            providerQuery.toString(),
-          );
+          final providerType =
+              _parseTwoFaProviderType(providerQuery) ??
+              TwoFaProviderType.unknownDefaultOpenApi;
 
           final force =
               bool.tryParse(state.uri.queryParameters['force'].toString()) ??
@@ -79,7 +79,7 @@ final loginRoutes = [
           final providerQuery = state.uri.queryParameters['selectedProvider'];
           final providerType =
               providerQuery != null
-                  ? twoFaProviderTypeFromString(providerQuery)
+                  ? _parseTwoFaProviderType(providerQuery)
                   : null;
 
           return TwoFactorAuthSetup(
@@ -95,3 +95,12 @@ final loginRoutes = [
     },
   ),
 ];
+
+TwoFaProviderType? _parseTwoFaProviderType(String? name) {
+  if (name == null) return null;
+  try {
+    return TwoFaProviderType.valueOf(name);
+  } catch (_) {
+    return null;
+  }
+}

lib/core/auth/2FA/confirm/providers/2fa_avalible_providers/two_factor_avalible_providers.dart

@@ -10,10 +10,11 @@ part 'two_factor_avalible_providers.g.dart';
 Future<List<TwoFaProviderInfo>> twoFaConfirmAvalibleProviders(Ref ref) async {
   final tbClient = getIt<ITbClientService>().client;
   try {
-    final info = await tbClient
-        .getTwoFactorAuthService()
-        .getAvailableLoginTwoFaProviders();
-    return info;
+    final res =
+        await tbClient
+            .getTwoFactorAuthControllerApi()
+            .getAvailableTwoFaProviderInfos();
+    return res.data?.toList() ?? [];
   } catch (e) {
     return [];
   }

lib/core/auth/2FA/confirm/providers/2fa_confirm_provider/two_factor_confirm_provider.dart

@@ -36,12 +36,25 @@ class TwoFactorConfirm extends _$TwoFactorConfirm {
   Future<void> verifyCode(String code) async {
     state = state.copyWith(loading: true);
     try {
-      final res = await _tbClient.checkTwoFaVerificationCode(
-        type,
-        code,
-        requestConfig: RequestConfig(ignoreErrors: true),
-      );
-      await ref.read(loginProvider.notifier).twoFaConfirmed(res);
+      final res = await _tbClient
+          .getTwoFactorAuthControllerApi()
+          .checkTwoFaVerificationCode(
+            providerType: type,
+            verificationCode: code,
+            // Handle errors (e.g. 429) in-widget below instead of the global
+            // error overlay; the new client exposes this via Dio `extra`.
+            extra: const {'ignoreErrors': true},
+          );
+      final token = res.data?.token;
+      if (token == null) {
+        state = state.copyWith(loading: false, codeState: CodeState.invalid);
+        return;
+      }
+      await ref
+          .read(loginProvider.notifier)
+          .twoFaConfirmed(
+            LoginResponse(token: token, refreshToken: res.data?.refreshToken),
+          );
       state = state.copyWith(loading: false, codeState: CodeState.valid);
     } catch (e) {
       state = state.copyWith(loading: false);
@@ -62,10 +75,12 @@ class TwoFactorConfirm extends _$TwoFactorConfirm {
   Future<void> sendCode() async {
     state = state.copyWith(codeSent: false, loading: true);
     try {
-      await _tbClient.getTwoFactorAuthService().requestTwoFaVerificationCode(
-        type,
-        requestConfig: RequestConfig(ignoreErrors: true),
-      );
+      await _tbClient
+          .getTwoFactorAuthControllerApi()
+          .requestTwoFaVerificationCode(
+            providerType: type,
+            extra: const {'ignoreErrors': true},
+          );
       _resendTimer?.cancel();
       _resendTimer = Timer(
         Duration(seconds: _resendTimerDurationSeconds),

lib/core/auth/2FA/confirm/two_factor_authentication_page.dart

@@ -35,16 +35,16 @@ class TwoFactorAuthenticationPage extends HookConsumerWidget {
         }
         if (providers.value?.length == 1) {
           context.pushReplacement(
-            '${LoginRoutes.login}${LoginRoutes.mfaConfirm}?selectedProvider=${providers.value!.first.type.toShortString()}',
+            '${LoginRoutes.login}${LoginRoutes.mfaConfirm}?selectedProvider=${providers.value!.first.type?.name}',
           );
           return;
         }
         final defaultProvider = providers.value?.firstWhereOrNull(
-          (e) => e.isDefault,
+          (e) => e.default_ ?? false,
         );
         if (defaultProvider != null) {
           context.pushReplacement(
-             '${LoginRoutes.login}${LoginRoutes.mfaConfirm}?selectedProvider=${defaultProvider.type.toShortString()}',
+            '${LoginRoutes.login}${LoginRoutes.mfaConfirm}?selectedProvider=${defaultProvider.type?.name}',
           );
           return;
         }
@@ -59,9 +59,10 @@ class TwoFactorAuthenticationPage extends HookConsumerWidget {
       final info = providers.value!.firstWhere(
         (e) => e.type == selectedProvider,
       );
+      if (info.type == null) return const SizedBox();
       final codeLoading = ref.watch(
         twoFactorConfirmProvider(
-          info.type,
+          info.type!,
           info.minVerificationCodeSendPeriod,
         ).select((state) => state.loading),
       );
@@ -81,13 +82,18 @@ class TwoFactorAuthenticationPage extends HookConsumerWidget {
     return BaseTwoFactorLayout(
       title: S.of(context).verifyYourIdentity,
       isLoading: isLoading.value,
-      child: providers.value != null
-          ? SelectProviderTypeWidget(
-              activeProviders: const [],
-              avalibleTypes: providers.value!.map((e) => e.type).toList(),
-              type: TwoFaViewType.confirm,
-            )
-          : const SizedBox(),
+      child:
+          providers.value != null
+              ? SelectProviderTypeWidget(
+                activeProviders: const [],
+                avalibleTypes:
+                    providers.value!
+                        .where((e) => e.type != null)
+                        .map((e) => e.type!)
+                        .toList(),
+                type: TwoFaViewType.confirm,
+              )
+              : const SizedBox(),
     );
   }
 
@@ -96,11 +102,12 @@ class TwoFactorAuthenticationPage extends HookConsumerWidget {
     WidgetRef ref,
     TwoFaProviderInfo info,
   ) async {
+    if (info.type == null) return;
     isLoading.value = true;
     await ref
         .read(
           twoFactorConfirmProvider(
-            info.type,
+            info.type!,
             info.minVerificationCodeSendPeriod,
           ).notifier,
         )

lib/core/auth/2FA/confirm/widgets/select_provider_type_widget.dart

@@ -35,7 +35,7 @@ class SelectProviderTypeWidget extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final loading = useState(false);
-    final isForce = type == TwoFaViewType.force ;
+    final isForce = type == TwoFaViewType.force;
     final filtered =
         switch (type) {
           TwoFaViewType.setup => avalibleTypes,
@@ -122,7 +122,7 @@ class SelectProviderTypeWidget extends HookConsumerWidget {
                               }
 
                               context.push(
-                                '${LoginRoutes.login}${LoginRoutes.mfaConfigure}?selectedProvider=${provider.toShortString()}&force=$isForce',
+                                '${LoginRoutes.login}${LoginRoutes.mfaConfigure}?selectedProvider=${provider.name}&force=$isForce',
                               );
                             },
                             contentPadding: const EdgeInsets.symmetric(
@@ -183,10 +183,7 @@ class SelectProviderTypeWidget extends HookConsumerWidget {
                           : OutlinedButton.icon(
                             onPressed: () {
                               context.push(
-                                '${LoginRoutes.login}${type == TwoFaViewType.confirm
-                                        ? LoginRoutes.mfaConfirm
-                                        : LoginRoutes.mfaConfigure}?selectedProvider=${provider.toShortString()}&force=$isForce',
-
+                                '${LoginRoutes.login}${type == TwoFaViewType.confirm ? LoginRoutes.mfaConfirm : LoginRoutes.mfaConfigure}?selectedProvider=${provider.name}&force=$isForce',
                               );
                             },
                             style: OutlinedButton.styleFrom(
@@ -279,8 +276,14 @@ class SelectProviderTypeWidget extends HookConsumerWidget {
                               loading.value = true;
                               try {
                                 await getIt<ITbClientService>().client
-                                    .getTwoFactorAuthService()
-                                    .updateTwoFaAccountConfig(info, true);
+                                    .getTwoFactorAuthConfigControllerApi()
+                                    .updateTwoFaAccountConfig(
+                                      providerType: info,
+                                      twoFaAccountConfigUpdateRequest:
+                                          TwoFaAccountConfigUpdateRequest(
+                                            (b) => b..useByDefault = true,
+                                          ),
+                                    );
                                 await Future.delayed(
                                   const Duration(milliseconds: 200),
                                 );
@@ -375,8 +378,8 @@ class SelectProviderTypeWidget extends HookConsumerWidget {
     }
     try {
       await getIt<ITbClientService>().client
-          .getTwoFactorAuthService()
-          .deleteTwoFaAccountConfig(providerType);
+          .getTwoFactorAuthConfigControllerApi()
+          .deleteTwoFaAccountConfig(providerType: providerType);
 
       ref.invalidate(acountTwoFactorSettingsProvider);
     } catch (e) {

lib/core/auth/2FA/confirm/widgets/two_factor_auth_code_widget.dart

@@ -25,7 +25,8 @@ class EnterACodeWidget extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final data = getTwoFaProviderData(selectedProvider.type);
+    final providerType = selectedProvider.type!;
+    final data = getTwoFaProviderData(providerType);
     final timerDuration = selectedProvider.minVerificationCodeSendPeriod ?? 0;
     final form = useMemoized(
       () => FormGroup({
@@ -43,13 +44,13 @@ class EnterACodeWidget extends HookConsumerWidget {
     )..forward();
     final state = ref.watch(
       twoFactorConfirmProvider(
-        selectedProvider.type,
+        providerType,
         selectedProvider.minVerificationCodeSendPeriod,
       ),
     );
     ref.listen(
       twoFactorConfirmProvider(
-        selectedProvider.type,
+        providerType,
         selectedProvider.minVerificationCodeSendPeriod,
       ),
       (prev, next) {
@@ -105,7 +106,7 @@ class EnterACodeWidget extends HookConsumerWidget {
               type: data.textInputType,
               autoFillHints: const [AutofillHints.oneTimeCode],
             ),
-            if (!noResendCodeProviders.contains(selectedProvider.type))
+            if (!noResendCodeProviders.contains(providerType))
               AnimatedSwitcher(
                 duration: const Duration(milliseconds: 300),
                 child:
@@ -167,7 +168,7 @@ class EnterACodeWidget extends HookConsumerWidget {
     await ref
         .read(
           twoFactorConfirmProvider(
-            selectedProvider.type,
+            selectedProvider.type!,
             selectedProvider.minVerificationCodeSendPeriod,
           ).notifier,
         )
@@ -178,7 +179,7 @@ class EnterACodeWidget extends HookConsumerWidget {
     ref
         .read(
           twoFactorConfirmProvider(
-            selectedProvider.type,
+            selectedProvider.type!,
             selectedProvider.minVerificationCodeSendPeriod,
           ).notifier,
         )

lib/core/auth/2FA/setup/providers/two_factor_setup_account_settings_provider/two_factor_setup_account_settings_provider.dart

@@ -8,6 +8,9 @@ part 'two_factor_setup_account_settings_provider.g.dart';
 @riverpod
 Future<AccountTwoFaSettings?> acountTwoFactorSettings(Ref ref) async {
   final client = getIt<ITbClientService>().client;
-  final res = await client.getTwoFactorAuthService().getAccountTwoFaSettings();
-  return res;
+  final res =
+      await client
+          .getTwoFactorAuthConfigControllerApi()
+          .getAccountTwoFaSettings();
+  return res.data;
 }

lib/core/auth/2FA/setup/providers/two_factor_setup_avalible_providers/two_factor_setup_avalible_providers.dart

@@ -9,10 +9,11 @@ part 'two_factor_setup_avalible_providers.g.dart';
 Future<List<TwoFaProviderType>> twoFactorSetupAvalibleProviders(Ref ref) async {
   final tbClient = getIt<ITbClientService>().client;
   try {
-    final info = await tbClient
-        .getTwoFactorAuthService()
-        .getAvailableTwoFaProviders();
-    return info;
+    final res =
+        await tbClient
+            .getTwoFactorAuthConfigControllerApi()
+            .getAvailableTwoFaProviderTypes();
+    return res.data?.toList() ?? [];
   } catch (e) {
     return [];
   }