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
15 changes: 8 additions & 7 deletions Assets/Talo Game Services/Talo/Runtime/Utils/SessionManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,22 @@ private void SaveSession(string sessionToken, string refreshToken)

public async Task<bool> ClearSession(bool resetSocket = true)
{
if (!Talo.HasIdentity())
{
return false;
}
var hadIdentity = Talo.HasIdentity();

_sessionToken = null;
Talo.CurrentAlias = null;
PlayerAlias.DeleteOfflineAlias();

if (hadIdentity)
{
PlayerAlias.DeleteOfflineAlias();
}

PlayerPrefs.DeleteKey("TaloRefreshToken");

Talo.Events.ClearQueue();
Talo.Continuity.ClearRequests();

if (resetSocket)
if (resetSocket && hadIdentity)
{
try
{
Expand All @@ -68,7 +69,7 @@ public async Task<bool> ClearSession(bool resetSocket = true)
}
}

return true;
return hadIdentity;
}

public string GetSessionToken()
Expand Down
8 changes: 8 additions & 0 deletions Assets/Talo Game Services/Talo/Tests/SessionManager.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
using System.Collections;
using NUnit.Framework;
using UnityEngine;
using UnityEngine.TestTools;

namespace TaloGameServices.Test
{
internal class ClearSessionTest
{
[OneTimeSetUp]
public void Setup()
{
var tm = new GameObject().AddComponent<TaloManager>();
tm.settings = ScriptableObject.CreateInstance<TaloSettings>();
tm.settings.autoConnectSocket = false;
tm.settings.autoStartSession = false;

Talo.CurrentAlias = null;
PlayerPrefs.DeleteAll();
}

[UnityTest]
public IEnumerator ClearSession_WithoutIdentity_DeletesStoredToken()
{
Talo.CurrentAlias = null;
PlayerPrefs.SetString("TaloRefreshToken", "stale-token");

// TestMode makes HasIdentity() always return true, which would mask
// the no-identity path this test exercises
TestModeFlag.IsEnabled = false;
try
{
var task = Talo.PlayerAuth.SessionManager.ClearSession(false);
while (!task.IsCompleted)
{
yield return null;
}

Assert.IsFalse(task.Result);
Assert.IsEmpty(PlayerPrefs.GetString("TaloRefreshToken"));
}
finally
{
TestModeFlag.IsEnabled = true;
}
}

[UnityTest]
public IEnumerator ClearSession_WithIdentity_ReturnsTrue()
{
Talo.CurrentAlias = new PlayerAlias() {
player = new Player() {
id = "uuid"
}
};
PlayerPrefs.SetString("TaloRefreshToken", "some-token");

var task = Talo.PlayerAuth.SessionManager.ClearSession(false);
while (!task.IsCompleted)
{
yield return null;
}

Assert.IsTrue(task.Result);
Assert.IsEmpty(PlayerPrefs.GetString("TaloRefreshToken"));
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading