chore: housekeeping re cds^9 (#30)

- [x] make 9 jobs required for merge

---------

Co-authored-by: heikowitteborg <[email protected]>
Co-authored-by: d049904 <[email protected]>

Author: 3 people

.github/workflows/ci.yml

@@ -1,4 +1,6 @@
 name: CI
+permissions:
+  contents: read
 
 on:
   workflow_dispatch:
@@ -8,20 +10,27 @@ on:
     branches: [main]
 
 jobs:
-  build:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm i
+      - run: npm run lint
+  test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         node-version: [22.x, 20.x]
+        cds-version: [9, 8]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
-      - run: npm i -g @sap/cds-dk
+      - run: npm i -g @sap/cds-dk@${{ matrix.cds-version }}
       - run: npm i
+      - run: if [ ${{ matrix.cds-version }} -eq 8 ]; then npm i -f @sap/cds@8 @cap-js/sqlite@1; fi
       - run: cds v
-      - run: npm run lint
       - run: npm run test

.gitignore

@@ -1,3 +1,6 @@
+# macOS
+.DS_Store
+
 # Logs
 logs
 *.log

jest.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  transform: {},
+  moduleNameMapper: {
+    '^@sap/xssec$': '<rootDir>/test/__mocks__/xssec.js'
+  }
+}

package.json

@@ -22,6 +22,8 @@
   },
   "devDependencies": {
     "@cap-js/event-broker": "file:.",
+    "@cap-js/cds-test": ">=0",
+    "@cap-js/sqlite": ">=1",
     "@sap-cloud-sdk/resilience": "^4.0.0",
     "@sap/xssec": "^4.2.4"
   },

test/__mocks__/xssec.js

@@ -0,0 +1,31 @@
+class IdentityService {
+  constructor(credentials, config) {
+    this.credentials = credentials
+    this.config = config
+  }
+}
+
+class ValidationError extends Error {
+  constructor(message = 'Invalid token') {
+    super(message)
+    this.name = 'ValidationError'
+  }
+}
+
+module.exports = {
+  v3: 'dummy',
+  createSecurityContext(_, contextConfig) {
+    contextConfig.jwt ??= contextConfig.req?.headers?.authorization?.split(' ')[1]
+    if (contextConfig.jwt !== 'dummyToken') throw new ValidationError()
+    const tokenInfoObj = { sub: 'eb-client-id', azp: 'eb-client-id' }
+    const dummyTokenInfo = {
+      getPayload: () => tokenInfoObj,
+      getClientId: () => 'eb-client-id',
+      getZoneId: () => 'dummyZoneId',
+      ...tokenInfoObj
+    }
+    return { token: dummyTokenInfo }
+  },
+  IdentityService,
+  errors: { ValidationError }
+}

test/event-broker-ias-multitenant/event-broker.test.js

@@ -4,21 +4,6 @@ const DATA = { key1: 1, value1: 1 }
 const HEADERS = { keyHeader1: 1, valueHeader1: 1 }
 let messaging, ownSrv, extSrv
 
-jest.mock('@sap/xssec', () => ({
-  createSecurityContext(token, _credentials, id, cb) {
-    if (token !== 'dummyToken') return cb(null, null, null)
-    const dummyContext = {}
-    const tokenInfoObj = { sub: 'eb-client-id', azp: 'eb-client-id' }
-    const dummyTokenInfo = {
-      getPayload: () => tokenInfoObj,
-      getClientId: () => 'eb-client-id',
-      getZoneId: () => 'dummyZoneId',
-      ...tokenInfoObj
-    }
-    return cb(null, dummyContext, dummyTokenInfo)
-  }
-}))
-
 const mockHttps = {
   handleHttpReq: () => {
     throw new Error('must be implemented by test')
@@ -120,14 +105,14 @@ describe('event-broker service with ias auth', () => {
   test('request without JWT token', async () => {
     await expect(POST(`/-/cds/event-broker/webhook`)).rejects.toHaveProperty(
       'message',
-      'Request failed with status code 401'
+      expect.stringMatching('Request failed with status code 401')
     )
   })
 
   test('request with invalid JWT token', async () => {
     await expect(
       POST(`/-/cds/event-broker/webhook`, { some: 'data' }, { headers: { Authorization: 'Bearer invalidtoken' } })
-    ).rejects.toHaveProperty('message', 'Request failed with status code 401')
+    ).rejects.toHaveProperty('message', expect.stringMatching('Request failed with status code 401'))
   })
 
   test('Event broker mock event - messaging service ', done => {

test/event-broker-ias-single-tenant/event-broker.test.js

@@ -4,21 +4,6 @@ const DATA = { key1: 1, value1: 1 }
 const HEADERS = { keyHeader1: 1, valueHeader1: 1 }
 let messaging, ownSrv, extSrv, credentials
 
-jest.mock('@sap/xssec', () => ({
-  createSecurityContext(token, _credentials, id, cb) {
-    if (token !== 'dummyToken') return cb(null, null, null)
-    const dummyContext = {}
-    const tokenInfoObj = { sub: 'eb-client-id', azp: 'eb-client-id' }
-    const dummyTokenInfo = {
-      getPayload: () => tokenInfoObj,
-      getClientId: () => 'eb-client-id',
-      getZoneId: () => 'dummyZoneId',
-      ...tokenInfoObj
-    }
-    return cb(null, dummyContext, dummyTokenInfo)
-  }
-}))
-
 const mockHttps = {
   handleHttpReq: () => {
     throw new Error('must be implemented by test')
@@ -89,14 +74,14 @@ describe('event-broker service with ias auth for single tenant scenario', () =>
   test('request without JWT token', async () => {
     await expect(POST(`/-/cds/event-broker/webhook`)).rejects.toHaveProperty(
       'message',
-      'Request failed with status code 401'
+      expect.stringMatching('Request failed with status code 401')
     )
   })
 
   test('request with invalid JWT token', async () => {
     await expect(
       POST(`/-/cds/event-broker/webhook`, { some: 'data' }, { headers: { Authorization: 'Bearer invalidtoken' } })
-    ).rejects.toHaveProperty('message', 'Request failed with status code 401')
+    ).rejects.toHaveProperty('message', expect.stringMatching('Request failed with status code 401'))
   })
 
   test('Event broker mock event - messaging service ', done => {

test/event-broker-x509-multitenant/event-broker.test.js

@@ -102,7 +102,7 @@ describe('event-broker service', () => {
   test('request without client cert', async () => {
     await expect(POST(`/-/cds/event-broker/webhook`)).rejects.toHaveProperty(
       'message',
-      'Request failed with status code 401'
+      expect.stringMatching('Request failed with status code 401')
     )
   })