From 98b809ccb29a5721695d0153cb58d8958a1ec9e4 Mon Sep 17 00:00:00 2001
From: Klaus Fischer <klaus.fischer@eloware.com>
Date: Tue, 23 Aug 2022 21:48:14 +0200
Subject: [PATCH] Resolved merge errors
---
FitConnect/Models/SecurityEventToken.cs | 4 ++--
FitConnect/Services/SelfServicePortalService.cs | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/FitConnect/Models/SecurityEventToken.cs b/FitConnect/Models/SecurityEventToken.cs
index b5717635..143e198a 100644
--- a/FitConnect/Models/SecurityEventToken.cs
+++ b/FitConnect/Models/SecurityEventToken.cs
@@ -84,13 +84,13 @@ public class SecurityEventToken {
if (eventsClaim.Value.Contains(
ForwardSubmissionSchema))
return EventType.Forward;
- if (eventsClaim.Value.Contains(Reject)) {
+ if (eventsClaim.Value.Contains(
RejectSubmissionSchema)) {
Problems = GetProblems(events?.Values?.FirstOrDefault()?.ToString() ?? "");
return EventType.Reject;
}
- if (eventsClaim.Value.Contains(Accept)) return EventType.Accept;
+
if (eventsClaim.Value.Contains(AcceptSubmissionSchema))
return EventType.Accept;
diff --git a/FitConnect/Services/SelfServicePortalService.cs b/FitConnect/Services/SelfServicePortalService.cs
index f6cc0c01..34d520ec 100644
--- a/FitConnect/Services/SelfServicePortalService.cs
+++ b/FitConnect/Services/SelfServicePortalService.cs
@@ -1,3 +1,4 @@
+using FitConnect.Services.Interfaces;
using Jose;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
--
GitLab