ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Try downgrading flutter web auth

Browse source
This commit is contained in:
Krille 2024-11-20 15:48:17 +01:00
parent d8cf6dfb13
commit 1c5c491ceb
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
9 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pages/chat/chat_view.dart
View file

@ -1,6 +1,5 @@
import 'dart:ui' as ui;
import 'package:fluffychat/utils/localized_exception_extension.dart';
import 'package:flutter/material.dart';
import 'package:badges/badges.dart';
@ -18,6 +17,7 @@ import 'package:fluffychat/pages/chat/pinned_events.dart';
import 'package:fluffychat/pages/chat/reactions_picker.dart';
import 'package:fluffychat/pages/chat/reply_display.dart';
import 'package:fluffychat/utils/account_config.dart';
import 'package:fluffychat/utils/localized_exception_extension.dart';
import 'package:fluffychat/widgets/chat_settings_popup_menu.dart';
import 'package:fluffychat/widgets/connection_status_header.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart';

2
lib/pages/homeserver_picker/homeserver_picker.dart
View file

@ -169,7 +169,7 @@ class HomeserverPickerController extends State<HomeserverPicker> {
final result = await FlutterWebAuth2.authenticate(
url: url.toString(),
callbackUrlScheme: urlScheme,
options: FlutterWebAuth2Options(useWebview: !isDefaultPlatform),
options: const FlutterWebAuth2Options(),
);
final token = Uri.parse(result).queryParameters['loginToken'];
if (token?.isEmpty ?? false) return;

4
linux/flutter/generated_plugin_registrant.cc
View file

@ -7,7 +7,6 @@
#include "generated_plugin_registrant.h"
#include <desktop_drop/desktop_drop_plugin.h>
#include <desktop_webview_window/desktop_webview_window_plugin.h>
#include <dynamic_color/dynamic_color_plugin.h>
#include <emoji_picker_flutter/emoji_picker_flutter_plugin.h>
#include <file_selector_linux/file_selector_plugin.h>
@ -24,9 +23,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) desktop_drop_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopDropPlugin");
desktop_drop_plugin_register_with_registrar(desktop_drop_registrar);
g_autoptr(FlPluginRegistrar) desktop_webview_window_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopWebviewWindowPlugin");
desktop_webview_window_plugin_register_with_registrar(desktop_webview_window_registrar);
g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);

1
linux/flutter/generated_plugins.cmake
View file

@ -4,7 +4,6 @@
list(APPEND FLUTTER_PLUGIN_LIST
desktop_drop
desktop_webview_window
dynamic_color
emoji_picker_flutter
file_selector_linux

2
macos/Flutter/GeneratedPluginRegistrant.swift
View file

@ -8,7 +8,6 @@ import Foundation
import appkit_ui_element_colors
import audio_session
import desktop_drop
import desktop_webview_window
import device_info_plus
import dynamic_color
import emoji_picker_flutter
@ -40,7 +39,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
AppkitUiElementColorsPlugin.register(with: registry.registrar(forPlugin: "AppkitUiElementColorsPlugin"))
AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin"))
DesktopWebviewWindowPlugin.register(with: registry.registrar(forPlugin: "DesktopWebviewWindowPlugin"))
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin"))

16
pubspec.lock
View file

@ -294,14 +294,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.6.3"
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:
@ -759,18 +751,18 @@ packages:
dependency: "direct main"
description:
name: flutter_web_auth_2
sha256: "8f59c9fa71b5affb322cb7103b836cd0ced89c9c50c66f82b523b7d339018dc3"
sha256: "4d3d2fd3d26bf1a26b3beafd4b4b899c0ffe10dc99af25abc58ffe24e991133c"
url: "https://pub.dev"
source: hosted
version: "4.0.1"
version: "3.1.2"
flutter_web_auth_2_platform_interface:
dependency: transitive
description:
name: flutter_web_auth_2_platform_interface
sha256: "222264d4979e9372c90e441736a62d800481e4a9c860cc2c235d1d605a118a2b"
sha256: e8669e262005a8354389ba2971f0fc1c36188481234ff50d013aaf993f30f739
url: "https://pub.dev"
source: hosted
version: "4.0.1"
version: "3.1.0"
flutter_web_plugins:
dependency: transitive
description: flutter

2
pubspec.yaml
View file

@ -49,7 +49,7 @@ dependencies:
flutter_shortcuts:
git: https://github.com/krille-chan/flutter_shortcuts.git
flutter_typeahead: ^5.2.0
flutter_web_auth_2: ^4.0.1
flutter_web_auth_2: ^3.1.1
flutter_webrtc: ^0.11.7
geolocator: ^13.0.1
go_router: ^14.3.0

3
windows/flutter/generated_plugin_registrant.cc
View file

@ -7,7 +7,6 @@
#include "generated_plugin_registrant.h"
#include <desktop_drop/desktop_drop_plugin.h>
#include <desktop_webview_window/desktop_webview_window_plugin.h>
#include <dynamic_color/dynamic_color_plugin_c_api.h>
#include <emoji_picker_flutter/emoji_picker_flutter_plugin_c_api.h>
#include <file_selector_windows/file_selector_windows.h>
@ -25,8 +24,6 @@
void RegisterPlugins(flutter::PluginRegistry* registry) {
DesktopDropPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("DesktopDropPlugin"));
DesktopWebviewWindowPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("DesktopWebviewWindowPlugin"));
DynamicColorPluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
EmojiPickerFlutterPluginCApiRegisterWithRegistrar(

1
windows/flutter/generated_plugins.cmake
View file

@ -4,7 +4,6 @@
list(APPEND FLUTTER_PLUGIN_LIST
desktop_drop
desktop_webview_window
dynamic_color
emoji_picker_flutter
file_selector_windows