feat(license-service): Use smart-solutions-v2 client

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<Result<Pass | undefined>> {
+  ): Promise<Result<Partial<Pass> | undefined>> {
     let updatePayload: PassDataInput = {
       expirationDate,
     }
@@ -178,7 +182,7 @@ export class LicenseService {
     service: BaseLicenseUpdateClient,
     nationalId: string,
     requestId?: string,
-  ): Promise<Result<Pass | undefined>> {
+  ): Promise<Result<Partial<Pass> | 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<Pass | undefined>
+    let updateRes: Result<Partial<Pass> | undefined>
     if (inputData.licenseUpdateType === 'push') {
       const { expiryDate, payload } = inputData
 

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',

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'

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<typeof AdrDigitalLicenseClientConfig>,
-      ) => {
-        const smartConfig: SmartSolutionsConfig = {
-          apiKey: config.apiKey,
-          apiUrl: config.apiUrl,
-          passTemplateId: config.passTemplateId,
-        }
-        return smartConfig
-      },
-      inject: [AdrDigitalLicenseClientConfig.KEY],
-    }),
+    smartSolutionsModuleFactory(AdrDigitalLicenseClientConfig),
   ],
   providers: [AdrLicenseClient],
   exports: [AdrLicenseClient],

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<LicenseType.AdrLicense> {
   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<LicenseType.AdrLicense> {
     }
   }
 
-  private async getPkPass(user: User): Promise<Result<Pass>> {
+  private async getPkPass(user: User): Promise<Result<Partial<Pass>>> {
     const license = await this.fetchLicense(user)
 
     if (!license.ok || !license.data) {

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'
 

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<Result<Pass | undefined>>
+  ): Promise<Result<Partial<Pass> | undefined>>
 
   abstract pullUpdate(
     nationalId: string,
     requestId?: string,
-  ): Promise<Result<Pass | undefined>>
+  ): Promise<Result<Partial<Pass> | undefined>>
 
   abstract revoke(
     nationalId: string,

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<typeof DisabilityDigitalLicenseClientConfig>,
-      ) => config,
-      inject: [DisabilityDigitalLicenseClientConfig.KEY],
-    }),
+    smartSolutionsModuleFactory(DisabilityDigitalLicenseClientConfig),
   ],
   providers: [DisabilityLicenseClient],
   exports: [DisabilityLicenseClient],

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<typeof DisabilityDigitalLicenseClientConfig>,
-      ) => config,
-      inject: [DisabilityDigitalLicenseClientConfig.KEY],
-    }),
-  ],
+  imports: [smartSolutionsModuleFactory(DisabilityDigitalLicenseClientConfig)],
   providers: [DisabilityLicenseUpdateClient],
   exports: [DisabilityLicenseUpdateClient],
 })

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<Result<Pass>> {
+  async getPkPass(user: User): Promise<Result<Partial<Pass>>> {
     const license = await this.fetchLicense(user)
 
     if (!license.ok || !license.data) {

libs/clients/license-client/src/lib/clients/disability-license-client/services/disabilityLicenseUpdateClient.service.ts

@@ -1,36 +1,36 @@
 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)
   }
 
   pushUpdate(
     inputData: PassDataInput,
     nationalId: string,
-  ): Promise<Result<Pass | undefined>> {
+  ): Promise<Result<Partial<Pass> | undefined>> {
     return this.smartApi.updatePkPass(inputData, nationalId)
   }
 
-  async pullUpdate(): Promise<Result<Pass>> {
+  async pullUpdate(): Promise<Result<Partial<Pass>>> {
     return {
       ok: false,
       error: {

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'
 

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<typeof DrivingDigitalLicenseClientConfig>,
-      ) => config,
-      inject: [DrivingDigitalLicenseClientConfig.KEY],
-    }),
+    smartSolutionsModuleFactory(DrivingDigitalLicenseClientConfig),
   ],
   providers: [DrivingLicenseClient],
   exports: [DrivingLicenseClient],

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<typeof DrivingDigitalLicenseClientConfig>,
-      ) => config,
-      inject: [DrivingDigitalLicenseClientConfig.KEY],
-    }),
+    smartSolutionsModuleFactory(DrivingDigitalLicenseClientConfig),
   ],
   providers: [DrivingLicenseUpdateClient],
   exports: [DrivingLicenseUpdateClient],