Merge pull request #183 from LezdCS/develop

StreamElements oauth2 + overlay support
LezdCS · May 22, 2024 · 4dfc0a5 · 4dfc0a5
2 parents 0873ba3 + f5e7e83
commit 4dfc0a5
Show file tree

Hide file tree

Showing 35 changed files with 1,012 additions and 324 deletions.
diff --git a/lib/assets/streamelements/seLogo.png b/lib/assets/streamelements/seLogo.png
diff --git a/lib/src/bindings/home_bindings.dart b/lib/src/bindings/home_bindings.dart
@@ -29,6 +29,9 @@ class HomeBindings extends Bindings {
           settingsUseCase: SettingsUseCase(
             settingsRepository: SettingsRepositoryImpl(),
           ),
+          streamelementsUseCase: StreamelementsUseCase(
+            streamelementsRepository: StreamelementsRepositoryImpl(),
+          ),
         ),
       ),
     );
@@ -48,6 +51,9 @@ class HomeBindings extends Bindings {
             settingsUseCase: SettingsUseCase(
               settingsRepository: SettingsRepositoryImpl(),
             ),
+            streamelementsUseCase: StreamelementsUseCase(
+              streamelementsRepository: StreamelementsRepositoryImpl(),
+            ),
           ),
         ));
 
@@ -72,6 +78,9 @@ class HomeBindings extends Bindings {
             settingsUseCase: SettingsUseCase(
               settingsRepository: SettingsRepositoryImpl(),
             ),
+            streamelementsUseCase: StreamelementsUseCase(
+              streamelementsRepository: StreamelementsRepositoryImpl(),
+            ),
           ),
         ));
     Get.find<TwitchTabViewController>();

diff --git a/lib/src/bindings/settings_bindings.dart b/lib/src/bindings/settings_bindings.dart
@@ -2,26 +2,36 @@ import 'package:get/get_core/src/get_main.dart';
 import 'package:get/get_instance/src/bindings_interface.dart';
 import 'package:get/get_instance/src/extension_instance.dart';
 import 'package:irllink/src/data/repositories/settings_repository_impl.dart';
+import 'package:irllink/src/data/repositories/streamelements_repository_impl.dart';
 import 'package:irllink/src/data/repositories/twitch_repository_impl.dart';
 import 'package:irllink/src/domain/usecases/settings_usecase.dart';
+import 'package:irllink/src/domain/usecases/streamelements_usecase.dart';
 import 'package:irllink/src/domain/usecases/twitch_usecase.dart';
 import 'package:irllink/src/presentation/controllers/settings_view_controller.dart';
 import 'package:irllink/src/presentation/events/settings_events.dart';
+import 'package:irllink/src/presentation/events/streamelements_events.dart';
 
 class SettingsBindings extends Bindings {
   @override
   void dependencies() {
     Get.lazyPut<SettingsViewController>(
       () => SettingsViewController(
-        settingsEvents: SettingsEvents(
-          settingsUseCase: SettingsUseCase(
-            settingsRepository: SettingsRepositoryImpl(),
+          settingsEvents: SettingsEvents(
+            settingsUseCase: SettingsUseCase(
+              settingsRepository: SettingsRepositoryImpl(),
+            ),
+            twitchUseCase: TwitchUseCase(
+              twitchRepository: TwitchRepositoryImpl(),
+            ),
           ),
-          twitchUseCase: TwitchUseCase(
-            twitchRepository: TwitchRepositoryImpl(),
-          ),
-        ),
-      ),
+          streamelementsEvents: StreamelementsEvents(
+            streamelementsUseCase: StreamelementsUseCase(
+              streamelementsRepository: StreamelementsRepositoryImpl(),
+            ),
+            settingsUseCase: SettingsUseCase(
+              settingsRepository: SettingsRepositoryImpl(),
+            ),
+          )),
     );
   }
 }
diff --git a/lib/src/core/params/streamelements_auth_params.dart b/lib/src/core/params/streamelements_auth_params.dart
@@ -8,8 +8,8 @@ class StreamelementsAuthParams {
 
   const StreamelementsAuthParams({
     this.clientId = kStreamelementsAuthClientId,
-    this.redirectUri = 'https://irllink.com/streamelements/auth',
+    this.redirectUri = 'https://www.irllink.com/api/streamelements/auth',
     this.responseType = 'code',
-    this.scopes = 'activities:read activities:write tips:read',
+    this.scopes = 'channel:read tips:read activities:read overlays:read',
   });
 }
diff --git a/lib/src/core/resources/data_state.dart b/lib/src/core/resources/data_state.dart
@@ -1,17 +1,23 @@
+import 'package:irllink/src/core/utils/globals.dart' as globals;
+
 abstract class DataState<T> {
   final T? data;
   final String? error;
 
-  const DataState({
+  DataState({
     this.data,
     this.error,
-  });
+  }) {
+    if(error != null) {
+      globals.talker?.error(error);
+    }
+  }
 }
 
 class DataSuccess<T> extends DataState<T> {
-  const DataSuccess(T data) : super(data: data);
+  DataSuccess(T data) : super(data: data);
 }
 
 class DataFailed<T> extends DataState<T> {
-  const DataFailed(String error) : super(error: error);
+  DataFailed(String error) : super(error: error);
 }
diff --git a/lib/src/core/utils/constants.dart b/lib/src/core/utils/constants.dart
@@ -4,6 +4,6 @@ const kTwitchAuthUrlPath = '/oauth2/authorize';
 
 const kRedirectScheme = 'dev.lezd.www.irllink';
 
-const kStreamelementsAuthClientId = '';
+const kStreamelementsAuthClientId = '77746eebf069856d';
 const kStreamelementsUrlBase = 'api.streamelements.com';
 const kStreamelementsAuthPath = '/oauth2/authorize';
diff --git a/lib/src/core/utils/init_dio.dart b/lib/src/core/utils/init_dio.dart
@@ -1,5 +1,4 @@
 import 'package:dio/dio.dart';
-import 'package:flutter/foundation.dart';
 import 'package:talker_dio_logger/talker_dio_logger_interceptor.dart';
 import 'package:talker_dio_logger/talker_dio_logger_settings.dart';
 import 'package:irllink/src/core/utils/globals.dart' as globals;
@@ -11,8 +10,9 @@ Dio initDio() {
     TalkerDioLogger(
       talker: talker,
       settings: TalkerDioLoggerSettings(
-        requestFilter: (RequestOptions options) => kDebugMode ? true : !options.path.contains('api.twitch.tv'),
-        responseFilter: (response) => kDebugMode ? true : ![200, 202].contains(response.statusCode),
+        requestFilter: (RequestOptions options) => !options.path.contains('api.twitch.tv'),
+        printRequestHeaders: true,
+        // responseFilter: (response) => ![200, 202].contains(response.statusCode),
       ),
     ),
   );

diff --git a/lib/src/core/utils/twitch_event_sub.dart b/lib/src/core/utils/twitch_event_sub.dart
@@ -139,7 +139,7 @@ class TwitchEventSub {
   }
 
   void _onDone() {
-    globals.talker?.debug("Twitch Sub Event: Connection closed");
+    globals.talker?.info("Twitch Sub Event: Connection closed");
     close();
   }
 

diff --git a/lib/src/data/entities/settings/stream_elements_settings_dto.dart b/lib/src/data/entities/settings/stream_elements_settings_dto.dart
@@ -10,6 +10,9 @@ class StreamElementsSettingsDTO extends StreamElementsSettings {
     required super.showRaidActivity,
     required super.showHostActivity,
     required super.showMerchActivity,
+    required super.jwt,
+    required super.overlayToken,
+    required super.mutedOverlays,
   });
 
   @override
@@ -21,6 +24,9 @@ class StreamElementsSettingsDTO extends StreamElementsSettings {
         'showRaidActivity': showRaidActivity,
         'showHostActivity': showHostActivity,
         'showMerchActivity': showMerchActivity,
+        'jwt': jwt,
+        'overlayToken': overlayToken,
+        'mutedOverlays': mutedOverlays,
       };
 
   factory StreamElementsSettingsDTO.fromJson(Map<String, dynamic> map) {
@@ -53,6 +59,14 @@ class StreamElementsSettingsDTO extends StreamElementsSettings {
           const Settings.defaultSettings()
               .streamElementsSettings!
               .showMerchActivity,
+      jwt: map['jwt'] ??
+          const Settings.defaultSettings().streamElementsSettings!.jwt,
+      overlayToken: map['overlayToken'] ??
+          const Settings.defaultSettings().streamElementsSettings!.overlayToken,
+      mutedOverlays: (List<String>.from(map['mutedOverlays'] ??
+          const Settings.defaultSettings()
+              .streamElementsSettings!
+              .mutedOverlays)),
     );
   }
 }
diff --git a/lib/src/data/entities/settings_dto.dart b/lib/src/data/entities/settings_dto.dart
@@ -29,7 +29,6 @@ class SettingsDTO extends Settings {
     required bool isObsConnected,
     required String obsWebsocketUrl,
     required String obsWebsocketPassword,
-    required String streamElementsAccessToken,
     required List browserTabs,
     required List obsConnectionsHistory,
     required StreamElementsSettings streamElementsSettings,
@@ -50,7 +49,6 @@ class SettingsDTO extends Settings {
             obsWebsocketUrl: obsWebsocketUrl,
             obsWebsocketPassword: obsWebsocketPassword,
             isObsConnected: isObsConnected,
-            streamElementsAccessToken: streamElementsAccessToken,
             browserTabs: browserTabs,
             obsConnectionsHistory: obsConnectionsHistory,
             streamElementsSettings: streamElementsSettings,
@@ -73,7 +71,6 @@ class SettingsDTO extends Settings {
         'isObsConnected': isObsConnected,
         'obsWebsocketUrl': obsWebsocketUrl,
         'obsWebsocketPassword': obsWebsocketPassword,
-        'streamElementsAccessToken': streamElementsAccessToken,
         'browserTabs': browserTabs,
         'obsConnectionsHistory': obsConnectionsHistory,
         'streamElementsSettings': streamElementsSettings?.toJson(),
@@ -119,9 +116,6 @@ class SettingsDTO extends Settings {
       obsWebsocketPassword: map['obsWebsocketPassword'] != null
           ? map['obsWebsocketPassword'] as String
           : const Settings.defaultSettings().obsWebsocketPassword!,
-      streamElementsAccessToken: map['streamElementsAccessToken'] != null
-          ? map['streamElementsAccessToken'] as String
-          : const Settings.defaultSettings().streamElementsAccessToken!,
       browserTabs: map['browserTabs'] != null
           ? map['browserTabs'] as List
           : const Settings.defaultSettings().browserTabs!,

diff --git a/lib/src/data/entities/stream_elements/se_credentials_dto.dart b/lib/src/data/entities/stream_elements/se_credentials_dto.dart
@@ -0,0 +1,27 @@
+import 'package:irllink/src/domain/entities/stream_elements/se_credentials.dart';
+
+class SeCredentialsDTO extends SeCredentials {
+  const SeCredentialsDTO({
+    required super.accessToken,
+    required super.refreshToken,
+    required super.expiresIn,
+    required super.scopes,
+  });
+
+  @override
+  Map toJson() => {
+        'accessToken': accessToken,
+        'refreshToken': refreshToken,
+        'expiresIn': expiresIn,
+        'scopes': scopes,
+      };
+
+  factory SeCredentialsDTO.fromJson(Map<String, dynamic> map) {
+    return SeCredentialsDTO(
+      accessToken: map['accessToken'] as String,
+      refreshToken: map['refreshToken'] as String,
+      expiresIn: map['expiresIn'] as int,
+      scopes: map['scopes'] as String,
+    );
+  }
+}
diff --git a/lib/src/data/repositories/settings_repository_impl.dart b/lib/src/data/repositories/settings_repository_impl.dart
@@ -15,7 +15,7 @@ class SettingsRepositoryImpl extends SettingsRepository {
       SettingsDTO settings = SettingsDTO.fromJson(settingsJson);
       return DataSuccess(settings);
     }
-    return const DataSuccess(Settings.defaultSettings());
+    return DataSuccess(const Settings.defaultSettings());
   }
 
   @override