Merge pull request #790 from IABTechLab/sas-UID2-3641-better-messaging

Sas UI d2 3641 better messaging

Author: ssundahlTTD

src/api/middleware/userRoleMiddleware.ts

@@ -28,7 +28,11 @@ export const isSuperUserCheck: Handler = async (req: ParticipantRequest, res, ne
 // assign uid2 support if user has prod-uid2.0-support in Microsoft Entra ID
 export const isUid2Support = async (req: Request) => {
   const authGroups = (req.auth?.payload?.groups as string[] | undefined) ?? [];
-  if (isSuperUser(req) || authGroups.includes(developerRole) || authGroups.includes(uid2SupportRole)) {
+  if (
+    isSuperUser(req) ||
+    authGroups.includes(developerRole) ||
+    authGroups.includes(uid2SupportRole)
+  ) {
     return true;
   }
 
@@ -55,8 +59,7 @@ export const isAdminOrUid2SupportCheck: Handler = async (req: ParticipantRequest
   const user = await findUserByEmail(userEmail);
   const userParticipant = user?.participants?.find((item) => item.id === participant?.id);
   const userIsAdminOrUid2Support =
-    userParticipant?.currentUserRoleIds?.includes(UserRoleId.Admin) ||
-    (await isUid2Support(req));
+    userParticipant?.currentUserRoleIds?.includes(UserRoleId.Admin) || (await isUid2Support(req));
   if (!userIsAdminOrUid2Support) {
     return res.status(403).json({
       message: 'Unauthorized. You do not have the necessary permissions.',

src/web/components/Home/SharingPermissionCard.tsx

@@ -42,7 +42,7 @@ function SharingPermissionCard({
       ) : (
         <div className='no-sharing-permissions-banner'>
           <Banner
-            message='You do not have access to this feature. To get access, please contact Support.'
+            message='Use of sharing requires an API key or client-side key pair.  Please reach out to our support team for assistance.'
             type='Info'
             fitContent
           />

src/web/utils/urlHelpers.ts

@@ -26,6 +26,6 @@ export const extractLocationFromPath = (path: string) => {
 };
 
 export function getPathWithParticipant(path: string, participantId: string | number | undefined) {
-  const location = extractLocationFromPath(path);
+  const location = extractLocationFromPath(path).replace(/^\//, '');
   return `/participant/${participantId}/${location}`;
 }