2023-03-12 12:33:47 +08:00 · 2023-03-12 12:33:47 +08:00 · fa02384808
parent dd4f2fcc35
commit fa02384808
11 changed files with 150 additions and 119 deletions
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -93,8 +93,9 @@
            </intent-filter>
        </activity>

-        <activity android:name="com.linusu.flutter_web_auth.CallbackActivity"
-            android:exported="true">
+        <activity
+          android:name="com.linusu.flutter_web_auth_2.CallbackActivity"
+          android:exported="true">
            <intent-filter android:label="flutter_web_auth">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
--- a/lib/pages/connect/connect_page.dart
+++ b/lib/pages/connect/connect_page.dart
@ -3,7 +3,7 @@ import 'package:flutter/material.dart';

 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:flutter_web_auth/flutter_web_auth.dart';
+import 'package:flutter_web_auth_2/flutter_web_auth_2.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:matrix/matrix.dart';
@ -103,11 +103,10 @@ class ConnectPageController extends State<ConnectPage> {
          .any((flow) => flow.type == flowType) ??
      false;

-  bool get supportsSso =>
-      (PlatformInfos.isMobile ||
-          PlatformInfos.isWeb ||
-          PlatformInfos.isMacOS) &&
-      _supportsFlow('m.login.sso');
+  bool get supportsSso => _supportsFlow('m.login.sso');
+
+  bool isDefaultPlatform =
+      (PlatformInfos.isMobile || PlatformInfos.isWeb || PlatformInfos.isMacOS);

  bool get supportsLogin => _supportsFlow('m.login.password');

@ -133,11 +132,15 @@ class ConnectPageController extends State<ConnectPage> {
  void ssoLoginAction(String id) async {
    final redirectUrl = kIsWeb
        ? '${html.window.origin!}/web/auth.html'
-        : '${AppConfig.appOpenUrlScheme.toLowerCase()}://login';
+        : isDefaultPlatform
+            ? '${AppConfig.appOpenUrlScheme.toLowerCase()}://login'
+            : 'http://localhost:3001//login';
    final url =
        '${Matrix.of(context).getLoginClient().homeserver?.toString()}/_matrix/client/r0/login/sso/redirect/${Uri.encodeComponent(id)}?redirectUrl=${Uri.encodeQueryComponent(redirectUrl)}';
-    final urlScheme = Uri.parse(redirectUrl).scheme;
-    final result = await FlutterWebAuth.authenticate(
+    final urlScheme = isDefaultPlatform
+        ? Uri.parse(redirectUrl).scheme
+        : "http://localhost:3001";
+    final result = await FlutterWebAuth2.authenticate(
      url: url,
      callbackUrlScheme: urlScheme,
    );
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@ -14,6 +14,7 @@
 #include <handy_window/handy_window_plugin.h>
 #include <record_linux/record_linux_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
+#include <window_to_front/window_to_front_plugin.h>

 void fl_register_plugins(FlPluginRegistry* registry) {
  g_autoptr(FlPluginRegistrar) desktop_drop_registrar =
@ -40,4 +41,7 @@ void fl_register_plugins(FlPluginRegistry* registry) {
  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
+  g_autoptr(FlPluginRegistrar) window_to_front_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "WindowToFrontPlugin");
+  window_to_front_plugin_register_with_registrar(window_to_front_registrar);
 }
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@ -11,6 +11,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
  handy_window
  record_linux
  url_launcher_linux
+  window_to_front
 )

 list(APPEND FLUTTER_FFI_PLUGIN_LIST
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -15,7 +15,7 @@ import emoji_picker_flutter
 import flutter_app_badger
 import flutter_local_notifications
 import flutter_secure_storage_macos
-import flutter_web_auth
+import flutter_web_auth_2
 import flutter_webrtc
 import geolocator_apple
 import just_audio
@ -29,6 +29,7 @@ import sqflite
 import url_launcher_macos
 import video_compress
 import wakelock_macos
+import window_to_front

 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
@ -41,7 +42,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  FlutterAppBadgerPlugin.register(with: registry.registrar(forPlugin: "FlutterAppBadgerPlugin"))
  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
-  FlutterWebAuthPlugin.register(with: registry.registrar(forPlugin: "FlutterWebAuthPlugin"))
+  FlutterWebAuth2Plugin.register(with: registry.registrar(forPlugin: "FlutterWebAuth2Plugin"))
  FlutterWebRTCPlugin.register(with: registry.registrar(forPlugin: "FlutterWebRTCPlugin"))
  GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
  JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin"))
@ -55,4 +56,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
  VideoCompressPlugin.register(with: registry.registrar(forPlugin: "VideoCompressPlugin"))
  WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin"))
+  WindowToFrontPlugin.register(with: registry.registrar(forPlugin: "WindowToFrontPlugin"))
 }
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@ -270,7 +270,7 @@
 				"${BUILT_PRODUCTS_DIR}/emoji_picker_flutter/emoji_picker_flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_secure_storage_macos/flutter_secure_storage_macos.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_web_auth/flutter_web_auth.framework",
+				"${BUILT_PRODUCTS_DIR}/flutter_web_auth_2/flutter_web_auth_2.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_webrtc/flutter_webrtc.framework",
 				"${BUILT_PRODUCTS_DIR}/geolocator_apple/geolocator_apple.framework",
 				"${BUILT_PRODUCTS_DIR}/just_audio/just_audio.framework",
@ -297,7 +297,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/emoji_picker_flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage_macos.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_web_auth.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_web_auth_2.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_webrtc.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geolocator_apple.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/just_audio.framework",
--- a/pubspec.lock
+++ b/pubspec.lock
@ -61,10 +61,10 @@ packages:
    dependency: transitive
    description:
      name: args
-      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
  async:
    dependency: transitive
    description:
@ -205,18 +205,18 @@ packages:
    dependency: "direct main"
    description:
      name: connectivity_plus
-      sha256: "745ebcccb1ef73768386154428a55250bc8d44059c19fd27aecda2a6dc013a22"
+      sha256: "8875e8ed511a49f030e313656154e4bbbcef18d68dfd32eb853fac10bce48e96"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
  connectivity_plus_platform_interface:
    dependency: transitive
    description:
      name: connectivity_plus_platform_interface
-      sha256: b8795b9238bf83b64375f63492034cb3d8e222af4d9ce59dda085edf038fa06f
+      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.3"
+    version: "1.2.4"
  console:
    dependency: transitive
    description:
@ -237,10 +237,10 @@ packages:
    dependency: transitive
    description:
      name: cross_file
-      sha256: f71079978789bc2fe78d79227f1f8cfe195b31bbd8db2399b0d15a4b96fb843b
+      sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.3+2"
+    version: "0.3.3+4"
  crypto:
    dependency: transitive
    description:
@ -277,10 +277,10 @@ packages:
    dependency: transitive
    description:
      name: dart_style
-      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
+      sha256: "5be16bf1707658e4c03078d4a9b90208ded217fb02c163e207d334082412f2fb"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.4"
+    version: "2.2.5"
  dart_webrtc:
    dependency: transitive
    description:
@ -301,10 +301,10 @@ packages:
    dependency: "direct main"
    description:
      name: desktop_drop
-      sha256: f649bd498e87d39ddf3ba229a720144fe2a5362ba921627303f97d0b09481e7d
+      sha256: "4ca4d960f4b11c032e9adfd2a0a8ac615bc3fddb4cbe73dcf840dd8077582186"
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.0"
+    version: "0.4.1"
  desktop_lifecycle:
    dependency: "direct main"
    description:
@ -325,10 +325,10 @@ packages:
    dependency: "direct main"
    description:
      name: device_info_plus
-      sha256: "7ff671ed0a6356fa8f2e1ae7d3558d3fb7b6a41e24455e4f8df75b811fb8e4ab"
+      sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95"
      url: "https://pub.dev"
    source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
  device_info_plus_platform_interface:
    dependency: transitive
    description:
@ -341,10 +341,10 @@ packages:
    dependency: "direct main"
    description:
      name: dynamic_color
-      sha256: "0ff251e8a31f54adde9ab4d4b301c94df46dcd34e4fbd6d7623631ed174b205e"
+      sha256: c4a508284b14ec4dda5adba2c28b2cdd34fbae1afead7e8c52cad87d51c5405b
      url: "https://pub.dev"
    source: hosted
-    version: "1.6.0"
+    version: "1.6.2"
  emoji_picker_flutter:
    dependency: "direct main"
    description:
@ -612,10 +612,10 @@ packages:
    dependency: transitive
    description:
      name: flutter_plugin_android_lifecycle
-      sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b"
+      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.7"
+    version: "2.0.9"
  flutter_ringtone_player:
    dependency: "direct main"
    description:
@ -636,10 +636,10 @@ packages:
    dependency: transitive
    description:
      name: flutter_secure_storage_linux
-      sha256: "736436adaf91552433823f51ce22e098c2f0551db06b6596f58597a25b8ea797"
+      sha256: "0912ae29a572230ad52d8a4697e5518d7f0f429052fd51df7e5a7952c7efe2a3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
  flutter_secure_storage_macos:
    dependency: transitive
    description:
@ -690,18 +690,26 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_typeahead
-      sha256: "9ed8fe6412ba4c1196c0cada258f476b42361d59e3c831e406ce263ba229ec1d"
+      sha256: edfc51579ca3756adaa32b6849cf44af03276b93e8a8a68d8247ee243598f1b2
      url: "https://pub.dev"
    source: hosted
-    version: "4.3.2"
-  flutter_web_auth:
+    version: "4.3.7"
+  flutter_web_auth_2:
    dependency: "direct main"
    description:
-      name: flutter_web_auth
-      sha256: a69fa8f43b9e4d86ac72176bf747b735e7b977dd7cf215076d95b87cb05affdd
+      name: flutter_web_auth_2
+      sha256: eab1cc4ba7b2c517a7ea1cf0d165f2ae22403f4a725ea681fc238c32abd0ab87
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.0"
+    version: "2.1.1"
+  flutter_web_auth_2_platform_interface:
+    dependency: transitive
+    description:
+      name: flutter_web_auth_2_platform_interface
+      sha256: dd934033564cacff127b4776798dc2b27b2f2ebfd6b669746455b91c3611cfde
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
  flutter_web_plugins:
    dependency: transitive
    description: flutter
@ -821,10 +829,10 @@ packages:
    dependency: transitive
    description:
      name: html
-      sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269
+      sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.15.1"
+    version: "0.15.2"
  html_unescape:
    dependency: transitive
    description:
@ -861,42 +869,42 @@ packages:
    dependency: "direct main"
    description:
      name: image_picker
-      sha256: f98d76672d309c8b7030c323b3394669e122d52b307d2bbd8d06bd70f5b2aabe
+      sha256: "64b21d9f0e065f9ab0e4dde458076226c97382cc0c6949144cb874c62bf8e9f8"
      url: "https://pub.dev"
    source: hosted
-    version: "0.8.6+1"
+    version: "0.8.7"
  image_picker_android:
    dependency: transitive
    description:
      name: image_picker_android
-      sha256: b1cbfec0f5aef427a18eb573f5445af8c9c568626bf3388553e40c263d3f7368
+      sha256: b81db5f5ed8a69d54d5f0932c2af8120e8c0518a037d8beee494eec671da4d4c
      url: "https://pub.dev"
    source: hosted
-    version: "0.8.5+5"
+    version: "0.8.6+5"
  image_picker_for_web:
    dependency: transitive
    description:
      name: image_picker_for_web
-      sha256: "7d319fb74955ca46d9bf7011497860e3923bb67feebcf068f489311065863899"
+      sha256: "98f50d6b9f294c8ba35e25cc0d13b04bfddd25dbc8d32fa9d566a6572f2c081c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.10"
+    version: "2.1.12"
  image_picker_ios:
    dependency: transitive
    description:
      name: image_picker_ios
-      sha256: "39c013200046d14c58b71dc4fa3d00e425fc9c699d589136cd3ca018727c0493"
+      sha256: "50e882fe0a06bf0c8f7f5bce78d30975f279213293afc9471dc35f05617c50ff"
      url: "https://pub.dev"
    source: hosted
-    version: "0.8.6+6"
+    version: "0.8.7+1"
  image_picker_platform_interface:
    dependency: transitive
    description:
      name: image_picker_platform_interface
-      sha256: "7cef2f28f4f2fef99180f636c3d446b4ccbafd6ba0fad2adc9a80c4040f656b8"
+      sha256: "1991219d9dbc42a99aff77e663af8ca51ced592cd6685c9485e3458302d3d4f8"
      url: "https://pub.dev"
    source: hosted
-    version: "2.6.2"
+    version: "2.6.3"
  import_sorter:
    dependency: "direct dev"
    description:
@ -1027,10 +1035,10 @@ packages:
    dependency: transitive
    description:
      name: macos_ui
-      sha256: f4581e71b7b06e0d8daa0696fcd5a26677d53a9dbb87ae681d5617829292194b
+      sha256: "57208eec8180656acd379e1c754e9b6d8830f32a020b94571ae2188f8112075b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.7.6"
+    version: "1.12.2"
  markdown:
    dependency: transitive
    description:
@ -1171,10 +1179,10 @@ packages:
    dependency: transitive
    description:
      name: olm
-      sha256: cf10282cff694b6eff9727f5d7ace0741771113cad6582f04e8682cce4160768
+      sha256: "37948a6576949256f3ee1d0063d5b408634ff7e452b9a5c2f6410f9d7ced1c20"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
  package_config:
    dependency: transitive
    description:
@ -1259,50 +1267,50 @@ packages:
    dependency: "direct main"
    description:
      name: path_provider
-      sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95
+      sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e
+      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.22"
+    version: "2.0.24"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74"
+      sha256: "12eee51abdf4d34c590f043f45073adbb45514a108bd9db4491547a2fd891059"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.2.0"
  path_provider_linux:
    dependency: transitive
    description:
      name: path_provider_linux
-      sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
+      sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.7"
+    version: "2.1.10"
  path_provider_platform_interface:
    dependency: transitive
    description:
      name: path_provider_platform_interface
-      sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76
+      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
  path_provider_windows:
    dependency: transitive
    description:
      name: path_provider_windows
-      sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
+      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.5"
  pedantic:
    dependency: transitive
    description:
@ -1387,10 +1395,10 @@ packages:
    dependency: transitive
    description:
      name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
  polylabel:
    dependency: transitive
    description:
@ -1611,10 +1619,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "955e9736a12ba776bdd261cf030232b30eadfcd9c79b32a3250dd4a494e8c8f7"
+      sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.15"
+    version: "2.0.17"
  shared_preferences_ios:
    dependency: transitive
    description:
@ -1627,10 +1635,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_linux
-      sha256: f8ea038aa6da37090093974ebdcf4397010605fd2ff65c37a66f9d28394cb874
+      sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.5"
  shared_preferences_macos:
    dependency: transitive
    description:
@ -1643,26 +1651,26 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_platform_interface
-      sha256: da9431745ede5ece47bc26d5d73a9d3c6936ef6945c101a5aca46f62e52c1cf3
+      sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
  shared_preferences_web:
    dependency: transitive
    description:
      name: shared_preferences_web
-      sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958
+      sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.4"
+    version: "2.0.6"
  shared_preferences_windows:
    dependency: transitive
    description:
      name: shared_preferences_windows
-      sha256: "5eaf05ae77658d3521d0e993ede1af962d4b326cd2153d312df716dc250f00c9"
+      sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.5"
  sky_engine:
    dependency: transitive
    description: flutter
@ -1688,18 +1696,18 @@ packages:
    dependency: transitive
    description:
      name: sqflite
-      sha256: "78324387dc81df14f78df06019175a86a2ee0437624166c382e145d0a7fd9a4f"
+      sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.4+1"
+    version: "2.2.6"
  sqflite_common:
    dependency: transitive
    description:
      name: sqflite_common
-      sha256: bfd6973aaeeb93475bc0d875ac9aefddf7965ef22ce09790eb963992ffc5183f
+      sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.2+2"
+    version: "2.4.3"
  stack_trace:
    dependency: transitive
    description:
@ -1776,10 +1784,10 @@ packages:
    dependency: transitive
    description:
      name: tint
-      sha256: d856019547532d4ea24171f554b319081c004c37741e7946eae30cb09f24e1c7
+      sha256: "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
  tor_detector_web:
    dependency: "direct main"
    description:
@ -1872,18 +1880,18 @@ packages:
    dependency: "direct main"
    description:
      name: universal_html
-      sha256: "5ff50b7c14d201421cf5230ec389a0591c4deb5c817c9d7ccca3b26fe5f31e34"
+      sha256: ed4f24120c9b1b4721d44e439f7a47d09d9f1b7b868bc84c9d6d373a4a8732af
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.8"
+    version: "2.2.1"
  universal_io:
    dependency: transitive
    description:
      name: universal_io
-      sha256: "79f78ddad839ee3aae3ec7c01eb4575faf0d5c860f8e5223bc9f9c17f7f03cef"
+      sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.4"
+    version: "2.2.0"
  unorm_dart:
    dependency: transitive
    description:
@ -1896,66 +1904,66 @@ packages:
    dependency: "direct main"
    description:
      name: url_launcher
-      sha256: "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809"
+      sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e"
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.8"
+    version: "6.1.10"
  url_launcher_android:
    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: "3e2f6dfd2c7d9cd123296cab8ef66cfc2c1a13f5845f42c7a0f365690a8a7dd1"
+      sha256: "845530e5e05db5500c1a4c1446785d60cbd8f9bd45e21e7dd643a3273bb4bbd1"
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.23"
+    version: "6.0.25"
  url_launcher_ios:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: bb328b24d3bccc20bdf1024a0990ac4f869d57663660de9c936fb8c043edefe3
+      sha256: "3dedc66ca3c0bef9e6a93c0999aee102556a450afcc1b7bcfeace7a424927d92"
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.18"
+    version: "6.1.3"
  url_launcher_linux:
    dependency: transitive
    description:
      name: url_launcher_linux
-      sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc"
+      sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.4"
  url_launcher_macos:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: "41988b55570df53b3dd2a7fc90c76756a963de6a8c5f8e113330cb35992e2094"
+      sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.4"
  url_launcher_platform_interface:
    dependency: transitive
    description:
      name: url_launcher_platform_interface
-      sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6"
+      sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  url_launcher_web:
    dependency: transitive
    description:
      name: url_launcher_web
-      sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0"
+      sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.14"
+    version: "2.0.16"
  url_launcher_windows:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615
+      sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
  url_strategy:
    dependency: transitive
    description:
@ -2000,42 +2008,42 @@ packages:
    dependency: "direct main"
    description:
      name: video_player
-      sha256: "59f7f31c919c59cbedd37c617317045f5f650dc0eeb568b0b0de9a36472bdb28"
+      sha256: "868a139229acb5018d22aded3eb9cb4767ff43a8216573c086b6c535a4957481"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.1"
+    version: "2.6.0"
  video_player_android:
    dependency: transitive
    description:
      name: video_player_android
-      sha256: "984388511230bac63feb53b2911a70e829fe0976b6b2213f5c579c4e0a882db3"
+      sha256: dc31c60ae591aa3ccb2d460c3690ceceb86cbb826e73428d817a37650dc4e229
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.10"
+    version: "2.4.2"
  video_player_avfoundation:
    dependency: transitive
    description:
      name: video_player_avfoundation
-      sha256: d9f7a46d6a77680adb03ec05a381025d6e890ebe636637c6c3014cc3926b97e9
+      sha256: "90468226c8687adf7b567d9bb42c25588783c4d30509af1fbd663b2dd049f700"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.8"
+    version: "2.4.2"
  video_player_platform_interface:
    dependency: transitive
    description:
      name: video_player_platform_interface
-      sha256: "42bb75de5e9b79e1f20f1d95f688fac0f95beac4d89c6eb2cd421724d4432dae"
+      sha256: a8c4dcae2a7a6e7cc1d7f9808294d968eca1993af34a98e95b9bdfa959bec684
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.1"
+    version: "6.1.0"
  video_player_web:
    dependency: transitive
    description:
      name: video_player_web
-      sha256: b649b07b8f8f553bee4a97a0a53d0fe78a70b115eafaf0105b612b32b05ddb99
+      sha256: fb3bbeaf0302cb0c31340ebd6075487939aa1fe3b379d1a8784ef852b679940e
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.13"
+    version: "2.0.15"
  visibility_detector:
    dependency: transitive
    description:
@ -2132,6 +2140,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.1.3"
+  window_to_front:
+    dependency: transitive
+    description:
+      name: window_to_front
+      sha256: "7aef379752b7190c10479e12b5fd7c0b9d92adc96817d9e96c59937929512aee"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.3"
  wkt_parser:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -43,7 +43,7 @@ dependencies:
  flutter_ringtone_player: ^3.1.1
  flutter_secure_storage: ^7.0.1
  flutter_typeahead: ^4.3.2
-  flutter_web_auth: ^0.5.0
+  flutter_web_auth_2: ^2.1.1
  flutter_webrtc: ^0.9.24
  future_loading_dialog: ^0.2.3
  geolocator: ^7.6.2
--- a/web/auth.html
+++ b/web/auth.html
@ -7,7 +7,7 @@
  close the window.
  <script>
    window.opener.postMessage({
-      'flutter-web-auth': window.location.href
+      'flutter-web-auth-2': window.location.href
    }, window.location.origin);
    window.close();
  </script>
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@ -16,6 +16,7 @@
 #include <record_windows/record_windows_plugin_c_api.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
+#include <window_to_front/window_to_front_plugin.h>

 void RegisterPlugins(flutter::PluginRegistry* registry) {
  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
@ -38,4 +39,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
  UrlLauncherWindowsRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
+  WindowToFrontPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("WindowToFrontPlugin"));
 }
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@ -13,6 +13,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
  record_windows
  share_plus
  url_launcher_windows
+  window_to_front
 )

 list(APPEND FLUTTER_FFI_PLUGIN_LIST