Merge branch 'main' into EzioTheDeadPoet-patch-3

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

Wabbajack.Networking.NexusApi/NexusApi.cs

@@ -193,11 +193,8 @@ protected virtual async ValueTask<HttpRequestMessage> GenerateMessage(HttpMethod
         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 @@ protected virtual async ValueTask<HttpRequestMessage> GenerateMessage(HttpMethod
         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;