Merge pull request #1039 from ITfoxtec/test

Test
ITfoxtec · Nov 19, 2024 · c454601 · c454601
2 parents 7ef4290 + b4a3cae
commit c454601
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 14 deletions.
diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/src/FoxIDs.Control/FoxIDs.Control.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.11.20</Version>
+		<Version>1.11.21</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj b/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.11.20</Version>
+		<Version>1.11.21</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlClient/Pages/MasterTenant.cs b/src/FoxIDs.ControlClient/Pages/MasterTenant.cs
@@ -168,18 +168,25 @@ private async Task OnOpenPaymentMethodAsync()
 
         private async Task ShowPaymentModalAsync()
         {
-            (var isValid, var error) = await tenantSettingsForm.Submit();
-            if(isValid)
+            try
             {
-                changePaymentError = null;
-                changePaymentWorking = false;
-                changePaymentModal.Show();
+                (var isValid, var error) = await tenantSettingsForm.Submit();
+                if (isValid)
+                {
+                    changePaymentError = null;
+                    changePaymentWorking = false;
+                    changePaymentModal.Show();
 
-                await LoadMollieAsync();
+                    await LoadMollieAsync();
+                }
+                else if (!error.IsNullOrWhiteSpace())
+                {
+                    ToastService.ShowError(error);
+                }
             }
-            else if(!error.IsNullOrWhiteSpace())
+            catch (TokenUnavailableException)
             {
-                ToastService.ShowError(error);
+                await (OpenidConnectPkce as TenantOpenidConnectPkce).TenantLoginAsync();
             }
         }
 

diff --git a/src/FoxIDs.ControlClient/Pages/MasterTenant.razor b/src/FoxIDs.ControlClient/Pages/MasterTenant.razor
@@ -253,6 +253,12 @@
                 <button type="button" class="btn btn-primary @(changePaymentWorking ? "disabled" : "")" @onclick="SubmitMollieAsync">Register payment</button>
                 <button type="button" class="btn btn-secondary @(changePaymentWorking ? "disabled" : "")" @onclick="HidePaymentModalAsync">Cancel</button>
             </div>
+            <div class="footer-container text-center">
+                <div class="footer-content">
+                    <a href="https://www.mollie.com/" target="_blank"><i class="bi bi-lock"></i>Payment secured and provided by <strong>mollie</strong></a>
+                </div>
+            </div>
+
         </form>
     </div>
 </Modal>

diff --git a/src/FoxIDs.ControlClient/wwwroot/css/app.css b/src/FoxIDs.ControlClient/wwwroot/css/app.css
@@ -79,6 +79,9 @@ h4 {
     line-height: normal;
     letter-spacing: normal;
 }
+    .footer-container a {
+        color: #666;
+    }
 
 .footer-content {
     padding-left: 1rem;

diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.11.20</Version>
+		<Version>1.11.21</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>net8.0</TargetFramework>
-		<Version>1.11.20</Version>
+		<Version>1.11.21</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

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

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