Skip to content

504-[Feature]: Add delete functionality on filesystem and delete stor… #666

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

Open
v-raghulraja wants to merge 1 commit into
base: main
Choose a base branch
from
Open

504-[Feature]: Add delete functionality on filesystem and delete stor… #666

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
48 changes: 48 additions & 0 deletions src/testengine.user.storagestate.tests/StorageStateUserManagerModuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
using Microsoft.PowerApps.TestEngine.System;
using Microsoft.PowerApps.TestEngine.TestInfra;
using Microsoft.PowerApps.TestEngine.Tests.Helpers;
using Microsoft.PowerApps.TestEngine.Users;
using Moq;
using System;
using System.IO;
using System.Threading.Tasks;
using Xunit;

namespace testengine.user.storagestate.tests
Expand Down Expand Up @@ -237,5 +241,49 @@ public async Task ProtectandUnprotect()
Assert.Equal(DATA, unprotected);
}
}

[Fact]
public void Protect_Should_Delete_File_When_Encryption_Fails()
{
// Arrange
var testFile = "test-state.json";
var testContent = "{\"cookies\":[{\"name\":\"test\",\"value\":\"data\"}]}\"";

MockFileSystem.Setup(f => f.ReadAllText(testFile)).Returns(testContent);
MockFileSystem.Setup(f => f.WriteTextToFile(testFile, It.IsAny<string>(), true))
.Throws(new System.Security.Cryptography.CryptographicException("Encryption failed"));
MockFileSystem.Setup(f => f.Delete(testFile));

var userManager = new StorageStateUserManagerModule();

// Act & Assert
Assert.Throws<System.Security.Cryptography.CryptographicException>(() =>
userManager.Protect(MockFileSystem.Object, testFile));

// Verify file was deleted in finally block
MockFileSystem.Verify(f => f.Delete(testFile), Times.Once,
"File should be deleted when encryption fails");
}

[Fact]
public void Protect_Should_Delete_File_When_ReadAllText_Fails()
{
// Arrange
var testFile = "test-state.json";

MockFileSystem.Setup(f => f.ReadAllText(testFile))
.Throws(new IOException("Failed to read file"));
MockFileSystem.Setup(f => f.Delete(testFile));

var userManager = new StorageStateUserManagerModule();

// Act & Assert
Assert.Throws<IOException>(() =>
userManager.Protect(MockFileSystem.Object, testFile));

// Verify file was deleted in finally block
MockFileSystem.Verify(f => f.Delete(testFile), Times.Once,
"File should be deleted when read fails");
}
}
}
43 changes: 36 additions & 7 deletions src/testengine.user.storagestate/StorageStateUserManagerModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,43 @@ public async Task LoginAsUserAsync(
CallbackErrorFound = async () =>
{
var stateFile = Path.Combine(Location, "state.json");
await context.StorageStateAsync(new BrowserContextStorageStateOptions { Path = stateFile });
Protect(fileSystem, stateFile);
try
{
await context.StorageStateAsync(new BrowserContextStorageStateOptions { Path = stateFile });
Protect(fileSystem, stateFile);
logger.LogInformation("Storage state saved saved successfully");
}
catch (Exception ex)
{
logger.LogError(ex, "Failed to save storage state after error");
// Ensure cleanup happens even if storage state save fails
if (fileSystem.FileExists(stateFile))
{
fileSystem.Delete(stateFile);
logger.LogDebug($"Deleted unprotected state file: {stateFile}");
}
}
},
CallbackDesiredUrlFound = async (match) =>
{

var stateFile = Path.Combine(Location, "state.json");
await context.StorageStateAsync(new BrowserContextStorageStateOptions { Path = stateFile });
Protect(fileSystem, stateFile);
try
{
await context.StorageStateAsync(new BrowserContextStorageStateOptions { Path = stateFile });
Protect(fileSystem, stateFile);
logger.LogInformation("Storage state saved successfully");
}
catch (Exception ex)
{
logger.LogError(ex, "Failed to save storage state after successful login");
// Ensure cleanup happens even if storage state save fails
if (fileSystem.FileExists(stateFile))
{
fileSystem.Delete(stateFile);
logger.LogDebug($"Deleted unprotected state file: {stateFile}");
}
throw;
}
},
CallbackRedirectRequiredFound = !UseStaticContext ? null : async (matchPage) =>
{
Expand All @@ -244,8 +272,9 @@ public async Task LoginAsUserAsync(
}
}
}
catch
catch (Exception ex)
{
logger.LogWarning(ex, "Failed to redirect to desired URL");
}
},
Module = this
Expand All @@ -269,7 +298,7 @@ public async Task LoginAsUserAsync(
logger.LogError(ex, "Error waiting for login");
}

if (!state.FoundMatch || !state.IsError)
if (!state.FoundMatch && !state.IsError)
{
logger.LogDebug($"Desired page not found, waiting {DateTime.Now.Subtract(started).TotalSeconds}");
System.Threading.Thread.Sleep(1000);
Expand Down
Loading