Merge branch 'develop' into test

bcgov · Jan 18, 2024 · 80c8fc6 · 80c8fc6
2 parents eeef913 + f1d24f1
commit 80c8fc6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/prime-angular-frontend/package.json b/prime-angular-frontend/package.json
@@ -47,7 +47,7 @@
     "popper.js": "^1.16.0",
     "rxjs": "~7.5.4",
     "smoothscroll-polyfill": "^0.4.4",
-    "tinymce": "^5.4.0",
+    "tinymce": "^5.10.9",
     "tslib": "^2.0.0",
     "tus-js-client": "^1.8.0",
     "web-animations-js": "^2.3.2",

diff --git a/prime-angular-frontend/yarn.lock b/prime-angular-frontend/yarn.lock
@@ -8345,10 +8345,10 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
-tinymce@^5.4.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.6.0.tgz#b5eda4888e1a607ddd545619cfaa137d59de14b4"
-  integrity sha512-f8LsyT80j8hD4wrL8Sac0DWDG5k10cDyykL/qkJ6kexn1KMt7w1ByrGlUm53XCYDqtavBA5snTU7odioMwSXSQ==
+tinymce@^5.10.9:
+  version "5.10.9"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.9.tgz#1dfacb3231c71a688d90ff44a0b3f2e91b3b9edf"
+  integrity sha512-5bkrors87X9LhYX2xq8GgPHrIgJYHl87YNs+kBcjQ5I3CiUgzo/vFcGvT3MZQ9QHsEeYMhYO6a5CLGGffR8hMg==
 
 [email protected]:
   version "0.0.30"

diff --git a/prime-dotnet-webapi/Controllers/ProvisionerAccessController.cs b/prime-dotnet-webapi/Controllers/ProvisionerAccessController.cs
@@ -60,18 +60,18 @@ public async Task<ActionResult> GetEnrolmentCertificate(Guid accessTokenId)
         {
             var certificate = await _certificateService.GetEnrolmentCertificateAsync(accessTokenId);
 
+            if (certificate == null)
+            {
+                return NotFound($"No valid Enrolment Certificate Access Token found with id {accessTokenId}");
+            }
+
             //set health authority
             if (certificate.HealthAuthories.Count() > 0)
             {
                 var careSetting = certificate.CareSettings.First(cs => cs.Code == (int)CareSettingType.HealthAuthority);
                 careSetting.Name += $" - {string.Join(", ", certificate.HealthAuthories.Select(ha => ha.Name))}";
             }
 
-            if (certificate == null)
-            {
-                return NotFound($"No valid Enrolment Certificate Access Token found with id {accessTokenId}");
-            }
-
             return Ok(certificate);
         }