Merge pull request #1077 from ITfoxtec/1.14.x-development

1.14.x development
ITfoxtec · Dec 11, 2024 · 69cf03a · 69cf03a
2 parents b7ef4eb + dd98340
commit 69cf03a
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 34 deletions.
diff --git a/src/FoxIDs.Control/Controllers/Tracks/TExternalUserController.cs b/src/FoxIDs.Control/Controllers/Tracks/TExternalUserController.cs
@@ -41,18 +41,8 @@ public TExternalUserController(TelemetryScopedLogger logger, IMapper mapper, ITe
             try
             {
                 if (!await ModelState.TryValidateObjectAsync(userRequest)) return BadRequest(ModelState);
-
-                var mExternalUser = await tenantDataRepository.GetAsync<ExternalUser>(await ExternalUser.IdFormatAsync(RouteBinding, userRequest.UpPartyName, await GetLinkClaimHashAsync(userRequest.LinkClaimValue, userRequest.RedemptionClaimValue)), required: !userRequest.LinkClaimValue.IsNullOrWhiteSpace());
-                if (mExternalUser == null)
-                {
-                    var idKey = new Track.IdKey { TenantName = RouteBinding.TenantName, TrackName = RouteBinding.TrackName };
-                    (var mExternalUsers, _) = await tenantDataRepository.GetListAsync<ExternalUser>(idKey, whereQuery: u => u.RedemptionClaimValue.Equals(userRequest.RedemptionClaimValue));
-                    mExternalUser = mExternalUsers?.FirstOrDefault();
-                    if (mExternalUser == null)
-                    {
-                        throw new FoxIDsDataException() { StatusCode = DataStatusCode.NotFound };
-                    }
-                }
+
+                var mExternalUser = await GetExternalUserAsync(userRequest);
                 return Ok(mapper.Map<Api.ExternalUser>(mExternalUser));
             }
             catch (FoxIDsDataException ex)
@@ -100,6 +90,9 @@ public TExternalUserController(TelemetryScopedLogger logger, IMapper mapper, ITe
 
         /// <summary>
         /// Update external user.
+        /// 
+        /// Select which external user to update with the attributes 'LinkClaimValue' and / or 'RedemptionClaimValue' and set the new values with the attributes 'UpdateLinkClaimValue' and 'UpdateLinkRedemptionClaimValue'.
+        /// If there are no changes to the attributes 'LinkClaimValue' and 'RedemptionClaimValue' they should be equal to the attributes 'UpdateLinkClaimValue' and 'UpdateLinkRedemptionClaimValue'.
         /// </summary>
         /// <param name="userRequest">External user.</param>
         /// <returns>External user.</returns>
@@ -111,7 +104,7 @@ public TExternalUserController(TelemetryScopedLogger logger, IMapper mapper, ITe
             {
                 if (!await ModelState.TryValidateObjectAsync(userRequest)) return BadRequest(ModelState);
 
-                var mExternalUser = await tenantDataRepository.GetAsync<ExternalUser>(await ExternalUser.IdFormatAsync(RouteBinding, userRequest.UpPartyName, await GetLinkClaimHashAsync(userRequest.LinkClaimValue, userRequest.RedemptionClaimValue)));
+                var mExternalUser = await GetExternalUserAsync(userRequest);
 
                 mExternalUser.LinkClaimValue = userRequest.UpdateLinkClaimValue;
                 if(mExternalUser.LinkClaimValue.IsNullOrWhiteSpace())
@@ -164,7 +157,8 @@ public async Task<IActionResult> DeleteExternalUser(Api.ExternalUserId userReque
             {
                 if (!await ModelState.TryValidateObjectAsync(userRequest)) return BadRequest(ModelState);
 
-                await tenantDataRepository.DeleteAsync<ExternalUser>(await ExternalUser.IdFormatAsync(RouteBinding, userRequest.UpPartyName, await GetLinkClaimHashAsync(userRequest.LinkClaimValue, userRequest.RedemptionClaimValue)));
+                var mExternalUser = await GetExternalUserAsync(userRequest);
+                await tenantDataRepository.DeleteAsync<ExternalUser>(mExternalUser.Id);
                 return NoContent();
             }
             catch (FoxIDsDataException ex)
@@ -178,6 +172,23 @@ public async Task<IActionResult> DeleteExternalUser(Api.ExternalUserId userReque
             }
         }
 
+        private async Task<ExternalUser> GetExternalUserAsync(Api.ExternalUserId userRequest)
+        {
+            var mExternalUser = await tenantDataRepository.GetAsync<ExternalUser>(await ExternalUser.IdFormatAsync(RouteBinding, userRequest.UpPartyName, await GetLinkClaimHashAsync(userRequest.LinkClaimValue, userRequest.RedemptionClaimValue)), required: !userRequest.LinkClaimValue.IsNullOrWhiteSpace());
+            if (mExternalUser == null)
+            {
+                var idKey = new Track.IdKey { TenantName = RouteBinding.TenantName, TrackName = RouteBinding.TrackName };
+                (var mExternalUsers, _) = await tenantDataRepository.GetListAsync<ExternalUser>(idKey, whereQuery: u => u.UpPartyName.Equals(userRequest.UpPartyName) && u.RedemptionClaimValue.Equals(userRequest.RedemptionClaimValue));
+                mExternalUser = mExternalUsers?.FirstOrDefault();
+                if (mExternalUser == null)
+                {
+                    throw new FoxIDsDataException() { StatusCode = DataStatusCode.NotFound };
+                }
+            }
+
+            return mExternalUser;
+        }
+
         private Task<string> GetLinkClaimHashAsync(string linkClaimValue, string redemptionClaimValue)
         {
             if (linkClaimValue.IsNullOrWhiteSpace())

diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/src/FoxIDs.Control/FoxIDs.Control.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.2</Version>
+		<Version>1.14.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Control/Infrastructure/Hosting/ApplicationBuilderExtensions.cs b/src/FoxIDs.Control/Infrastructure/Hosting/ApplicationBuilderExtensions.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Builder;
+using ITfoxtec.Identity.Util;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.OpenApi.Models;
 using System.Collections.Generic;
 
@@ -12,15 +13,14 @@ public static void UseApiSwagger(this IApplicationBuilder builder)
             {
                 c.PreSerializeFilters.Add((openApiDocument, httpRequest) =>
                 {
-                    openApiDocument.Servers = new List<OpenApiServer> { new OpenApiServer { Url = httpRequest.HttpContext.GetHost(addTrailingSlash: false) } };
+                    openApiDocument.Servers = new List<OpenApiServer> { new OpenApiServer { Url = UrlCombine.Combine(httpRequest.HttpContext.GetHost(addTrailingSlash: false), Constants.Routes.ApiPath) } };
                 });
                 c.RouteTemplate = "api/swagger/{documentname}/swagger.json";
             });
 #if DEBUG
             builder.UseSwaggerUI(c =>
             {
                 c.SwaggerEndpoint($"/api/swagger/{Constants.ControlApi.Version}/swagger.json", "FoxIDs Control API");
-                c.RoutePrefix = "api";
             });
 #endif
         }

diff --git a/src/FoxIDs.Control/Infrastructure/Hosting/ServiceCollectionExtensions.cs b/src/FoxIDs.Control/Infrastructure/Hosting/ServiceCollectionExtensions.cs
@@ -147,7 +147,7 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
                 services.AddSingleton(new OpenSearchClientQueryLog(openSearchQueryLogSettings));
             }
 
-            services.AddApiSwagger();
+            services.AddApiSwagger(settings);
             services.AddAutoMapper();
 
             if(settings.Payment?.EnablePayment == true && settings.Usage?.EnableInvoice == true)
@@ -181,7 +181,7 @@ public static IServiceCollection AddAuthenticationAndAuthorization(this IService
             return services;
         }
 
-        public static IServiceCollection AddApiSwagger(this IServiceCollection services)
+        public static IServiceCollection AddApiSwagger(this IServiceCollection services, FoxIDsControlSettings settings)
         {
             services.AddSwaggerGen(c =>
             {

diff --git a/src/FoxIDs.Control/wwwroot/robots.txt b/src/FoxIDs.Control/wwwroot/robots.txt
@@ -1,2 +1,3 @@
 User-agent: *
-Disallow: /
+Disallow: /
+Allow: /api/swagger/
diff --git a/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj b/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.2</Version>
+		<Version>1.14.3</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlClient/Pages/ExternalUsers.razor b/src/FoxIDs.ControlClient/Pages/ExternalUsers.razor
@@ -164,7 +164,7 @@
             else
             {
                 <button type="button" class="btn btn-link" @onclick="@(async () => await ShowUpdateExternalUserAsync(externalUser))">
-                    @(!externalUser.LinkClaimValue.IsNullOrWhiteSpace() ? externalUser.LinkClaimValue : externalUser.RedemptionClaimValue) (@(externalUser.UpPartyDisplayName ?? externalUser.UpPartyName))
+                    @(!externalUser.RedemptionClaimValue.IsNullOrWhiteSpace() ? externalUser.RedemptionClaimValue : externalUser.LinkClaimValue) (@(externalUser.UpPartyDisplayName ?? externalUser.UpPartyName))
                 </button>
             }
         </li>

diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.2</Version>
+		<Version>1.14.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/FoxIDs.Shared.csproj b/src/FoxIDs.Shared/FoxIDs.Shared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.2</Version>
+		<Version>1.14.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/Models/Tracks/ExternalUser.cs b/src/FoxIDs.Shared/Models/Tracks/ExternalUser.cs
@@ -46,6 +46,10 @@ public static async Task<string> IdFormatAsync(RouteBinding routeBinding, string
         [JsonProperty(PropertyName = "user_id")]
         public string UserId { get; set; }
 
+        [MaxLength(Constants.Models.Party.NameLength)]
+        [JsonProperty(PropertyName = "up_party_name")]
+        public string UpPartyName { get; set; }
+
         [MaxLength(Constants.Models.Claim.ValueLength)]
         [JsonProperty(PropertyName = "link_claim_value")]
         public string LinkClaimValue { get; set; }

diff --git a/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj b/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.2</Version>
+		<Version>1.14.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/Controllers/Site/ErrorController.cs b/src/FoxIDs/Controllers/Site/ErrorController.cs
@@ -58,8 +58,7 @@ public async Task<IActionResult> Index()
             var exception = exceptionHandlerPathFeature?.Error;
 
             if (exceptionHandlerPathFeature != null && exception != null && exceptionHandlerPathFeature.Path.EndsWith($"/{Constants.Routes.OAuthController}/{Constants.Endpoints.Token}", StringComparison.OrdinalIgnoreCase))
-            {
-                logger.Error(exception);
+            {                
                 return HandleOAuthTokenException(exception);
             }
             else
@@ -257,18 +256,29 @@ private IActionResult HandleOAuthTokenException(Exception exception)
                 var oauthRequestException = FindException<OAuthRequestException>(exception);
                 if (oauthRequestException != null)
                 {
+                    if (oauthRequestException is OAuthRefreshTokenGrantNotFoundException)
+                    {
+                        logger.Warning(exception);
+                    }
+                    else
+                    {
+                        logger.Error(exception);
+                    }
                     return TokenResponseResult(error: oauthRequestException.Error, errorDescription: oauthRequestException.ErrorDescription);
                 }
 
                 var routeCreationException = FindException<RouteCreationException>(exception);
                 if (routeCreationException != null)
                 {
+                    logger.Error(exception);
                     return TokenResponseResult(errorDescription: routeCreationException.Message);
-                }                
+                }
 
+                logger.Error(exception);
                 return TokenResponseResult(errorDescription: exception.GetAllMessagesJoined());
             }
-
+
+            logger.Error(exception);
             return TokenResponseResult();
         }
 

diff --git a/src/FoxIDs/Extensions/HtmActionExtensions.cs → ...FoxIDs/Extensions/HtmlActionExtensions.cs b/src/FoxIDs/Extensions/HtmActionExtensions.cs → ...FoxIDs/Extensions/HtmlActionExtensions.cs
@@ -8,7 +8,7 @@ namespace FoxIDs
     /// <summary>
     /// Extension methods for HTML form and redirect actions.
     /// </summary>
-    public static class HtmActionExtensions
+    public static class HtmlActionExtensions
     {
         /// <summary>
         /// Converts URL and Dictionary&lt;string, string&gt; to a HTML Post ContentResult.

diff --git a/src/FoxIDs/FoxIDs.csproj b/src/FoxIDs/FoxIDs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.2</Version>
+		<Version>1.14.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/Logic/Exceptions/OAuthRefreshTokenGrantNotFoundException.cs b/src/FoxIDs/Logic/Exceptions/OAuthRefreshTokenGrantNotFoundException.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace FoxIDs.Logic
+{
+    [Serializable]
+    public class OAuthRefreshTokenGrantNotFoundException : OAuthRequestException
+    {
+        public OAuthRefreshTokenGrantNotFoundException() { }
+        public OAuthRefreshTokenGrantNotFoundException(string errorDescription) : base(errorDescription)
+        { }
+        public OAuthRefreshTokenGrantNotFoundException(string errorDescription, Exception inner) : base(errorDescription, inner)
+        { }
+    }
+}
diff --git a/src/FoxIDs/Logic/OAuth/OAuthRefreshTokenGrantDownLogic.cs b/src/FoxIDs/Logic/OAuth/OAuthRefreshTokenGrantDownLogic.cs
@@ -4,6 +4,7 @@
 using ITfoxtec.Identity;
 using ITfoxtec.Identity.Util;
 using Microsoft.AspNetCore.Http;
+using OpenSearch.Client;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -49,7 +50,7 @@ public async Task<string> CreateRefreshTokenGrantAsync(TClient client, List<Clai
             var grant = await GetRefreshTokenGrantAsync(client, refreshToken);
             if (grant == null)
             {
-                throw new OAuthRequestException($"Refresh Token grant not found for client id '{client.ClientId}' and probably timed out.") { RouteBinding = RouteBinding, Error = IdentityConstants.ResponseErrors.InvalidGrant };
+                throw new OAuthRefreshTokenGrantNotFoundException($"Refresh Token grant not found for client id '{client.ClientId}' and probably timed out.") { RouteBinding = RouteBinding, Error = IdentityConstants.ResponseErrors.InvalidGrant };
             }
             if (!grant.ClientId.Equals(client.ClientId, StringComparison.InvariantCultureIgnoreCase))
             {

diff --git a/src/FoxIDs/Logic/Tracks/StateUpPartyLogic.cs b/src/FoxIDs/Logic/Tracks/StateUpPartyLogic.cs
@@ -54,7 +54,7 @@ public async Task<string> GetAndDeleteStateCookieAsync<T>(T upParty) where T : U
             {
                 await stateCookieRepository.DeleteAsync(upParty);
             }
-            return stateCookie.State;            
+            return stateCookie?.State;            
         }
 
         public async Task DeleteStateCookieAsync<T>(T upParty) where T : UpParty