From 888c4b9c06696827ff34ae684ef389e68036fa6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Eorkell=20M=C3=A1ni=20=C3=9Eorkelsson?= Date: Wed, 11 Sep 2024 15:11:53 +0000 Subject: [PATCH 1/6] feat: init --- .../app/modules/license/license.service.ts | 12 +++++++---- .../adrLicenseClient.module.ts | 20 ++---------------- .../adrLicenseClient.service.ts | 14 ++++++------- .../lib/clients/baseLicenseUpdateClient.ts | 12 +++++------ .../modules/disabilityLicenseClient.module.ts | 10 ++------- .../disabilityLicenseUpdateClient.module.ts | 12 ++--------- .../disabilityLicenseClient.service.ts | 14 ++++++------- .../disabilityLicenseUpdateClient.service.ts | 18 ++++++++-------- .../modules/drivingLicenseClient.module.ts | 10 ++------- .../drivingLicenseUpdateClient.module.ts | 10 ++------- .../services/drivingLicenseClient.service.ts | 10 ++++----- .../drivingLicenseUpdateClient.service.ts | 12 +++++------ .../modules/firearmLicenseClient.module.ts | 8 +++++-- .../firearmLicenseUpdateClient.module.ts | 8 +++++-- .../modules/smartSolutionsFirearm.module.ts | 21 ------------------- .../services/firearmLicenseClient.service.ts | 8 +++---- .../firearmLicenseUpdateClient.service.ts | 12 +++++------ .../huntingLicenseClient.module.ts | 20 ++---------------- .../huntingLicenseClient.service.ts | 8 +++---- .../machineLicenseClient.module.ts | 20 ++---------------- .../machineLicenseClient.service.ts | 11 ++++++---- .../src/lib/factories/clientConfigFactory.ts | 2 +- .../factories/smartSolutionsModuleFactory.ts | 21 +++++++++++++++++++ .../src/lib/licenseClient.module.ts | 2 +- libs/clients/smart-solutions-v2/src/index.ts | 4 ++++ .../src/lib/smartSolutions.service.ts | 1 - 26 files changed, 122 insertions(+), 178 deletions(-) delete mode 100644 libs/clients/license-client/src/lib/clients/firearm-license-client/modules/smartSolutionsFirearm.module.ts create mode 100644 libs/clients/license-client/src/lib/factories/smartSolutionsModuleFactory.ts diff --git a/apps/services/license-api/src/app/modules/license/license.service.ts b/apps/services/license-api/src/app/modules/license/license.service.ts index db3a10cc8619..4c7dd12e8a74 100644 --- a/apps/services/license-api/src/app/modules/license/license.service.ts +++ b/apps/services/license-api/src/app/modules/license/license.service.ts @@ -3,7 +3,6 @@ import { LicenseType, LicenseUpdateClientService, } from '@island.is/clients/license-client' -import { Pass, PassDataInput, Result } from '@island.is/clients/smartsolutions' import type { Logger } from '@island.is/logging' import { LOGGER_PROVIDER } from '@island.is/logging' import { @@ -28,6 +27,11 @@ import { } from './dto' import { ErrorType, LicenseId } from './license.types' import { mapLicenseIdToLicenseType } from './utils/mapLicenseId' +import { + Pass, + PassDataInput, + Result, +} from '@island.is/clients/smart-solutions-v2' const LOG_CATEGORY = 'license-api' @@ -139,7 +143,7 @@ export class LicenseService { nationalId: string, payload?: string, requestId?: string, - ): Promise> { + ): Promise | undefined>> { let updatePayload: PassDataInput = { expirationDate, } @@ -178,7 +182,7 @@ export class LicenseService { service: BaseLicenseUpdateClient, nationalId: string, requestId?: string, - ): Promise> { + ): Promise | undefined>> { /** PULL - Update electronic license with pulled data from service * 1. Fetch data from provider * 2. Parse and validate license data @@ -209,7 +213,7 @@ export class LicenseService { updateType: inputData.licenseUpdateType, }) - let updateRes: Result + let updateRes: Result | undefined> if (inputData.licenseUpdateType === 'push') { const { expiryDate, payload } = inputData diff --git a/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClient.module.ts b/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClient.module.ts index 8dcea7fdc1da..3e1714808194 100644 --- a/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClient.module.ts +++ b/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClient.module.ts @@ -1,29 +1,13 @@ import { AdrAndMachineLicenseClientModule } from '@island.is/clients/adr-and-machine-license' -import { - SmartSolutionsApiClientModule, - SmartSolutionsConfig, -} from '@island.is/clients/smartsolutions' import { Module } from '@nestjs/common' -import { ConfigType } from '@island.is/nest/config' import { AdrLicenseClient } from './adrLicenseClient.service' import { AdrDigitalLicenseClientConfig } from './adrLicenseClient.config' +import { smartSolutionsModuleFactory } from '../../factories/smartSolutionsModuleFactory' @Module({ imports: [ AdrAndMachineLicenseClientModule, - SmartSolutionsApiClientModule.registerAsync({ - useFactory: ( - config: ConfigType, - ) => { - const smartConfig: SmartSolutionsConfig = { - apiKey: config.apiKey, - apiUrl: config.apiUrl, - passTemplateId: config.passTemplateId, - } - return smartConfig - }, - inject: [AdrDigitalLicenseClientConfig.KEY], - }), + smartSolutionsModuleFactory(AdrDigitalLicenseClientConfig), ], providers: [AdrLicenseClient], exports: [AdrLicenseClient], diff --git a/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClient.service.ts b/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClient.service.ts index 05e6f4b978cb..d37f97e3747e 100644 --- a/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClient.service.ts @@ -4,11 +4,6 @@ import { Inject, Injectable } from '@nestjs/common' import { Auth, AuthMiddleware, User } from '@island.is/auth-nest-tools' import { createPkPassDataInput } from './adrLicenseClientMapper' import { AdrApi, AdrDto } from '@island.is/clients/adr-and-machine-license' -import { - Pass, - PassDataInput, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' import { format } from 'kennitala' import { FetchError } from '@island.is/clients/middlewares' import compareAsc from 'date-fns/compareAsc' @@ -22,6 +17,11 @@ import { VerifyPkPassResult, } from '../../licenseClient.type' import { FlattenedAdrDto } from './adrLicenseClient.type' +import { + Pass, + PassDataInput, + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' /** Category to attach each log message to */ const LOG_CATEGORY = 'adrlicense-service' @@ -31,7 +31,7 @@ export class AdrLicenseClient implements LicenseClient { constructor( @Inject(LOGGER_PROVIDER) private logger: Logger, private adrApi: AdrApi, - private smartApi: SmartSolutionsApi, + private smartApi: SmartSolutionsService, ) {} clientSupportsPkPass = true @@ -155,7 +155,7 @@ export class AdrLicenseClient implements LicenseClient { } } - private async getPkPass(user: User): Promise> { + private async getPkPass(user: User): Promise>> { const license = await this.fetchLicense(user) if (!license.ok || !license.data) { diff --git a/libs/clients/license-client/src/lib/clients/baseLicenseUpdateClient.ts b/libs/clients/license-client/src/lib/clients/baseLicenseUpdateClient.ts index 186768ceaa6c..727683148614 100644 --- a/libs/clients/license-client/src/lib/clients/baseLicenseUpdateClient.ts +++ b/libs/clients/license-client/src/lib/clients/baseLicenseUpdateClient.ts @@ -1,30 +1,30 @@ import type { Logger } from '@island.is/logging' import { Injectable } from '@nestjs/common' +import { PassVerificationData, Result } from '../licenseClient.type' import { Pass, PassDataInput, RevokePassData, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' -import { PassVerificationData, Result } from '../licenseClient.type' + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' @Injectable() export abstract class BaseLicenseUpdateClient { constructor( protected logger: Logger, - protected smartApi: SmartSolutionsApi, + protected smartApi: SmartSolutionsService, ) {} abstract pushUpdate( inputData: PassDataInput, nationalId: string, requestId?: string, - ): Promise> + ): Promise | undefined>> abstract pullUpdate( nationalId: string, requestId?: string, - ): Promise> + ): Promise | undefined>> abstract revoke( nationalId: string, diff --git a/libs/clients/license-client/src/lib/clients/disability-license-client/modules/disabilityLicenseClient.module.ts b/libs/clients/license-client/src/lib/clients/disability-license-client/modules/disabilityLicenseClient.module.ts index 9df1770defd6..9b94032f980a 100644 --- a/libs/clients/license-client/src/lib/clients/disability-license-client/modules/disabilityLicenseClient.module.ts +++ b/libs/clients/license-client/src/lib/clients/disability-license-client/modules/disabilityLicenseClient.module.ts @@ -1,19 +1,13 @@ import { DisabilityLicenseClientModule } from '@island.is/clients/disability-license' -import { SmartSolutionsApiClientModule } from '@island.is/clients/smartsolutions' import { Module } from '@nestjs/common' -import { ConfigType } from '@island.is/nest/config' import { DisabilityLicenseClient } from '../services/disabilityLicenseClient.service' import { DisabilityDigitalLicenseClientConfig } from '../disabilityLicenseClient.config' +import { smartSolutionsModuleFactory } from '../../../factories/smartSolutionsModuleFactory' @Module({ imports: [ DisabilityLicenseClientModule, - SmartSolutionsApiClientModule.registerAsync({ - useFactory: ( - config: ConfigType, - ) => config, - inject: [DisabilityDigitalLicenseClientConfig.KEY], - }), + smartSolutionsModuleFactory(DisabilityDigitalLicenseClientConfig), ], providers: [DisabilityLicenseClient], exports: [DisabilityLicenseClient], diff --git a/libs/clients/license-client/src/lib/clients/disability-license-client/modules/disabilityLicenseUpdateClient.module.ts b/libs/clients/license-client/src/lib/clients/disability-license-client/modules/disabilityLicenseUpdateClient.module.ts index 7b5f0e956cbe..8d0b62b3029d 100644 --- a/libs/clients/license-client/src/lib/clients/disability-license-client/modules/disabilityLicenseUpdateClient.module.ts +++ b/libs/clients/license-client/src/lib/clients/disability-license-client/modules/disabilityLicenseUpdateClient.module.ts @@ -1,18 +1,10 @@ -import { SmartSolutionsApiClientModule } from '@island.is/clients/smartsolutions' import { Module } from '@nestjs/common' -import { ConfigType } from '@island.is/nest/config' import { DisabilityDigitalLicenseClientConfig } from '../disabilityLicenseClient.config' import { DisabilityLicenseUpdateClient } from '../services/disabilityLicenseUpdateClient.service' +import { smartSolutionsModuleFactory } from '../../../factories/smartSolutionsModuleFactory' @Module({ - imports: [ - SmartSolutionsApiClientModule.registerAsync({ - useFactory: ( - config: ConfigType, - ) => config, - inject: [DisabilityDigitalLicenseClientConfig.KEY], - }), - ], + imports: [smartSolutionsModuleFactory(DisabilityDigitalLicenseClientConfig)], providers: [DisabilityLicenseUpdateClient], exports: [DisabilityLicenseUpdateClient], }) diff --git a/libs/clients/license-client/src/lib/clients/disability-license-client/services/disabilityLicenseClient.service.ts b/libs/clients/license-client/src/lib/clients/disability-license-client/services/disabilityLicenseClient.service.ts index 31783509adb7..d32bbdc811de 100644 --- a/libs/clients/license-client/src/lib/clients/disability-license-client/services/disabilityLicenseClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/disability-license-client/services/disabilityLicenseClient.service.ts @@ -7,11 +7,6 @@ import { DisabilityLicenseService, OrorkuSkirteini, } from '@island.is/clients/disability-license' -import { - Pass, - PassDataInput, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' import { FetchError } from '@island.is/clients/middlewares' import compareAsc from 'date-fns/compareAsc' import { @@ -22,6 +17,11 @@ import { Result, VerifyPkPassResult, } from '../../../licenseClient.type' +import { + Pass, + PassDataInput, + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' /** Category to attach each log message to */ const LOG_CATEGORY = 'disability-license-service' @@ -33,7 +33,7 @@ export class DisabilityLicenseClient constructor( @Inject(LOGGER_PROVIDER) private logger: Logger, private disabilityLicenseApi: DisabilityLicenseService, - private smartApi: SmartSolutionsApi, + private smartApi: SmartSolutionsService, ) {} clientSupportsPkPass = true @@ -157,7 +157,7 @@ export class DisabilityLicenseClient } } - async getPkPass(user: User): Promise> { + async getPkPass(user: User): Promise>> { const license = await this.fetchLicense(user) if (!license.ok || !license.data) { diff --git a/libs/clients/license-client/src/lib/clients/disability-license-client/services/disabilityLicenseUpdateClient.service.ts b/libs/clients/license-client/src/lib/clients/disability-license-client/services/disabilityLicenseUpdateClient.service.ts index 812e35882ad3..8d9daf8756bd 100644 --- a/libs/clients/license-client/src/lib/clients/disability-license-client/services/disabilityLicenseUpdateClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/disability-license-client/services/disabilityLicenseUpdateClient.service.ts @@ -1,24 +1,24 @@ import type { Logger } from '@island.is/logging' import { LOGGER_PROVIDER } from '@island.is/logging' import { Inject, Injectable } from '@nestjs/common' -import { - Pass, - PassDataInput, - RevokePassData, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' import { PassVerificationData, Result, VerifyInputData, } from '../../../licenseClient.type' import { BaseLicenseUpdateClient } from '../../baseLicenseUpdateClient' +import { + Pass, + PassDataInput, + RevokePassData, + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' @Injectable() export class DisabilityLicenseUpdateClient extends BaseLicenseUpdateClient { constructor( @Inject(LOGGER_PROVIDER) protected logger: Logger, - protected smartApi: SmartSolutionsApi, + protected smartApi: SmartSolutionsService, ) { super(logger, smartApi) } @@ -26,11 +26,11 @@ export class DisabilityLicenseUpdateClient extends BaseLicenseUpdateClient { pushUpdate( inputData: PassDataInput, nationalId: string, - ): Promise> { + ): Promise | undefined>> { return this.smartApi.updatePkPass(inputData, nationalId) } - async pullUpdate(): Promise> { + async pullUpdate(): Promise>> { return { ok: false, error: { diff --git a/libs/clients/license-client/src/lib/clients/driving-license-client/modules/drivingLicenseClient.module.ts b/libs/clients/license-client/src/lib/clients/driving-license-client/modules/drivingLicenseClient.module.ts index 3a2f4afb5e64..e073fe43919e 100644 --- a/libs/clients/license-client/src/lib/clients/driving-license-client/modules/drivingLicenseClient.module.ts +++ b/libs/clients/license-client/src/lib/clients/driving-license-client/modules/drivingLicenseClient.module.ts @@ -1,21 +1,15 @@ import { DrivingLicenseApiModule } from '@island.is/clients/driving-license' import { DrivingLicenseClient } from '../services/drivingLicenseClient.service' import { Module } from '@nestjs/common' -import { SmartSolutionsApiClientModule } from '@island.is/clients/smartsolutions' -import { ConfigType } from '@nestjs/config' import { DrivingDigitalLicenseClientConfig } from '../drivingLicenseClient.config' import { FeatureFlagModule } from '@island.is/nest/feature-flags' +import { smartSolutionsModuleFactory } from '../../../factories/smartSolutionsModuleFactory' @Module({ imports: [ DrivingLicenseApiModule, FeatureFlagModule, - SmartSolutionsApiClientModule.registerAsync({ - useFactory: ( - config: ConfigType, - ) => config, - inject: [DrivingDigitalLicenseClientConfig.KEY], - }), + smartSolutionsModuleFactory(DrivingDigitalLicenseClientConfig), ], providers: [DrivingLicenseClient], exports: [DrivingLicenseClient], diff --git a/libs/clients/license-client/src/lib/clients/driving-license-client/modules/drivingLicenseUpdateClient.module.ts b/libs/clients/license-client/src/lib/clients/driving-license-client/modules/drivingLicenseUpdateClient.module.ts index ffb8814deda1..5bb3c0f22019 100644 --- a/libs/clients/license-client/src/lib/clients/driving-license-client/modules/drivingLicenseUpdateClient.module.ts +++ b/libs/clients/license-client/src/lib/clients/driving-license-client/modules/drivingLicenseUpdateClient.module.ts @@ -1,19 +1,13 @@ import { Module } from '@nestjs/common' -import { SmartSolutionsApiClientModule } from '@island.is/clients/smartsolutions' -import { ConfigType } from '@nestjs/config' import { DrivingLicenseUpdateClient } from '../services/drivingLicenseUpdateClient.service' import { DrivingDigitalLicenseClientConfig } from '../drivingLicenseClient.config' import { DrivingLicenseApiModule } from '@island.is/clients/driving-license' +import { smartSolutionsModuleFactory } from '../../../factories/smartSolutionsModuleFactory' @Module({ imports: [ DrivingLicenseApiModule, - SmartSolutionsApiClientModule.registerAsync({ - useFactory: ( - config: ConfigType, - ) => config, - inject: [DrivingDigitalLicenseClientConfig.KEY], - }), + smartSolutionsModuleFactory(DrivingDigitalLicenseClientConfig), ], providers: [DrivingLicenseUpdateClient], exports: [DrivingLicenseUpdateClient], diff --git a/libs/clients/license-client/src/lib/clients/driving-license-client/services/drivingLicenseClient.service.ts b/libs/clients/license-client/src/lib/clients/driving-license-client/services/drivingLicenseClient.service.ts index 3c89d2f4af11..3cea342539b8 100644 --- a/libs/clients/license-client/src/lib/clients/driving-license-client/services/drivingLicenseClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/driving-license-client/services/drivingLicenseClient.service.ts @@ -8,8 +8,8 @@ import { FetchError } from '@island.is/clients/middlewares' import { Pass, PassDataInput, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' import type { Logger } from '@island.is/logging' import { LOGGER_PROVIDER } from '@island.is/logging' import { BadRequestException, Inject, Injectable } from '@nestjs/common' @@ -36,7 +36,7 @@ export class DrivingLicenseClient constructor( @Inject(LOGGER_PROVIDER) private logger: Logger, private drivingApi: DrivingLicenseApi, - private smartApi: SmartSolutionsApi, + private smartApi: SmartSolutionsService, private readonly featureFlagService: FeatureFlagService, ) {} @@ -171,7 +171,7 @@ export class DrivingLicenseClient } } - async getPkPass(user: User): Promise> { + async getPkPass(user: User): Promise>> { const license = await Promise.all([ this.fetchLicense(user), this.fetchCategories(), @@ -339,7 +339,7 @@ export class DrivingLicenseClient } const nationalIdFromPkPass = result.data.pass?.inputFieldValues - .find((i) => i.passInputField.identifier === 'kennitala') + ?.find((i) => i.passInputField.identifier === 'kennitala') ?.value?.replace('-', '') if (!nationalIdFromPkPass) { diff --git a/libs/clients/license-client/src/lib/clients/driving-license-client/services/drivingLicenseUpdateClient.service.ts b/libs/clients/license-client/src/lib/clients/driving-license-client/services/drivingLicenseUpdateClient.service.ts index c29b7bc92608..b8114c9fb909 100644 --- a/libs/clients/license-client/src/lib/clients/driving-license-client/services/drivingLicenseUpdateClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/driving-license-client/services/drivingLicenseUpdateClient.service.ts @@ -6,8 +6,8 @@ import { Pass, PassDataInput, RevokePassData, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' import { PassVerificationData, Result, @@ -32,7 +32,7 @@ export class DrivingLicenseUpdateClient extends BaseLicenseUpdateClient { @Inject(DrivingDigitalLicenseClientConfig.KEY) private config: ConfigType, private drivingLicenseApi: DrivingLicenseApi, - protected smartApi: SmartSolutionsApi, + protected smartApi: SmartSolutionsService, ) { super(logger, smartApi) } @@ -41,7 +41,7 @@ export class DrivingLicenseUpdateClient extends BaseLicenseUpdateClient { inputData: PassDataInput, nationalId: string, requestId?: string, - ): Promise> { + ): Promise | undefined>> { const inputFieldValues = inputData.inputFieldValues ?? [] //small check that nationalId doesnt' already exist if ( @@ -63,7 +63,7 @@ export class DrivingLicenseUpdateClient extends BaseLicenseUpdateClient { async pullUpdate( nationalId: string, requestId?: string, - ): Promise> { + ): Promise | undefined>> { let data try { data = await Promise.all([ @@ -221,7 +221,7 @@ export class DrivingLicenseUpdateClient extends BaseLicenseUpdateClient { } } - const passNationalId = verifyRes.data.pass?.inputFieldValues.find( + const passNationalId = verifyRes.data.pass?.inputFieldValues?.find( (i) => i.passInputField.identifier === 'kennitala', )?.value diff --git a/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/firearmLicenseClient.module.ts b/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/firearmLicenseClient.module.ts index 0a1e212352ce..fcc3b127ea49 100644 --- a/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/firearmLicenseClient.module.ts +++ b/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/firearmLicenseClient.module.ts @@ -1,10 +1,14 @@ import { FirearmLicenseClientModule } from '@island.is/clients/firearm-license' import { Module } from '@nestjs/common' import { FirearmLicenseClient } from '../services/firearmLicenseClient.service' -import { SmartSolutionsFirearmModule } from './smartSolutionsFirearm.module' +import { smartSolutionsModuleFactory } from '../../../factories/smartSolutionsModuleFactory' +import { FirearmDigitalLicenseClientConfig } from '../firearmLicenseClient.config' @Module({ - imports: [FirearmLicenseClientModule, SmartSolutionsFirearmModule], + imports: [ + FirearmLicenseClientModule, + smartSolutionsModuleFactory(FirearmDigitalLicenseClientConfig), + ], providers: [FirearmLicenseClient], exports: [FirearmLicenseClient], }) diff --git a/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/firearmLicenseUpdateClient.module.ts b/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/firearmLicenseUpdateClient.module.ts index 11f8917a11a8..c749f112b4fd 100644 --- a/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/firearmLicenseUpdateClient.module.ts +++ b/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/firearmLicenseUpdateClient.module.ts @@ -1,10 +1,14 @@ import { Module } from '@nestjs/common' import { FirearmLicenseUpdateClientModule } from '@island.is/clients/firearm-license' import { FirearmLicenseUpdateClient } from '../services/firearmLicenseUpdateClient.service' -import { SmartSolutionsFirearmModule } from './smartSolutionsFirearm.module' +import { smartSolutionsModuleFactory } from '../../../factories/smartSolutionsModuleFactory' +import { FirearmDigitalLicenseClientConfig } from '../firearmLicenseClient.config' @Module({ - imports: [FirearmLicenseUpdateClientModule, SmartSolutionsFirearmModule], + imports: [ + FirearmLicenseUpdateClientModule, + smartSolutionsModuleFactory(FirearmDigitalLicenseClientConfig), + ], providers: [FirearmLicenseUpdateClient], exports: [FirearmLicenseUpdateClient], }) diff --git a/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/smartSolutionsFirearm.module.ts b/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/smartSolutionsFirearm.module.ts deleted file mode 100644 index d324d3c3b63c..000000000000 --- a/libs/clients/license-client/src/lib/clients/firearm-license-client/modules/smartSolutionsFirearm.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { - SmartSolutionsApiClientModule, - SmartSolutionsConfig, -} from '@island.is/clients/smartsolutions' -import { FirearmDigitalLicenseClientConfig } from '../firearmLicenseClient.config' -import { ConfigType } from '@nestjs/config' - -export const SmartSolutionsFirearmModule = - SmartSolutionsApiClientModule.registerAsync({ - useFactory: ( - config: ConfigType, - ) => { - const smartConfig: SmartSolutionsConfig = { - apiKey: config.apiKey, - apiUrl: config.apiUrl, - passTemplateId: config.passTemplateId, - } - return smartConfig - }, - inject: [FirearmDigitalLicenseClientConfig.KEY], - }) diff --git a/libs/clients/license-client/src/lib/clients/firearm-license-client/services/firearmLicenseClient.service.ts b/libs/clients/license-client/src/lib/clients/firearm-license-client/services/firearmLicenseClient.service.ts index c0ed478a08c3..d03490d9f53b 100644 --- a/libs/clients/license-client/src/lib/clients/firearm-license-client/services/firearmLicenseClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/firearm-license-client/services/firearmLicenseClient.service.ts @@ -7,8 +7,8 @@ import { Pass, PassDataInput, Result, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' import compareAsc from 'date-fns/compareAsc' import { LicenseClient, @@ -30,7 +30,7 @@ export class FirearmLicenseClient constructor( @Inject(LOGGER_PROVIDER) private logger: Logger, private firearmApi: FirearmApi, - private smartApi: SmartSolutionsApi, + private smartApi: SmartSolutionsService, ) {} clientSupportsPkPass = true @@ -185,7 +185,7 @@ export class FirearmLicenseClient return payload } - async getPkPass(user: User): Promise> { + async getPkPass(user: User): Promise>> { const license = await this.fetchLicenseData(user) if (!license.ok || !license.data) { diff --git a/libs/clients/license-client/src/lib/clients/firearm-license-client/services/firearmLicenseUpdateClient.service.ts b/libs/clients/license-client/src/lib/clients/firearm-license-client/services/firearmLicenseUpdateClient.service.ts index 2e767da1ee6f..abf188f80800 100644 --- a/libs/clients/license-client/src/lib/clients/firearm-license-client/services/firearmLicenseUpdateClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/firearm-license-client/services/firearmLicenseUpdateClient.service.ts @@ -7,8 +7,8 @@ import { Pass, PassDataInput, RevokePassData, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' import { PassVerificationData, Result, @@ -30,7 +30,7 @@ export class FirearmLicenseUpdateClient extends BaseLicenseUpdateClient { @Inject(FirearmDigitalLicenseClientConfig.KEY) private config: ConfigType, private openFirearmApi: OpenFirearmApi, - protected smartApi: SmartSolutionsApi, + protected smartApi: SmartSolutionsService, ) { super(logger, smartApi) } @@ -39,7 +39,7 @@ export class FirearmLicenseUpdateClient extends BaseLicenseUpdateClient { inputData: PassDataInput, nationalId: string, requestId?: string, - ): Promise> { + ): Promise | undefined>> { const inputFieldValues = inputData.inputFieldValues ?? [] //small check that nationalId doesnt' already exist if ( @@ -62,7 +62,7 @@ export class FirearmLicenseUpdateClient extends BaseLicenseUpdateClient { async pullUpdate( nationalId: string, requestId?: string, - ): Promise> { + ): Promise>> { let data try { data = await Promise.all([ @@ -202,7 +202,7 @@ export class FirearmLicenseUpdateClient extends BaseLicenseUpdateClient { } } - const passNationalId = verifyRes.data.pass?.inputFieldValues.find( + const passNationalId = verifyRes.data.pass?.inputFieldValues?.find( (i) => i.passInputField.identifier === 'kt', )?.value diff --git a/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClient.module.ts b/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClient.module.ts index f1bbae21eba0..41ae5b272aa9 100644 --- a/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClient.module.ts +++ b/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClient.module.ts @@ -1,29 +1,13 @@ import { HuntingLicenseClientModule } from '@island.is/clients/hunting-license' -import { - SmartSolutionsApiClientModule, - SmartSolutionsConfig, -} from '@island.is/clients/smartsolutions' import { Module } from '@nestjs/common' -import { ConfigType } from '@island.is/nest/config' import { HuntingDigitalLicenseClientConfig } from './huntingLicenseClient.config' import { HuntingLicenseClient } from './huntingLicenseClient.service' +import { smartSolutionsModuleFactory } from '../../factories/smartSolutionsModuleFactory' @Module({ imports: [ HuntingLicenseClientModule, - SmartSolutionsApiClientModule.registerAsync({ - useFactory: ( - config: ConfigType, - ) => { - const smartConfig: SmartSolutionsConfig = { - apiKey: config.apiKey, - apiUrl: config.apiUrl, - passTemplateId: config.passTemplateId, - } - return smartConfig - }, - inject: [HuntingDigitalLicenseClientConfig.KEY], - }), + smartSolutionsModuleFactory(HuntingDigitalLicenseClientConfig), ], providers: [HuntingLicenseClient], exports: [HuntingLicenseClient], diff --git a/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClient.service.ts b/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClient.service.ts index 635cea7d3617..174055e02142 100644 --- a/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClient.service.ts @@ -6,8 +6,8 @@ import { createPkPassDataInput } from './huntingLicenseClientMapper' import { Pass, PassDataInput, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' import { FetchError } from '@island.is/clients/middlewares' import { LicenseClient, @@ -32,7 +32,7 @@ export class HuntingLicenseClient constructor( @Inject(LOGGER_PROVIDER) private logger: Logger, private huntingService: HuntingLicenseClientService, - private smartApi: SmartSolutionsApi, + private smartApi: SmartSolutionsService, ) {} clientSupportsPkPass = true @@ -151,7 +151,7 @@ export class HuntingLicenseClient } } - private async getPkPass(user: User): Promise> { + private async getPkPass(user: User): Promise>> { const license = await this.fetchLicense(user) if (!license.ok || !license.data) { diff --git a/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.module.ts b/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.module.ts index f26612b543db..ccd1950d6b67 100644 --- a/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.module.ts +++ b/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.module.ts @@ -1,29 +1,13 @@ import { AdrAndMachineLicenseClientModule } from '@island.is/clients/adr-and-machine-license' -import { - SmartSolutionsApiClientModule, - SmartSolutionsConfig, -} from '@island.is/clients/smartsolutions' import { Module } from '@nestjs/common' -import { ConfigType } from '@island.is/nest/config' import { MachineLicenseClient } from './machineLicenseClient.service' import { MachineDigitalLicenseClientConfig } from './machineLicenseClient.config' +import { smartSolutionsModuleFactory } from '../../factories/smartSolutionsModuleFactory' @Module({ imports: [ AdrAndMachineLicenseClientModule, - SmartSolutionsApiClientModule.registerAsync({ - useFactory: ( - config: ConfigType, - ) => { - const smartConfig: SmartSolutionsConfig = { - apiKey: config.apiKey, - apiUrl: config.apiUrl, - passTemplateId: config.passTemplateId, - } - return smartConfig - }, - inject: [MachineDigitalLicenseClientConfig.KEY], - }), + smartSolutionsModuleFactory(MachineDigitalLicenseClientConfig), ], providers: [MachineLicenseClient], exports: [MachineLicenseClient], diff --git a/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.service.ts b/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.service.ts index f49c370c883b..652b4960d521 100644 --- a/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.service.ts @@ -14,8 +14,8 @@ import { FetchError } from '@island.is/clients/middlewares' import { Pass, PassDataInput, - SmartSolutionsApi, -} from '@island.is/clients/smartsolutions' + SmartSolutionsService, +} from '@island.is/clients/smart-solutions-v2' import { Locale } from '@island.is/shared/types' import { LicenseClient, @@ -36,7 +36,7 @@ export class MachineLicenseClient constructor( @Inject(LOGGER_PROVIDER) private logger: Logger, private machineApi: VinnuvelaApi, - private smartApi: SmartSolutionsApi, + private smartApi: SmartSolutionsService, ) {} clientSupportsPkPass = true @@ -154,7 +154,10 @@ export class MachineLicenseClient } } - async getPkPass(user: User, locale: Locale = 'is'): Promise> { + async getPkPass( + user: User, + locale: Locale = 'is', + ): Promise>> { const license = await this.fetchLicense(user) if (!license.ok || !license.data) { this.logger.info( diff --git a/libs/clients/license-client/src/lib/factories/clientConfigFactory.ts b/libs/clients/license-client/src/lib/factories/clientConfigFactory.ts index 8e4a8478525b..9a0d9f70c0a4 100644 --- a/libs/clients/license-client/src/lib/factories/clientConfigFactory.ts +++ b/libs/clients/license-client/src/lib/factories/clientConfigFactory.ts @@ -1,5 +1,5 @@ import { defineConfig } from '@island.is/nest/config' -import { SmartSolutionsApiConfigSchema as schema } from '@island.is/clients/smartsolutions' +import { SmartSolutionsApiConfigSchema as schema } from '@island.is/clients/smart-solutions-v2' import * as z from 'zod' export const clientConfigFactory = (licenseId: string, organisation: string) => diff --git a/libs/clients/license-client/src/lib/factories/smartSolutionsModuleFactory.ts b/libs/clients/license-client/src/lib/factories/smartSolutionsModuleFactory.ts new file mode 100644 index 000000000000..5aa372f71002 --- /dev/null +++ b/libs/clients/license-client/src/lib/factories/smartSolutionsModuleFactory.ts @@ -0,0 +1,21 @@ +import { + SmartSolutionsConfig, + SmartSolutionsModule, +} from '@island.is/clients/smart-solutions-v2' +import { ConfigFactory } from '@island.is/nest/config' +import { ConfigType } from '@nestjs/config' + +export const smartSolutionsModuleFactory = ( + configFactory: ConfigFactory, +) => + SmartSolutionsModule.registerAsync({ + useFactory: (config: ConfigType) => { + const smartConfig: SmartSolutionsConfig = { + apiKey: config.apiKey, + apiUrl: config.apiUrl, + passTemplateId: config.passTemplateId, + } + return { config: smartConfig } + }, + inject: [configFactory.KEY], + }) diff --git a/libs/clients/license-client/src/lib/licenseClient.module.ts b/libs/clients/license-client/src/lib/licenseClient.module.ts index 44de7a7fd454..d08a76776048 100644 --- a/libs/clients/license-client/src/lib/licenseClient.module.ts +++ b/libs/clients/license-client/src/lib/licenseClient.module.ts @@ -25,12 +25,12 @@ import { DrivingLicenseClient, } from './clients/driving-license-client' import { PCardClient, PCardModule } from './clients/p-card-client' -import { EhicClient, EhicModule } from './clients/ehic-card-client' import { HuntingClientModule, HuntingLicenseClient, } from './clients/hunting-license-client' import { PassportsClient, PassportsModule } from './clients/passport-client' +import { EhicClient, EhicModule } from './clients/ehic-card-client' @Module({ imports: [ diff --git a/libs/clients/smart-solutions-v2/src/index.ts b/libs/clients/smart-solutions-v2/src/index.ts index 7a95c276a65a..0b04b57def89 100644 --- a/libs/clients/smart-solutions-v2/src/index.ts +++ b/libs/clients/smart-solutions-v2/src/index.ts @@ -2,4 +2,8 @@ export { SmartSolutionsModule } from './lib/smartSolutions.module' export { SmartSolutionsService } from './lib/smartSolutions.service' export { PkPass, RevokePassData } from './lib/types/responses.type' export { Result } from './lib/types/result.type' +export { + SmartSolutionsConfig, + SmartSolutionsApiConfigSchema, +} from './lib/smartSolutions.config' export * from '../gen/schema' diff --git a/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts index ae2894f58569..67f46939d077 100644 --- a/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts +++ b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts @@ -262,7 +262,6 @@ export class SmartSolutionsService { } this.logger.info('Pass templates listing successful', { - requestId, category: LOG_CATEGORY, }) From 4b141143c6d60ceec564a578e4d2474ade245b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Eorkell=20M=C3=A1ni=20=C3=9Eorkelsson?= Date: Wed, 11 Sep 2024 19:30:33 +0000 Subject: [PATCH 2/6] chore: type import --- .../smart-solutions-v2/src/lib/smartSolutions.service.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts index 67f46939d077..8124393f5796 100644 --- a/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts +++ b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts @@ -26,7 +26,10 @@ import { VerifyPassResponseData, } from './types/responses.type' import { GQLFetcher } from './gqlFetch' -import { LOG_CATEGORY, SmartSolutionsModuleOptions } from './types/config.type' +import { + LOG_CATEGORY, + type SmartSolutionsModuleOptions, +} from './types/config.type' import { Result } from './types/result.type' export class SmartSolutionsService { From 3e8c53c05f0d484892b2e57c93ecc2c5abbb5d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Eorkell=20M=C3=A1ni=20=C3=9Eorkelsson?= Date: Tue, 17 Sep 2024 11:32:53 +0000 Subject: [PATCH 3/6] fix: imports --- .../license-api/src/app/modules/license/license.types.ts | 2 +- .../src/app/modules/license/test/license.service.spec.ts | 2 +- .../lib/clients/adr-license-client/adrLicenseClientMapper.ts | 1 - .../lib/clients/driving-license-client/drivingLicenseMapper.ts | 2 +- .../lib/clients/firearm-license-client/firearmLicenseMapper.ts | 2 +- .../hunting-license-client/huntingLicenseClientMapper.ts | 2 +- libs/clients/license-client/src/lib/constants.ts | 1 + .../license-client/src/lib/licenseUpdateClient.service.ts | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 libs/clients/license-client/src/lib/constants.ts diff --git a/apps/services/license-api/src/app/modules/license/license.types.ts b/apps/services/license-api/src/app/modules/license/license.types.ts index c4cec1d4e62f..8d735b8edbdd 100644 --- a/apps/services/license-api/src/app/modules/license/license.types.ts +++ b/apps/services/license-api/src/app/modules/license/license.types.ts @@ -3,7 +3,7 @@ import { PassDataInput, Result, RevokePassData, -} from '@island.is/clients/smartsolutions' +} from '@island.is/clients/smart-solutions-v2' export enum LicenseUpdateType { PUSH = 'push', diff --git a/apps/services/license-api/src/app/modules/license/test/license.service.spec.ts b/apps/services/license-api/src/app/modules/license/test/license.service.spec.ts index 5933d9cb0a92..26734802a7ff 100644 --- a/apps/services/license-api/src/app/modules/license/test/license.service.spec.ts +++ b/apps/services/license-api/src/app/modules/license/test/license.service.spec.ts @@ -10,7 +10,7 @@ import { RevokePassData, SmartSolutionsApi, VerifyPassData, -} from '@island.is/clients/smartsolutions' +} from '@island.is/clients/smart-solutions-v2' import type { Logger } from '@island.is/logging' import { LOGGER_PROVIDER } from '@island.is/logging' import { ConfigModule } from '@island.is/nest/config' diff --git a/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClientMapper.ts b/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClientMapper.ts index 90ace195e270..49632996e3d7 100644 --- a/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClientMapper.ts +++ b/libs/clients/license-client/src/lib/clients/adr-license-client/adrLicenseClientMapper.ts @@ -1,5 +1,4 @@ import { AdrDto } from '@island.is/clients/adr-and-machine-license' - import format from 'date-fns/format' import { FlattenedAdrDto, FlattenedAdrRightsDto } from './adrLicenseClient.type' diff --git a/libs/clients/license-client/src/lib/clients/driving-license-client/drivingLicenseMapper.ts b/libs/clients/license-client/src/lib/clients/driving-license-client/drivingLicenseMapper.ts index 4a3f6aa9cd8a..7b180bcffa1d 100644 --- a/libs/clients/license-client/src/lib/clients/driving-license-client/drivingLicenseMapper.ts +++ b/libs/clients/license-client/src/lib/clients/driving-license-client/drivingLicenseMapper.ts @@ -3,7 +3,7 @@ import { DriverLicenseDto as DriversLicense, RemarkCode, } from '@island.is/clients/driving-license' -import { PassInputFieldValueDataInput } from '@island.is/clients/smartsolutions' +import { PassInputFieldValueDataInput } from '@island.is/clients/smart-solutions-v2' import format from 'date-fns/format' import { info, format as formatSsn } from 'kennitala' diff --git a/libs/clients/license-client/src/lib/clients/firearm-license-client/firearmLicenseMapper.ts b/libs/clients/license-client/src/lib/clients/firearm-license-client/firearmLicenseMapper.ts index bea0243f1cae..1cde425f70c9 100644 --- a/libs/clients/license-client/src/lib/clients/firearm-license-client/firearmLicenseMapper.ts +++ b/libs/clients/license-client/src/lib/clients/firearm-license-client/firearmLicenseMapper.ts @@ -3,7 +3,7 @@ import { FirearmPropertyList, LicenseInfo, } from '@island.is/clients/firearm-license' -import { PassInputFieldValueDataInput } from '@island.is/clients/smartsolutions' +import { PassInputFieldValueDataInput } from '@island.is/clients/smart-solutions-v2' import format from 'date-fns/format' import { format as formatSsn } from 'kennitala' diff --git a/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClientMapper.ts b/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClientMapper.ts index 4df96e3724d0..06336c4d690d 100644 --- a/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClientMapper.ts +++ b/libs/clients/license-client/src/lib/clients/hunting-license-client/huntingLicenseClientMapper.ts @@ -1,7 +1,7 @@ import format from 'date-fns/format' import { isDefined } from '@island.is/shared/utils' import { HuntingLicenseDto } from '@island.is/clients/hunting-license' -import { PassInputFieldValueDataInput } from '@island.is/clients/smartsolutions' +import { PassInputFieldValueDataInput } from '@island.is/clients/smart-solutions-v2' import capitalize from 'lodash/capitalize' export const createPkPassDataInput = ( diff --git a/libs/clients/license-client/src/lib/constants.ts b/libs/clients/license-client/src/lib/constants.ts new file mode 100644 index 000000000000..859eec179595 --- /dev/null +++ b/libs/clients/license-client/src/lib/constants.ts @@ -0,0 +1 @@ +export const LOG_CATEGORY = 'clients-license-client' diff --git a/libs/clients/license-client/src/lib/licenseUpdateClient.service.ts b/libs/clients/license-client/src/lib/licenseUpdateClient.service.ts index 44e72b9de465..9c529c082e1e 100644 --- a/libs/clients/license-client/src/lib/licenseUpdateClient.service.ts +++ b/libs/clients/license-client/src/lib/licenseUpdateClient.service.ts @@ -8,7 +8,7 @@ import { } from './licenseClient.type' import type { PassTemplateIds, LicenseTypeType } from './licenseClient.type' import { BaseLicenseUpdateClient } from './clients/baseLicenseUpdateClient' -import { LOG_CATEGORY } from '@island.is/clients/smartsolutions' +import { LOG_CATEGORY } from './constants' @Injectable() export class LicenseUpdateClientService { From 4ae143dc429d4400f14d014ed1699c807bc063dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Eorkell=20M=C3=A1ni=20=C3=9Eorkelsson?= Date: Tue, 17 Sep 2024 14:05:46 +0000 Subject: [PATCH 4/6] chore: init --- .../services/license/src/lib/licenseCache.provider.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/services/license/src/lib/licenseCache.provider.ts b/libs/services/license/src/lib/licenseCache.provider.ts index aee2a04eca46..be469dc39fbb 100644 --- a/libs/services/license/src/lib/licenseCache.provider.ts +++ b/libs/services/license/src/lib/licenseCache.provider.ts @@ -9,12 +9,17 @@ export const LICENSE_SERVICE_CACHE_MANAGER_PROVIDER = export const LicenseCacheProvider: FactoryProvider = { provide: LICENSE_SERVICE_CACHE_MANAGER_PROVIDER, scope: LazyDuringDevScope, - useFactory: (licenseServiceConfig: ConfigType) => - createRedisCacheManager({ + useFactory: (licenseServiceConfig: ConfigType) => { + console.log(process.env.NODE_ENV) + if (process.env.NODE_ENV !== 'production') { + return undefined + } + return createRedisCacheManager({ name: 'license_service_cache_manager', nodes: licenseServiceConfig.redis.nodes, ssl: licenseServiceConfig.redis.ssl, ttl: licenseServiceConfig.redis.cacheTtl, - }), + }) + }, inject: [LicenseConfig.KEY], } From 6c869d74214d770a87328d9bd4e336301ffa18cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Eorkell=20M=C3=A1ni=20=C3=9Eorkelsson?= Date: Tue, 17 Sep 2024 14:07:46 +0000 Subject: [PATCH 5/6] chore: console --- libs/services/license/src/lib/licenseCache.provider.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/services/license/src/lib/licenseCache.provider.ts b/libs/services/license/src/lib/licenseCache.provider.ts index be469dc39fbb..254fcaa38cf5 100644 --- a/libs/services/license/src/lib/licenseCache.provider.ts +++ b/libs/services/license/src/lib/licenseCache.provider.ts @@ -10,7 +10,6 @@ export const LicenseCacheProvider: FactoryProvider = { provide: LICENSE_SERVICE_CACHE_MANAGER_PROVIDER, scope: LazyDuringDevScope, useFactory: (licenseServiceConfig: ConfigType) => { - console.log(process.env.NODE_ENV) if (process.env.NODE_ENV !== 'production') { return undefined } From d0ba331771b68f2cf82cda4c198339307a69b4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Eorkell=20M=C3=A1ni=20=C3=9Eorkelsson?= Date: Tue, 17 Sep 2024 14:19:46 +0000 Subject: [PATCH 6/6] fix: imports --- .../src/app/modules/license/test/license.service.spec.ts | 9 ++++----- libs/clients/smart-solutions-v2/src/index.ts | 6 +++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/services/license-api/src/app/modules/license/test/license.service.spec.ts b/apps/services/license-api/src/app/modules/license/test/license.service.spec.ts index 26734802a7ff..2521777bf441 100644 --- a/apps/services/license-api/src/app/modules/license/test/license.service.spec.ts +++ b/apps/services/license-api/src/app/modules/license/test/license.service.spec.ts @@ -8,7 +8,7 @@ import { PassDataInput, Result, RevokePassData, - SmartSolutionsApi, + SmartSolutionsService, VerifyPassData, } from '@island.is/clients/smart-solutions-v2' import type { Logger } from '@island.is/logging' @@ -19,7 +19,6 @@ import { BarcodeService, LICENSE_SERVICE_CACHE_MANAGER_PROVIDER, LicenseConfig, - TOKEN_EXPIRED_ERROR, } from '@island.is/services/license' import { BadRequestException, @@ -72,7 +71,7 @@ const getLicenseType = (id: LicenseId) => { export class MockUpdateClient extends BaseLicenseUpdateClient { constructor( @Inject(LOGGER_PROVIDER) protected logger: Logger, - protected smartApi: SmartSolutionsApi, + protected smartApi: SmartSolutionsService, ) { super(logger, smartApi) } @@ -254,7 +253,7 @@ describe('LicenseService', () => { })), }, { - provide: SmartSolutionsApi, + provide: SmartSolutionsService, useClass: jest.fn(() => ({})), }, { @@ -275,7 +274,7 @@ describe('LicenseService', () => { async (): Promise => new MockUpdateClient(logger, smart), }), - inject: [LOGGER_PROVIDER, SmartSolutionsApi], + inject: [LOGGER_PROVIDER, SmartSolutionsService], }, { provide: BarcodeService, diff --git a/libs/clients/smart-solutions-v2/src/index.ts b/libs/clients/smart-solutions-v2/src/index.ts index 0b04b57def89..e04ba1bcea7e 100644 --- a/libs/clients/smart-solutions-v2/src/index.ts +++ b/libs/clients/smart-solutions-v2/src/index.ts @@ -1,6 +1,10 @@ export { SmartSolutionsModule } from './lib/smartSolutions.module' export { SmartSolutionsService } from './lib/smartSolutions.service' -export { PkPass, RevokePassData } from './lib/types/responses.type' +export { + PkPass, + RevokePassData, + VerifyPassData, +} from './lib/types/responses.type' export { Result } from './lib/types/result.type' export { SmartSolutionsConfig,