fix: somewhat fix discord login

aayush2622 · aayush2622 · commit 02e555d8e0d7 · 2025-06-18T14:28:52.000+05:30
diff --git a/lib/Api/Discord/Login.dart b/lib/Api/Discord/Login.dart
@@ -18,13 +18,14 @@ class MobileLoginState extends State<MobileLogin> {
   late InAppWebViewController _controller;
 
   Future<void> _extractToken() async {
+    if (!mounted) return;
     await Future.delayed(const Duration(seconds: 2));
     try {
       final result = await _controller.evaluateJavascript(source: '''
-        (function() {
-    const m = []; webpackChunkdiscord_app.push([[""], {}, e => {for (let c in e.c)m.push(e.c[c])}]);
-    return m.find(n => n?.exports?.default?.getToken !== void 0)?.exports?.default?.getToken();
-    })()''');
+  (function() {
+    return window.LOCAL_STORAGE.getItem('token');
+  })()
+''');
 
       if (result != null && result != 'null') {
         _login(result.trim().replaceAll('"', ''));
@@ -53,12 +54,20 @@ class MobileLoginState extends State<MobileLogin> {
               javaScriptEnabled: true,
             ),
           ),
+          onLoadStart: (controller, url) async {
+            await controller.evaluateJavascript(source: '''
+            try {
+              window.LOCAL_STORAGE = localStorage;
+            } catch (e) {}
+          ''');
+          },
           onWebViewCreated: (controller) {
             _controller = controller;
             _clearDiscordData();
           },
           onUpdateVisitedHistory: (controller, url, isReload) async {
-            if (url.toString() != 'https://discord.com/login') {
+            if (url.toString() != 'https://discord.com/login' &&
+                url.toString() != 'about:blank') {
               await _extractToken();
             }
           },
@@ -75,7 +84,7 @@ class MobileLoginState extends State<MobileLogin> {
   Future<void> _clearDiscordData() async {
     await _controller.evaluateJavascript(source: '''
       if (window.location.hostname === 'discord.com') {
-        window.localStorage.clear();
+        window.LOCAL_STORAGE.clear();
         window.sessionStorage.clear();
       }
     ''');
@@ -118,6 +127,10 @@ class LinuxLoginState extends State<LinuxLogin> {
       ..setBrightness(Brightness.dark)
       ..launch('https://discord.com/login');
 
+    await Future.delayed(const Duration(milliseconds: 1000));
+
+    await _controller.evaluateJavaScript('''window.LOCAL_STORAGE = window.localStorage;
+    Object.keys(window.localStorage);''');
     _controller.addOnUrlRequestCallback(
       (String url) async {
         if (url != 'https://discord.com/login' && url != 'about:blank') {
@@ -129,11 +142,12 @@ class LinuxLoginState extends State<LinuxLogin> {
 
   Future<void> _extractToken() async {
     try {
+
       final result = await _controller.evaluateJavaScript('''
-        (function() {
-    const m = []; webpackChunkdiscord_app.push([[""], {}, e => {for (let c in e.c)m.push(e.c[c])}]);
-    return m.find(n => n?.exports?.default?.getToken !== void 0)?.exports?.default?.getToken();
-    })()''');
+  (function() {
+    return window.LOCAL_STORAGE.getItem('token');
+  })()
+''');
 
       if (result != null && result != 'null') {
         _login(result.trim().replaceAll('"', ''));
diff --git a/lib/Functions/Function.dart b/lib/Functions/Function.dart
@@ -80,6 +80,7 @@ Future<void> snackString(
 }) async {
   var context = c ?? Get.context;
   Logger.log('Showing SnackBar with message: $s');
+  debugPrint('Showing SnackBar with message: $s');
   if (context != null && s != null && s.isNotEmpty) {
     var theme = Theme.of(context).colorScheme;
     try {
diff --git a/lib/Screens/Home/HomeScreen.dart b/lib/Screens/Home/HomeScreen.dart
@@ -104,8 +104,23 @@ class HomeScreenState extends State<HomeScreen> {
       children: [
         SizedBox(
           height: backgroundHeight,
-          child: Obx(
-            () {
+          child: AnimatedSwitcher(
+            duration: const Duration(milliseconds: 500),
+            switchInCurve: Curves.easeInOut,
+            switchOutCurve: Curves.easeInOut,
+            transitionBuilder: (Widget child, Animation<double> animation) {
+              return FadeTransition(
+                opacity: animation,
+                child: SlideTransition(
+                  position: Tween<Offset>(
+                    begin: const Offset(0.0, 0.05),
+                    end: Offset.zero,
+                  ).animate(animation),
+                  child: child,
+                ),
+              );
+            },
+            child: Obx(() {
               if (!service.running.value) {
                 return const LoadingWidget();
               }
@@ -118,8 +133,9 @@ class HomeScreenState extends State<HomeScreen> {
                   _buildCards(service, data),
                 ],
               );
-            },
+            }),
           ),
+
         ),
       ],
     );
diff --git a/lib/Screens/Home/Widgets/LoadingWidget.dart b/lib/Screens/Home/Widgets/LoadingWidget.dart
@@ -22,13 +22,14 @@ class LoadingWidget extends StatelessWidget {
           child: const LinearProgressIndicator(),
         ),
         Positioned(
-            right: 34,
-            top: 36.statusBar(),
-            child: GestureDetector(
-              child: const SettingIconWidget(icon: Icons.settings),
-              onTap: () =>
-                  showCustomBottomDialog(context, const SettingsBottomSheet()),
-            )),
+          right: 34,
+          top: 36.statusBar(),
+          child: GestureDetector(
+            child: const SettingIconWidget(icon: Icons.settings),
+            onTap: () =>
+                showCustomBottomDialog(context, const SettingsBottomSheet()),
+          ),
+        ),
       ],
     );
   }
diff --git a/lib/Screens/Settings/SettingsAccountScreen.dart b/lib/Screens/Settings/SettingsAccountScreen.dart
@@ -82,7 +82,6 @@ class SettingsAccountScreenState extends BaseSettingsScreen {
           ..show(),
         onLogIn: () => Simkl.login(context),
       ),
-      const SizedBox(height: 16),
       _buildAccountSection(
         context,
         iconPath: 'assets/svg/discord.svg',
