add: webview login (allows for 2fa and other verfication)

TheHCJ · TheHCJ · commit 0680fa9614ca · 2024-04-24T20:57:55.000+01:00
diff --git a/lib/client/client.dart b/lib/client/client.dart
@@ -30,7 +30,8 @@ class _QuackerTwitterClient extends TwitterClient {
       if (response?.statusCode != null && response!.statusCode >= 200 && response.statusCode < 300) {
         return response;
       } else {
-        return Future.error(HttpException("${response?.statusCode}: ${response?.reasonPhrase}"));
+        print(response?.body);
+        return Future.error(HttpException(response?.body ?? response?.statusCode.toString() ?? ""));
       }
     });
   }
diff --git a/lib/client/client_regular_account.dart b/lib/client/client_regular_account.dart
diff --git a/lib/client/login_webview.dart b/lib/client/login_webview.dart
@@ -0,0 +1,75 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
+import 'package:quacker/constants.dart';
+import 'package:quacker/database/entities.dart';
+import 'package:quacker/database/repository.dart';
+import 'package:quacker/generated/l10n.dart';
+import 'package:webview_cookie_manager/webview_cookie_manager.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+class TwitterLoginWebview extends StatefulWidget {
+  const TwitterLoginWebview({super.key});
+
+  @override
+  State<TwitterLoginWebview> createState() => _TwitterLoginWebviewState();
+}
+
+class _TwitterLoginWebviewState extends State<TwitterLoginWebview> {
+  @override
+  Widget build(BuildContext context) {
+    WebViewPlatform.instance;
+    final webviewCookieManager = WebviewCookieManager();
+    final webviewController = WebViewController();
+    webviewController.setJavaScriptMode(JavaScriptMode.unrestricted);
+    webviewController.loadRequest(Uri.https("twitter.com", "i/flow/login"));
+    webviewController.setNavigationDelegate(NavigationDelegate(
+      onUrlChange: (change) async {
+        if (change.url == "https://twitter.com/home") {
+          final cookies = await webviewCookieManager.getCookies("https://twitter.com/i/flow/login");
+          Logger("").info(cookies);
+
+          try {
+            final expCt0 = RegExp(r'(ct0=(.+?));');
+            final RegExpMatch? matchCt0 = expCt0.firstMatch(cookies.toString());
+            final csrfToken = matchCt0?.group(2);
+            if (csrfToken != null) {
+              final Map<String, String> authHeader = {
+                "Cookie": cookies
+                    .where((cookie) =>
+                        cookie.name == "guest_id" ||
+                        cookie.name == "gt" ||
+                        cookie.name == "att" ||
+                        cookie.name == "auth_token" ||
+                        cookie.name == "ct0")
+                    .map((cookie) => '${cookie.name}=${cookie.value}')
+                    .join(";"),
+                "authorization": bearerToken,
+                "x-csrf-token": csrfToken,
+              };
+
+              print(authHeader);
+
+              final database = await Repository.writable();
+              database.insert(tableAccounts,
+                  Account(id: csrfToken, name: "", description: "", authHeader: json.encode(authHeader)).toMap());
+              database.close();
+            }
+            Navigator.pop(context);
+          } catch (e) {
+            throw Exception(e);
+          }
+        }
+      },
+    ));
+    return Scaffold(
+      appBar: AppBar(
+        toolbarHeight: 50,
+      ),
+      body: WebViewWidget(
+        controller: webviewController,
+      ),
+    );
+  }
+}
diff --git a/lib/database/entities.dart b/lib/database/entities.dart
@@ -213,17 +213,17 @@ class SubscriptionGroupMember with ToMappable {
 
 class Account {
   final String id;
-  final String password;
-  final String? email;
+  final String name;
+  final String? description;
   final dynamic authHeader;
 
-  Account({required this.id, required this.password, this.email, required this.authHeader});
+  Account({required this.id, required this.name, this.description, required this.authHeader});
 
   factory Account.fromMap(Map<String, Object?> map) {
     return Account(
       id: map['id'] as String,
-      password: map['password'] as String,
-      email: map['email'] as String?,
+      name: map['name'] as String,
+      description: map['description'] as String?,
       authHeader: map['auth_header'],
     );
   }
@@ -237,6 +237,6 @@ class Account {
 
   @override
   Map<String, dynamic> toMap() {
-    return {'screen_name': id, 'password': password, 'email': email, 'auth_header': authHeader};
+    return {'id': id, 'password': name, 'email': description, 'auth_header': authHeader};
   }
 }
diff --git a/lib/database/repository.dart b/lib/database/repository.dart
@@ -223,7 +223,7 @@ class Repository {
         // create table for storing twitter accounts
         SqlMigration(
             'CREATE TABLE IF NOT EXISTS $tableAccounts (id TEXT PRIMARY KEY, password TEXT, email TEXT, auth_header VARCHAR)'),
-      ]
+      ],
     });
     await openDatabase(
       databaseName,
diff --git a/lib/settings/_account.dart b/lib/settings/_account.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:pref/pref.dart';
 import 'package:quacker/client/client_regular_account.dart';
+import 'package:quacker/client/login_webview.dart';
 import 'package:quacker/generated/l10n.dart';
-import 'package:provider/provider.dart';
-import 'package:pref/pref.dart';
-import 'package:quacker/ui/errors.dart';
 
 class SettingsAccountFragment extends StatefulWidget {
   const SettingsAccountFragment({super.key});
@@ -15,13 +14,12 @@ class SettingsAccountFragment extends StatefulWidget {
 class _SettingsAccountFragment extends State<SettingsAccountFragment> {
   @override
   Widget build(BuildContext context) {
-    var model = context.read<XRegularAccount>();
     return Scaffold(
       appBar: AppBar(
         title: Text(L10n.current.account),
         actions: [
           IconButton(
-              onPressed: () => showDialog(context: context, builder: (_) => addDialog(model)),
+              onPressed: () => Navigator.push(context, MaterialPageRoute(builder: (_) => const TwitterLoginWebview())),
               icon: const Icon(Icons.add))
         ],
       ),
@@ -37,127 +35,19 @@ class _SettingsAccountFragment extends State<SettingsAccountFragment> {
                   itemBuilder: (BuildContext itemContext, int index) {
                     return Card(
                         child: ListTile(
-                      title: Text(data[index]['id'].toString()),
-                      subtitle: Text(data[index]['email'].toString()),
-                      leading: Icon(Icons.account_circle),
-                      trailing: Row(mainAxisSize: MainAxisSize.min, children: [
-                        IconButton(
-                          icon: Icon(Icons.refresh),
-                          onPressed: () async {
-                            await addAccount(data[index]['id'] as String, data[index]['password'] as String,
-                                data[index]['email'].toString());
-                            setState(() {});
-                          },
-                        ),
-                        IconButton(
-                          icon: Icon(Icons.delete),
-                          onPressed: () async {
-                            await deleteAccount(data[index]['id'].toString());
-                            setState(() {});
-                          },
-                        )
-                      ]),
-                      onTap: () => showDialog(
-                          context: context,
-                          builder: (_) => addDialog(model,
-                              username: data[index]['id'] as String,
-                              password: data[index]['password'] as String,
-                              email: data[index]['email'].toString())),
-                    ));
+                            title: Text(L10n.of(context).account),
+                            subtitle: Text(L10n.of(context).unknown),
+                            leading: Icon(Icons.account_circle),
+                            trailing: IconButton(
+                              icon: Icon(Icons.delete),
+                              onPressed: () async {
+                                await deleteAccount(data[index]['id'].toString());
+                                setState(() {});
+                              },
+                            )));
                   });
             }
           }),
     );
   }
 }
-
-class addDialog extends StatefulWidget {
-  final XRegularAccount model;
-  final String username;
-  final String password;
-  final String email;
-
-  const addDialog(this.model, {super.key, this.username = "", this.password = "", this.email = ""});
-
-  @override
-  State<addDialog> createState() => _addDialog();
-}
-
-class _addDialog extends State<addDialog> {
-  bool hidePassword = true;
-
-  TextEditingController _username = TextEditingController();
-  TextEditingController _password = TextEditingController();
-  TextEditingController _email = TextEditingController();
-
-  Widget build(BuildContext context) {
-    _username.text = widget.username;
-    _password.text = widget.password;
-    _email.text = widget.email;
-
-    return AlertDialog(
-      title: Text(L10n.of(context).account),
-      content: Column(mainAxisSize: MainAxisSize.min, children: [
-        Flexible(
-          child: TextField(
-            controller: _username,
-            decoration: InputDecoration(
-                isDense: true, label: Text(L10n.of(context).loginNameTwitterAcc), border: const OutlineInputBorder()),
-          ),
-        ),
-        const SizedBox(
-          height: 8.0,
-        ),
-        Flexible(
-          child: TextField(
-            controller: _password,
-            obscureText: hidePassword,
-            decoration: InputDecoration(
-              isDense: true,
-              label: Text(L10n.of(context).passwordTwitterAcc),
-              border: const OutlineInputBorder(),
-              suffixIcon: IconButton(
-                icon: Icon(hidePassword ? Icons.visibility : Icons.visibility_off),
-                onPressed: () => setState(() => hidePassword = !hidePassword),
-              ),
-            ),
-          ),
-        ),
-        const SizedBox(
-          height: 8.0,
-        ),
-        Flexible(
-          child: TextField(
-            controller: _email,
-            keyboardType: TextInputType.emailAddress,
-            decoration: InputDecoration(
-                isDense: true, label: Text(L10n.of(context).emailTwitterAcc), border: const OutlineInputBorder()),
-          ),
-        ),
-        const SizedBox(
-          height: 8.0,
-        ),
-        const Padding(
-            padding: EdgeInsets.all(8.0),
-            child: Text(
-              "⚠️ 2FA is currently not supported ⚠️",
-              textAlign: TextAlign.center,
-            )),
-      ]),
-      actions: [
-        TextButton(
-            onPressed: () async {
-              final response = await addAccount(_username.text, _password.text, _email.text);
-              if (context.mounted) {
-                showSnackBar(context, icon: '', message: response);
-              }
-              Navigator.pop(context);
-
-              setState(() {});
-            },
-            child: Text(L10n.of(context).login)),
-        TextButton(onPressed: () => Navigator.pop(context), child: Text(L10n.of(context).close)),
-      ],
-    );
-  }
-}
diff --git a/pubspec.lock b/pubspec.lock
@@ -1284,6 +1284,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
+  webview_cookie_manager:
+    dependency: "direct main"
+    description:
+      name: webview_cookie_manager
+      sha256: "425a9feac5cd2cb62a71da3dda5ac2eaf9ece5481ee8d79f3868dc5ba8223ad3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.6"
+  webview_flutter:
+    dependency: "direct main"
+    description:
+      name: webview_flutter
+      sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.7.0"
+  webview_flutter_android:
+    dependency: transitive
+    description:
+      name: webview_flutter_android
+      sha256: f038ee2fae73b509dde1bc9d2c5a50ca92054282de17631a9a3d515883740934
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.16.0"
+  webview_flutter_platform_interface:
+    dependency: transitive
+    description:
+      name: webview_flutter_platform_interface
+      sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.10.0"
+  webview_flutter_wkwebview:
+    dependency: transitive
+    description:
+      name: webview_flutter_wkwebview
+      sha256: f12f8d8a99784b863e8b85e4a9a5e3cf1839d6803d2c0c3e0533a8f3c5a992a7
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.13.0"
   win32:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -76,6 +76,8 @@ dependencies:
     sdk: flutter
   flutter_local_notifications: ^17.0.0
   dynamic_color: ^1.7.0
+  webview_flutter: ^4.7.0
+  webview_cookie_manager: ^2.0.6
 
 dev_dependencies:
   flutter_test:

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ class _QuackerTwitterClient extends TwitterClient {`
`30`	`30`	`if (response?.statusCode != null && response!.statusCode >= 200 && response.statusCode < 300) {`
`31`	`31`	`return response;`
`32`	`32`	`} else {`
`33`		`- return Future.error(HttpException("${response?.statusCode}: ${response?.reasonPhrase}"));`
	`33`	`+ print(response?.body);`
	`34`	`+ return Future.error(HttpException(response?.body ?? response?.statusCode.toString() ?? ""));`
`34`	`35`	`}`
`35`	`36`	`});`
`36`	`37`	`}`