code clean up

swiss-ssi-group · Mar 9, 2024 · 9698efc · 9698efc
1 parent aad89ce
commit 9698efc
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 34 deletions.
diff --git a/EmployeeUnlockDoor/Pages/Error.cshtml.cs b/EmployeeUnlockDoor/Pages/Error.cshtml.cs
@@ -1,6 +1,6 @@
+using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using System.Diagnostics;
 
 namespace EmployeeUnlockDoor.Pages;
 

diff --git a/EmployeeUnlockDoor/Pages/UnlockDoor/UnlockDoor.cshtml.cs b/EmployeeUnlockDoor/Pages/UnlockDoor/UnlockDoor.cshtml.cs
@@ -1,11 +1,11 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Caching.Distributed;
 using VerifierInsuranceCompany.Services;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
 
 namespace EmployeeUnlockDoor.Pages.UnlockDoor;
 
@@ -49,7 +49,7 @@ public async Task<IActionResult> OnPostAsync()
             new Claim("Mail", credentialData!.Employee.Mail, ClaimValueTypes.String, "damienbodsharepoint"),
             new Claim("Surname", credentialData!.Employee.Surname, ClaimValueTypes.String, "damienbodsharepoint"),
             new Claim("Photo", credentialData!.Employee.Photo, ClaimValueTypes.String, "damienbodsharepoint"),
-            new Claim("DoorCode", credentialData!.DoorCode, ClaimValueTypes.String, "damienbodsharepoint"), 
+            new Claim("DoorCode", credentialData!.DoorCode, ClaimValueTypes.String, "damienbodsharepoint"),
         };
 
         var userIdentity = new ClaimsIdentity(claims, "entraemployee");

diff --git a/EmployeeUnlockDoor/Pages/UnlockDoor/Unlocked.cshtml.cs b/EmployeeUnlockDoor/Pages/UnlockDoor/Unlocked.cshtml.cs
@@ -1,9 +1,7 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Authentication;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace EmployeeUnlockDoor.Pages.UnlockDoor;
 

diff --git a/EmployeeUnlockDoor/Program.cs b/EmployeeUnlockDoor/Program.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using VerifierInsuranceCompany;
 
 namespace EmployeeUnlockDoor;

diff --git a/EmployeeUnlockDoor/Services/CredentialSettings.cs b/EmployeeUnlockDoor/Services/CredentialSettings.cs
@@ -1,5 +1,5 @@
-using Microsoft.Identity.Web;
 using System.Security.Cryptography.X509Certificates;
+using Microsoft.Identity.Web;
 
 namespace VerifierInsuranceCompany;
 

diff --git a/EmployeeUnlockDoor/Services/VerifierCallbackResponse.cs b/EmployeeUnlockDoor/Services/VerifierCallbackResponse.cs
@@ -1,6 +1,5 @@
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using EmployeeUnlockDoor.Services;
 
 namespace VerifierInsuranceCompany.Services;
 

diff --git a/EmployeeUnlockDoor/Services/VerifierController.cs b/EmployeeUnlockDoor/Services/VerifierController.cs
@@ -1,13 +1,13 @@
-using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;
+using System.Globalization;
 using System.Net;
 using System.Net.Http.Headers;
-using Microsoft.Extensions.Options;
-using VerifierInsuranceCompany.Services;
 using System.Text.Json;
-using System.Globalization;
-using Microsoft.Extensions.Caching.Distributed;
 using EmployeeUnlockDoor.Services;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+using VerifierInsuranceCompany.Services;
 
 namespace VerifierInsuranceCompany;
 
@@ -98,7 +98,7 @@ public async Task<ActionResult> PresentationCallback()
 
         try
         {
-            if (verifierCallbackResponse != null  && verifierCallbackResponse.RequestStatus == VerifierConst.RequestRetrieved)
+            if (verifierCallbackResponse != null && verifierCallbackResponse.RequestStatus == VerifierConst.RequestRetrieved)
             {
                 var cacheData = new CacheData
                 {
@@ -150,7 +150,7 @@ private static void ParseClaimsData(VerifiedCredentialsData verifiedCredentialsD
         else // "DoorCode"
         {
             var data = verifiedCredentialsData!.Claims.Deserialize<DoorCodeClaims>();
-            if(data!.DoorCode != null)
+            if (data!.DoorCode != null)
                 cacheData.DoorCode = data.DoorCode;
         }
     }
@@ -170,8 +170,11 @@ public ActionResult PresentationResponse()
             if (data != null)
             {
                 Debug.WriteLine("check if there was a response yet: " + data);
-                return new ContentResult { ContentType = "application/json",
-                    Content = JsonSerializer.Serialize(data) };
+                return new ContentResult
+                {
+                    ContentType = "application/json",
+                    Content = JsonSerializer.Serialize(data)
+                };
             }
 
             return Ok();

diff --git a/EmployeeUnlockDoor/ValidateUserAndDoorCodeService.cs b/EmployeeUnlockDoor/ValidateUserAndDoorCodeService.cs
@@ -12,7 +12,7 @@ public class ValidateUserAndDoorCodeService
 
         // simi check, only accept requests for "2023" and any upn
         // This code be updated once a month
-        if(doorCode == "2023")
+        if (doorCode == "2023")
             return (true, string.Empty);
 
         return (false, "Error, data code is incorrect, code is '2023'");

diff --git a/IssueUnlockDoor/Pages/Error.cshtml.cs b/IssueUnlockDoor/Pages/Error.cshtml.cs
@@ -1,6 +1,6 @@
+using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using System.Diagnostics;
 
 namespace IssueUnlockDoor.Pages;
 

diff --git a/IssueUnlockDoor/SecurityHeadersDefinitions.cs b/IssueUnlockDoor/SecurityHeadersDefinitions.cs
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Builder;
-
 namespace IssueUnlockDoor;
 
 public static class SecurityHeadersDefinitions

diff --git a/IssueUnlockDoor/Services/CredentialSettings.cs b/IssueUnlockDoor/Services/CredentialSettings.cs
@@ -1,5 +1,5 @@
-using Microsoft.Identity.Web;
 using System.Security.Cryptography.X509Certificates;
+using Microsoft.Identity.Web;
 
 namespace IssueUnlockDoor;
 

diff --git a/IssueUnlockDoor/Services/IssuerController.cs b/IssueUnlockDoor/Services/IssuerController.cs
@@ -1,13 +1,13 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using System.Net;
 using System.Diagnostics;
+using System.Globalization;
+using System.Net;
 using System.Net.Http.Headers;
+using System.Text.Json;
 using IssueUnlockDoor.Services;
 using Microsoft.AspNetCore.Authorization;
-using System.Text.Json;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Distributed;
-using System.Globalization;
+using Microsoft.Extensions.Options;
 
 namespace IssueUnlockDoor;
 

diff --git a/IssueUnlockDoor/Services/IssuerService.cs b/IssueUnlockDoor/Services/IssuerService.cs
@@ -1,5 +1,3 @@
-using System.Globalization;
-using System.Security.Cryptography;
 using IssueUnlockDoor.Services;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;