Merge remote-tracking branch 'origin' into mDL-age-verification-demo

Author: Toktar

.github/workflows/heka-identity-service-verify.yml

@@ -65,18 +65,16 @@ jobs:
       - name: Run ESLint
         run: yarn lint
 
-# TODO - re-enable tests after we add proper support for ESM packages in tests configuration
-#      - name: Run unit tests
-#        run: env FORCE_COLOR=1 yarn test ./src --config=./src/jest.config.ts --ci --reporters=default
-
-#      - name: Run integration tests
-#        env:
-#          MIKRO_ORM_HOST: postgres
-#          MIKRO_ORM_PORT: 5432
-#          MIKRO_ORM_USER: heka
-#          MIKRO_ORM_PASSWORD: heka1
-#          WALLET_POSTGRES_HOST: postgres
-#          EXPRESS_HOST: localhost
-#          FILE_STORAGE_FS_URL: http://localhost:3000
-#          APP_ENDPOINT: http://localhost:3000
-#        run: yarn test --ci --reporters=default
+      - name: Run tests
+        env:
+          FORCE_COLOR: 1
+          NODE_OPTIONS: --max-old-space-size=6144
+          MIKRO_ORM_HOST: localhost
+          MIKRO_ORM_PORT: 5432
+          MIKRO_ORM_USER: heka
+          MIKRO_ORM_PASSWORD: heka1
+          WALLET_POSTGRES_HOST: localhost
+          EXPRESS_HOST: localhost
+          FILE_STORAGE_FS_URL: http://localhost:3000
+          APP_ENDPOINT: http://localhost:3000
+        run: yarn test

heka-auth-service/README.md

@@ -9,8 +9,7 @@ Authentication service for [Heka Identity Service](https://github.com/hiero-ledg
 #### Locally
 
 1. Run local Postgres database with the following command:
-   ```
-   bash
+   ```bash
    $ docker run --name heka-auth-service-postgres -e POSTGRES_DB=heka-auth-service -e POSTGRES_USER=heka -e POSTGRES_PASSWORD=heka1 -p 5433:5432 -d postgres
    ```
 2. Install dependencies:

heka-auth-service/src/oauth/oauth.service.ts

@@ -42,11 +42,18 @@ export class OAuthService {
   }
 
   public async refreshToken(accessToken: string, refreshToken: string): Promise<RefreshResponse> {
-    // parse refresh token
-    const refresh = await this.jwtService.decode(refreshToken)
+    let refresh: { exp?: number; jti?: string }
+    try {
+      refresh = await this.jwtService.verifyAsync(refreshToken, {
+        secret: this.configService.jwtConfig.secret,
+        issuer: this.configService.jwtConfig.issuer,
+        audience: this.configService.jwtConfig.audience,
+      })
+    } catch {
+      throw new UnauthorizedException('Refresh token is incorrect.')
+    }
 
-    // check expiration of the refresh token
-    if (SecondsToDate(refresh.exp) <= new Date()) {
+    if (!refresh.jti) {
       throw new UnauthorizedException('Refresh token is incorrect.')
     }
 

heka-identity-service/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-bullseye-slim
+FROM node:22-bullseye-slim
 
 ARG EXPRESS_PORT
 

heka-identity-service/docs/api.md

@@ -1,4 +1,4 @@
-# Heka Identity Service -  API
+# Heka Identity Service - API
 
 The Identity Service provides a REST API (by default, it is available at <http://localhost:3000> for the locally running application). This API can be explored and accessed via Swagger UI which is available at `/docs` path (<http://localhost:3000/docs> for the case above).
 Since API methods often initiate asynchronous processes, the Generic Agency server provides notification events to inform clients of any updates to the process. These notifications can be received through a webhook URL or a WebSocket connection, you can choose your preferred method for receiving notification using `/user` endpoint.

heka-identity-service/docs/setup.md

@@ -32,9 +32,10 @@ To run Heka Identity Service locally, follow these steps:
 Identity Service endpoints are protected with JWT Authentication and require integration with OAuth 2.0 Authorization Server.
 
 You can modify JWT verification options by setting the following environment variables:
+
 - `JWT_SECRET` - secret used to sign and verify tokens, defaults to `test`
 - `JWT_VERIFY_OPTIONS_ISSUER` - required value of `iss` claim, defaults to `Heka`
-- `JWT_VERIFY_OPTIONS_AUDIENCE` - required value of `aud` claim, defaults to `Heka Identity Platform`
+- `JWT_VERIFY_OPTIONS_AUDIENCE` - required value of `aud` claim, defaults to `Heka Identity Service`
 
 While integration with external auth providers is supported, it's recommended to use [Heka Auth Service](https://github.com/hiero-ledger/heka-identity-platform/tree/main/heka-auth-service) for basic deployments.
 

heka-identity-service/jest.config.ts

@@ -10,7 +10,8 @@
     "start": "ts-node -r tsconfig-paths/register -r @openwallet-foundation/askar-nodejs src/main.ts",
     "watch": "nodemon --config nodemon.json",
     "debug": "nodemon --config nodemon-debug.json",
-    "test": "node --experimental-vm-modules node_modules/.bin/jest --runInBand --forceExit",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "check-types": "yarn check-types:src && yarn check-types:test",
     "check-types:src": "tsc -p tsconfig.src.json --noEmit",
     "check-types:test": "tsc -p tsconfig.test.json --noEmit",
@@ -89,14 +90,12 @@
     "zstd-napi": "^0.0.10"
   },
   "devDependencies": {
-    "@golevelup/ts-jest": "^0.3.7",
+    "@golevelup/ts-vitest": "^0.5.2",
     "@mikro-orm/cli": "^5.7.12",
     "@mikro-orm/sqlite": "^5.7.12",
     "@nestjs/testing": "^11.1.5",
     "@types/express": "^5.0.0",
     "@types/fs-extra": "^11.0.2",
-    "@types/jest": "^29.5.1",
-    "@types/jest-when": "^3.5.2",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/multer": "^1.4.11",
     "@types/node": "^18.15.12",
@@ -111,19 +110,19 @@
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.5.0",
-    "jest-when": "^3.5.2",
     "jsonwebtoken": "^9.0.0",
     "nodemon": "^2.0.22",
     "patch-package": "^8.0.0",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^3.1.0",
     "supertest": "^6.3.3",
     "superwstest": "^2.0.3",
-    "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
+    "vite-tsconfig-paths": "^5.1.4",
+    "vitest": "^2.1.8",
+    "vitest-when": "0.5.0",
     "ws": "^8.13.0"
   },
   "mikro-orm": {

heka-identity-service/package.json

@@ -1,5 +1,7 @@
+import type { MockedFunction } from 'vitest'
+
 export { pino as testLogger } from 'pino'
 
-export function mockFunction<T extends (...args: any[]) => any>(fn: T): jest.MockedFunction<T> {
-  return fn as jest.MockedFunction<T>
+export function mockFunction<T extends (...args: any[]) => any>(fn: T): MockedFunction<T> {
+  return fn as MockedFunction<T>
 }

heka-identity-service/src/__tests__/helpers.ts

@@ -1,6 +1,5 @@
 // Use type-only imports to break ESM circular dependency TDZ with schema-field and schema-registration.
 // The @OneToMany decorators use string entity names so there is no runtime reference to these modules.
-
 import type { SchemaField } from './schema-field.entity'
 import type { SchemaRegistration } from './schema-registration.entity'