delegation-to for access control

island-is · Sep 26, 2024 · 18f03fc · 18f03fc
1 parent 102d8db
commit 18f03fc
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/libs/auth-api-lib/src/lib/delegations/delegations-outgoing.service.ts b/libs/auth-api-lib/src/lib/delegations/delegations-outgoing.service.ts
@@ -39,6 +39,8 @@ import {
 import { Features } from '@island.is/feature-flags'
 import { FeatureFlagService } from '@island.is/nest/feature-flags'
 import { LOGGER_PROVIDER } from '@island.is/logging'
+import { DelegationDelegationType } from './models/delegation-delegation-type.model'
+import { AuthDelegationType } from '@island.is/shared/types'
 
 /**
  * Service class for outgoing delegations.
@@ -103,7 +105,34 @@ export class DelegationsOutgoingService {
       ],
     })
 
-    return delegations.map((d) => d.toDTO())
+    const delegationTypesDelegations = await this.delegationModel.findAll({
+      where: {
+        fromNationalId: user.nationalId,
+      },
+      include: [
+        {
+          model: DelegationDelegationType,
+          where: {
+            delegationTypeId: AuthDelegationType.GeneralMandate,
+            validTo: {
+              [Op.or]: {
+                [Op.gt]: new Date(),
+                [Op.is]: null,
+              },
+            },
+          },
+          required: true,
+        },
+      ],
+    })
+
+    const delegationTypesDTO = delegationTypesDelegations.map((d) =>
+      d.toDTO(AuthDelegationType.GeneralMandate),
+    )
+
+    const delegationsDTO = delegations.map((d) => d.toDTO())
+
+    return [...delegationsDTO, ...delegationTypesDTO]
   }
 
   async findByOtherUser(

diff --git a/libs/portals/shared-modules/delegations/src/components/access/AccessCard.tsx b/libs/portals/shared-modules/delegations/src/components/access/AccessCard.tsx
@@ -5,13 +5,13 @@ import * as kennitala from 'kennitala'
 
 import {
   Box,
-  Text,
-  Stack,
-  Tag,
-  Inline,
+  Button,
   Icon,
   IconMapIcon as IconType,
-  Button,
+  Inline,
+  Stack,
+  Tag,
+  Text,
   Tooltip,
 } from '@island.is/island-ui/core'
 import { useLocale } from '@island.is/localization'
@@ -182,7 +182,9 @@ export const AccessCard = ({
       <Box display="flex" justifyContent="spaceBetween" alignItems="flexStart">
         <Stack space="smallGutter">
           <Box display="flex" columnGap={2} alignItems="center">
-            {(isAdminView || !isOutgoing) && (
+            {(isAdminView ||
+              !isOutgoing ||
+              delegation.type === AuthDelegationType.GeneralMandate) && (
               <>
                 {renderDelegationTypeLabel(delegation.type)}
                 {delegation.domain?.name && (