PR Feedback #1

backend/lib/routes/members.js

@@ -56,23 +56,21 @@ router.route('/:name')
       next(err)
     }
   })
-  .delete(async (req, res, next) => {
+  .post(async (req, res, next) => {
     try {
       const user = req.user
-      const namespace = req.params.namespace
-      const name = req.params.name
-      res.send(await members.remove({ user, namespace, name }))
+      const { namespace, name } = req.params
+      res.send(await members.rotateSecret({ user, namespace, name }))
     } catch (err) {
       next(err)
     }
   })
-
-router.route('/:name/secret')
   .delete(async (req, res, next) => {
     try {
       const user = req.user
-      const { namespace, name } = req.params
-      res.send(await members.removeSecret({ user, namespace, name }))
+      const namespace = req.params.namespace
+      const name = req.params.name
+      res.send(await members.remove({ user, namespace, name }))
     } catch (err) {
       next(err)
     }

backend/lib/services/members/MemberManager.js

@@ -7,7 +7,7 @@
 'use strict'
 
 const _ = require('lodash')
-const { NotFound, Conflict, UnprocessableEntity, MethodNotAllowed } = require('http-errors')
+const { NotFound, Conflict, UnprocessableEntity } = require('http-errors')
 const { dumpKubeconfig } = require('@gardener-dashboard/kube-config')
 
 const config = require('../../config')
@@ -108,8 +108,6 @@ class MemberManager {
     }
 
     await this.deleteServiceAccountSecret(item)
-
-    return this.subjectList.members
   }
 
   setItemRoles (item, roles) {
@@ -187,7 +185,7 @@ class MemberManager {
   async deleteServiceAccountSecret (item) {
     const { namespace } = Member.parseUsername(item.id)
     if (namespace !== this.namespace) {
-      return
+      throw new UnprocessableEntity(`ServiceAccount namespace ${namespace} does not match project namespace this.namespace`)
     }
 
     const name = _

backend/lib/services/members/index.js

@@ -33,7 +33,7 @@ exports.remove = async function ({ user, namespace, name }) {
   return memberManager.delete(name)
 }
 
-exports.removeSecret = async function ({ user, namespace, name }) {
+exports.rotateSecret = async function ({ user, namespace, name }) {
   const memberManager = await MemberManager.create(user, namespace)
-  return memberManager.deleteSecret(name)
+  return memberManager.rotateServiceAccountSecret(name)
 }

frontend/src/store/modules/members.js

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import { getMembers, addMember, updateMember, deleteMember, deleteServiceAccountSecret } from '@/utils/api'
+import { getMembers, addMember, updateMember, deleteMember, rotateServiceAccountSecret } from '@/utils/api'
 
 // initial state
 const state = {
@@ -44,8 +44,7 @@ const actions = {
   },
   async rotateServiceAccountSecret ({ commit, rootState }, name) {
     const namespace = rootState.namespace
-    const res = await deleteServiceAccountSecret({ namespace, name })
-    commit('RECEIVE', res.data)
+    await rotateServiceAccountSecret({ namespace, name })
   }
 }
 

frontend/src/utils/api.js

@@ -216,10 +216,10 @@ export function deleteMember ({ namespace, name }) {
   return deleteResource(`/api/namespaces/${namespace}/members/${name}`)
 }
 
-export function deleteServiceAccountSecret ({ namespace, name }) {
+export function rotateServiceAccountSecret ({ namespace, name }) {
   namespace = encodeURIComponent(namespace)
   name = encodeURIComponent(name)
-  return deleteResource(`/api/namespaces/${namespace}/members/${name}/secret`)
+  return createResource(`/api/namespaces/${namespace}/members/${name}`)
 }
 
 /* User */

frontend/src/views/Members.vue

@@ -375,8 +375,7 @@ export default {
       'addMember',
       'deleteMember',
       'rotateServiceAccountSecret',
-      'setError',
-      'set'
+      'setError'
     ]),
     openUserAddDialog () {
       this.userAddDialog = true