Merge pull request #2735 from TechnologyEnhancedLearning/Develop/Fix/TD-2364-linking-admin-registered-unclaimed-account

TD-2364- Added action method without custom policy to verify dls account before linking.

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/Register/ClaimAccountController.cs

@@ -176,6 +176,21 @@ public IActionResult Confirmation()
             return View(model);
         }
 
+        [HttpGet]
+        public IActionResult VerifyLinkDlsAccount(string email, string code)
+        {
+            var userId = userService.GetUserAccountByEmailAddress(email).Id;
+            var model = GetViewModelIfValidParameters(email, code, userId);
+            var actionResult = ValidateClaimAccountViewModelForLinkingAccounts(userId, model);
+
+            if (actionResult != null)
+            {
+                return actionResult;
+            }
+
+            return RedirectToAction("LinkDlsAccount", new { email, code });
+        }
+
         [Authorize(Policy = CustomPolicies.BasicUser)]
         [HttpGet]
         public IActionResult LinkDlsAccount(string email, string code)
@@ -219,23 +234,20 @@ public IActionResult AccountsLinked(string centreName)
             return View(model);
         }
 
-        [Authorize(Policy = CustomPolicies.BasicUser)]
         [HttpGet]
         public IActionResult WrongUser(string email, string centreName)
         {
             var model = new ClaimAccountViewModel { Email = email, CentreName = centreName };
             return View(model);
         }
 
-        [Authorize(Policy = CustomPolicies.BasicUser)]
         [HttpGet]
         public IActionResult AccountAlreadyExists(string email, string centreName)
         {
             var model = new ClaimAccountViewModel { Email = email, CentreName = centreName };
             return View(model);
         }
 
-        [Authorize(Policy = CustomPolicies.BasicUser)]
         [HttpGet]
         public IActionResult AdminAccountAlreadyExists(string email, string centreName)
         {

DigitalLearningSolutions.Web/Views/ClaimAccount/Index.cshtml

@@ -2,66 +2,66 @@
 @model ClaimAccountViewModel
 
 @{
-  ViewData["Title"] = "Complete registration";
+    ViewData["Title"] = "Complete registration";
 
-  var routeData = new Dictionary<string, string> {
+    var routeData = new Dictionary<string, string> {
     { "email", Model.Email },
     { "code", Model.RegistrationConfirmationHash },
   };
 }
 
 <div class="nhsuk-grid-row">
-  <div class="nhsuk-grid-column-full">
+    <div class="nhsuk-grid-column-full">
 
-    <h1 class="nhsuk-heading-x1" id="app-page-heading">
-      Complete registration
-    </h1>
+        <h1 class="nhsuk-heading-x1" id="app-page-heading">
+            Complete registration
+        </h1>
 
-    <p class="nhsuk-body-m">A new delegate record has been created for you by an administrator.</p>
+        <p class="nhsuk-body-m">A new delegate record has been created for you by an administrator.</p>
 
-    <partial name="_DelegateRecordSummary" model="@Model" />
+        <partial name="_DelegateRecordSummary" model="@Model" />
 
-    @if (Model.IdOfUserMatchingEmailIfAny != null)
-    {
-      if (Model.UserMatchingEmailIsActive)
-      {
-        <p class="nhsuk-body-m">
-          A DLS user account is already registered with this email address. If that account belongs to you, you can link this delegate record to your login.
-        </p>
+        @if (Model.IdOfUserMatchingEmailIfAny != null)
+        {
+            if (Model.UserMatchingEmailIsActive)
+            {
+                <p class="nhsuk-body-m">
+                    A DLS user account is already registered with this email address. If that account belongs to you, you can link this delegate record to your login.
+                </p>
 
-        <vc:action-link asp-controller="ClaimAccount"
-                    asp-action="LinkDlsAccount"
-                    asp-all-route-data="@routeData"
-                    link-text="Link this record" />
-      }
-      else
-      {
-        <p class="nhsuk-body-m">
-          There is already an inactive DLS user account associated with this email address. To request reactivation of the user account and link this delegate record to the account, please contact <a href="mailto:@Model.SupportEmail">@Model.SupportEmail</a>.
-        </p>
-      }
-    }
-    else
-    {
-      <h2 class="nhsuk-heading-s nhsuk-u-margin-bottom-3">I am an existing DLS user</h2>
-      <p class="nhsuk-hint">
-        If you have used DLS in the past (for example, at another organisation or university), we <b>recommend</b> that you link this record to your existing login.
-      </p>
+                <vc:action-link asp-controller="ClaimAccount"
+                                asp-action="VerifyLinkDlsAccount"
+                                asp-all-route-data="@routeData"
+                                link-text="Link this record" />
+            }
+            else
+            {
+                <p class="nhsuk-body-m">
+                    There is already an inactive DLS user account associated with this email address. To request reactivation of the user account and link this delegate record to the account, please contact <a href="mailto:@Model.SupportEmail">@Model.SupportEmail</a>.
+                </p>
+            }
+        }
+        else
+        {
+            <h2 class="nhsuk-heading-s nhsuk-u-margin-bottom-3">I am an existing DLS user</h2>
+            <p class="nhsuk-hint">
+                If you have used DLS in the past (for example, at another organisation or university), we <b>recommend</b> that you link this record to your existing login.
+            </p>
 
-      <vc:action-link asp-controller="ClaimAccount"
-                    asp-action="LinkDlsAccount"
-                    asp-all-route-data="@routeData"
-                    link-text="Use existing login and link delegate record" />
+            <vc:action-link asp-controller="ClaimAccount"
+                            asp-action="LinkDlsAccount"
+                            asp-all-route-data="@routeData"
+                            link-text="Use existing login and link delegate record" />
 
-      <h2 class="nhsuk-heading-s nhsuk-u-margin-bottom-3">I am a new DLS user</h2>
-      <p class="nhsuk-hint">
-        If you have never accessed DLS before, please activate this delegate record to log in. A new DLS user account will be created.
-      </p>
+            <h2 class="nhsuk-heading-s nhsuk-u-margin-bottom-3">I am a new DLS user</h2>
+            <p class="nhsuk-hint">
+                If you have never accessed DLS before, please activate this delegate record to log in. A new DLS user account will be created.
+            </p>
 
-      <vc:action-link asp-controller="ClaimAccount"
-                    asp-action="CompleteRegistration"
-                    asp-all-route-data="@routeData"
-                    link-text="Create new login and activate delegate record" />
-    }
-  </div>
+            <vc:action-link asp-controller="ClaimAccount"
+                            asp-action="CompleteRegistration"
+                            asp-all-route-data="@routeData"
+                            link-text="Create new login and activate delegate record" />
+        }
+    </div>
 </div>