Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(service-portal): Improve error handling when user tries to grant self access as actor #16408

Merged
merged 7 commits into from
Oct 16, 2024
Merged

fix(service-portal): Improve error handling when user tries to grant self access as actor #16408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9f1b12
Improve error handling when user tries to grant self access as actor
magnearun Oct 15, 2024
f35095f
Merge branch 'main' into fix/error-handling-delegation-actor
magnearun Oct 15, 2024
884907c
chore: nx format:write update dirty files
andes-it Oct 15, 2024
52cbdad
Merge branch 'main' into fix/error-handling-delegation-actor
magnearun Oct 15, 2024
185e0ff
Merge branch 'main' into fix/error-handling-delegation-actor
magnearun Oct 16, 2024
e0461a1
Merge branch 'main' into fix/error-handling-delegation-actor
magnearun Oct 16, 2024
621a0e4
Merge branch 'main' into fix/error-handling-delegation-actor
kodiakhq[bot] Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libs/portals/shared-modules/delegations/src/lib/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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ð',
Expand Down
9 changes: 8 additions & 1 deletion libs/portals/shared-modules/delegations/src/screens/GrantAccess/GrantAccess.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } },
Expand Down Expand Up @@ -207,6 +208,12 @@ const GrantAccess = () => {
return formatMessage(m.grantSameSsn)
}

if (
valueAsString === userInfo.profile.actor?.nationalId
) {
return formatMessage(m.grantActorSsn)
}

if (kennitala.isCompany(valueAsString)) {
return formatMessage(m.grantCompanySsn)
}
Expand Down