From 17c509471978d9e1452b3997ea0c5d8d39ed8214 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 9 Mar 2025 20:26:37 -0500 Subject: [PATCH] chore(mobile): upgrade flutter_web_auth_2 (#16741) * chore(mobile): upgrade flutter_web_auth_2 * pod file --- .../android/app/src/main/AndroidManifest.xml | 4 +-- mobile/ios/Podfile.lock | 10 +++--- mobile/lib/services/oauth.service.dart | 4 +-- mobile/pubspec.lock | 34 ++++++++++++++++--- mobile/pubspec.yaml | 2 +- 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml index ac57884eef..eb81dc267b 100644 --- a/mobile/android/app/src/main/AndroidManifest.xml +++ b/mobile/android/app/src/main/AndroidManifest.xml @@ -93,9 +93,9 @@ - + diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock index 00a63be8d7..c2a1056c14 100644 --- a/mobile/ios/Podfile.lock +++ b/mobile/ios/Podfile.lock @@ -48,7 +48,7 @@ PODS: - flutter_udid (0.0.1): - Flutter - SAMKeychain - - flutter_web_auth (0.6.0): + - flutter_web_auth_2 (3.0.0): - Flutter - fluttertoast (0.0.2): - Flutter @@ -117,7 +117,7 @@ DEPENDENCIES: - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - flutter_udid (from `.symlinks/plugins/flutter_udid/ios`) - - flutter_web_auth (from `.symlinks/plugins/flutter_web_auth/ios`) + - flutter_web_auth_2 (from `.symlinks/plugins/flutter_web_auth_2/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) @@ -166,8 +166,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_native_splash/ios" flutter_udid: :path: ".symlinks/plugins/flutter_udid/ios" - flutter_web_auth: - :path: ".symlinks/plugins/flutter_web_auth/ios" + flutter_web_auth_2: + :path: ".symlinks/plugins/flutter_web_auth_2/ios" fluttertoast: :path: ".symlinks/plugins/fluttertoast/ios" geolocator_apple: @@ -220,7 +220,7 @@ SPEC CHECKSUMS: flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778 flutter_udid: a2482c67a61b9c806ef59dd82ed8d007f1b7ac04 - flutter_web_auth: acc15a8fd7bba796a933c724a6dffc3d00f07c27 + flutter_web_auth_2: 06d500582775790a0d4c323222fcb6d7990f9603 fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450 image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1 diff --git a/mobile/lib/services/oauth.service.dart b/mobile/lib/services/oauth.service.dart index 30e6448d7f..ddd97522f8 100644 --- a/mobile/lib/services/oauth.service.dart +++ b/mobile/lib/services/oauth.service.dart @@ -1,7 +1,7 @@ +import 'package:flutter_web_auth_2/flutter_web_auth_2.dart'; import 'package:immich_mobile/services/api.service.dart'; import 'package:logging/logging.dart'; import 'package:openapi/api.dart'; -import 'package:flutter_web_auth/flutter_web_auth.dart'; // Redirect URL = app.immich:///oauth-callback @@ -32,7 +32,7 @@ class OAuthService { } Future oAuthLogin(String oauthUrl) async { - String result = await FlutterWebAuth.authenticate( + String result = await FlutterWebAuth2.authenticate( url: oauthUrl, callbackUrlScheme: callbackUrlScheme, ); diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index fc3105098f..db1a335adf 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -358,6 +358,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.10" + desktop_webview_window: + dependency: transitive + description: + name: desktop_webview_window + sha256: "57cf20d81689d5cbb1adfd0017e96b669398a669d927906073b0e42fc64111c0" + url: "https://pub.dev" + source: hosted + version: "0.2.3" device_info_plus: dependency: "direct main" description: @@ -602,14 +610,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" - flutter_web_auth: + flutter_web_auth_2: dependency: "direct main" description: - name: flutter_web_auth - sha256: "95e4856e24fb6ac1678f5ff334743b63f782d839ab324543d29ccbd295176209" + name: flutter_web_auth_2 + sha256: "561c32d32ed537853de43852c35849cf1d37f3482f41f22b718ab6112f96b333" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "5.0.0-alpha.0" + flutter_web_auth_2_platform_interface: + dependency: transitive + description: + name: flutter_web_auth_2_platform_interface + sha256: "45927587ebb2364cd273675ec95f6f67b81725754b416cef2b65cdc63fd3e853" + url: "https://pub.dev" + source: hosted + version: "5.0.0-alpha.0" flutter_web_plugins: dependency: transitive description: flutter @@ -1813,6 +1829,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.4" + window_to_front: + dependency: transitive + description: + name: window_to_front + sha256: "7aef379752b7190c10479e12b5fd7c0b9d92adc96817d9e96c59937929512aee" + url: "https://pub.dev" + source: hosted + version: "0.0.3" xdg_directories: dependency: transitive description: @@ -1846,5 +1870,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.3 <4.0.0" + dart: ">=3.5.0 <4.0.0" flutter: ">=3.24.5" diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 7bce65e484..1d16359f9a 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -42,7 +42,7 @@ dependencies: path_provider: ^2.1.2 collection: ^1.18.0 http_parser: ^4.0.2 - flutter_web_auth: 0.6.0 + flutter_web_auth_2: ^5.0.0-alpha.0 easy_image_viewer: ^1.4.0 isar: version: *isar_version