Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/heka-auth-service-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@ jobs:
checkout-ref: '${{ github.ref }}'
checkout-token: '${{ secrets.GITHUB_TOKEN }}'
setup-node: 'true'
node-version: '20'
node-version: '22'

- name: Enable Corepack
run: corepack enable

- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable
shell: bash

- name: Run typecheck
run: yarn check-types
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/heka-identity-service-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
checkout-ref: '${{ github.ref }}'
checkout-token: '${{ secrets.GITHUB_TOKEN }}'
setup-node: 'true'
node-version: '20'
node-version: '22'

- name: Enable Corepack
run: corepack enable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/heka-identity-service-web-ui-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
checkout-ref: '${{ github.ref }}'
checkout-token: '${{ secrets.GITHUB_TOKEN }}'
setup-node: 'true'
node-version: '20'
node-version: '22'

- name: Enable Corepack
run: corepack enable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/heka-wallet-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
java-distribution: 'zulu'
java-cache: 'gradle'
setup-node: 'true'
node-version: '20'
node-version: '22'

- name: Enable Corepack
run: corepack enable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/heka-wallet-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
checkout-ref: '${{ github.ref }}'
checkout-token: '${{ secrets.GITHUB_TOKEN }}'
setup-node: 'true'
node-version: '20'
node-version: '22'

- name: Enable Corepack
run: corepack enable
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@ node_modules/
# Intellij IDEs
.idea

# Auto-generated files
.yarn/install-state.gz
# Yarn Berry (regenerated on install; keep .yarn/releases & .yarn/plugins tracked)
**/.yarn/cache
**/.yarn/install-state.gz
944 changes: 944 additions & 0 deletions demo/a2a-oid4vp/.yarn/releases/yarn-4.16.0.cjs

Large diffs are not rendered by default.

942 changes: 0 additions & 942 deletions demo/a2a-oid4vp/.yarn/releases/yarn-4.9.4.cjs

This file was deleted.

6 changes: 5 additions & 1 deletion demo/a2a-oid4vp/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
enableScripts: true

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.9.4.cjs
npmMinimalAgeGate: 0

yarnPath: .yarn/releases/yarn-4.16.0.cjs
4 changes: 2 additions & 2 deletions demo/a2a-oid4vp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ sequenceDiagram

### 1. Install prerequisites

- Node.js (v18 or higher)
- yarn v4.9.4
- Node.js (v22 LTS recommended)
- yarn v4.16.0
- Docker
- An OpenAI API key

Expand Down
2 changes: 1 addition & 1 deletion demo/a2a-oid4vp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
"typescript": "^5.9.3",
"ws": "^8.19.0"
},
"packageManager": "yarn@4.9.4"
"packageManager": "yarn@4.16.0"
}
2 changes: 1 addition & 1 deletion demo/a2a-oid4vp/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 8
version: 10
cacheKey: 10c0

"@2060.io/ffi-napi@npm:^4.0.9":
Expand Down
3 changes: 0 additions & 3 deletions heka-auth-service/.eslintignore

This file was deleted.

33 changes: 0 additions & 33 deletions heka-auth-service/.eslintrc.js

This file was deleted.

5 changes: 4 additions & 1 deletion heka-auth-service/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ node_modules

# Optional npm/yarn cache directory
.npm
.yarn

# Yarn Berry (keep .yarn/releases tracked)
.yarn/cache
.yarn/install-state.gz

# Optional REPL history
.node_repl_history
Expand Down
944 changes: 944 additions & 0 deletions heka-auth-service/.yarn/releases/yarn-4.16.0.cjs

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions heka-auth-service/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
enableScripts: true

nodeLinker: node-modules

npmMinimalAgeGate: 0
Comment thread
AlexanderShenshin marked this conversation as resolved.

yarnPath: .yarn/releases/yarn-4.16.0.cjs
13 changes: 9 additions & 4 deletions heka-auth-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
FROM node:18 AS builder
FROM node:22 AS builder

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN mkdir -p /opt/heka-auth-service
WORKDIR /opt/heka-auth-service
COPY package*.json yarn.lock ./

RUN yarn install
COPY package*.json yarn.lock .yarnrc.yml ./
COPY .yarn ./.yarn

RUN yarn install --immutable

COPY . .
RUN yarn build

FROM node:18-bookworm-slim
FROM node:22-bookworm-slim

RUN apt-get update && apt-get install curl -y

Expand All @@ -23,5 +26,7 @@ COPY --from=builder /opt/heka-auth-service/node_modules ./node_modules
COPY --from=builder /opt/heka-auth-service/package*.json ./
COPY --from=builder /opt/heka-auth-service/tsconfig*.json ./
COPY --from=builder /opt/heka-auth-service/yarn.lock ./
COPY --from=builder /opt/heka-auth-service/.yarn ./.yarn
COPY --from=builder /opt/heka-auth-service/.yarnrc.yml ./

CMD ["sh", "-c", "yarn migration:up && yarn start"]
3 changes: 2 additions & 1 deletion heka-auth-service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ Authentication service for the [Heka Identity Service](https://github.com/hiero-
-p 5433:5432 -d postgres
```

2. Install dependencies:
2. Enable Corepack so the pinned Yarn 4 runs, then install dependencies. The repo pins `yarn@4.16.0` in `package.json`; without Corepack the system Yarn 1.x may run instead and produce unexpected lockfile behavior:

```bash
corepack enable
yarn install
```

Expand Down
34 changes: 34 additions & 0 deletions heka-auth-service/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import prettierRecommended from 'eslint-plugin-prettier/recommended';
import simpleImportSort from 'eslint-plugin-simple-import-sort';
import globals from 'globals';
import tseslint from 'typescript-eslint';

export default tseslint.config(
{
ignores: ['dist/**', 'migrations/**', 'eslint.config.mjs'],
},
...tseslint.configs.recommended,
{
languageOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
globals: {
...globals.node,
...globals.jest,
},
},
plugins: {
'simple-import-sort': simpleImportSort,
},
rules: {
'linebreak-style': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-namespace': 'off',
'simple-import-sort/imports': 'error',
'simple-import-sort/exports': 'error',
},
},
prettierRecommended,
);
22 changes: 12 additions & 10 deletions heka-auth-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
"migration:fresh": "npx mikro-orm migration:fresh",
"test": "jest --runInBand --forceExit"
},
"engines": {
"node": "^20.19.2 || ^22.13.0"
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
"dependencies": {
"@eropple/nestjs-correlation-id": "^1.0.1",
"@mikro-orm/core": "^6.2.9",
Expand Down Expand Up @@ -65,19 +68,17 @@
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/jest": "^29.5.12",
"@types/node": "^20.11.25",
"@types/node": "^22.0.2",
"@types/passport": "^1.0.16",
"@types/passport-http": "^0.3.11",
"@types/passport-jwt": "^4.0.1",
"@types/supertest": "^6.0.2",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint": "^10.4.1",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.6",
"eslint-plugin-simple-import-sort": "^13.0.0",
"globals": "^17.6.0",
"jest": "^29.7.0",
"pino-pretty": "^10.3.1",
"prettier": "^3.2.5",
Expand All @@ -86,7 +87,8 @@
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.4.2"
"typescript": "~5.9.3",
"typescript-eslint": "^8.60.1"
Comment thread
AlexanderShenshin marked this conversation as resolved.
},
"mikro-orm": {
"useTsNode": true,
Expand All @@ -95,5 +97,5 @@
"./dist/core/database/database.options.cli.js"
]
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
"packageManager": "yarn@4.16.0"
}
4 changes: 2 additions & 2 deletions heka-auth-service/src/core/config/configs/db.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export class DbConfig {

public constructor(configuration?: Record<string, any>) {
const env = configuration ?? process.env
;(this.host = env[OrmConfigKeys.host] || dbConfigDefaults.host),
(this.port = env[OrmConfigKeys.port] ? parseInt(env[OrmConfigKeys.port]) : dbConfigDefaults.port)
this.host = env[OrmConfigKeys.host] || dbConfigDefaults.host
this.port = env[OrmConfigKeys.port] ? parseInt(env[OrmConfigKeys.port]) : dbConfigDefaults.port
this.name = env[OrmConfigKeys.dbName] || dbConfigDefaults.name
this.user = env[OrmConfigKeys.user] || dbConfigDefaults.user
this.password = env[OrmConfigKeys.password] || dbConfigDefaults.password
Expand Down
Loading
Loading