From f9f1b124c49e612a8d8bd4947505637f12a77d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnea=20R=C3=BAn=20Vignisd=C3=B3ttir?= Date: Tue, 15 Oct 2024 13:37:21 +0000 Subject: [PATCH 1/2] Improve error handling when user tries to grant self access as actor --- .../portals/shared-modules/delegations/src/lib/messages.ts | 4 ++++ .../delegations/src/screens/GrantAccess/GrantAccess.tsx | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/portals/shared-modules/delegations/src/lib/messages.ts b/libs/portals/shared-modules/delegations/src/lib/messages.ts index 988d58e55edf..e8470979dab6 100644 --- a/libs/portals/shared-modules/delegations/src/lib/messages.ts +++ b/libs/portals/shared-modules/delegations/src/lib/messages.ts @@ -206,6 +206,10 @@ export const m = defineMessages({ id: 'sp.access-control-delegations:grant-same-ssn', defaultMessage: 'Ekki má veita sjálfum sér umboð', }, + grantActorSsn: { + id: 'sp.access-control-delegations:grant-actor-ssn', + defaultMessage: 'Sem umboðshafi má ekki veita sjálfum sér umboð', + }, grantCompanySsn: { id: 'sp.access-control-delegations:grant-company-ssn', defaultMessage: 'Ekki má veita fyrirtækjum umboð', diff --git a/libs/portals/shared-modules/delegations/src/screens/GrantAccess/GrantAccess.tsx b/libs/portals/shared-modules/delegations/src/screens/GrantAccess/GrantAccess.tsx index e41de7ceeea3..654bb8def377 100644 --- a/libs/portals/shared-modules/delegations/src/screens/GrantAccess/GrantAccess.tsx +++ b/libs/portals/shared-modules/delegations/src/screens/GrantAccess/GrantAccess.tsx @@ -107,7 +107,8 @@ const GrantAccess = () => { value.length === 10 && kennitala.isValid(value) && !kennitala.isCompany(value) && - value !== userInfo.profile.nationalId + value !== userInfo.profile.nationalId && + value !== userInfo.profile.actor?.nationalId ) { getIdentity({ variables: { input: { nationalId: value } }, @@ -207,6 +208,10 @@ const GrantAccess = () => { return formatMessage(m.grantSameSsn) } + if (valueAsString === userInfo.profile.actor?.nationalId) { + return formatMessage(m.grantActorSsn) + } + if (kennitala.isCompany(valueAsString)) { return formatMessage(m.grantCompanySsn) } From 884907ce982966cfeb5668f08696175fd256e43f Mon Sep 17 00:00:00 2001 From: andes-it Date: Tue, 15 Oct 2024 14:22:09 +0000 Subject: [PATCH 2/2] chore: nx format:write update dirty files --- .../delegations/src/screens/GrantAccess/GrantAccess.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/portals/shared-modules/delegations/src/screens/GrantAccess/GrantAccess.tsx b/libs/portals/shared-modules/delegations/src/screens/GrantAccess/GrantAccess.tsx index 654bb8def377..b9244ccbbabd 100644 --- a/libs/portals/shared-modules/delegations/src/screens/GrantAccess/GrantAccess.tsx +++ b/libs/portals/shared-modules/delegations/src/screens/GrantAccess/GrantAccess.tsx @@ -208,7 +208,9 @@ const GrantAccess = () => { return formatMessage(m.grantSameSsn) } - if (valueAsString === userInfo.profile.actor?.nationalId) { + if ( + valueAsString === userInfo.profile.actor?.nationalId + ) { return formatMessage(m.grantActorSsn) }