More changes

mridang · mridang · commit 2752ffea14b1 · 2025-06-07T17:02:24.000+03:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,18 +1,18 @@
 version: 2
 updates:
-  - package-ecosystem: "composer"
+  - package-ecosystem: "npm"
     directory: "/"
     schedule:
       interval: "weekly"
     commit-message:
       prefix: "chore(deps):"
     open-pull-requests-limit: 10
     groups:
-      composer-version-updates:
+      npm-version-updates:
         patterns:
           - "*"
         applies-to: "version-updates"
-      composer-security-updates:
+      npm-security-updates:
         patterns:
           - "*"
         applies-to: "security-updates"
diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -15,11 +15,11 @@ permissions:
 
 jobs:
   check-compatibility:
-    name: With PHP ${{ matrix.php-version }}
+    name: With Node ${{ matrix.node-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
+        node-version: [ '20', '21', '23', '24' ]
       fail-fast: false
 
     steps:
@@ -40,11 +40,12 @@ jobs:
           ref: ${{ inputs.sanity_ref }}
           path: project/sanity
 
-      - name: Set up PHP
-        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          php-version: ${{ matrix.php-version }}
+          cache: 'npm'
+          node-version: ${{ matrix.node-version }}
 
       - name: Check Installability
         working-directory: project/sanity
-        run: composer require zitadel/client
+        run: npm install @zitadel/client-node
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -36,16 +36,17 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          php-version: '8.1'
+          cache: 'npm'
+          node-version-file: '.nvmrc'
 
       - name: Install Dependencies
-        run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
+        run: npm ci --no-progress
 
       - name: Run Formatter
-        run: composer format
+        run: npm run format
 
       - name: Commit Changes
         if: ${{ inputs.commit_changes == true }}
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -81,7 +81,6 @@ jobs:
     needs:
       #      - lint-commits
       - code-style
-      - auto-fix
       - compat-check
       - type-check
       - run-tests
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,11 +36,6 @@ jobs:
         with:
           node-version: 'lts/*'
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
-        with:
-          php-version: '8.1'
-
       - name: Run semantic-release
         uses: mridang/action-semantic-release@v1.2.3
         with:
@@ -49,5 +44,4 @@ jobs:
         env:
           DOCKER_REGISTRY_USER: ${{ github.actor }}
           DOCKER_REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          PACKAGIST_USERNAME: ${{ secrets.PACKAGIST_USERNAME }}
-          PACKAGIST_TOKEN: ${{ secrets.PACKAGIST_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,16 +38,17 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          php-version: '8.1'
+          cache: 'npm'
+          node-version-file: '.nvmrc'
 
       - name: Install Dependencies
-        run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
+        run: npm ci --no-progress
 
       - name: Run Tests
-        run: composer test
+        run: npm run test
         env:
           BASE_URL: ${{ secrets.BASE_URL }}
           AUTH_TOKEN: ${{ secrets.AUTH_TOKEN }}
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
@@ -30,13 +30,14 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          php-version: '8.1'
+          cache: 'npm'
+          node-version-file: '.nvmrc'
 
       - name: Install Dependencies
-        run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
+        run: npm ci --no-progress
 
-      - name: Run Phpstan
-        run: composer phpstan -- --error-format=github --no-progress
+      - name: Run Typecheck
+        run: npm run prepack
diff --git a/knip.config.js b/knip.config.js
@@ -1,4 +1,3 @@
 module.exports = {
-  entry: ['src/index.ts'],
-  ignoreDependencies: ['@semantic-release/.*?'],
+  entry: ['src/index.ts', 'release.config.mjs'],
 };
diff --git a/lefthook.yml b/lefthook.yml
@@ -3,11 +3,9 @@ pre-commit:
 
   commands:
     format:
-      glob: "*.php"
-      run: composer format
+      glob: "*.*"
+      run: npm run format
 
     check:
-      glob: "*.php"
-      run: |
-        composer rector
-        composer phpstan
+      glob: "*.*"
+      run: npm run lint:fix
diff --git a/package.json b/package.json
@@ -43,7 +43,6 @@
 		"jest": "^29.7.0",
 		"knip": "^5.43.6",
 		"prettier": "^3.1.1",
-		"semantic-release": "^24.0.0",
 		"testcontainers": "^11.0.1",
 		"ts-jest": "^29.1.0",
 		"typescript": "^5.1.3"
diff --git a/src/auth/jwtbearer.ts b/src/auth/jwtbearer.ts
diff --git a/test/api-exception.test.ts b/test/api-exception.test.ts
@@ -0,0 +1,11 @@
+import { ApiException } from '../src/api-exception.js';
+
+describe('ApiExceptionTest', () => {
+  test('testApiException', () => {
+    const e = new ApiException('Error 418', 418, { H: ['v'] }, 'body');
+    expect(e.message).toBe('Error 418');
+    expect(e.getStatusCode()).toBe(418);
+    expect(e.getResponseHeaders()).toEqual({ H: ['v'] });
+    expect(e.getResponseBody()).toBe('body');
+  });
+});
diff --git a/test/auth/client-credentials-authenticator.test.ts b/test/auth/client-credentials-authenticator.test.ts
@@ -9,8 +9,7 @@ const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
  * This test verifies that the client credentials authenticator correctly
  * refreshes its token and returns the proper Authorization header.
  */
-describe(
-  'ClientCredentialsAuthenticatorTest',
+describe('ClientCredentialsAuthenticatorTest', () => {
   withOauthContainer((oauthHost: string) => {
     test('testRefreshToken', async () => {
       await sleep(20);
@@ -38,5 +37,5 @@ describe(
         (await authenticator.refreshToken()).access_token,
       );
     }, 40000);
-  }),
-);
+  });
+});
diff --git a/test/auth/oauth-authenticator.test.ts b/test/auth/oauth-authenticator.test.ts
@@ -1,35 +1,37 @@
+// file: test/auth/oauth-authenticator.test.ts
 import { GenericContainer, StartedTestContainer, Wait } from 'testcontainers';
 
 export function withOauthContainer(
-  defineTests: (ctx: string) => void,
-): () => void {
-  return () => {
-    let ctx: {
-      oauthHost: string;
-      container: StartedTestContainer;
-    };
+  defineTests: (oauthHost: string) => void,
+): void {
+  let container: StartedTestContainer;
+  let oauthHost = '';
 
+  // Outer describe ensures test registration happens after setup
+  describe('with mock OAuth2 server', () => {
     beforeAll(async () => {
-      const container = await new GenericContainer(
+      container = await new GenericContainer(
         'ghcr.io/navikt/mock-oauth2-server:2.1.10',
       )
         .withExposedPorts(8080)
         .withWaitStrategy(Wait.forHttp('/', 8080).forStatusCode(405))
         .start();
 
-      // noinspection HttpUrlsUsage
-      const oauthHost = `http://${container.getHost()}:${container.getMappedPort(8080)}`;
-      ctx = { oauthHost, container };
+      oauthHost = `http://${container.getHost()}:${container.getMappedPort(8080)}`;
     }, 30_000);
 
     afterAll(async () => {
-      await ctx.container.stop();
+      await container.stop();
     });
 
-    describe('OAuth2 server is ready', () => {
-      beforeAll(() => {
-        defineTests(ctx.oauthHost);
-      });
+    defineTestsProxy(defineTests);
+  });
+
+  // Proxy defers test registration until after `oauthHost` is assigned
+  function defineTestsProxy(fn: (oauthHost: string) => void) {
+    beforeAll(() => {
+      if (!oauthHost) throw new Error('oauthHost not initialized');
+      fn(oauthHost);
     });
-  };
+  }
 }
diff --git a/test/auth/web-token-authenticator.test.ts b/test/auth/web-token-authenticator.test.ts
