Skip to content

Commit 6e6bd2d

Browse files
committed
Fix tests
1 parent 67cd0ae commit 6e6bd2d

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

src/Components/Components/test/Lifetime/ComponentStatePersistenceManagerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public async Task PersistStateAsync_FiresCallbacksInParallel()
148148
await persistTask;
149149

150150
// Assert
151-
Assert.Equal(new[] { 1, 2, 3, 4 }, sequence);
151+
Assert.Equal(new[] { 2, 1, 3, 4 }, sequence);
152152
}
153153

154154
[Fact]

src/Components/Endpoints/src/Forms/EndpointAntiforgeryStateProvider.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,12 @@ internal void SetRequestContext(HttpContext context)
1616
_context = context;
1717
}
1818

19-
public override AntiforgeryRequestToken? CurrentToken {
20-
get
21-
{
22-
return field ??= GetAntiforgeryToken();
23-
}
24-
set;
25-
}
26-
2719
public override AntiforgeryRequestToken? GetAntiforgeryToken()
2820
{
2921
if (_context == null)
3022
{
3123
// We're in an interactive context. Use the token persisted during static rendering.
32-
return base.GetAntiforgeryToken();
24+
return _currentToken;
3325
}
3426

3527
// We already have a callback setup to generate the token when the response starts if needed.
@@ -42,7 +34,7 @@ public override AntiforgeryRequestToken? CurrentToken {
4234
return null;
4335
}
4436

45-
CurrentToken = new AntiforgeryRequestToken(tokens.RequestToken, tokens.FormFieldName);
46-
return CurrentToken;
37+
_currentToken = new AntiforgeryRequestToken(tokens.RequestToken, tokens.FormFieldName);
38+
return _currentToken;
4739
}
4840
}

src/Components/Shared/src/DefaultAntiforgeryStateProvider.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@ namespace Microsoft.AspNetCore.Components.Forms;
55

66
internal class DefaultAntiforgeryStateProvider : AntiforgeryStateProvider
77
{
8+
protected AntiforgeryRequestToken? _currentToken;
9+
810
[SupplyParameterFromPersistentComponentState]
9-
public virtual AntiforgeryRequestToken? CurrentToken { get; set; }
11+
public AntiforgeryRequestToken? CurrentToken
12+
{
13+
get => _currentToken ??= GetAntiforgeryToken();
14+
set => _currentToken = value;
15+
}
1016

1117
/// <inheritdoc />
12-
public override AntiforgeryRequestToken? GetAntiforgeryToken() => CurrentToken;
18+
public override AntiforgeryRequestToken? GetAntiforgeryToken() => _currentToken;
1319
}

0 commit comments

Comments
 (0)