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

feat(ids-admin): Enable delegation settings for normal users #15181

Merged
merged 4 commits into from
Jun 19, 2024
Merged

feat(ids-admin): Enable delegation settings for normal users #15181

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c15516
Open delegation settings for normal users. Also open access control s…
saevarma Jun 11, 2024
2078ba3
Update description for authenticated user and specific national ids f…
saevarma Jun 11, 2024
d509034
Fix tests
saevarma Jun 11, 2024
da34fdf
Merge branch 'main' into ap-ids-admin-text-fixes
kodiakhq[bot] Jun 19, 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
9 changes: 0 additions & 9 deletions libs/auth-api-lib/src/lib/clients/admin/dto/admin-patch-client.dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,6 @@ export class AdminPatchClientDto {
}

export const superUserFields = [
'supportsCustomDelegation',
'supportsLegalGuardians',
'supportsProcuringHolders',
'supportsPersonalRepresentatives',
'supportedDelegationTypes',
'addedDelegationTypes',
'removedDelegationTypes',
'promptDelegations',
'requireApiScopes',
'requireConsent',
'allowOfflineAccess',
'requirePkce',
Expand Down
5 changes: 1 addition & 4 deletions libs/auth-api-lib/src/lib/resources/admin/admin-scope.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ import { TranslatedValueDto } from '../../translation/dto/translated-value.dto'
import { TranslationService } from '../../translation/translation.service'
import { User } from '@island.is/auth-nest-tools'
import { AdminPortalScope } from '@island.is/auth/scopes'
import { AuthDelegationProvider, AuthDelegationType } from 'delegation'
import { AuthDelegationType } from 'delegation'
import { ApiScopeDelegationType } from '../models/api-scope-delegation-type.model'
import { DelegationTypeModel } from '../../delegations/models/delegation-type.model'

/**
* This is a service that is used to access the admin scopes
Expand All @@ -41,8 +40,6 @@ export class AdminScopeService {
private readonly apiScopeUserClaim: typeof ApiScopeUserClaim,
@InjectModel(ApiScopeDelegationType)
private readonly apiScopeDelegationType: typeof ApiScopeDelegationType,
@InjectModel(DelegationTypeModel)
private readonly delegationTypeModel: typeof DelegationTypeModel,
private readonly adminTranslationService: AdminTranslationService,
private readonly translationService: TranslationService,
private sequelize: Sequelize,
Expand Down
18 changes: 10 additions & 8 deletions libs/auth-api-lib/src/lib/resources/admin/dto/admin-patch-scope.dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,13 @@ export class AdminPatchScopeDto {
removedDelegationTypes?: string[]
}

export const superUserScopeFields = [
'grantToAuthenticatedUser',
'grantToLegalGuardians',
'grantToProcuringHolders',
'allowExplicitDelegationGrant',
'isAccessControlled',
'grantToPersonalRepresentatives',
]
/**
* Here we can define properties that should only be editable by a super user
*
* For example:
* export const superUserScopeFields = [
* 'isAccessControlled',
* 'grantToAuthenticatedUser',
* ]
*/
export const superUserScopeFields: string[] = []
6 changes: 4 additions & 2 deletions libs/portals/admin/ids-admin/src/lib/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,15 +766,17 @@ export const m = defineMessages({
},
isAccessControlledDescription: {
id: 'ap.ids-admin:is-access-controlled-description',
defaultMessage: 'Only allow specific national ids',
defaultMessage:
'Authorize a list of national ids for this permission. Request support from island.is to manage the list.',
},
grantToAuthenticatedUser: {
id: 'ap.ids-admin:grant-to-authenticated-user',
defaultMessage: 'Authenticated user',
},
grantToAuthenticatedUserDescription: {
id: 'ap.ids-admin:grant-to-authenticated-user-description',
defaultMessage: 'Should the authenticated user get this scope',
defaultMessage:
'Should the authenticated individual get this scope (uncheck if only delegated users should be allowed).',
},
grantToProcuringHolders: {
id: 'ap.ids-admin:grant-to-procuring-holders',
Expand Down
2 changes: 1 addition & 1 deletion libs/portals/admin/ids-admin/src/screens/Client/EditClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export const EditClient = () => {
<Permissions
allowedScopes={selectedEnvironment?.allowedScopes ?? []}
/>
{isSuperAdmin && !isMachineApplication && (
{!isMachineApplication && (
<Delegation
promptDelegations={selectedEnvironment.promptDelegations}
requireApiScopes={selectedEnvironment.requireApiScopes}
Expand Down
4 changes: 0 additions & 4 deletions libs/portals/admin/ids-admin/src/screens/Client/components/Delegation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const Delegation = ({
selectedEnvironment,
}: DelegationProps) => {
const { formatMessage } = useLocale()
const { isSuperAdmin } = useSuperAdmin()
const { client } = useClient()
const { getDelegationProviders } = useDelegationProviders()

Expand Down Expand Up @@ -149,7 +148,6 @@ const Delegation = ({
large
name={`${FIELD_PREFIX}${delegationType.id}`}
value="true"
disabled={!isSuperAdmin}
checked={inputValues.supportedDelegationTypes?.includes(
delegationType.id,
)}
Expand All @@ -172,7 +170,6 @@ const Delegation = ({
label={formatMessage(m.alwaysPromptDelegations)}
backgroundColor={'blue'}
large
disabled={!isSuperAdmin}
name="promptDelegations"
value="true"
checked={inputValues.promptDelegations}
Expand All @@ -188,7 +185,6 @@ const Delegation = ({
label={formatMessage(m.requirePermissions)}
backgroundColor={'blue'}
large
disabled={!isSuperAdmin}
name="requireApiScopes"
value="true"
checked={inputValues.requireApiScopes}
Expand Down
7 changes: 3 additions & 4 deletions libs/portals/admin/ids-admin/src/screens/Permission/EditPermission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ import { PermissionAccessControl } from './components/PermissionAccessControl'
import { EnvironmentProvider } from '../../context/EnvironmentContext'
import { usePermission } from './PermissionContext'
import { PublishPermission } from './PublishPermission/PublishPermission'
import { useSuperAdmin } from '../../hooks/useSuperAdmin'
import { PermissionDelegations } from './components/PermissionDelegations'

export const EditPermission = () => {
const { selectedPermission, permission } = usePermission()
const { isSuperAdmin } = useSuperAdmin()

return (
<EnvironmentProvider
selectedEnvironment={selectedPermission.environment}
Expand All @@ -20,8 +19,8 @@ export const EditPermission = () => {
<Box display="flex" flexDirection="column" rowGap={5}>
<PermissionBasicInfo />
<PermissionContent />
{isSuperAdmin && <PermissionAccessControl />}
{isSuperAdmin && <PermissionDelegations />}
<PermissionDelegations />
<PermissionAccessControl />
<PublishPermission />
</Box>
</EnvironmentProvider>
Expand Down
Loading