From 809ca92c8a23515621698dbac771a1744d0d7952 Mon Sep 17 00:00:00 2001 From: Lucas Morgan Date: Sun, 14 May 2023 18:55:19 -0500 Subject: [PATCH] Yep --- Shogi.Api/appsettings.json | 3 +- Shogi.Domain/Aggregates/Session.cs | 3 ++ Shogi.UI/Pages/Home/Account/AccountManager.cs | 5 --- Shogi.UI/Pages/Home/Api/MsalMessageHandler.cs | 30 +++++++++-------- Shogi.UI/Pages/Home/PageHeader.razor | 6 +++- Shogi.UI/Program.cs | 7 +++- Shogi.UI/wwwroot/appsettings.json | 3 +- Shogi.sln | 7 ++++ Tests/E2ETests/E2ETests.csproj | 23 +++++++++++++ Tests/E2ETests/MicrosoftLoginTests.cs | 30 +++++++++++++++++ Tests/E2ETests/PlaywriteExample.cs | 33 +++++++++++++++++++ Tests/E2ETests/Usings.cs | 1 + Tests/E2ETests/appsettings.json | 3 ++ 13 files changed, 130 insertions(+), 24 deletions(-) create mode 100644 Tests/E2ETests/E2ETests.csproj create mode 100644 Tests/E2ETests/MicrosoftLoginTests.cs create mode 100644 Tests/E2ETests/PlaywriteExample.cs create mode 100644 Tests/E2ETests/Usings.cs create mode 100644 Tests/E2ETests/appsettings.json diff --git a/Shogi.Api/appsettings.json b/Shogi.Api/appsettings.json index bee5e44..b4da000 100644 --- a/Shogi.Api/appsettings.json +++ b/Shogi.Api/appsettings.json @@ -15,7 +15,8 @@ "Instance": "https://login.microsoftonline.com/", "TenantId": "common", "ClientId": "c1e94676-cab0-42ba-8b6c-9532b8486fff", - "SwaggerUIClientId": "26bf69a4-2af8-4711-bf5b-79f75e20b082" + "SwaggerUIClientId": "26bf69a4-2af8-4711-bf5b-79f75e20b082", + "Scope": "api://c1e94676-cab0-42ba-8b6c-9532b8486fff/DefaultScope" }, "Cors": { "AllowedOrigins": [ diff --git a/Shogi.Domain/Aggregates/Session.cs b/Shogi.Domain/Aggregates/Session.cs index a48bca2..6ba0e35 100644 --- a/Shogi.Domain/Aggregates/Session.cs +++ b/Shogi.Domain/Aggregates/Session.cs @@ -14,11 +14,14 @@ public class Session } public string Name { get; } + public ShogiBoard Board { get; } + /// /// The User.Id of the player which created the session. /// public string Player1 { get; } + /// /// The User.Id of the second player. /// diff --git a/Shogi.UI/Pages/Home/Account/AccountManager.cs b/Shogi.UI/Pages/Home/Account/AccountManager.cs index ec98ea3..9ec7ec6 100644 --- a/Shogi.UI/Pages/Home/Account/AccountManager.cs +++ b/Shogi.UI/Pages/Home/Account/AccountManager.cs @@ -10,7 +10,6 @@ public class AccountManager { private readonly AccountState accountState; private readonly IShogiApi shogiApi; - private readonly IConfiguration configuration; private readonly ILocalStorage localStorage; private readonly AuthenticationStateProvider authState; private readonly NavigationManager navigation; @@ -19,7 +18,6 @@ public class AccountManager public AccountManager( AccountState accountState, IShogiApi unauthenticatedClient, - IConfiguration configuration, AuthenticationStateProvider authState, ILocalStorage localStorage, NavigationManager navigation, @@ -27,15 +25,12 @@ public class AccountManager { this.accountState = accountState; this.shogiApi = unauthenticatedClient; - this.configuration = configuration; this.authState = authState; this.localStorage = localStorage; this.navigation = navigation; this.shogiSocket = shogiSocket; } - private User? MyUser => accountState.User; - private Task SetUser(User user) => accountState.SetUser(user); diff --git a/Shogi.UI/Pages/Home/Api/MsalMessageHandler.cs b/Shogi.UI/Pages/Home/Api/MsalMessageHandler.cs index d91861c..fe6ad64 100644 --- a/Shogi.UI/Pages/Home/Api/MsalMessageHandler.cs +++ b/Shogi.UI/Pages/Home/Api/MsalMessageHandler.cs @@ -3,19 +3,21 @@ using Microsoft.AspNetCore.Components.WebAssembly.Authentication; namespace Shogi.UI.Pages.Home.Api { - public class MsalMessageHandler : AuthorizationMessageHandler - { - public MsalMessageHandler(IAccessTokenProvider provider, NavigationManager navigation) : base(provider, navigation) - { - ConfigureHandler( - authorizedUrls: new[] { "https://api.lucaserver.space", "https://localhost:5001" }, - scopes: new[] { "api://c1e94676-cab0-42ba-8b6c-9532b8486fff/DefaultScope" }, - returnUrl: "https://localhost:3000"); - } + public class MsalMessageHandler : AuthorizationMessageHandler + { + public MsalMessageHandler(IAccessTokenProvider provider, NavigationManager navigation) : base(provider, navigation) + { + ConfigureHandler( + authorizedUrls: new[] { "https://api.lucaserver.space/Shogi.Api", "https://localhost:5001" }, + scopes: new string[] { + "api://c1e94676-cab0-42ba-8b6c-9532b8486fff/DefaultScope", + "offline_access", + }); + } - protected override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - return base.SendAsync(request, cancellationToken); - } - } + protected override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + return base.SendAsync(request, cancellationToken); + } + } } diff --git a/Shogi.UI/Pages/Home/PageHeader.razor b/Shogi.UI/Pages/Home/PageHeader.razor index 5a9a96d..49b4839 100644 --- a/Shogi.UI/Pages/Home/PageHeader.razor +++ b/Shogi.UI/Pages/Home/PageHeader.razor @@ -3,7 +3,11 @@

Shogi

- @if (user != null) + @if (user == null) + { + + } + else {
@user.Value.DisplayName
diff --git a/Shogi.UI/Program.cs b/Shogi.UI/Program.cs index 8a40c1b..ff19fe2 100644 --- a/Shogi.UI/Program.cs +++ b/Shogi.UI/Program.cs @@ -39,7 +39,12 @@ static void ConfigureDependencies(IServiceCollection services, IConfiguration co services.AddMsalAuthentication(options => { configuration.Bind("AzureAd", options.ProviderOptions.Authentication); - options.ProviderOptions.LoginMode = "redirect"; + //options.ProviderOptions.DefaultAccessTokenScopes.Add("https://graph.microsoft.com/User.Read"); + //options.ProviderOptions.DefaultAccessTokenScopes.Add("openid"); + //options.ProviderOptions.DefaultAccessTokenScopes.Add("offline_access"); + //options.ProviderOptions.DefaultAccessTokenScopes.Add("profile"); + //options.ProviderOptions.LoginMode = "redirect"; + }); services.AddOidcAuthentication(options => { diff --git a/Shogi.UI/wwwroot/appsettings.json b/Shogi.UI/wwwroot/appsettings.json index aacf8c5..66f4809 100644 --- a/Shogi.UI/wwwroot/appsettings.json +++ b/Shogi.UI/wwwroot/appsettings.json @@ -5,11 +5,10 @@ } }, "AzureAd": { - "ClientId": "935df672-efa6-45fa-b2e8-b76dfd65a122", "Authority": "https://login.microsoftonline.com/common", + "ClientId": "935df672-efa6-45fa-b2e8-b76dfd65a122", "ValidateAuthority": true, "Scopes": [ - "profile", "api://c1e94676-cab0-42ba-8b6c-9532b8486fff/DefaultScope" ] }, diff --git a/Shogi.sln b/Shogi.sln index 25391b4..00812e7 100644 --- a/Shogi.sln +++ b/Shogi.sln @@ -27,6 +27,8 @@ Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "Shogi.Database", "Shogi.Dat EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shogi.Api", "Shogi.Api\Shogi.Api.csproj", "{62604006-6E18-45DA-8D5A-6ADD1C6D3CE2}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "E2ETests", "Tests\E2ETests\E2ETests.csproj", "{401120C3-45D6-4A23-8D87-C2BED29F4950}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -60,6 +62,10 @@ Global {62604006-6E18-45DA-8D5A-6ADD1C6D3CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU {62604006-6E18-45DA-8D5A-6ADD1C6D3CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU {62604006-6E18-45DA-8D5A-6ADD1C6D3CE2}.Release|Any CPU.Build.0 = Release|Any CPU + {401120C3-45D6-4A23-8D87-C2BED29F4950}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {401120C3-45D6-4A23-8D87-C2BED29F4950}.Debug|Any CPU.Build.0 = Debug|Any CPU + {401120C3-45D6-4A23-8D87-C2BED29F4950}.Release|Any CPU.ActiveCfg = Release|Any CPU + {401120C3-45D6-4A23-8D87-C2BED29F4950}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -67,6 +73,7 @@ Global GlobalSection(NestedProjects) = preSolution {4F93F735-DCCE-4A5D-ADDC-E0986DE4C48D} = {A968C8E6-47B7-4F72-A27A-AC9B643FD320} {30F4E3DB-027F-4885-BE06-884167C1C6CF} = {A968C8E6-47B7-4F72-A27A-AC9B643FD320} + {401120C3-45D6-4A23-8D87-C2BED29F4950} = {A968C8E6-47B7-4F72-A27A-AC9B643FD320} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D0B04F2-0DA1-4CB4-A82A-5A1C3B52ACEB} diff --git a/Tests/E2ETests/E2ETests.csproj b/Tests/E2ETests/E2ETests.csproj new file mode 100644 index 0000000..8814f3d --- /dev/null +++ b/Tests/E2ETests/E2ETests.csproj @@ -0,0 +1,23 @@ + + + + net7.0 + enable + enable + + false + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/Tests/E2ETests/MicrosoftLoginTests.cs b/Tests/E2ETests/MicrosoftLoginTests.cs new file mode 100644 index 0000000..cb17a53 --- /dev/null +++ b/Tests/E2ETests/MicrosoftLoginTests.cs @@ -0,0 +1,30 @@ +using Microsoft.Playwright; +using Microsoft.Playwright.NUnit; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace E2ETests; + +[Parallelizable(ParallelScope.Self)] +[TestFixture] +public class MicrosoftLoginTests : PageTest +{ + + [SetUp] + public async void Init() + { + + } + + [Test] + public async Task Test1() + { + await Page.GotoAsync("https://lucaserver.space/shogi", new PageGotoOptions { WaitUntil = WaitUntilState.NetworkIdle }); + var loginButton = Page.GetByRole(AriaRole.Button, new PageGetByRoleOptions { Name = "Log in" }); + await loginButton.ClickAsync(); + //await Page.WaitForURLAsync() + } +} \ No newline at end of file diff --git a/Tests/E2ETests/PlaywriteExample.cs b/Tests/E2ETests/PlaywriteExample.cs new file mode 100644 index 0000000..74a3cd5 --- /dev/null +++ b/Tests/E2ETests/PlaywriteExample.cs @@ -0,0 +1,33 @@ +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using Microsoft.Playwright; +using Microsoft.Playwright.NUnit; +using NUnit.Framework; + +namespace E2ETests; + +[Parallelizable(ParallelScope.Self)] +[TestFixture] +public class PlaywriteExample : PageTest +{ + [Test] + public async Task HomepageHasPlaywrightInTitleAndGetStartedLinkLinkingtoTheIntroPage() + { + await Page.GotoAsync("https://playwright.dev"); + + // Expect a title "to contain" a substring. + await Expect(Page).ToHaveTitleAsync(new Regex("Playwright")); + + // create a locator + var getStarted = Page.GetByRole(AriaRole.Link, new() { Name = "Get started" }); + + // Expect an attribute "to be strictly equal" to the value. + await Expect(getStarted).ToHaveAttributeAsync("href", "/docs/intro"); + + // Click the get started link. + await getStarted.ClickAsync(); + + // Expects the URL to contain intro. + await Expect(Page).ToHaveURLAsync(new Regex(".*intro")); + } +} \ No newline at end of file diff --git a/Tests/E2ETests/Usings.cs b/Tests/E2ETests/Usings.cs new file mode 100644 index 0000000..cefced4 --- /dev/null +++ b/Tests/E2ETests/Usings.cs @@ -0,0 +1 @@ +global using NUnit.Framework; \ No newline at end of file diff --git a/Tests/E2ETests/appsettings.json b/Tests/E2ETests/appsettings.json new file mode 100644 index 0000000..0db3279 --- /dev/null +++ b/Tests/E2ETests/appsettings.json @@ -0,0 +1,3 @@ +{ + +}