Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved NexusDownloader CLIArguments API key encryption to Prepare

Browse Source
This commit is contained in:
Justin Swanson 2020-08-08 07:56:43 -05:00
parent 446ed80f98
commit 785e2fba5a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Wabbajack.Lib/Downloaders/NexusDownloader.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using System.Reactive; using System.Reactive;
@ -38,11 +38,6 @@ namespace Wabbajack.Lib.Downloaders
public NexusDownloader() public NexusDownloader()
{ {
if (CLIArguments.ApiKey != null)
{
CLIArguments.ApiKey.ToEcryptedJson("nexusapikey");
}
TriggerLogin = ReactiveCommand.CreateFromTask( TriggerLogin = ReactiveCommand.CreateFromTask(
execute: () => Utils.CatchAndLog(NexusApiClient.RequestAndCacheAPIKey), execute: () => Utils.CatchAndLog(NexusApiClient.RequestAndCacheAPIKey),
canExecute: IsLoggedIn.Select(b => !b).ObserveOnGuiThread()); canExecute: IsLoggedIn.Select(b => !b).ObserveOnGuiThread());
@ -115,6 +110,11 @@ namespace Wabbajack.Lib.Downloaders
// Could have become prepared while we waited for the lock // Could have become prepared while we waited for the lock
if (!_prepared) if (!_prepared)
{ {
if (CLIArguments.ApiKey != null)
{
await CLIArguments.ApiKey.ToEcryptedJson("nexusapikey");
}
_client = await NexusApiClient.Get(); _client = await NexusApiClient.Get();
_status = await _client.GetUserStatus(); _status = await _client.GetUserStatus();
if (!_client.IsAuthenticated) if (!_client.IsAuthenticated)