From b59ef4bfc98c0e4014e476212c38591ba3bb7bb4 Mon Sep 17 00:00:00 2001 From: halgari Date: Sat, 25 May 2024 10:54:53 -0600 Subject: [PATCH] Fix login for Nexus when using a Environment API Key --- CHANGELOG.md | 4 ++++ Wabbajack.Networking.NexusApi/NexusApi.cs | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea243eb8..f5cb3a43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ### Changelog +#### Version - 3.6.0.0 - 5/25/2024 +* Wabbajack now uses OAuth2 for Nexus Mods logins +* Support for DirectURL use with LL files + #### Version - 3.5.0.2 - 5/21/2024 * *HOTFIX* - change how we log into Nexus Mods. We still need to rewrite this on Oauth2, but this should fix the current issues we have, and get people back up and running diff --git a/Wabbajack.Networking.NexusApi/NexusApi.cs b/Wabbajack.Networking.NexusApi/NexusApi.cs index 31c7c01f..bfc9f8d2 100644 --- a/Wabbajack.Networking.NexusApi/NexusApi.cs +++ b/Wabbajack.Networking.NexusApi/NexusApi.cs @@ -193,11 +193,8 @@ public class NexusApi var userAgent = $"{_appInfo.ApplicationSlug}/{_appInfo.Version} ({_appInfo.OSVersion}; {_appInfo.Platform})"; - if (!AuthInfo.HaveToken()) - throw new Exception("Please log into the Nexus before attempting to use Wabbajack"); + await AddAuthHeaders(msg); - var token = (await AuthInfo.Get())!; - if (uri.StartsWith("http")) { msg.RequestUri = new Uri($"{string.Format(uri, parameters)}"); @@ -211,7 +208,6 @@ public class NexusApi msg.Headers.Add("Application-Name", _appInfo.ApplicationSlug); msg.Headers.Add("Application-Version", _appInfo.Version); - await AddAuthHeaders(msg); msg.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); return msg;