liza/PalacePal
liza/PalacePal
1
0
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases 47 Activity

Fix account creation, include more detailed results for "test connection"

Browse Source
This commit is contained in:
Liza 2022-11-02 21:28:33 +01:00
parent 4cc7f634b2
commit 7942dfc92f
3 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pal.Client/Pal.Client.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<LangVersion>9.0</LangVersion>
<Version>1.14.0.0</Version>
<Version>1.15.0.0</Version>
<Nullable>enable</Nullable>
</PropertyGroup>

52
Pal.Client/RemoteApi.cs
View File

@ -25,10 +25,11 @@ namespace Pal.Client
private GrpcChannel? _channel;
private LoginReply? _lastLoginReply;
private bool _warnedAboutUpgrade = false;
public Guid? AccountId
{
get => Service.Configuration.AccountIds[remoteUrl];
get => Service.Configuration.AccountIds.TryGetValue(remoteUrl, out Guid accountId) ? accountId : null;
set
{
if (value != null)
@ -38,10 +39,10 @@ namespace Pal.Client
}
}
private async Task<bool> Connect(CancellationToken cancellationToken, bool retry = true)
private async Task<(bool Success, string Error)> TryConnect(CancellationToken cancellationToken, bool retry = true)
{
if (Service.Configuration.Mode != Configuration.EMode.Online)
return false;
return (false, "You are not online.");
if (_channel == null || !(_channel.State == ConnectivityState.Ready || _channel.State == ConnectivityState.Idle))
{
@ -67,10 +68,19 @@ namespace Pal.Client
AccountId = Guid.Parse(createAccountReply.AccountId);
Service.Configuration.Save();
}
else
{
if (createAccountReply.Error == CreateAccountError.UpgradeRequired && !_warnedAboutUpgrade)
{
Service.Chat.PrintError("[Palace Pal] Your version of Palace Pal is outdated, please update the plugin using the Plugin Installer.");
_warnedAboutUpgrade = true;
}
return (false, $"Could not create account ({createAccountReply.Error}).");
}
}
if (AccountId == null)
return false;
return (false, "No account-id after account was attempted to be created.");
if (_lastLoginReply == null || string.IsNullOrEmpty(_lastLoginReply.AuthToken) || _lastLoginReply.ExpiresAt.ToDateTime().ToLocalTime() < DateTime.Now)
{
@ -82,24 +92,46 @@ namespace Pal.Client
AccountId = null;
Service.Configuration.Save();
if (retry)
return await Connect(cancellationToken, retry: false);
return await TryConnect(cancellationToken, retry: false);
else
return false;
return (false, "Invalid account id.");
}
if (_lastLoginReply.Error == LoginError.UpgradeRequired && !_warnedAboutUpgrade)
{
Service.Chat.PrintError("[Palace Pal] Your version of Palace Pal is outdated, please update the plugin using the Plugin Installer.");
_warnedAboutUpgrade = true;
}
return (false, $"Could not log in ({_lastLoginReply.Error}).");
}
}
return !string.IsNullOrEmpty(_lastLoginReply?.AuthToken);
if (_lastLoginReply == null)
return (false, "No login information available.");
bool success = !string.IsNullOrEmpty(_lastLoginReply?.AuthToken);
if (!success)
return (success, "Login reply did not include auth token.");
return (success, string.Empty);
}
private async Task<bool> Connect(CancellationToken cancellationToken)
{
var result = await TryConnect(cancellationToken);
return result.Success;
}
public async Task<string> VerifyConnection(CancellationToken cancellationToken = default)
{
if (!await Connect(cancellationToken))
return "Could not connect to server";
_warnedAboutUpgrade = false;
var connectionResult = await TryConnect(cancellationToken);
if (!connectionResult.Success)
return $"Could not connect to server: {connectionResult.Error}";
var accountClient = new AccountService.AccountServiceClient(_channel);
await accountClient.VerifyAsync(new VerifyRequest(), headers: AuthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(10), cancellationToken: cancellationToken);
return "Connection successful";
return "Connection successful.";
}
public async Task<(bool, List<Marker>)> DownloadRemoteMarkers(ushort territoryId, CancellationToken cancellationToken = default)

9
Pal.Common/Protos/account.proto
View File

@ -25,6 +25,14 @@ message CreateAccountRequest {
message CreateAccountReply {
bool success = 1;
string accountId = 2;
CreateAccountError error = 3;
}
enum CreateAccountError {
CREATE_ACCOUNT_ERROR_NONE = 0;
CREATE_ACCOUNT_ERROR_UNKNOWN = 1;
CREATE_ACCOUNT_ERROR_UPGRADE_REQUIRED = 2;
CREATE_ACCOUNT_ERROR_INVALID_HASH = 3;
}
message LoginRequest {
@ -42,6 +50,7 @@ enum LoginError {
LOGIN_ERROR_NONE = 0;
LOGIN_ERROR_UNKNOWN = 1;
LOGIN_ERROR_INVALID_ACCOUNT_ID = 2;
LOGIN_ERROR_UPGRADE_REQUIRED = 3;
}
message VerifyRequest {