Moved auth logic to expose service and logic to app model

ubuntu-flutter-community · Nov 13, 2024 · d3fa726 · d3fa726
1 parent e08c629
commit d3fa726
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 31 deletions.
diff --git a/lib/app/app_model.dart b/lib/app/app_model.dart
@@ -26,10 +26,20 @@ class AppModel extends SafeChangeNotifier {
   Stream<String?> get errorStream => _exposeService.discordErrorStream;
   Stream<bool> get isDiscordConnectedStream =>
       _exposeService.isDiscordConnectedStream;
+  Stream<bool> get isLastFmAuthenticatedStream =>
+      _exposeService.isLastFmAuthenticatedStream;
+  //TODO: Do something(ex:change the text of the save button) once authenticated
 
   Future<void> connectToDiscord() async => _exposeService.connectToDiscord();
   Future<void> disconnectFromDiscord() async =>
       _exposeService.disconnectFromDiscord();
+  Future<void> setLastFmAuth() async {
+    final sessionData = await _exposeService.setLastFmAuth();
+    if (sessionData != null) {
+      _settingsService.setLastFmSessionKey(sessionData['sessionKey']!);
+      _settingsService.setLastFmUsername(sessionData['username']!);
+    }
+  }
 
   final GitHub _gitHub;
   final SettingsService _settingsService;

diff --git a/lib/expose/expose_service.dart b/lib/expose/expose_service.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter_discord_rpc/flutter_discord_rpc.dart';
 import 'package:lastfm/lastfm.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class ExposeService {
   ExposeService({
@@ -13,9 +14,11 @@ class ExposeService {
   final FlutterDiscordRPC? _discordRPC;
   final LastFMAuthorized? _lastFm;
   final _errorController = StreamController<String?>.broadcast();
+  final _lastFmAuthController = StreamController<bool>.broadcast();
   Stream<String?> get discordErrorStream => _errorController.stream;
   Stream<bool> get isDiscordConnectedStream =>
       _discordRPC?.isConnectedStream ?? Stream.value(false);
+  Stream<bool> get isLastFmAuthenticatedStream => _lastFmAuthController.stream;
 
   Future<void> exposeTitleOnline({
     required String title,
@@ -37,6 +40,37 @@ class ExposeService {
     }
   }
 
+  Future<Map<String, String>?> setLastFmAuth() async {
+    final lastfmua = _lastFm as LastFMUnauthorized;
+    launchUrl(
+      Uri.parse(await lastfmua.authorizeDesktop()),
+    );
+
+    const maxWaitDuration = Duration(minutes: 2); // Customize as needed
+    final startTime = DateTime.now();
+    await Future.delayed(const Duration(seconds: 10));
+    while (DateTime.now().difference(startTime) < maxWaitDuration) {
+      try {
+        final lastfm = await lastfmua.finishAuthorizeDesktop();
+        final sessionKey = lastfm.sessionKey;
+        final username = lastfm.username;
+        _updateLastFmAuthStatus(true);
+        return {
+          'sessionKey': sessionKey,
+          'username': username,
+        };
+      } catch (e) {
+        await Future.delayed(const Duration(seconds: 10));
+      }
+    }
+    _updateLastFmAuthStatus(false);
+    return null;
+  }
+
+  void _updateLastFmAuthStatus(bool status) {
+    _lastFmAuthController.add(status);
+  }
+
   Future<void> _exposeTitleToDiscord({
     required String title,
     required String artist,
@@ -103,5 +137,6 @@ class ExposeService {
   Future<void> dispose() async {
     await disconnectFromDiscord();
     await _errorController.close();
+    await _lastFmAuthController.close();
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -160,7 +160,6 @@ void registerServicesAndViewModels({
       () => SettingsService(
         sharedPreferences: di<SharedPreferences>(),
         downloadsDefaultDir: downloadsDefaultDir,
-        lastFm: di<LastFM>(),
       ),
       dispose: (s) async => s.dispose(),
     )

diff --git a/lib/settings/settings_model.dart b/lib/settings/settings_model.dart
@@ -74,7 +74,6 @@ class SettingsModel extends SafeChangeNotifier {
   void setLastFmSecret(String value) => _service.setLastFmSecret(value);
   void setLastFmSessionKey(String value) => _service.setLastFmSessionKey(value);
   void setLastFmUsername(String value) => _service.setLastFmUsername(value);
-  Future<void> setLastFmAuth() async => _service.setLastFmAuth();
 
   bool get useMoreAnimations => _service.useMoreAnimations;
   void setUseMoreAnimations(bool value) => _service.setUseMoreAnimations(value);

diff --git a/lib/settings/settings_service.dart b/lib/settings/settings_service.dart
@@ -1,9 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:lastfm/lastfm.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 import '../common/data/close_btn_action.dart';
 import '../constants.dart';
@@ -12,14 +10,11 @@ class SettingsService {
   SettingsService({
     required String? downloadsDefaultDir,
     required SharedPreferences sharedPreferences,
-    required LastFM lastFm,
   })  : _preferences = sharedPreferences,
-        _downloadsDefaultDir = downloadsDefaultDir,
-        _lastFm = lastFm;
+        _downloadsDefaultDir = downloadsDefaultDir;
 
   final String? _downloadsDefaultDir;
   final SharedPreferences _preferences;
-  final LastFM _lastFm;
   final _propertiesChangedController = StreamController<bool>.broadcast();
   Stream<bool> get propertiesChanged => _propertiesChangedController.stream;
 
@@ -88,28 +83,6 @@ class SettingsService {
     );
   }
 
-  Future<void> setLastFmAuth() async {
-    final lastfmua = _lastFm as LastFMUnauthorized;
-    launchUrl(
-      Uri.parse(await lastfmua.authorizeDesktop()),
-    );
-
-    const maxWaitDuration = Duration(minutes: 2); // Customize as needed
-    final startTime = DateTime.now();
-    await Future.delayed(const Duration(seconds: 10));
-    while (DateTime.now().difference(startTime) < maxWaitDuration) {
-      try {
-        final lastfm = await lastfmua.finishAuthorizeDesktop();
-        setLastFmSessionKey(lastfm.sessionKey);
-        setLastFmUsername(lastfm.username);
-        return;
-      } catch (e) {
-        await Future.delayed(const Duration(seconds: 10));
-      }
-    }
-    //TODO: Do something if it fails
-  }
-
   bool get enableDiscordRPC => _preferences.getBool(kEnableDiscordRPC) ?? false;
   void setEnableDiscordRPC(bool value) {
     _preferences.setBool(kEnableDiscordRPC, value).then(

diff --git a/lib/settings/view/settings_page.dart b/lib/settings/view/settings_page.dart
@@ -652,7 +652,7 @@ class _ExposeOnlineSection extends StatelessWidget with WatchItMixin {
                     onPressed: () {
                       if (lastFmApiKeyController.text.isNotEmpty &&
                           lastFmSecretController.text.isNotEmpty) {
-                        di<SettingsModel>().setLastFmAuth();
+                        di<AppModel>().setLastFmAuth();
                       }
                     },
                     child: Text(l10n.save),