Updated CSR Modal & Service login Certificate Modal (#59)

* Updated CSR Modal - Removed the certificate type option from the modal - Only admin can upload Service login Certificate Signed-off-by: Kenneth Fullbright <[email protected]>
ibm-openbmc · Jun 30, 2022 · fe8a5a4 · fe8a5a4
1 parent b787ab4
commit fe8a5a4
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 10 deletions.
diff --git a/src/components/Mixins/CurrentUserMixin.js b/src/components/Mixins/CurrentUserMixin.js
@@ -0,0 +1,12 @@
+const CurrentUserMixin = {
+  computed: {
+    currentUser() {
+      const value = this.$store.getters['userManagement/allUsers'].filter(
+        (user) => user.Id === this.$store.getters['global/username']
+      )[0];
+      return value;
+    },
+  },
+};
+
+export default CurrentUserMixin;
diff --git a/src/views/SecurityAndAccess/Certificates/Certificates.vue b/src/views/SecurityAndAccess/Certificates/Certificates.vue
@@ -91,7 +91,11 @@
       </b-col>
     </b-row>
     <!-- Modals -->
-    <modal-upload-certificate :certificate="modalCertificate" @ok="onModalOk" />
+    <modal-upload-certificate
+      :certificate="modalCertificate"
+      :user-role-id="userRoleId"
+      @ok="onModalOk"
+    />
     <modal-generate-csr />
   </b-container>
 </template>
@@ -106,6 +110,7 @@ import TableRowAction from '@/components/Global/TableRowAction';
 import StatusIcon from '@/components/Global/StatusIcon';
 import Alert from '@/components/Global/Alert';
 import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import CurrentUserMixin from '@/components/Mixins/CurrentUserMixin';
 import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
 export default {
   name: 'Certificates',
@@ -120,13 +125,14 @@ export default {
     StatusIcon,
     TableRowAction,
   },
-  mixins: [BVToastMixin, LoadingBarMixin],
+  mixins: [BVToastMixin, CurrentUserMixin, LoadingBarMixin],
   beforeRouteLeave(to, from, next) {
     this.hideLoader();
     next();
   },
   data() {
     return {
+      userRoleId: null,
       isBusy: true,
       modalCertificate: null,
       fields: [
@@ -215,7 +221,12 @@ export default {
       this.$store.dispatch('global/getBmcTime'),
       this.$store.dispatch('certificates/getAcfCertificate'),
       this.$store.dispatch('certificates/getCertificates'),
-    ]).finally(() => this.endLoader());
+      this.$store.dispatch('userManagement/getUsers'),
+    ]).finally(() => {
+      this.endLoader();
+      this.isBusy = false;
+      this.userRoleId = this.currentUser.RoleId;
+    });
   },
   methods: {
     onTableRowAction(event, rowItem) {

diff --git a/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue b/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
@@ -406,7 +406,11 @@ export default {
         keyBitLength: null,
       },
       certificateOptions: CERTIFICATE_TYPES.reduce((arr, cert) => {
-        if (cert.type === 'TrustStore Certificate') return arr;
+        if (
+          cert.type === 'TrustStore Certificate' ||
+          cert.type === 'ServiceLogin Certificate'
+        )
+          return arr;
         arr.push({
           text: cert.label,
           value: cert.type,

diff --git a/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue b/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
@@ -105,6 +105,10 @@ export default {
         );
       },
     },
+    userRoleId: {
+      type: String,
+      default: null,
+    },
   },
   data() {
     return {
@@ -119,12 +123,25 @@ export default {
       return this.$store.getters['certificates/availableUploadTypes'];
     },
     certificateOptions() {
-      return this.certificateTypes.map(({ type, label }) => {
-        return {
-          text: label,
-          value: type,
-        };
-      });
+      return this.certificateTypes
+        .filter((certificate) => {
+          if (
+            certificate.type === 'ServiceLogin Certificate' &&
+            this.isNotAdmin
+          ) {
+            return certificate.type !== 'ServiceLogin Certificate';
+          }
+          return certificate === certificate;
+        })
+        .map(({ type, label }) => {
+          return {
+            text: label,
+            value: type,
+          };
+        });
+    },
+    isNotAdmin() {
+      return this.userRoleId !== 'Administrator';
     },
   },
   watch: {