fixed backend tests

backend/lib/io/helper.js

@@ -28,14 +28,11 @@ async function userProfiles (req, res, next) {
   try {
     const [
       canListProjects,
-      canGetSecrets,
     ] = await Promise.all([
       authorization.canListProjects(req.user),
-      authorization.canListSecrets(req.user),
     ])
     const profiles = Object.freeze({
       canListProjects,
-      canGetSecrets,
     })
     Object.defineProperty(req.user, 'profiles', {
       value: profiles,

backend/lib/io/index.js

@@ -30,6 +30,7 @@ function init (httpServer, cache) {
 
     // handle 'subscribe' events
     socket.on('subscribe', async (key, ...args) => {
+      logger.debug('Socket %s subscribed to %s', socket.id, key)
       const done = args.pop()
       try {
         await dispatcher.subscribe(socket, key, ...args)

backend/lib/watches/projects.js

@@ -11,7 +11,7 @@ const { get } = require('lodash')
 const ioHelper = require('../io/helper')
 const { isMemberOf } = require('../utils')
 
-module.exports = (io, informer, options) => {
+module.exports = (io, informer) => {
   const nsp = io.of('/')
 
   const handleEvent = async (type, newObject, oldObject) => {

backend/test/acceptance/__snapshots__/io.spec.js.snap

@@ -70,7 +70,7 @@ exports[`api events when user is "admin" should subscribe shoots for a single cl
     "code": 404,
     "details": {
       "group": "core.gardener.cloud",
-      "kind": "shoots",
+      "kind": "Shoot",
       "uid": 2,
     },
     "kind": "Status",
@@ -150,7 +150,7 @@ exports[`api events when user is "admin" should subscribe shoots for a single na
     "code": 404,
     "details": {
       "group": "core.gardener.cloud",
-      "kind": "shoots",
+      "kind": "Shoot",
       "uid": 4,
     },
     "kind": "Status",

backend/test/acceptance/io.spec.js

@@ -120,15 +120,25 @@ describe('api', function () {
 
   describe('events', function () {
     describe('when user is "foo"', () => {
+      const username = '[email protected]'
       const user = fixtures.auth.createUser({
-        id: '[email protected]',
+        id: username,
       })
+      let defaultRooms
       let args
 
       beforeEach(async () => {
+        // authorization check for `canListProjects`
+        mockRequest.mockImplementationOnce(fixtures.auth.mocks.reviewSelfSubjectAccess())
         socket = await agent.connect({
           cookie: await user.cookie,
         })
+        defaultRooms = [
+          socket.id,
+          ioHelper.sha256(username),
+        ]
+        expect(mockRequest).toHaveBeenCalledTimes(1)
+        mockRequest.mockClear()
       })
 
       it('should subscribe shoots for a single cluster', async function () {
@@ -140,7 +150,7 @@ describe('api', function () {
         expect(mockRequest.mock.calls).toMatchSnapshot()
 
         expect(getRooms(socket, nsp)).toEqual(new Set([
-          socket.id,
+          ...defaultRooms,
           'shoots;garden-foo/fooShoot',
         ]))
 
@@ -170,13 +180,13 @@ describe('api', function () {
         expect(mockRequest.mock.calls).toMatchSnapshot()
 
         expect(getRooms(socket, nsp)).toEqual(new Set([
-          socket.id,
+          ...defaultRooms,
           'shoots;garden-foo',
         ]))
 
         await unsubscribe(socket, 'shoots')
         expect(getRooms(socket, nsp)).toEqual(new Set([
-          socket.id,
+          ...defaultRooms,
         ]))
       })
 
@@ -191,7 +201,7 @@ describe('api', function () {
         expect(mockRequest.mock.calls).toMatchSnapshot()
 
         expect(getRooms(socket, nsp)).toEqual(new Set([
-          socket.id,
+          ...defaultRooms,
           'shoots;garden-foo',
           'shoots;garden-bar',
         ]))
@@ -208,7 +218,7 @@ describe('api', function () {
         expect(mockRequest.mock.calls).toMatchSnapshot()
 
         expect(getRooms(socket, nsp)).toEqual(new Set([
-          socket.id,
+          ...defaultRooms,
           'shoots:unhealthy;garden-foo',
           'shoots:unhealthy;garden-bar',
         ]))
@@ -254,14 +264,23 @@ describe('api', function () {
     })
 
     describe('when user is "admin"', () => {
+      const username = '[email protected]'
       const user = fixtures.auth.createUser({
-        id: '[email protected]',
+        id: username,
       })
+      let defaultRooms
 
       beforeEach(async () => {
+        mockRequest.mockImplementationOnce(fixtures.auth.mocks.reviewSelfSubjectAccess())
         socket = await agent.connect({
           cookie: await user.cookie,
         })
+        defaultRooms = [
+          socket.id,
+          ioHelper.sha256(username),
+        ]
+        expect(mockRequest).toHaveBeenCalledTimes(1)
+        mockRequest.mockClear()
       })
 
       it('should subscribe shoots for a single cluster', async function () {
@@ -273,7 +292,7 @@ describe('api', function () {
         expect(mockRequest.mock.calls).toMatchSnapshot()
 
         expect(getRooms(socket, nsp)).toEqual(new Set([
-          socket.id,
+          ...defaultRooms,
           'shoots;garden-foo/fooShoot',
         ]))
 
@@ -290,7 +309,7 @@ describe('api', function () {
         expect(mockRequest.mock.calls).toMatchSnapshot()
 
         expect(getRooms(socket, nsp)).toEqual(new Set([
-          socket.id,
+          ...defaultRooms,
           'shoots;garden-foo',
         ]))
 
@@ -307,7 +326,7 @@ describe('api', function () {
         expect(mockRequest.mock.calls).toMatchSnapshot()
 
         expect(getRooms(socket, nsp)).toEqual(new Set([
-          socket.id,
+          ...defaultRooms,
           'shoots:admin',
         ]))
 
@@ -324,7 +343,7 @@ describe('api', function () {
         expect(mockRequest.mock.calls).toMatchSnapshot()
 
         expect(getRooms(socket, nsp)).toEqual(new Set([
-          socket.id,
+          ...defaultRooms,
           'shoots:unhealthy:admin',
         ]))
       })
@@ -399,15 +418,18 @@ describe('api', function () {
     })
 
     it('should close the underlying connection', async function () {
+      const username = '[email protected]'
       const options = {
-        id: '[email protected]',
+        id: username,
         rti: 'abcdefg',
         refresh_at: Math.ceil(Date.now() / 1000) + 4,
       }
       const user = fixtures.auth.createUser(options)
+      mockRequest.mockImplementationOnce(fixtures.auth.mocks.reviewSelfSubjectAccess())
       socket = await agent.connect({
         cookie: await user.cookie,
       })
+      expect(mockRequest).toHaveBeenCalledTimes(1)
       expect(mockSetDisconnectTimeout).toHaveBeenCalledTimes(1)
       expect(mockSetDisconnectTimeout.mock.calls[0]).toEqual([
         expect.objectContaining({

backend/test/hooks.spec.js

@@ -88,32 +88,29 @@ describe('hooks', () => {
       const server = {}
       const ticketCache = {}
       const ioInstance = {}
+      const keys = ['leases', 'shoots', 'projects']
       let informers
       let mockCreateInformers
 
       beforeEach(() => {
-        informers = {
-          leases: {
-            run: jest.fn(),
-            store: {
-              untilHasSynced: Promise.resolve('leases'),
+        informers = keys.reduce((acc, key) => {
+          return Object.assign(acc, {
+            [key]: {
+              run: jest.fn(),
+              store: {
+                untilHasSynced: Promise.resolve(key),
+              },
             },
-          },
-          shoots: {
-            run: jest.fn(),
-            store: {
-              untilHasSynced: Promise.resolve('shoots'),
-            },
-          },
-        }
+          })
+        }, {})
         hooks.constructor.createInformers = mockCreateInformers = jest.fn(() => informers)
         cache.initialize = jest.fn()
         cache.getTicketCache = jest.fn(() => ticketCache)
         io.mockReturnValue(ioInstance)
       })
 
       it('should create and run informers, create io instance and initialize cache and watches', async function () {
-        await expect(hooks.beforeListen(server)).resolves.toEqual(['leases', 'shoots'])
+        await expect(hooks.beforeListen(server)).resolves.toEqual(keys)
 
         expect(mockCreateInformers).toHaveBeenCalledTimes(1)
         expect(mockCreateInformers.mock.calls[0]).toHaveLength(1)