Merge tag '0.5.3' into develop

0.5.3

Author: alkampfergit

src/WebAppTest/Controllers/Models/ClientFlowDto.cs

@@ -4,4 +4,9 @@ public class ClientFlowDto
     {
         public string Email { get; set; }
     }
+
+    public class CodeFlowDto
+    {
+        public string? Scope { get; set; }
+    }
 }

src/WebAppTest/Controllers/OAuth2Controller.cs

@@ -1,13 +1,11 @@
 using DotNetCoreOAuth2;
 using MailKit;
 using MailKit.Net.Imap;
-using MailKit.Search;
 using MailKit.Security;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using System.Text;
-using WebAppTest.Support;
 
 namespace WebAppTest.Controllers
 {

src/WebAppTest/Controllers/SampleIMAPController.cs

@@ -44,22 +44,24 @@ public IActionResult Index()
 
         [Route("code-flow")]
         [HttpPost]
-        public async Task<IActionResult> CodeFlow()
+        public async Task<IActionResult> CodeFlow(CodeFlowDto dto)
         {
             OAuth2Client oAuth2Client = CreateOAuth2Client();
 
+            var clientScope = dto?.Scope ?? "openid email offline_access https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send";
+
             var relativeUrl = Url.Action("GetToken", "SampleIMAP")!;
             var redirectUrl = $"{Request.Scheme}://{Request.Host}{Request.PathBase}/{relativeUrl.TrimStart('/')}";
             var customState = Guid.NewGuid().ToString();
             var codeChallengeUrl = await oAuth2Client.GenerateUrlForCodeFlowAsync(
-                "openid email offline_access https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send",
+                clientScope,
                 redirectUrl,
                 new Dictionary<string, string>(),
                 customState: customState);
 
             // In a real world, this will return a redirect to the code challenge url so that
             // the user will be immediately prompted with a login page.
-            var model = new ();
+            var model = new SampleIMAPModel();
             model.State = customState;
             model.LoginLink = codeChallengeUrl.AbsoluteUri;
             model.DebugLoginLink = DumpUrl(model.LoginLink);

src/WebAppTest/Views/SampleIMAP/Index.cshtml

@@ -36,7 +36,8 @@
 
         <h2>IMAP with code flow</h2>
         <form action="/sample-oauth2/code-flow" method="post">
-
+            <label for="scop">Scope:</label>
+            <input style="width: 800px" type="text" id="scope" name="scope" value="openid email offline_access https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send" />
             <input type="submit" value="Generate code flow link" />
         </form>
     }