feat: remove obsolete code, refactor vpa, iam services

.mocharc.json

@@ -1,8 +1,8 @@
 {
-  "require": ["test/helpers/init.js", "ts-node/register"],
+  "require": ["test/helpers/init.js"],
   "watch-extensions": ["ts"],
   "recursive": true,
   "reporter": "spec",
   "timeout": 60000,
-  "node-option": ["loader=ts-node/esm", "experimental-specifier-resolution=node"]
+  "node-option": ["import=tsx", "experimental-specifier-resolution=node"]
 }

bin/dev.cmd

@@ -1,3 +1,3 @@
 @echo off
 
-node --loader ts-node/esm --no-warnings=ExperimentalWarning "%~dp0\dev" %*
+node --import tsx --no-warnings=ExperimentalWarning "%~dp0\dev" %*

bin/dev.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --loader ts-node/esm --no-warnings=ExperimentalWarning
+#!/usr/bin/env -S node --import tsx --no-warnings=ExperimentalWarning
 
 import { execute } from '@oclif/core'
 

package.json

@@ -18,12 +18,11 @@
   ],
   "scripts": {
     "dev": "./bin/dev",
-    "build": "shx rm -rf dist && tsc -b",
+    "build": "shx rm -rf dist && tsc -b && tsc -v",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "test": "mocha \"test/**/*.test.ts\"",
-    "generate:readme": "npm run build && oclif readme --multi --no-aliases",
-    "generate:api": "node scripts/generate-api.cjs"
+    "generate:readme": "npm run build && oclif readme --multi --no-aliases"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -43,18 +42,20 @@
     "oclif"
   ],
   "dependencies": {
-    "@affinidi-tdk/credential-issuance-client": "^1.26.1",
-    "@affinidi-tdk/iota-client": "^1.23.0",
-    "@affinidi-tdk/wallets-client": "^1.14.0",
+    "@affinidi-tdk/credential-issuance-client": "^1.46.0",
+    "@affinidi-tdk/iam-client": "^1.37.0",
+    "@affinidi-tdk/iota-client": "^1.37.0",
+    "@affinidi-tdk/login-configuration-client": "^1.40.0",
+    "@affinidi-tdk/wallets-client": "^1.37.0",
     "@inquirer/prompts": "^5.3.4",
-    "@oclif/core": "^4.0.17",
+    "@oclif/core": "^4.2.6",
     "@oclif/plugin-autocomplete": "^3.1.11",
     "@oclif/plugin-commands": "^4.0.10",
     "@oclif/plugin-help": "^6.2.7",
-    "@oclif/plugin-not-found": "^3.2.14",
+    "@oclif/plugin-not-found": "^3.2.42",
     "@oclif/plugin-search": "^1.2.5",
     "@oclif/plugin-warn-if-update-available": "^3.1.11",
-    "@postman/node-keytar": "^7.9.3",
+    "@postman/node-keytar": "7.9.3",
     "axios": "^1.7.7",
     "chalk": "^5.3.0",
     "conf": "^13.0.1",
@@ -91,15 +92,14 @@
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-mocha": "^10.4.3",
     "eslint-plugin-prettier": "^4.2.1",
-    "mocha": "^10.6.0",
+    "mocha": "^11.1.0",
     "nock": "^13.5.4",
     "oclif": "^4.14.12",
     "prettier": "^2.7.1",
     "semantic-release": "^24.1.1",
     "shx": "^0.3.4",
-    "swagger-typescript-api": "^12.0.4",
-    "ts-node": "^10.9.2",
     "tslib": "^2.6.3",
+    "tsx": "^4.19.3",
     "typescript": "^5.5.3"
   },
   "overrides": {

src/commands/generate/app.ts

@@ -1,3 +1,4 @@
+import { JsonWebKeySetDto } from '@affinidi-tdk/iam-client'
 import { confirm, input, password, select } from '@inquirer/prompts'
 import { ux, Flags } from '@oclif/core'
 import { CLIError } from '@oclif/core/errors'
@@ -19,7 +20,6 @@
 import { cloneWithDegit } from '../../helpers/degit.js'
 import { addPrincipal, createToken, generateKeyPair, updatePolicies } from '../../helpers/token.js'
 import { bffService } from '../../services/affinidi/bff-service.js'
-import { JsonWebKeySetDto } from '../../services/affinidi/iam/iam.api.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
 import { createAuth0Resources } from '../../services/generator/auth0.js'
 import { configureAppEnvironment } from '../../services/generator/env-configurer.js'
@@ -93,7 +93,7 @@
         }))
 
       // Make nextjs first option
       const frameworks = GenerateApp.frameworks.get(provider)!
       const nextJsIndex = frameworks.indexOf('nextjs')
       if (nextJsIndex > 0) {
         frameworks.unshift(frameworks.splice(nextJsIndex, 1)[0])
@@ -111,7 +111,7 @@
         flags.library ??
         (await select({
           message: 'Select the library for the sample app',
           choices: GenerateApp.libraries.get(`${provider}-${framework}`)!.map((value) => ({
             name: value,
             value,
           })),
@@ -221,8 +221,8 @@
               connectionName,
               {
                 callbackUrl: GenerateApp.apps.appName.redirectUris.callbackUrl,
                 logOutUrl: GenerateApp.apps.appName.redirectUris.logOutUrl!,
                 webOriginUrl: GenerateApp.apps.appName.redirectUris.webOriginUrl!,
               },
             )
             clientId = auth0ClientId
@@ -246,7 +246,7 @@
               const token = await createToken(tokenName, SupportedAlgorithms.RS256, jwks)
               const promises = [addPrincipal(token.id), bffService.getActiveProject()]
               const [, activeProject] = await Promise.all(promises)
               const projectId = activeProject!.id
               await updatePolicies(token.id, projectId, tokenMetadata.policy.actions, [`*:${projectId}:*`])
               tokenParams = {
                 projectId,
@@ -275,7 +275,7 @@
         }
       }
       this.log('\nPlease read the generated README for instructions on how to run your sample app\n')
     } catch (err: any) {
       if (!err?.oclif) throw new CLIError('Unexpected error while generating sample app')
       else throw new CLIError(err)
     }

src/commands/iam/get-policies.ts

@@ -1,3 +1,4 @@
+import { PolicyDto } from '@affinidi-tdk/iam-client'
 import { select } from '@inquirer/prompts'
 import { ux, Flags } from '@oclif/core'
 import { CLIError } from '@oclif/core/errors'
@@ -8,7 +9,6 @@ import { PrincipalTypes } from '../../common/constants.js'
 import { giveFlagInputErrorMessage } from '../../common/error-messages.js'
 import { promptRequiredParameters } from '../../common/prompts.js'
 import { INPUT_LIMIT } from '../../common/validators.js'
-import { PolicyDto } from '../../services/affinidi/iam/iam.api.js'
 import { iamService } from '../../services/affinidi/iam/service.js'
 
 export class GetPolicies extends BaseCommand<typeof GetPolicies> {

src/commands/iam/list-principals.ts

@@ -1,7 +1,7 @@
+import { UserList } from '@affinidi-tdk/iam-client'
 import { ux } from '@oclif/core'
 import chalk from 'chalk'
 import { BaseCommand } from '../../common/base-command.js'
-import { UserList } from '../../services/affinidi/iam/iam.api.js'
 import { iamService } from '../../services/affinidi/iam/service.js'
 
 export class ListPrincipals extends BaseCommand<typeof ListPrincipals> {

src/commands/iam/update-policies.ts

@@ -1,4 +1,5 @@
 import { readFile } from 'fs/promises'
+import { PolicyDto } from '@affinidi-tdk/iam-client'
 import { confirm, input, select } from '@inquirer/prompts'
 import { ux, Flags } from '@oclif/core'
 import { CLIError } from '@oclif/core/errors'
@@ -10,7 +11,6 @@ import { giveFlagInputErrorMessage } from '../../common/error-messages.js'
 import { promptRequiredParameters } from '../../common/prompts.js'
 import { INPUT_LIMIT, policiesDataSchema, validateInputLength } from '../../common/validators.js'
 import { bffService } from '../../services/affinidi/bff-service.js'
-import { PolicyDto } from '../../services/affinidi/iam/iam.api.js'
 import { iamService } from '../../services/affinidi/iam/service.js'
 
 export class UpdatePolicies extends BaseCommand<typeof UpdatePolicies> {

src/commands/login/add-user-to-group.ts

@@ -1,10 +1,10 @@
+import { GroupUserMappingDto } from '@affinidi-tdk/login-configuration-client'
 import { ux, Flags } from '@oclif/core'
 import z from 'zod'
 import { BaseCommand } from '../../common/base-command.js'
 import { promptRequiredParameters } from '../../common/prompts.js'
 import { INPUT_LIMIT } from '../../common/validators.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
-import { GroupUserMappingDto } from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 export class AddUserToGroup extends BaseCommand<typeof AddUserToGroup> {
   static summary = 'Adds a user to a user group'
@@ -14,7 +14,13 @@ export class AddUserToGroup extends BaseCommand<typeof AddUserToGroup> {
       summary: 'Name of the user group',
     }),
     'user-id': Flags.string({
-      summary: "Id of the user. Currently the user's DID is supported.",
+      summary: "Id of the user. Currently the user's DID is supported",
+    }),
+    'user-name': Flags.string({
+      summary: 'Name of the user',
+    }),
+    'user-description': Flags.string({
+      summary: 'Description of the user',
     }),
   }
 
@@ -24,14 +30,17 @@ export class AddUserToGroup extends BaseCommand<typeof AddUserToGroup> {
     const schema = z.object({
       'group-name': z.string().max(INPUT_LIMIT),
       'user-id': z.string().max(INPUT_LIMIT),
+      'user-name': z.string().max(INPUT_LIMIT).optional(),
+      'user-description': z.string().max(INPUT_LIMIT).optional(),
     })
     const validatedFlags = schema.parse(promptFlags)
 
     ux.action.start('Adding user to group')
-    const addUserToGroupOutput = await vpAdapterService.addUserToGroup(
-      validatedFlags['group-name'],
-      validatedFlags['user-id'],
-    )
+    const addUserToGroupOutput = await vpAdapterService.addUserToGroup(validatedFlags['group-name'], {
+      userId: validatedFlags['user-id'],
+      ...(validatedFlags['user-name'] && { name: validatedFlags['user-name'] }),
+      ...(validatedFlags['user-description'] && { description: validatedFlags['user-description'] }),
+    })
     ux.action.stop('Added successfully!')
 
     if (!this.jsonEnabled()) this.logJson(addUserToGroupOutput)

src/commands/login/create-config.ts

@@ -1,4 +1,9 @@
 import { readFile } from 'fs/promises'
+import {
+  CreateLoginConfigurationInput,
+  CreateLoginConfigurationOutput,
+  TokenEndpointAuthMethod,
+} from '@affinidi-tdk/login-configuration-client'
 import { input } from '@inquirer/prompts'
 import { Flags, ux } from '@oclif/core'
 import { CLIError } from '@oclif/core/errors'
@@ -8,11 +13,6 @@ import { IdTokenClaimFormats } from '../../common/constants.js'
 import { giveFlagInputErrorMessage } from '../../common/error-messages.js'
 import { INPUT_LIMIT, PRESENTATION_DEFINITION_LIMIT, split, validateInputLength } from '../../common/validators.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
-import {
-  CreateLoginConfigurationInput,
-  CreateLoginConfigurationOutput,
-  TokenEndpointAuthMethod,
-} from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 export class CreateConfig extends BaseCommand<typeof CreateConfig> {
   static summary = 'Creates a login configuration in your active project'

src/commands/login/create-group.ts

@@ -1,10 +1,10 @@
+import { GroupDto } from '@affinidi-tdk/login-configuration-client'
 import { Flags, ux } from '@oclif/core'
 import chalk from 'chalk'
 import z from 'zod'
 import { BaseCommand } from '../../common/base-command.js'
 import { promptRequiredParameters } from '../../common/prompts.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
-import { GroupDto } from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 const CREATE_GROUP_NAME_LIMIT = 24
 export class CreateGroup extends BaseCommand<typeof CreateGroup> {

src/commands/login/get-config.ts

@@ -1,10 +1,10 @@
+import { LoginConfigurationObject } from '@affinidi-tdk/login-configuration-client'
 import { ux, Flags } from '@oclif/core'
 import z from 'zod'
 import { BaseCommand } from '../../common/base-command.js'
 import { promptRequiredParameters } from '../../common/prompts.js'
 import { INPUT_LIMIT } from '../../common/validators.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
-import { LoginConfigurationObject } from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 export class GetLoginConfiguration extends BaseCommand<typeof GetLoginConfiguration> {
   static summary = 'Gets the details of a login configuration in your active project'

src/commands/login/get-group.ts

@@ -1,10 +1,10 @@
+import { GroupDto } from '@affinidi-tdk/login-configuration-client'
 import { ux, Flags } from '@oclif/core'
 import z from 'zod'
 import { BaseCommand } from '../../common/base-command.js'
 import { promptRequiredParameters } from '../../common/prompts.js'
 import { INPUT_LIMIT } from '../../common/validators.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
-import { GroupDto } from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 export class GetGroup extends BaseCommand<typeof GetGroup> {
   static summary = 'Gets the details of a user group'

src/commands/login/import-configs.ts

@@ -1,4 +1,5 @@
 import { readFile } from 'fs/promises'
+import { TokenEndpointAuthMethod, CreateLoginConfigurationOutput } from '@affinidi-tdk/login-configuration-client'
 import { input } from '@inquirer/prompts'
 import { Flags, ux } from '@oclif/core'
 import { CLIError } from '@oclif/core/errors'
@@ -8,10 +9,6 @@ import { IdTokenClaimFormats } from '../../common/constants.js'
 import { giveFlagInputErrorMessage } from '../../common/error-messages.js'
 import { INPUT_LIMIT, validateInputLength } from '../../common/validators.js'
 import { bffService } from '../../services/affinidi/bff-service.js'
-import {
-  TokenEndpointAuthMethod,
-  CreateLoginConfigurationOutput,
-} from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 export class ImportLoginConfigs extends BaseCommand<typeof ImportLoginConfigs> {
   static summary = 'Import login configurations in your active project'

src/commands/login/import-groups.ts

@@ -1,4 +1,5 @@
 import { readFile } from 'fs/promises'
+import { GroupDto } from '@affinidi-tdk/login-configuration-client'
 import { input } from '@inquirer/prompts'
 import { Flags, ux } from '@oclif/core'
 import { CLIError } from '@oclif/core/errors'
@@ -7,7 +8,6 @@ import { BaseCommand } from '../../common/base-command.js'
 import { giveFlagInputErrorMessage } from '../../common/error-messages.js'
 import { INPUT_LIMIT, validateInputLength } from '../../common/validators.js'
 import { bffService } from '../../services/affinidi/bff-service.js'
-import { GroupDto } from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 export class ImportGroups extends BaseCommand<typeof ImportGroups> {
   static summary = 'Import groups with its users'

src/commands/login/list-configs.ts

@@ -1,7 +1,7 @@
+import { ListLoginConfigurationOutput } from '@affinidi-tdk/login-configuration-client'
 import { ux } from '@oclif/core'
 import { BaseCommand } from '../../common/base-command.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
-import { ListLoginConfigurationOutput } from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 export class ListLoginConfigurations extends BaseCommand<typeof ListLoginConfigurations> {
   static summary = 'Lists login configurations in your active project'

src/commands/login/list-groups.ts

@@ -1,7 +1,7 @@
+import { GroupsList } from '@affinidi-tdk/login-configuration-client'
 import { ux } from '@oclif/core'
 import { BaseCommand } from '../../common/base-command.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
-import { GroupsList } from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 export class ListGroups extends BaseCommand<typeof ListGroups> {
   static summary = 'Lists user groups in your active project'

src/commands/login/list-users-in-group.ts

@@ -1,11 +1,11 @@
+import { GroupUserMappingsList } from '@affinidi-tdk/login-configuration-client'
 import { confirm, select } from '@inquirer/prompts'
 import { ux, Flags } from '@oclif/core'
 import z from 'zod'
 import { BaseCommand } from '../../common/base-command.js'
 import { promptRequiredParameters } from '../../common/prompts.js'
 import { INPUT_LIMIT } from '../../common/validators.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
-import { GroupUserMappingsList } from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 const NEXT = 'Next'
 const PREVIOUS = 'Previous'
@@ -48,13 +48,14 @@ export class ListUsersInGroup extends BaseCommand<typeof ListUsersInGroup> {
     const groupName = validatedFlags['group-name']
 
     ux.action.start('Fetching users in the user group')
-    const listGroupUsersOutput = await vpAdapterService.listGroupUsers(validatedFlags['group-name'], {
-      limit: pageSize,
-      exclusiveStartKey: startingToken,
-    })
+    const listGroupUsersOutput = await vpAdapterService.listGroupUsers(
+      validatedFlags['group-name'],
+      pageSize,
+      startingToken,
+    )
     ux.action.stop('Fetched successfully!')
-
     const { lastEvaluatedKey, ...rest } = listGroupUsersOutput
+
     if (!this.jsonEnabled())
       this.logJson({
         ...rest,

src/commands/login/update-config.ts

@@ -1,16 +1,16 @@
 import { readFile } from 'fs/promises'
+import {
+  LoginConfigurationObject,
+  TokenEndpointAuthMethod,
+  UpdateLoginConfigurationInput,
+} from '@affinidi-tdk/login-configuration-client'
 import { Flags, ux } from '@oclif/core'
 import { CLIError } from '@oclif/core/errors'
 import z from 'zod'
 import { BaseCommand } from '../../common/base-command.js'
 import { promptRequiredParameters } from '../../common/prompts.js'
 import { INPUT_LIMIT, PRESENTATION_DEFINITION_LIMIT, split, validateInputLength } from '../../common/validators.js'
 import { vpAdapterService } from '../../services/affinidi/vp-adapter/service.js'
-import {
-  LoginConfigurationObject,
-  TokenEndpointAuthMethod,
-  UpdateLoginConfigurationInput,
-} from '../../services/affinidi/vp-adapter/vp-adapter.api.js'
 
 export class UpdateLoginConfiguration extends BaseCommand<typeof UpdateLoginConfiguration> {
   static summary = 'Updates a login configuration'

src/commands/project/create-project.ts

@@ -1,10 +1,10 @@
+import { ProjectDto } from '@affinidi-tdk/iam-client'
 import { ux, Flags } from '@oclif/core'
 import z from 'zod'
 import { BaseCommand } from '../../common/base-command.js'
 import { promptRequiredParameters } from '../../common/prompts.js'
 import { INPUT_LIMIT } from '../../common/validators.js'
 import { bffService } from '../../services/affinidi/bff-service.js'
-import { ProjectDto } from '../../services/affinidi/iam/iam.api.js'
 
 export class CreateProject extends BaseCommand<typeof CreateProject> {
   static summary = 'Creates a project and sets it as the active project'

src/commands/project/get-active-project.ts

@@ -1,7 +1,7 @@
+import { ProjectDto } from '@affinidi-tdk/iam-client'
 import { ux } from '@oclif/core'
 import { BaseCommand } from '../../common/base-command.js'
 import { bffService } from '../../services/affinidi/bff-service.js'
-import { ProjectDto } from '../../services/affinidi/iam/iam.api.js'
 
 export class GetActiveProject extends BaseCommand<typeof GetActiveProject> {
   static summary = 'Gets the current active project'

src/commands/project/list-projects.ts

@@ -1,7 +1,7 @@
+import { ProjectDto } from '@affinidi-tdk/iam-client'
 import { ux } from '@oclif/core'
 import { BaseCommand } from '../../common/base-command.js'
 import { bffService } from '../../services/affinidi/bff-service.js'
-import { ProjectDto } from '../../services/affinidi/iam/iam.api.js'
 
 export class ListProjects extends BaseCommand<typeof ListProjects> {
   static summary = 'Lists your projects'