From c6899ef577000a0f59bbfea239035a460ad688f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gunnlaugur=20Gu=C3=B0mundsson?= Date: Tue, 21 May 2024 13:56:57 +0000 Subject: [PATCH] fix codegen --- .../app/delegations/delegations.controller.spec.ts | 2 +- .../lib/delegations/delegations-index.service.ts | 13 ++++++++----- .../personal-representative.module.ts | 1 - .../services/personalRepresentative.service.ts | 4 +++- libs/shared/types/src/index.ts | 1 + .../src/lib/PersonalRepresentativeDelegationType.ts | 4 ++++ 6 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 libs/shared/types/src/lib/PersonalRepresentativeDelegationType.ts diff --git a/apps/services/auth/ids-api/src/app/delegations/delegations.controller.spec.ts b/apps/services/auth/ids-api/src/app/delegations/delegations.controller.spec.ts index b0c90bcf705a..59c84632b5f7 100644 --- a/apps/services/auth/ids-api/src/app/delegations/delegations.controller.spec.ts +++ b/apps/services/auth/ids-api/src/app/delegations/delegations.controller.spec.ts @@ -13,7 +13,6 @@ import { DelegationType, DelegationTypeModel, Domain, - getPersonalRepresentativeDelegationType, InactiveReason, MergedDelegationDTO, PersonalRepresentative, @@ -57,6 +56,7 @@ import { personalRepresentativeType, } from '../../../test/stubs/personalRepresentativeStubs' import { AuthDelegationProvider } from 'delegation' +import { getPersonalRepresentativeDelegationType } from '@island.is/shared/types' describe('DelegationsController', () => { describe('Given a user is authenticated', () => { diff --git a/libs/auth-api-lib/src/lib/delegations/delegations-index.service.ts b/libs/auth-api-lib/src/lib/delegations/delegations-index.service.ts index 3fe5e620a1be..493eb4b0380e 100644 --- a/libs/auth-api-lib/src/lib/delegations/delegations-index.service.ts +++ b/libs/auth-api-lib/src/lib/delegations/delegations-index.service.ts @@ -8,6 +8,7 @@ import { User } from '@island.is/auth-nest-tools' import { AuthDelegationProvider, AuthDelegationType, + getPersonalRepresentativeDelegationType, } from '@island.is/shared/types' import { ApiScope } from '../resources/models/api-scope.model' @@ -16,8 +17,8 @@ import { DelegationIndex } from './models/delegation-index.model' import { DelegationIndexMeta } from './models/delegation-index-meta.model' import { DelegationDTO } from './dto/delegation.dto' import { - DelegationRecordInputDTO, DelegationRecordDTO, + DelegationRecordInputDTO, PaginatedDelegationRecordDTO, } from './dto/delegation-index.dto' import { DelegationsIncomingCustomService } from './delegations-incoming-custom.service' @@ -29,9 +30,9 @@ import { PersonalRepresentativeDelegationType, } from './types/delegationRecord' import { + delegationProviderTypeMap, validateDelegationTypeAndProvider, validateToAndFromNationalId, - delegationProviderTypeMap, } from './utils/delegations' import { DelegationDirection } from './types/delegationDirection' import { UserIdentitiesService } from '../user-identities/user-identities.service' @@ -101,8 +102,8 @@ const validateCrudParams = (delegation: DelegationRecordInputDTO) => { } } -export const getPersonalRepresentativeDelegationType = (right: string) => - `${AuthDelegationType.PersonalRepresentative}:${right}` as PersonalRepresentativeDelegationType +// export const getPersonalRepresentativeDelegationType = (right: string) => +// `${AuthDelegationType.PersonalRepresentative}:${right}` as PersonalRepresentativeDelegationType const hasAllSameScopes = ( a: string[] | undefined, @@ -457,7 +458,9 @@ export class DelegationsIndexService { const delegations = delegation.rights.map((right) => ({ ...delegation, - type: getPersonalRepresentativeDelegationType(right.code), + type: getPersonalRepresentativeDelegationType( + right.code, + ) as PersonalRepresentativeDelegationType, })) return [...acc, ...delegations] diff --git a/libs/auth-api-lib/src/lib/personal-representative/personal-representative.module.ts b/libs/auth-api-lib/src/lib/personal-representative/personal-representative.module.ts index 2cb66283c96e..e67f3bb264c6 100644 --- a/libs/auth-api-lib/src/lib/personal-representative/personal-representative.module.ts +++ b/libs/auth-api-lib/src/lib/personal-representative/personal-representative.module.ts @@ -25,7 +25,6 @@ import { DelegationProviderModel } from '../delegations/models/delegation-provid PersonalRepresentativeRightType, PersonalRepresentativeScopePermission, PersonalRepresentativeType, - PersonalRepresentativeDelegationTypeModel, DelegationProviderModel, DelegationTypeModel, ]), diff --git a/libs/auth-api-lib/src/lib/personal-representative/services/personalRepresentative.service.ts b/libs/auth-api-lib/src/lib/personal-representative/services/personalRepresentative.service.ts index c36df2b3d343..72aa2b8b010f 100644 --- a/libs/auth-api-lib/src/lib/personal-representative/services/personalRepresentative.service.ts +++ b/libs/auth-api-lib/src/lib/personal-representative/services/personalRepresentative.service.ts @@ -5,6 +5,9 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common' import { InjectModel } from '@nestjs/sequelize' import { Op, WhereOptions } from 'sequelize' import { Sequelize } from 'sequelize-typescript' + +import { getPersonalRepresentativeDelegationType } from '@island.is/shared/types' + import { PaginatedPersonalRepresentativeDto } from '../dto/paginated-personal-representative.dto' import { PaginationWithNationalIdsDto } from '../dto/pagination-with-national-ids.dto' import { PersonalRepresentativeCreateDTO } from '../dto/personal-representative-create.dto' @@ -15,7 +18,6 @@ import { InactiveReason } from '../models/personal-representative.enum' import { PersonalRepresentative } from '../models/personal-representative.model' import { PersonalRepresentativeDelegationTypeModel } from '../models/personal-representative-delegation-type.model' import { DelegationTypeModel } from '../../delegations/models/delegation-type.model' -import { getPersonalRepresentativeDelegationType } from '../../delegations/delegations-index.service' type GetByPersonalRepresentativeOptions = { nationalIdPersonalRepresentative: string diff --git a/libs/shared/types/src/index.ts b/libs/shared/types/src/index.ts index 011c3aabd6a8..cb35f1030dd4 100644 --- a/libs/shared/types/src/index.ts +++ b/libs/shared/types/src/index.ts @@ -9,3 +9,4 @@ export * from './lib/static-text' export * from './lib/delegation' export * from './lib/environment' export * from './lib/searchable-content-types' +export * from './lib/PersonalRepresentativeDelegationType' diff --git a/libs/shared/types/src/lib/PersonalRepresentativeDelegationType.ts b/libs/shared/types/src/lib/PersonalRepresentativeDelegationType.ts new file mode 100644 index 000000000000..78f8d732f0d2 --- /dev/null +++ b/libs/shared/types/src/lib/PersonalRepresentativeDelegationType.ts @@ -0,0 +1,4 @@ +import { AuthDelegationType } from '..' + +export const getPersonalRepresentativeDelegationType = (right: string) => + `${AuthDelegationType.PersonalRepresentative}:${right}`