- Adding scope list validation check for user OAuth Tokens

SaviorXTanren · Aug 1, 2023 · 1c0a66b · 1c0a66b
1 parent 0b9033e
commit 1c0a66b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/MixItUp.Base/Services/Trovo/TrovoSessionService.cs b/MixItUp.Base/Services/Trovo/TrovoSessionService.cs
@@ -108,11 +108,19 @@ public async Task<Result> Connect(SettingsV3Model settings)
             {
                 Result userResult = null;
 
-                Result<TrovoPlatformService> trovoResult = await TrovoPlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Trovo].UserOAuthToken);
-                if (trovoResult.Success)
+                // If scopes don't match, re-auth the token
+                if (string.Equals(string.Join(",", TrovoPlatformService.StreamerScopes), settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Trovo].UserOAuthToken.ScopeList, StringComparison.OrdinalIgnoreCase))
                 {
-                    this.UserConnection = trovoResult.Value;
-                    userResult = trovoResult;
+                    Result<TrovoPlatformService> trovoResult = await TrovoPlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Trovo].UserOAuthToken);
+                    if (trovoResult.Success)
+                    {
+                        this.UserConnection = trovoResult.Value;
+                        userResult = trovoResult;
+                    }
+                    else
+                    {
+                        userResult = await this.ConnectUser();
+                    }
                 }
                 else
                 {
@@ -129,7 +137,7 @@ public async Task<Result> Connect(SettingsV3Model settings)
 
                     if (settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Trovo].BotOAuthToken != null)
                     {
-                        trovoResult = await TrovoPlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Trovo].BotOAuthToken);
+                        Result<TrovoPlatformService> trovoResult = await TrovoPlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Trovo].BotOAuthToken);
                         if (trovoResult.Success)
                         {
                             this.BotConnection = trovoResult.Value;
@@ -141,7 +149,6 @@ public async Task<Result> Connect(SettingsV3Model settings)
                         }
                         else
                         {
-
                             return new Result(success: true, message: MixItUp.Base.Resources.TrovoFailedToConnectBotAccount);
                         }
                     }

diff --git a/MixItUp.Base/Services/Twitch/TwitchSessionService.cs b/MixItUp.Base/Services/Twitch/TwitchSessionService.cs
@@ -108,11 +108,19 @@ public async Task<Result> Connect(SettingsV3Model settings)
             {
                 Result userResult = null;
 
-                Result<TwitchPlatformService> twitchResult = await TwitchPlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Twitch].UserOAuthToken);
-                if (twitchResult.Success)
+                // If scopes don't match, re-auth the token
+                if (string.Equals(string.Join(",", TwitchPlatformService.StreamerScopes), settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Twitch].UserOAuthToken.ScopeList, StringComparison.OrdinalIgnoreCase))
                 {
-                    this.UserConnection = twitchResult.Value;
-                    userResult = twitchResult;
+                    Result<TwitchPlatformService> twitchResult = await TwitchPlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Twitch].UserOAuthToken);
+                    if (twitchResult.Success)
+                    {
+                        this.UserConnection = twitchResult.Value;
+                        userResult = twitchResult;
+                    }
+                    else
+                    {
+                        userResult = await this.ConnectUser();
+                    }
                 }
                 else
                 {
@@ -129,7 +137,7 @@ public async Task<Result> Connect(SettingsV3Model settings)
 
                     if (settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Twitch].BotOAuthToken != null)
                     {
-                        twitchResult = await TwitchPlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Twitch].BotOAuthToken);
+                        Result<TwitchPlatformService> twitchResult = await TwitchPlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.Twitch].BotOAuthToken);
                         if (twitchResult.Success)
                         {
                             this.BotConnection = twitchResult.Value;
@@ -141,7 +149,6 @@ public async Task<Result> Connect(SettingsV3Model settings)
                         }
                         else
                         {
-
                             return new Result(success: true, message: MixItUp.Base.Resources.TwitchFailedToConnectBotAccount);
                         }
                     }

diff --git a/MixItUp.Base/Services/YouTube/YouTubeSessionService.cs b/MixItUp.Base/Services/YouTube/YouTubeSessionService.cs
@@ -91,11 +91,19 @@ public async Task<Result> Connect(SettingsV3Model settings)
             {
                 Result userResult = null;
 
-                Result<YouTubePlatformService> youtubeResult = await YouTubePlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.YouTube].UserOAuthToken);
-                if (youtubeResult.Success)
+                // If scopes don't match, re-auth the token
+                if (string.Equals(string.Join(",", YouTubePlatformService.StreamerScopes), settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.YouTube].UserOAuthToken.ScopeList, StringComparison.OrdinalIgnoreCase))
                 {
-                    this.UserConnection = youtubeResult.Value;
-                    userResult = youtubeResult;
+                    Result<YouTubePlatformService> youtubeResult = await YouTubePlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.YouTube].UserOAuthToken);
+                    if (youtubeResult.Success)
+                    {
+                        this.UserConnection = youtubeResult.Value;
+                        userResult = youtubeResult;
+                    }
+                    else
+                    {
+                        userResult = await this.ConnectUser();
+                    }
                 }
                 else
                 {
@@ -112,7 +120,7 @@ public async Task<Result> Connect(SettingsV3Model settings)
 
                     if (settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.YouTube].BotOAuthToken != null)
                     {
-                        youtubeResult = await YouTubePlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.YouTube].BotOAuthToken);
+                        Result<YouTubePlatformService> youtubeResult = await YouTubePlatformService.Connect(settings.StreamingPlatformAuthentications[StreamingPlatformTypeEnum.YouTube].BotOAuthToken);
                         if (youtubeResult.Success)
                         {
                             this.BotConnection = youtubeResult.Value;
@@ -124,7 +132,6 @@ public async Task<Result> Connect(SettingsV3Model settings)
                         }
                         else
                         {
-
                             return new Result(success: true, message: MixItUp.Base.Resources.YouTubeFailedToConnectBotAccount);
                         }
                     }