Skip to content

Revert "Enables manual login via WebView and debug mode" #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Isolaryn wants to merge 1 commit into from
Closed

Revert "Enables manual login via WebView and debug mode" #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions Games/EVE/EVEAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using System.Text;
using System.Web;
using System.Xml.Serialization;
using ISBoxerEVELauncher.Windows;


namespace ISBoxerEVELauncher.Games.EVE
Expand All @@ -28,7 +27,6 @@ namespace ISBoxerEVELauncher.Games.EVE
/// </summary>
public class EVEAccount : INotifyPropertyChanged, IDisposable, ILaunchTarget
{
private const string LogCategory = "EVEAccount";

[XmlIgnore]
private Guid challengeCodeSource;
Expand Down Expand Up @@ -228,23 +226,6 @@ public string NewCookieStorage
}
}

string _WebView2CookieStorage;
/// <summary>
/// WebView2 cookie storage (JSON format) - separate from HttpWebRequest cookies
/// </summary>
public string WebView2CookieStorage
{
get
{
return _WebView2CookieStorage;
}
set
{
_WebView2CookieStorage = value;
OnPropertyChanged("WebView2CookieStorage");
}
}


#region Password
System.Security.SecureString _SecurePassword;
Expand Down Expand Up @@ -1111,8 +1092,6 @@ public LoginResult GetCharacterChallenge(bool sisi, out Token accessToken)

public LoginResult GetAccessToken(bool sisi, HttpWebRequest req, out Token accessToken)
{
Utils.Debug.Info($"GetAccessToken - Request URI: {req.RequestUri} | Sisi: {sisi}", LogCategory);

accessToken = null;
Response response = null;

Expand All @@ -1131,8 +1110,6 @@ public LoginResult GetAccessToken(bool sisi, HttpWebRequest req, out Token acces
string responseBody = response.Body;
UpdateCookieStorage();

Utils.Debug.Info($"GetAccessToken - Response:{Environment.NewLine}{response.ToString()}", LogCategory);

if (responseBody.Contains("Incorrect character name entered"))
{
accessToken = null;
Expand Down Expand Up @@ -1339,14 +1316,6 @@ public LoginResult GetAccessToken(bool sisi, out Token accessToken)
App.strUserName = Username;
App.strPassword = new System.Net.NetworkCredential(string.Empty, SecurePassword).Password;

if (App.Settings.ManualLogin)
{
var manualLoginWindow = new EVEManualLogin(this, sisi);
manualLoginWindow.ShowDialog();
accessToken = manualLoginWindow.AccessToken;
return manualLoginWindow.LoginResult;
}

var uri = RequestResponse.GetLoginUri(sisi, state.ToString(), challengeHash);

string RequestVerificationToken = string.Empty;
Expand Down
16 changes: 0 additions & 16 deletions ISBoxerEVELauncher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,6 @@
<HintPath>packages\Microsoft.IdentityModel.Tokens.6.25.1\lib\net472\Microsoft.IdentityModel.Tokens.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Vsa, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.3537.50, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Web.WebView2.1.0.3537.50\lib\net462\Microsoft.Web.WebView2.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.3537.50, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Web.WebView2.1.0.3537.50\lib\net462\Microsoft.Web.WebView2.WinForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.3537.50, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Web.WebView2.1.0.3537.50\lib\net462\Microsoft.Web.WebView2.Wpf.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -337,7 +328,6 @@
<Compile Include="Interface\ILauncher.cs" />
<Compile Include="Interface\ILaunchTarget.cs" />
<Compile Include="Launchers\InnerSpace.cs" />
<Compile Include="Utils\Debug.cs" />
<Compile Include="Web\BrowserCookie.cs" />
<Compile Include="Web\CookieStorage.cs" />
<Compile Include="Games\EVE\EVECharacter.cs" />
Expand Down Expand Up @@ -383,9 +373,6 @@
<Compile Include="Windows\EVELoginBrowser.Designer.cs">
<DependentUpon>EVELoginBrowser.cs</DependentUpon>
</Compile>
<Compile Include="Windows\EVEManualLogin.xaml.cs">
<DependentUpon>EVEManualLogin.xaml</DependentUpon>
</Compile>
<Compile Include="Windows\LaunchProgressWindow.xaml.cs">
<DependentUpon>LaunchProgressWindow.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -438,7 +425,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Windows\EVEManualLogin.xaml" />
<Page Include="Windows\LaunchProgressWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down Expand Up @@ -558,12 +544,10 @@ if "$(ConfigurationName)"=="Debug" (
<Error Condition="!Exists('packages\Fody.6.6.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.6.4\build\Fody.targets'))" />
<Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
<Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
<Error Condition="!Exists('packages\Microsoft.Web.WebView2.1.0.3537.50\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Web.WebView2.1.0.3537.50\build\Microsoft.Web.WebView2.targets'))" />
</Target>
<Import Project="packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('packages\Fody.6.6.4\build\Fody.targets')" />
<Import Project="packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
<Import Project="packages\Microsoft.Web.WebView2.1.0.3537.50\build\Microsoft.Web.WebView2.targets" Condition="Exists('packages\Microsoft.Web.WebView2.1.0.3537.50\build\Microsoft.Web.WebView2.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
42 changes: 0 additions & 42 deletions Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,49 +316,7 @@ public DateTime MasterKeyRequested
OnPropertyChanged("MasterKeyRequested");
}
}

private bool _debugMode = false;
/// <summary>
/// If Debug Mode is enabled
/// </summary>
public bool DebugMode
{
get => _debugMode;
set
{
_debugMode = value;
OnPropertyChanged(nameof(DebugMode));
}
}

private bool _manualLogin = false;
/// <summary>
/// If Manual Login is enabled
/// </summary>
public bool ManualLogin
{
get => _manualLogin;
set
{
_manualLogin = value;
OnPropertyChanged(nameof(ManualLogin));
}
}

private bool _manualLoginAutofill = true;

/// <summary>
/// If Manual Login Autofill is enabled
/// </summary>
public bool ManualLoginAutofill
{
get => _manualLoginAutofill;
set
{
_manualLoginAutofill = value;
OnPropertyChanged(nameof(ManualLoginAutofill));
}
}

/// <summary>
/// This is used to generate the Master Key Check, along with an IV and the Master Key
Expand Down
36 changes: 0 additions & 36 deletions Utils/Debug.cs
View file
Open in desktop

This file was deleted.

13 changes: 2 additions & 11 deletions Web/RequestResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,8 @@ public static class RequestResponse
public const string originUri = "https://launcher.eveonline.com";
public const string refererUri = "https://launcher.eveonline.com/6-0-x/6.4.15/";

public static Uri FullUri(bool sisi, Uri uri)
{
if (!uri.IsAbsoluteUri)
uri = new Uri(string.Concat(sisi ? sisiBaseUri : tqBaseUri, uri.ToString()));
return uri;
}

public static Uri GetTokenUri(bool sisi)
{
return new Uri(token, UriKind.Relative);
}



public static Uri GetLoginUri(bool sisi, string state, string challengeHash)
{
Expand Down
20 changes: 0 additions & 20 deletions Windows/EVEManualLogin.xaml
View file
Open in desktop

This file was deleted.

Loading