diff --git a/src/Nullinside.Api.TwitchBot/Controllers/LoginController.cs b/src/Nullinside.Api.TwitchBot/Controllers/LoginController.cs index 080a6c0..ccbee72 100644 --- a/src/Nullinside.Api.TwitchBot/Controllers/LoginController.cs +++ b/src/Nullinside.Api.TwitchBot/Controllers/LoginController.cs @@ -8,6 +8,8 @@ using Nullinside.Api.Model; using Nullinside.Api.Model.Shared; +using TwitchLib.Api.Helix.Models.Users.GetUsers; + namespace Nullinside.Api.TwitchBot.Controllers; /// @@ -68,13 +70,13 @@ public async Task TwitchLogin([FromQuery] string code, [FromServi return Redirect($"{siteUrl}/twitch-bot/config?error={TwitchBotLoginErrors.TWITCH_ACCOUNT_HAS_NO_EMAIL}"); } - (string? id, string? username) user = await api.GetUser(token); - if (string.IsNullOrWhiteSpace(user.username) || string.IsNullOrWhiteSpace(user.id)) { + User? user = await api.GetUser(token); + if (string.IsNullOrWhiteSpace(user?.Login) || string.IsNullOrWhiteSpace(user.Id)) { return Redirect($"{siteUrl}/twitch-bot/config?error={TwitchBotLoginErrors.INTERNAL_ERROR}"); } string? bearerToken = await UserHelpers.GenerateTokenAndSaveToDatabase(_dbContext, email, token, api.OAuth?.AccessToken, - api.OAuth?.RefreshToken, api.OAuth?.ExpiresUtc, user.username, user.id); + api.OAuth?.RefreshToken, api.OAuth?.ExpiresUtc, user.Login, user.Id); if (string.IsNullOrWhiteSpace(bearerToken)) { return Redirect($"{siteUrl}/twitch-bot/config?error={TwitchBotLoginErrors.INTERNAL_ERROR}"); } diff --git a/src/nullinside-api b/src/nullinside-api index 27bdc0b..4c925fa 160000 --- a/src/nullinside-api +++ b/src/nullinside-api @@ -1 +1 @@ -Subproject commit 27bdc0b7db697831a353ebc4bdd11764814d82fe +Subproject commit 4c925fa307a7a55c0ca7453de732e9e8eb1b2c63