fix issue with unathorised role handling (#665)

Author: adamwhitingnhs

app/src/pages/unauthorisedLoginPage/UnauthorisedLoginPage.test.tsx

@@ -31,8 +31,10 @@ describe('UnauthorisedLoginPage', () => {
                 'In order to keep patient information safe, only authorised accounts can access this service',
                 'This includes:',
                 'GP practice staff who work at the practice the patient is registered with who have one of these roles on their smart cards:',
-                'GP Admin Role: R8010, R8013, R1790, R8008',
-                'GP Clinical Role: R8000',
+                'GP Admin Role:',
+                'R8010, R8013, R1790, R8008',
+                'GP Clinical Role:',
+                'R8000',
                 'PCSE staff where a patient does not have an active registration',
                 "If you don't have access and feel you should have, please contact your local Registration Authority",
             ];

app/src/pages/unauthorisedLoginPage/UnauthorisedLoginPage.tsx

@@ -1,7 +1,6 @@
 import { routes } from '../../types/generic/routes';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { ButtonLink } from 'nhsuk-react-components';
-import React from 'react';
 import useTitle from '../../helpers/hooks/useTitle';
 
 const UnauthorisedLoginPage = () => {
@@ -10,8 +9,10 @@ const UnauthorisedLoginPage = () => {
     const location = useLocation();
     const errorData = location.state?.errorData;
     useTitle({ pageTitle: 'Unauthorised account' });
-    const gpAdminRoles = errorData.roles[0];
-    const gpClinicalRoles = errorData.roles[1];
+
+    const gpAdminRoles = errorData.roles[0].split(',').join(', ');
+    const gpClinicalRoles = errorData.roles[1].split(',').join(', ');
+
     return (
         <>
             <h1>{pageHeader}</h1>
@@ -31,8 +32,12 @@ const UnauthorisedLoginPage = () => {
                     have one of these roles on their smart cards:
                     <br />
                     <br />
-                    <p>GP Admin Role: {gpAdminRoles}</p>
-                    <p>GP Clinical Role: {gpClinicalRoles}</p>
+                    <p>
+                        <strong>GP Admin Role:</strong> {gpAdminRoles}
+                    </p>
+                    <p>
+                        <strong>GP Clinical Role:</strong> {gpClinicalRoles}
+                    </p>
                 </li>
                 <li>PCSE staff where a patient does not have an active registration</li>
             </ul>

lambdas/handlers/token_handler.py

@@ -54,13 +54,13 @@ def lambda_handler(event, context):
             "GET",
         ).create_api_gateway_response()
     except LoginException as e:
-        if e.error == LambdaError.LoginNoRole:
+        if e.status_code == 401:
             allowed_roles = (
                 login_service.token_handler_ssm_service.get_smartcard_role_codes()
             )
             body = LambdaError.LoginNoRole.create_error_body(roles=allowed_roles)
             return ApiGatewayResponse(
-                401,
+                e.status_code,
                 body,
                 "GET",
             ).create_api_gateway_response()