Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 52 additions & 12 deletions Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Threading.Tasks;
using UnityEngine;
using System.IO;

namespace TaloGameServices
{
Expand All @@ -10,38 +11,64 @@ public class PlayersAPI : BaseAPI
public event Action OnIdentificationStarted;
public event Action OnIdentificationFailed;

private readonly string _offlineDataPath = Application.persistentDataPath + "/ta.bin";

public PlayersAPI() : base("v1/players") { }

public void InvokeIdentifiedEvent()
{
OnIdentified?.Invoke(Talo.CurrentPlayer);
}

private async Task<Player> HandleIdentifySuccess(PlayerAlias alias, string socketToken = "")
{
if (!Talo.IsOffline())
{
await Talo.Socket.ResetConnection();
}

Talo.CurrentAlias = alias;
if (!string.IsNullOrEmpty(socketToken))
{
Talo.Socket.SetSocketToken(socketToken);
}

WriteOfflineAlias();
InvokeIdentifiedEvent();

return alias.player;
}

public async Task<Player> Identify(string service, string identifier)
{
OnIdentificationStarted?.Invoke();

if (Talo.IsOffline())
{
var offlineAlias = GetOfflineAlias();
if (offlineAlias != null)
{
return await HandleIdentifySuccess(offlineAlias);
}
else
{
OnIdentificationFailed?.Invoke();
throw new Exception("No offline player alias found.");
}
}

var uri = new Uri($"{baseUrl}/identify?service={service}&identifier={identifier}");

try
{
var json = await Call(uri, "GET");

var res = JsonUtility.FromJson<PlayersIdentifyResponse>(json);
await Talo.Socket.ResetConnection();

Talo.CurrentAlias = res.alias;
Talo.Socket.SetSocketToken(res.socketToken);
InvokeIdentifiedEvent();

return Talo.CurrentPlayer;
return await HandleIdentifySuccess(res.alias, res.socketToken);
}
catch
{
if (!Talo.IsOffline())
{
await Talo.PlayerAuth.SessionManager.ClearSession();
}

await Talo.PlayerAuth.SessionManager.ClearSession();
OnIdentificationFailed?.Invoke();
throw;
}
Expand Down Expand Up @@ -69,6 +96,7 @@ public async Task<Player> Update()

var res = JsonUtility.FromJson<PlayersUpdateResponse>(json);
Talo.CurrentPlayer = res.player;
WriteOfflineAlias();

return Talo.CurrentPlayer;
}
Expand All @@ -91,5 +119,17 @@ public async Task<Player> Find(string playerId)
var res = JsonUtility.FromJson<PlayersFindResponse>(json);
return res.player;
}

private void WriteOfflineAlias()
{
var content = JsonUtility.ToJson(Talo.CurrentAlias);
Talo.Crypto.WriteFileContent(_offlineDataPath, content);
}

private PlayerAlias GetOfflineAlias()
{
if (!File.Exists(_offlineDataPath)) return null;
return JsonUtility.FromJson<PlayerAlias>(Talo.Crypto.ReadFileContent(_offlineDataPath));
}
}
}
2 changes: 1 addition & 1 deletion Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public void UnloadCurrentSave()

public async Task DeleteSave(int saveId)
{
var save = savesManager.FindSaveByID(saveId);
var _ = savesManager.FindSaveByID(saveId);

if (!Talo.IsOffline())
{
Expand Down
15 changes: 6 additions & 9 deletions Assets/Talo Game Services/Talo/Runtime/Talo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@ public static PlayerAlias CurrentAlias

public static Player CurrentPlayer
{
get
{
IdentityCheck();
return _currentAlias.player;
}
get => _currentAlias?.player ?? null;
set => _currentAlias.player = value;
}

Expand All @@ -58,7 +54,8 @@ public static Player CurrentPlayer

public static LiveConfig LiveConfig
{
get {
get
{
if (_liveConfig == null)
{
throw new Exception("Live config needs to be initialised first - use Talo.GameConfig.Get() to fetch it.");
Expand Down Expand Up @@ -196,12 +193,12 @@ public static void IdentityCheck()
public static bool IsOffline()
{
if (TestMode) return RequestMock.Offline;
return Application.internetReachability == NetworkReachability.NotReachable;
return Application.internetReachability == NetworkReachability.NotReachable || Settings.offlineMode;
}

internal static bool CheckTestMode()
{
#if UNITY_EDITOR || DEBUG
#if UNITY_EDITOR || DEBUG
var assembly = AppDomain.CurrentDomain.GetAssemblies()
.FirstOrDefault((assembly) => assembly.FullName.ToLowerInvariant().StartsWith("nunit.framework"));

Expand All @@ -217,7 +214,7 @@ internal static bool CheckTestMode()
return false;
}
}
#endif
#endif
_testMode = false;
return _testMode;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ private async void OnNewGameClick()
Talo.Saves.UnloadCurrentSave();

var date = DateTime.Now.ToString("ddd dd MMM HH:mm:ss");
await Talo.Saves.CreateSave($"Save created {date}");
var save = await Talo.Saves.CreateSave($"Save created {date}");
Talo.Saves.ChooseSave(save.id);
}

private void OnLoadClick()
Expand Down