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

Fixed JSON serialization failing for MEGA.AuthInfos

Browse Source
This commit is contained in:
erri120 2020-04-29 17:39:05 +02:00
parent e24cbbeb0f
commit ba6925c536
No known key found for this signature in database
GPG Key ID: A8C0A18D8D4D3135
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Wabbajack.Lib/Downloaders/MEGADownloader.cs
View File

@ -4,6 +4,7 @@ using System.Reactive.Linq;
using System.Security; using System.Security;
using System.Threading.Tasks; using System.Threading.Tasks;
using CG.Web.MegaApiClient; using CG.Web.MegaApiClient;
using Newtonsoft.Json;
using ReactiveUI; using ReactiveUI;
using Wabbajack.Common; using Wabbajack.Common;
using Wabbajack.Common.Serialization.Json; using Wabbajack.Common.Serialization.Json;
@ -15,6 +16,39 @@ namespace Wabbajack.Lib.Downloaders
public MegaApiClient MegaApiClient; public MegaApiClient MegaApiClient;
private const string DataName = "mega-cred"; private const string DataName = "mega-cred";
[JsonName("MEGAAuthInfos")]
//https://github.com/gpailler/MegaApiClient/blob/master/MegaApiClient/MegaApiClient.cs#L1242
internal class MEGAAuthInfos
{
[JsonProperty]
public string Email { get; private set; } = string.Empty;
[JsonProperty]
public string Hash { get; private set; } = string.Empty;
[JsonProperty]
public byte[]? PasswordAesKey { get; private set; }
[JsonProperty]
public string MFAKey { get; private set; } = string.Empty;
public static MEGAAuthInfos ToMEGAAuthInfos(MegaApiClient.AuthInfos infos)
{
return new MEGAAuthInfos
{
Email = infos.Email,
Hash = infos.Hash,
PasswordAesKey = infos.PasswordAesKey
};
}
public MegaApiClient.AuthInfos ToAuthInfos()
{
//TODO: MFAKey in the update
return new MegaApiClient.AuthInfos(Email, Hash, PasswordAesKey);
}
}
public LoginReturnMessage LoginWithCredentials(string username, SecureString password) public LoginReturnMessage LoginWithCredentials(string username, SecureString password)
{ {
MegaApiClient.AuthInfos authInfos; MegaApiClient.AuthInfos authInfos;
@ -51,8 +85,11 @@ namespace Wabbajack.Lib.Downloaders
}; };
} }
if(MegaApiClient.IsLoggedIn) if (MegaApiClient.IsLoggedIn)
authInfos.ToEcryptedJson(DataName); {
var infos = MEGAAuthInfos.ToMEGAAuthInfos(authInfos);
infos.ToEcryptedJson(DataName);
}
return new LoginReturnMessage("Logged in successfully, you can now close this window.", return new LoginReturnMessage("Logged in successfully, you can now close this window.",
!MegaApiClient.IsLoggedIn || !Utils.HaveEncryptedJson(DataName)); !MegaApiClient.IsLoggedIn || !Utils.HaveEncryptedJson(DataName));
@ -109,7 +146,8 @@ namespace Wabbajack.Lib.Downloaders
else else
{ {
Utils.Status("Logging into MEGA with saved credentials."); Utils.Status("Logging into MEGA with saved credentials.");
var authInfo = Utils.FromEncryptedJson<MegaApiClient.AuthInfos>(DataName); var infos = Utils.FromEncryptedJson<MEGAAuthInfos>(DataName);
var authInfo = infos.ToAuthInfos();
MegaApiClient.Login(authInfo); MegaApiClient.Login(authInfo);
} }
} }