feat: use own api clients (#16)

* generate kratos client * kratos client * add hydra client * remove clients * add kratos client * add hydra client * reference api clients * fix cancellationToken * add model prefix * migrate projects for new api clients
josxha · Apr 17, 2024 · 7c66265 · 7c66265
1 parent 83a27bc
commit 7c66265
Show file tree

Hide file tree

Showing 245 changed files with 34,244 additions and 11,385 deletions.
diff --git a/KratosSelfService/Controllers/LoginController.cs b/KratosSelfService/Controllers/LoginController.cs
@@ -36,7 +36,7 @@ public async Task<IActionResult> Login(
         KratosLoginFlow flow;
         try
         {
-            flow = await api.Frontend.GetLoginFlowAsync(flowId.ToString(), Request.Headers.Cookie, cancellationToken);
+            flow = await api.Frontend.GetLoginFlowAsync(flowId.ToString(), Request.Headers.Cookie, cancellationToken:cancellationToken);
         }
         catch (ApiException exception)
         {
@@ -48,7 +48,7 @@ public async Task<IActionResult> Login(
         if (flow.Ui.Messages?.Any(text => text.Id == 4000010) ?? false)
             // the login requires that the user verifies their email address before logging in
             // we will create a new verification flow and redirect the user to the verification page
-            return await RedirectToVerificationFlow(flow, cancellationToken);
+            return await RedirectToVerificationFlow(flow, cancellationToken:cancellationToken);
 
         // Render the data using a view:
         var initRegistrationQuery = new Dictionary<string, string?>
@@ -68,7 +68,7 @@ public async Task<IActionResult> Login(
 
         string? logoutUrl = null;
         if (flow.RequestedAal == KratosAuthenticatorAssuranceLevel.Aal2 || flow.Refresh)
-            logoutUrl = await GetLogoutUrl(flow, cancellationToken);
+            logoutUrl = await GetLogoutUrl(flow, cancellationToken:cancellationToken);
 
         var model = new LoginModel(flow, initRecoveryUrl, initRegistrationUrl, logoutUrl);
         return View("Login", model);
@@ -81,7 +81,7 @@ public async Task<IActionResult> Login(
         // to give the user the option to sign out!
         try
         {
-            var logoutFlow = await api.Frontend.CreateBrowserLogoutFlowAsync(Request.Headers.Cookie, flow.ReturnTo, cancellationToken);
+            var logoutFlow = await api.Frontend.CreateBrowserLogoutFlowAsync(Request.Headers.Cookie, flow.ReturnTo, cancellationToken:cancellationToken);
             return logoutFlow.LogoutUrl;
         }
         catch (Exception exception)
@@ -111,7 +111,7 @@ private async Task<IActionResult> RedirectToVerificationFlow(KratosLoginFlow flo
         try
         {
             var response = await api.Frontend
-                .CreateBrowserVerificationFlowWithHttpInfoAsync(flow.ReturnTo, cancellationToken);
+                .CreateBrowserVerificationFlowWithHttpInfoAsync(flow.ReturnTo, cancellationToken:cancellationToken);
             var verificationFlow = response.Data;
             // we need the csrf cookie from the verification flow
             Response.Headers.Append(HeaderNames.SetCookie, response.Headers[HeaderNames.SetCookie].ToString());

diff --git a/KratosSelfService/Controllers/LogoutController.cs b/KratosSelfService/Controllers/LogoutController.cs
@@ -19,7 +19,7 @@ public async Task<IActionResult> LogoutGet(
             // end hydra session
             try
             {
-                hydraResponse = await api.HydraOAuth2.AcceptOAuth2LogoutRequestAsync(logoutChallenge, cancellationToken);
+                hydraResponse = await api.HydraOAuth2.AcceptOAuth2LogoutRequestAsync(logoutChallenge, cancellationToken:cancellationToken);
             }
             catch (Ory.Hydra.Client.Client.ApiException exception)
             {
@@ -32,7 +32,7 @@ public async Task<IActionResult> LogoutGet(
         try
         {
             var flow = await api.Frontend.CreateBrowserLogoutFlowAsync(Request.Headers.Cookie, 
-                hydraResponse?.RedirectTo, cancellationToken);
+                hydraResponse?.RedirectTo, cancellationToken:cancellationToken);
             return Redirect(flow.LogoutUrl);
         }
         catch (Ory.Kratos.Client.Client.ApiException exception)

diff --git a/KratosSelfService/Controllers/OAuth2Controller.cs b/KratosSelfService/Controllers/OAuth2Controller.cs
@@ -18,7 +18,7 @@ public async Task<IActionResult> ConsentGet([FromQuery(Name = "consent_challenge
 
         // This section processes consent requests and either shows the consent UI or accepts
         // the consent request right away if the user has given consent to this app before.
-        var challengeRequest = await oAuth2Api.GetOAuth2ConsentRequestAsync(challenge, cancellationToken);
+        var challengeRequest = await oAuth2Api.GetOAuth2ConsentRequestAsync(challenge, cancellationToken:cancellationToken);
         // If a user has granted this application the requested scope, hydra will tell us to not show the UI.
         if (!CanSkipConsent(challengeRequest))
         {
@@ -152,9 +152,9 @@ private async Task<HydraOAuth2RedirectTo> AcceptRequest(string challenge, List<s
 
     private bool CanSkipConsent(HydraOAuth2ConsentRequest challenge)
     {
-        if (challenge.Skip || challenge._Client.SkipConsent) return true;
+        if (challenge.Skip || challenge.VarClient.SkipConsent) return true;
 
-        if (challenge._Client.ClientId == null || env.HydraTrustedClientIds == null) return false;
-        return env.HydraTrustedClientIds.Split(",").Contains(challenge._Client.ClientId);
+        if (challenge.VarClient.ClientId == null || env.HydraTrustedClientIds == null) return false;
+        return env.HydraTrustedClientIds.Split(",").Contains(challenge.VarClient.ClientId);
     }
 }
diff --git a/KratosSelfService/Controllers/ProfileController.cs b/KratosSelfService/Controllers/ProfileController.cs
@@ -14,7 +14,7 @@ public async Task<IActionResult> Profile(CancellationToken cancellationToken)
     {
         var session = (KratosSession)HttpContext.Items[typeof(KratosSession)]!;
         var schema = await schemaService.FetchSchema(session.Identity.SchemaId,
-            session.Identity.SchemaUrl, cancellationToken);
+            session.Identity.SchemaUrl, cancellationToken:cancellationToken);
         return View("Profile", new ProfileModel(session, IdentitySchemaService.GetTraits(schema)));
     }
 }
diff --git a/KratosSelfService/Controllers/RecoveryController.cs b/KratosSelfService/Controllers/RecoveryController.cs
@@ -13,7 +13,7 @@ public class RecoveryController(ILogger<RecoveryController> logger, ApiService a
     [AllowAnonymous]
     public async Task<IActionResult> Recovery(
         [FromQuery(Name = "flow")] Guid? flowId,
-        [FromQuery(Name = "return_to")] string? returnTo, 
+        [FromQuery(Name = "return_to")] string? returnTo,
         CancellationToken cancellationToken)
     {
         if (flowId == null)
@@ -28,7 +28,8 @@ public async Task<IActionResult> Recovery(
         KratosRecoveryFlow flow;
         try
         {
-            flow = await api.Frontend.GetRecoveryFlowAsync(flowId.ToString(), Request.Headers.Cookie, cancellationToken);
+            flow = await api.Frontend.GetRecoveryFlowAsync(flowId.ToString(), Request.Headers.Cookie,
+                cancellationToken: cancellationToken);
         }
         catch (ApiException exception)
         {

diff --git a/KratosSelfService/Controllers/RegistrationController.cs b/KratosSelfService/Controllers/RegistrationController.cs
@@ -41,7 +41,7 @@ public async Task<IActionResult> Registration(
         KratosRegistrationFlow flow;
         try
         {
-            flow = await api.Frontend.GetRegistrationFlowAsync(flowId.ToString(), Request.Headers.Cookie, cancellationToken);
+            flow = await api.Frontend.GetRegistrationFlowAsync(flowId.ToString(), Request.Headers.Cookie, cancellationToken:cancellationToken);
         }
         catch (ApiException exception)
         {

diff --git a/KratosSelfService/Controllers/VerificationController.cs b/KratosSelfService/Controllers/VerificationController.cs
@@ -32,7 +32,7 @@ public async Task<IActionResult> Verification(
         KratosVerificationFlow flow;
         try
         {
-            flow = await api.Frontend.GetVerificationFlowAsync(flowId.ToString(), Request.Headers.Cookie, cancellationToken);
+            flow = await api.Frontend.GetVerificationFlowAsync(flowId.ToString(), Request.Headers.Cookie, cancellationToken:cancellationToken);
         }
         catch (ApiException exception)
         {

diff --git a/KratosSelfService/Controllers/WellknownController.cs b/KratosSelfService/Controllers/WellknownController.cs
@@ -10,7 +10,7 @@ public class WellknownController(ApiService api) : Controller
     [AllowAnonymous]
     public async Task<IActionResult> Webauthn(CancellationToken cancellationToken)
     {
-        var script = await api.Frontend.GetWebAuthnJavaScriptAsync(cancellationToken);
+        var script = await api.Frontend.GetWebAuthnJavaScriptAsync(cancellationToken:cancellationToken);
         //Response.ContentType = "text/javascript";
         return new ObjectResult(script);
     }

diff --git a/KratosSelfService/KratosSelfService.csproj b/KratosSelfService/KratosSelfService.csproj
@@ -71,7 +71,6 @@
 
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
-        <PackageReference Include="Ory.Hydra.Client" Version="2.2.0-rc.3"/>
         <PackageReference Include="UAParser" Version="3.1.47"/>
     </ItemGroup>
 
@@ -130,7 +129,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Ory.Kratos.Client\Ory.Kratos.Client.csproj" />
+        <ProjectReference Include="..\Ory.Hydra.Client\Ory.Hydra.Client.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Ory.Kratos.Client\Ory.Kratos.Client.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/KratosSelfService/Services/IdentitySchemaService.cs b/KratosSelfService/Services/IdentitySchemaService.cs
@@ -12,7 +12,7 @@ public async Task<JSchema> FetchSchema(string schemaId, string schemaUri, Cancel
         // check if schema object is cached
         if (_schemaCache.TryGetValue(schemaId, out var schema))
             return schema;
-        var response = await _httpClient.GetStringAsync(schemaUri, cancellationToken);
+        var response = await _httpClient.GetStringAsync(schemaUri, cancellationToken:cancellationToken);
         // request and cache new schema object
         _schemaCache[schemaId] = JSchema.Parse(response);
         return _schemaCache[schemaId];

diff --git a/KratosSelfService/ViewComponents/KratosUiTextMessages.cs b/KratosSelfService/ViewComponents/KratosUiTextMessages.cs
@@ -1,4 +1,6 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewComponents;
 using Ory.Kratos.Client.Model;
 

diff --git a/KratosSelfService/Views/OAuth2/Consent.cshtml b/KratosSelfService/Views/OAuth2/Consent.cshtml
@@ -2,8 +2,8 @@
 @{
     ViewData["Title"] = CustomTranslator.Get("Grant access");
     Layout = "_CardLayout";
-    var clientName = Model.request._Client.ClientName;
-    if (string.IsNullOrWhiteSpace(clientName)) clientName = Model.request._Client.ClientId;
+    var clientName = Model.request.VarClient.ClientName;
+    if (string.IsNullOrWhiteSpace(clientName)) clientName = Model.request.VarClient.ClientId;
 }
 
 <form class="section" action="consent" method="post">