From 52c7d84904f4781f132161728d0204889b1db729 Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 16:07:48 -0400
Subject: [PATCH 01/12] Disabling the users page for normal users

---
 .../src/components/Breadcrumb.vue              | 10 +++++++++-
 .../src/components/admin-portal/TenantUser.vue | 18 ++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/custos-demo-gateway/src/components/Breadcrumb.vue b/custos-demo-gateway/src/components/Breadcrumb.vue
index d5006990..f5031f82 100644
--- a/custos-demo-gateway/src/components/Breadcrumb.vue
+++ b/custos-demo-gateway/src/components/Breadcrumb.vue
@@ -2,7 +2,9 @@
   <b-breadcrumb style="background: none;padding: 0px 0px;">
     <router-link v-for="(link, index) in links" :key="index" :to="link.to"
                  v-slot="{ href, route, navigate, isActive,isExactActive }" tag="">
-      <b-breadcrumb-item :href="href" :active="isExactActive" @click="navigate">{{ link.name }}</b-breadcrumb-item>
+      <b-breadcrumb-item :disabled="link.disabled === true" :href="href" :active="isExactActive" @click="navigate">
+        {{ link.name }}
+      </b-breadcrumb-item>
     </router-link>
   </b-breadcrumb>
 </template>
@@ -23,4 +25,10 @@ export default {
 ol {
   margin: 0px;
 }
+
+a.disabled, a.disabled:hover {
+  text-decoration: line-through;
+  color: #6c757d;
+  cursor: initial;
+}
 </style>
\ No newline at end of file
diff --git a/custos-demo-gateway/src/components/admin-portal/TenantUser.vue b/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
index 8ad47509..0b731b52 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
@@ -249,12 +249,26 @@ export default {
     user() {
       return this.$store.getters["user/getUser"]({clientId: this.clientId, username: this.username})
     },
+    tenant() {
+      return this.$store.getters["tenant/getTenant"]({clientId: this.clientId});
+    },
     breadcrumbLinks() {
-      const _breadcrumbLinks = [{to: `/tenants/${this.clientId}/users`, name: "Users"}];
+      const _breadcrumbLinks = [];
+
+      if (this.tenant) {
+        _breadcrumbLinks.push({
+          to: `/tenants/${this.clientId}/users`,
+          name: "Users",
+          disabled: !this.tenant.hasAdminPrivileges
+        });
+      }
+
       if (this.user) {
+        // alert("this.tenant.hasAdminPrivileges " + this.tenant.hasAdminPrivileges)
         _breadcrumbLinks.push({
           to: `/tenants/${this.clientId}/users/${this.username}`,
-          name: this.title
+          name: this.title,
+          disabled: !this.tenant.hasAdminPrivileges
         });
       }
 

From e1041bd7b7ebe0815af6f7e9385be4ba09a345c5 Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 16:08:16 -0400
Subject: [PATCH 02/12] Change input field validation regexes

---
 .../src/components/admin-portal/NewTenant.vue        | 11 ++++++++---
 .../src/components/admin-portal/TenantProfile.vue    | 11 ++++++++---
 .../src/components/admin-portal/TenantUser.vue       | 12 ++++++++----
 .../src/components/validation-regex.js               |  4 +++-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/custos-demo-gateway/src/components/admin-portal/NewTenant.vue b/custos-demo-gateway/src/components/admin-portal/NewTenant.vue
index d42adb46..3760530d 100644
--- a/custos-demo-gateway/src/components/admin-portal/NewTenant.vue
+++ b/custos-demo-gateway/src/components/admin-portal/NewTenant.vue
@@ -250,7 +250,12 @@
 import store from "../../new-service/store";
 import {custosService} from "@/new-service/store/util/custos.util";
 import TenantHome from "@/components/admin-portal/TenantHome";
-import {VALIDATION_REGEX_DOMAIN, VALIDATION_REGEX_EMAIL, VALIDATION_REGEX_URI} from "@/components/validation-regex";
+import {
+  VALIDATION_REGEX_DOMAIN,
+  VALIDATION_REGEX_EMAIL,
+  VALIDATION_REGEX_FIRST_NAME, VALIDATION_REGEX_LAST_NAME,
+  VALIDATION_REGEX_URI
+} from "@/components/validation-regex";
 
 export default {
   components: {TenantHome},
@@ -328,8 +333,8 @@ export default {
     isValid() {
       return {
         username: !!this.username && this.username.length >= 3,
-        firstName: !!this.firstName && this.firstName.length > 0,
-        lastName: !!this.lastName && this.lastName.length > 0,
+        firstName: !!this.firstName && VALIDATION_REGEX_FIRST_NAME.test(this.firstName),
+        lastName: !!this.lastName && VALIDATION_REGEX_LAST_NAME.test(this.lastName),
         email: !!this.email && VALIDATION_REGEX_EMAIL.test(this.email),
         password: !!this.password && /[a-z]/.test(this.password) && // checks for a-z
             /[0-9]/.test(this.password) && // checks for 0-9
diff --git a/custos-demo-gateway/src/components/admin-portal/TenantProfile.vue b/custos-demo-gateway/src/components/admin-portal/TenantProfile.vue
index 8b311f0f..629c2500 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantProfile.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantProfile.vue
@@ -229,7 +229,12 @@
 import store from "../../new-service/store";
 import TenantHome from "@/components/admin-portal/TenantHome";
 import {custosService} from "@/new-service/store/util/custos.util";
-import {VALIDATION_REGEX_DOMAIN, VALIDATION_REGEX_EMAIL, VALIDATION_REGEX_URI} from "@/components/validation-regex";
+import {
+  VALIDATION_REGEX_DOMAIN,
+  VALIDATION_REGEX_EMAIL,
+  VALIDATION_REGEX_FIRST_NAME, VALIDATION_REGEX_LAST_NAME,
+  VALIDATION_REGEX_URI
+} from "@/components/validation-regex";
 
 export default {
   name: "TenantProfile",
@@ -299,8 +304,8 @@ export default {
     isValid() {
       return {
         username: !!this.username && this.username.length >= 3,
-        firstName: !!this.firstName && this.firstName.length > 0,
-        lastName: !!this.lastName && this.lastName.length > 0,
+        firstName: !!this.firstName && VALIDATION_REGEX_FIRST_NAME.test(this.firstName),
+        lastName: !!this.lastName && VALIDATION_REGEX_LAST_NAME.test(this.lastName),
         email: !!this.email && VALIDATION_REGEX_EMAIL.test(this.email),
 
         tenantName: !!this.tenantName && this.tenantName.length > 0,
diff --git a/custos-demo-gateway/src/components/admin-portal/TenantUser.vue b/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
index 0b731b52..d8b11f5e 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
@@ -1,5 +1,5 @@
 <template>
-  <TenantHome :title="title" :breadcrumb-links="breadcrumbLinks">
+  <TenantHome :title="title" :breadcrumb-links="breadcrumbLinks" :errors="errors">
     <template #header-right>
       <div style="font-size: 14px; font-weight: 500;">
         <b-icon icon="envelope"></b-icon>
@@ -188,7 +188,11 @@
 import TenantHome from "@/components/admin-portal/TenantHome";
 import store from "@/new-service/store";
 import TableOverlayInfo from "@/components/table-overlay-info";
-import {VALIDATION_REGEX_EMAIL} from "@/components/validation-regex";
+import {
+  VALIDATION_REGEX_EMAIL,
+  VALIDATION_REGEX_FIRST_NAME,
+  VALIDATION_REGEX_LAST_NAME
+} from "@/components/validation-regex";
 // import TableOverlayInfo from "@/components/table-overlay-info";
 
 export default {
@@ -225,8 +229,8 @@ export default {
     isValid() {
       return {
         username: !!this.username && this.username.length > 0,
-        firstName: !!this.firstName && this.firstName.length > 0,
-        lastName: !!this.lastName && this.lastName.length > 0,
+        firstName: !!this.firstName && VALIDATION_REGEX_FIRST_NAME.test(this.firstName),
+        lastName: !!this.lastName && VALIDATION_REGEX_LAST_NAME.test(this.lastName),
         email: !!this.email && VALIDATION_REGEX_EMAIL.test(this.email),
         realmRoles: true,
         clientRoles: true,
diff --git a/custos-demo-gateway/src/components/validation-regex.js b/custos-demo-gateway/src/components/validation-regex.js
index 7921fcaf..841adffd 100644
--- a/custos-demo-gateway/src/components/validation-regex.js
+++ b/custos-demo-gateway/src/components/validation-regex.js
@@ -1,3 +1,5 @@
 export const VALIDATION_REGEX_EMAIL = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9_.-]+$/;
 export const VALIDATION_REGEX_URI = /^(http|https):\/\/.+$/;
-export const VALIDATION_REGEX_DOMAIN = /^[a-zA-Z0-9_-]+\.[a-zA-Z0-9_.-]+$/;
\ No newline at end of file
+export const VALIDATION_REGEX_DOMAIN = /^[a-zA-Z0-9_-]+\.[a-zA-Z0-9_.-]+$/;
+export const VALIDATION_REGEX_FIRST_NAME = /^[ ,.a-zA-Z0-9_-]{1,50}$/;
+export const VALIDATION_REGEX_LAST_NAME = /^[ ,.a-zA-Z0-9_-]{1,50}$/;
\ No newline at end of file

From 2f7fd1eabca10874a8808077a16aa355b7f7db09 Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 16:20:41 -0400
Subject: [PATCH 03/12] Fixed the save button in user profile page

---
 .../components/admin-portal/TenantUser.vue    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/custos-demo-gateway/src/components/admin-portal/TenantUser.vue b/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
index d8b11f5e..72556e8d 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
@@ -1,12 +1,17 @@
 <template>
   <TenantHome :title="title" :breadcrumb-links="breadcrumbLinks" :errors="errors">
     <template #header-right>
-      <div style="font-size: 14px; font-weight: 500;">
-        <b-icon icon="envelope"></b-icon>
-        {{ email }}
-        <br/>
-        <b-icon icon="person"></b-icon>
-        {{ username }}
+      <div style="display: flex; flex-direction: row;">
+        <div style="font-size: 14px; font-weight: 500;padding-right: 20px;">
+          <b-icon icon="envelope"></b-icon>
+          {{ email }}
+          <br/>
+          <b-icon icon="person"></b-icon>
+          {{ username }}
+        </div>
+        <div>
+          <b-button variant="primary" v-on:click="onClickSave">Save</b-button>
+        </div>
       </div>
     </template>
 
@@ -176,10 +181,6 @@
         </div>
 
       </div>
-      <div class="p-2 pt-4">
-        <b-button variant="primary" size="sm" v-on:click="onClickSave">Save</b-button>
-        <b-button variant="secondary" size="sm" class="ml-3">Cancel</b-button>
-      </div>
     </b-overlay>
   </TenantHome>
 </template>

From 556d263b0a9e5c7e562ff6086ce25c758fd7aff1 Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 17:35:40 -0400
Subject: [PATCH 04/12] Enabling SSH secret types

---
 .../components/admin-portal/TenantEntity.vue  |  2 +-
 .../block/entity-view/entity-view-secret.vue  | 45 ++++++++++++--
 .../block/entity-view/entity-view.vue         |  7 ++-
 .../custos-service-entities-secrets.js        | 62 +++++++++++++++++++
 .../index.js}                                 | 33 ++++++++--
 .../service/custos-service/index.js           |  3 +-
 .../new-service/store/modules/entity.store.js | 10 ++-
 7 files changed, 147 insertions(+), 15 deletions(-)
 create mode 100644 custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js
 rename custos-demo-gateway/src/new-service/service/custos-service/{custos-service-entities.js => custos-service-entities/index.js} (68%)

diff --git a/custos-demo-gateway/src/components/admin-portal/TenantEntity.vue b/custos-demo-gateway/src/components/admin-portal/TenantEntity.vue
index 47a70fa2..8bcf591a 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantEntity.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantEntity.vue
@@ -4,7 +4,7 @@
       <b-overlay :show="processingAddNewUsers" rounded spinner-small spinner-variant="primary" class="d-inline-block">
         <b-button variant="primary" v-b-modal="`modal-select-users-or-groups`">Share</b-button>
       </b-overlay>
-      <modal-share-entity :client-id="clientId" :entity-id="entityId"
+      <modal-share-entity v-if="entity" :client-id="clientId" :entity-id="entityId"
                           :modal-id="`modal-select-users-or-groups`"
                           :title="`Share Entity '${entity.name}'`"
                           v-on:close="refreshData"/>
diff --git a/custos-demo-gateway/src/components/admin-portal/block/entity-view/entity-view-secret.vue b/custos-demo-gateway/src/components/admin-portal/block/entity-view/entity-view-secret.vue
index f272973b..6d29e944 100644
--- a/custos-demo-gateway/src/components/admin-portal/block/entity-view/entity-view-secret.vue
+++ b/custos-demo-gateway/src/components/admin-portal/block/entity-view/entity-view-secret.vue
@@ -1,17 +1,54 @@
 <template>
   <div>
-    <div>Secret Entity. TBA</div>
-    <entity-view-default :entity-id="entityId" :client-id="clientId"/>
+    <div style="flex: 1;" class="ml-2">
+      <label class="form-label" for="passphrase">Passphrase</label>
+      <b-form-textarea
+          v-model="entity.ext.passphrase"
+          id="passphrase"
+          trim
+          size="sm"
+          readonly>
+      </b-form-textarea>
+      <b-form-invalid-feedback>
+      </b-form-invalid-feedback>
+    </div>
+
+    <div style="flex: 1;" class="ml-2">
+      <label class="form-label" for="public_key">Public Key</label>
+      <b-form-textarea
+          v-model="entity.ext.public_key"
+          id="public_key"
+          trim
+          size="sm"
+          readonly
+          style="min-height: 100px;">
+      </b-form-textarea>
+      <b-form-invalid-feedback>
+      </b-form-invalid-feedback>
+    </div>
+
+    <div style="flex: 1;" class="ml-2">
+      <label class="form-label" for="private_key">Private Key</label>
+      <b-form-textarea
+          v-model="entity.ext.private_key"
+          id="private_key"
+          trim
+          size="sm"
+          readonly
+          style="min-height: 300px;">
+      </b-form-textarea>
+      <b-form-invalid-feedback>
+      </b-form-invalid-feedback>
+    </div>
+
   </div>
 </template>
 
 <script>
 import store from "@/new-service/store";
-import EntityViewDefault from "@/components/admin-portal/block/entity-view/entity-view-default";
 
 export default {
   name: "entity-view-secret",
-  components: {EntityViewDefault},
   store: store,
   props: {
     clientId: {},
diff --git a/custos-demo-gateway/src/components/admin-portal/block/entity-view/entity-view.vue b/custos-demo-gateway/src/components/admin-portal/block/entity-view/entity-view.vue
index 98aa8f6a..f9fe4943 100644
--- a/custos-demo-gateway/src/components/admin-portal/block/entity-view/entity-view.vue
+++ b/custos-demo-gateway/src/components/admin-portal/block/entity-view/entity-view.vue
@@ -1,7 +1,10 @@
 <template>
   <table-overlay-info :rows="5" :columns="1" :data="entity ? [entity]: null">
-    <entity-view-secret v-if="entity.type === 'SECRET'" :entity-id="entityId" :client-id="clientId"/>
-    <entity-view-default v-else :entity-id="entityId" :client-id="clientId"/>
+    <div v-if="entity">
+      <entity-view-default :entity-id="entityId" :client-id="clientId"/>
+
+      <entity-view-secret v-if="entity.type === 'SECRET'" :entity-id="entityId" :client-id="clientId"/>
+    </div>
   </table-overlay-info>
 </template>
 
diff --git a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js
new file mode 100644
index 00000000..27f78a47
--- /dev/null
+++ b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js
@@ -0,0 +1,62 @@
+import CustosService from "../index";
+
+export default class CustosServiceEntitiesSecrets {
+    /**
+     * @type {CustosService}
+     */
+    _custosService = null;
+
+    constructor(custosService) {
+        this._custosService = custosService;
+    }
+
+    get custosService() {
+        return this._custosService;
+    }
+
+    async createSecret({clientId, description, ownerId}) {
+        const axiosInstance = await this.custosService.getAxiosInstanceWithClientAuthorization({clientId});
+        const {data: {token}} = await axiosInstance.post(
+            `${CustosService.ENDPOINTS.SECRETS}/secret/ssh`,
+            {
+                "metadata": {
+                    "client_id": clientId,
+                    "description": description,
+                    "owner_id": ownerId
+                }
+            }
+        );
+        const entityId = token;
+        return entityId;
+    }
+
+    async getSecret({clientId, entityId}) {
+        const axiosInstance = await this.custosService.getAxiosInstanceWithClientAuthorization({clientId});
+        const {data} = await axiosInstance.get(
+            `${CustosService.ENDPOINTS.SECRETS}/secret/ssh`,
+            {
+                params: {
+                    "client_id": clientId,
+                    "token": entityId
+                }
+            }
+        );
+
+        return data;
+    }
+
+    async getSecretMetadata({clientId, entityId = []}) {
+        const axiosInstance = await this.custosService.getAxiosInstanceWithClientAuthorization({clientId});
+        const {data: {metadata}} = await axiosInstance.get(
+            `${CustosService.ENDPOINTS.SECRETS}/secret/summaries`,
+            {
+                params: {
+                    client_id: clientId,
+                    accessible_tokens: entityId
+                }
+            }
+        );
+
+        return metadata[0];
+    }
+}
diff --git a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities.js b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/index.js
similarity index 68%
rename from custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities.js
rename to custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/index.js
index b7005de4..eb8791ae 100644
--- a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities.js
+++ b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/index.js
@@ -1,4 +1,5 @@
-import CustosService from "./index";
+import CustosService from "../index";
+import CustosServiceEntitiesSecrets from "./custos-service-entities-secrets";
 
 export default class CustosEntities {
     /**
@@ -6,15 +7,29 @@ export default class CustosEntities {
      */
     _custosService = null;
 
+    /**
+     * @type {CustosServiceEntitiesSecrets}
+     */
+    _secrets = null;
+
     constructor(custosService) {
         this._custosService = custosService;
+        this._secrets = new CustosServiceEntitiesSecrets(this.custosService);
     }
 
     get custosService() {
         return this._custosService;
     }
 
+    get secrets() {
+        return this._secrets;
+    }
+
     async createEntity({clientId, entityId, name, description, type, ownerId}) {
+        if (type === "SECRET") {
+            entityId = await this.custosService.entities.secrets.createSecret({clientId, description, ownerId})
+        }
+
         const axiosInstance = await this.custosService.getAxiosInstanceWithClientAuthorization({clientId});
         return axiosInstance.post(
             `${CustosService.ENDPOINTS.SHARING}/entity`,
@@ -58,17 +73,27 @@ export default class CustosEntities {
                 "client_id": clientId,
                 "owner_id": ownerId
             }
-        ).then(({data: {entity_array}}) => entity_array);
+            // ).then(({data: entity_array}) => entity_array);
+        ).then((res) => {
+            console.log(" $$$$$$$ getEntities ", res);
+            return res.data.entity_array;
+        });
     }
 
     async getEntity({clientId, entityId}) {
         const axiosInstance = await this.custosService.getAxiosInstanceWithClientAuthorization({clientId});
-        return axiosInstance.get(
+        const {data} = await axiosInstance.get(
             `${CustosService.ENDPOINTS.SHARING}/entity`,
             {
                 params: {"entity.id": entityId}
             }
-        ).then(({data}) => data);
+        );
+        if (data.type === "SECRET") {
+            data.metadata = await this.custosService.entities.secrets.getSecretMetadata({clientId, entityId: data.id});
+            data.ext = await this.custosService.entities.secrets.getSecret({clientId, entityId: data.id});
+        }
+
+        return data;
     }
 
 
diff --git a/custos-demo-gateway/src/new-service/service/custos-service/index.js b/custos-demo-gateway/src/new-service/service/custos-service/index.js
index 002f9156..9675e6a7 100644
--- a/custos-demo-gateway/src/new-service/service/custos-service/index.js
+++ b/custos-demo-gateway/src/new-service/service/custos-service/index.js
@@ -17,7 +17,8 @@ export default class CustosService {
         USERS: "user-management/v1.0.0",
         GROUPS: "group-management/v1.0.0",
         TENANTS: "tenant-management/v1.0.0",
-        SHARING: "sharing-management/v1.0.0"
+        SHARING: "sharing-management/v1.0.0",
+        SECRETS: "resource-secret-management/v1.0.0"
     };
 
     /**
diff --git a/custos-demo-gateway/src/new-service/store/modules/entity.store.js b/custos-demo-gateway/src/new-service/store/modules/entity.store.js
index d958d7a1..b3621733 100644
--- a/custos-demo-gateway/src/new-service/store/modules/entity.store.js
+++ b/custos-demo-gateway/src/new-service/store/modules/entity.store.js
@@ -50,7 +50,9 @@ const actions = {
             updatedAt: new Date(parseInt(entity.updated_at)).toLocaleString(),
             sharedCount: entity.shared_count,
             fullText: entity.full_text,
-            binaryData: entity.binary_data
+            binaryData: entity.binary_data,
+            metadata: entity.metadata,
+            ext: entity.ext
         });
     },
     async createEntity(obj, {clientId, entityId, name, description, type, ownerId}) {
@@ -62,7 +64,7 @@ const actions = {
 }
 
 const mutations = {
-    SET_ENTITY(state, {clientId, entityId, type, name, description, parentId, ownerId, createdAt, updatedAt, sharedCount, fullText, binaryData}) {
+    SET_ENTITY(state, {clientId, entityId, type, name, description, parentId, ownerId, createdAt, updatedAt, sharedCount, fullText, binaryData, metadata = {}, ext = {}}) {
         state.entityMap = {
             ...state.entityMap,
             [entityId]: {
@@ -77,7 +79,9 @@ const mutations = {
                 updatedAt,
                 sharedCount,
                 fullText,
-                binaryData
+                binaryData,
+                metadata,
+                ext
             }
         };
     },

From d13a7db5a24af0f7320b6631d22e912ff3edb4bd Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 17:52:35 -0400
Subject: [PATCH 05/12] Disable some tenant roles

---
 .../src/components/admin-portal/TenantUser.vue              | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/custos-demo-gateway/src/components/admin-portal/TenantUser.vue b/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
index 72556e8d..7649cab4 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantUser.vue
@@ -212,6 +212,8 @@ export default {
       clientRoles: [],
       attributes: null, // [{key: "a", values: ["1", "2", "3"]}, {key: "b", values: ["fhfhf"]}]
 
+      rolesToBeDisabled: ["uma_authorization", "offline_access"],
+
       inputFieldsList: ["firstName", "lastName", "email", "realmRoles", "clientRoles", "attributes"]
     }
   },
@@ -290,7 +292,9 @@ export default {
     availableTenantRoles() {
       const _roles = this.$store.getters["tenant/getTenantRoles"]({clientId: this.clientId, clientLevel: false});
       if (_roles) {
-        return _roles.map(({name}) => name);
+        return _roles.map(({name}) => {
+          return {value: name, text: name, disabled: this.rolesToBeDisabled.indexOf(name) >= 0}
+        });
       } else {
         return [];
       }

From 613b518ae2a0223e1ce8bd3527d42a25214c952b Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 20:23:47 -0400
Subject: [PATCH 06/12] Disable some permission types and entity types

---
 .../src/components/admin-portal/TenantEntityTypes.vue    | 9 +++++++--
 .../components/admin-portal/TenantPermissionTypes.vue    | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/custos-demo-gateway/src/components/admin-portal/TenantEntityTypes.vue b/custos-demo-gateway/src/components/admin-portal/TenantEntityTypes.vue
index f7e277e4..958d892b 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantEntityTypes.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantEntityTypes.vue
@@ -22,7 +22,8 @@
             <b-td>{{ entityType.description }}</b-td>
             <b-td>
               <button-overlay :show="processingDelete[entityType.id]">
-                <b-button variant="link" size="sm" v-on:click="onClickDelete(entityType)">
+                <b-button variant="link" size="sm" v-on:click="onClickDelete(entityType)"
+                          :disabled="disabledEntityTypes[entityType.id]">
                   <b-icon icon="trash"></b-icon>
                 </b-button>
               </button-overlay>
@@ -47,7 +48,11 @@ export default {
   data() {
     return {
       processingDelete: {},
-      errors: []
+      errors: [],
+
+      disabledEntityTypes: {
+        "SECRET": true
+      }
     }
   },
   computed: {
diff --git a/custos-demo-gateway/src/components/admin-portal/TenantPermissionTypes.vue b/custos-demo-gateway/src/components/admin-portal/TenantPermissionTypes.vue
index f8399694..c2329539 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantPermissionTypes.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantPermissionTypes.vue
@@ -22,7 +22,8 @@
             <b-td>{{ permissionType.description }}</b-td>
             <b-td>
               <button-overlay :show="processingDelete[permissionType.id]">
-                <b-button variant="link" size="sm" v-on:click="onClickDelete(permissionType)">
+                <b-button variant="link" size="sm" v-on:click="onClickDelete(permissionType)"
+                          :disabled="disabledPermissionType[permissionType.id]">
                   <b-icon icon="trash"></b-icon>
                 </b-button>
               </button-overlay>
@@ -47,7 +48,11 @@ export default {
   data() {
     return {
       processingDelete: {},
-      errors: []
+      errors: [],
+
+      disabledPermissionType: {
+        "OWNER": true
+      }
     }
   },
   computed: {

From 80f4a0b4530a52ea1142940d7d498c6a393fee3e Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 20:24:07 -0400
Subject: [PATCH 07/12] Fix the left navigation

---
 .../src/components/admin-portal/TenantHome.vue   | 16 ++++++++--------
 custos-demo-gateway/src/router.js                |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/custos-demo-gateway/src/components/admin-portal/TenantHome.vue b/custos-demo-gateway/src/components/admin-portal/TenantHome.vue
index c7f5d117..3dd6d8b4 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantHome.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantHome.vue
@@ -13,13 +13,13 @@
     </div>
 
     <div class="w-100" v-if="tenant" style="display: flex; flex-direction: row;">
-      <div style="width: 200px;padding-top: 15px;" v-if="tenant.hasAdminPrivileges">
+      <div style="width: 200px;padding-top: 15px;">
         <ul>
-          <li>
+          <li v-if="tenant.hasAdminPrivileges || appTenant.hasAdminPrivileges">
             <router-link :to="`/tenants/${clientId}/profile`" v-slot="{ href, route, navigate}" tag="">
               <b-link @click="navigate" :href="href">Profile</b-link>
             </router-link>
-            <ul>
+            <ul v-if="tenant.hasAdminPrivileges && tenant.status === 'ACTIVE'">
               <li>
                 <router-link :to="`/tenants/${clientId}/roles`" v-slot="{ href, route, navigate}"
                              tag="">
@@ -45,13 +45,13 @@
           <!--              <b-link @click="navigate" :href="href">User Management</b-link>-->
           <!--            </router-link>-->
           <!--            <ul>&lt;!&ndash;&ndash;&gt;-->
-          <li>
+          <li v-if="tenant.hasAdminPrivileges  && tenant.status === 'ACTIVE'">
             <router-link :to="`/tenants/${clientId}/users`" v-slot="{ href, route, navigate}"
                          tag="">
               <b-link @click="navigate" :href="href">Users</b-link>
             </router-link>
           </li>
-          <li>
+          <li v-if="tenant.hasAdminPrivileges  && tenant.status === 'ACTIVE'">
             <router-link :to="`/tenants/${clientId}/groups`" v-slot="{ href, route, navigate}"
                          tag="">
               <b-link @click="navigate" :href="href">Groups</b-link>
@@ -72,12 +72,12 @@
           <!--            </router-link>-->
           <!--          </li>-->
 
-          <li>
+          <li v-if="tenant.hasAdminPrivileges && tenant.status === 'ACTIVE'">
             <router-link :to="`/tenants/${clientId}/entities`" v-slot="{ href, route, navigate}" tag="">
               <b-link @click="navigate" :href="href">Entities</b-link>
             </router-link>
           </li>
-          <li>
+          <li v-if="tenant.hasAdminPrivileges && tenant.status === 'ACTIVE'">
             <router-link :to="`/tenants/${clientId}/audits`" v-slot="{ href, route, navigate}" tag="">
               <b-link @click="navigate" :href="href">Secrets</b-link>
             </router-link>
@@ -95,7 +95,7 @@
           <!--            </li>-->
           <!--          </ul>-->
 
-          <li v-if="tenant.type !== 'CHILD_TENANT'">
+          <li v-if="tenant.status === 'ACTIVE' && tenant.type !== 'CHILD_TENANT'">
             <router-link :to="`/tenants/${tenant.clientId}/child-tenants`" v-slot="{ href, route, navigate}" tag="">
               <b-link @click="navigate" :href="href" v-if="tenant.type === 'SUPER_TENANT'">Admin Clients</b-link>
               <b-link @click="navigate" :href="href" v-if="tenant.type === 'ADMIN_TENANT'">Child Clients</b-link>
diff --git a/custos-demo-gateway/src/router.js b/custos-demo-gateway/src/router.js
index ff2a3a5f..0f771275 100644
--- a/custos-demo-gateway/src/router.js
+++ b/custos-demo-gateway/src/router.js
@@ -137,8 +137,9 @@ export default new Router({
                 await _validateAuthenticationBeforeEnter(to, from, async (val) => {
                     if (val === true) {
                         await store.dispatch("tenant/fetchTenant", {clientId: to.params.clientId});
+                        const superTenant = store.getters["tenant/getTenant"]({clientId: custosService.clientId});
                         const tenant = store.getters["tenant/getTenant"]({clientId: to.params.clientId});
-                        if (tenant.hasAdminPrivileges || tenant.type === "CHILD_TENANT") {
+                        if (superTenant.hasAdminPrivileges || tenant.hasAdminPrivileges || tenant.type === "CHILD_TENANT") {
                             next(`/tenants/${to.params.clientId}/profile`);
                         } else {
                             next(`/tenants/${to.params.clientId}/child-tenants`);

From ff2a7b01567339dd8bbbb7c22b1b682aa708febc Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 20:26:50 -0400
Subject: [PATCH 08/12] Refactoring

---
 .../index.js}                                                     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/{custos-service-entities-secrets.js => custos-service-entities-secrets/index.js} (100%)

diff --git a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets/index.js
similarity index 100%
rename from custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js
rename to custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets/index.js

From 2e338e1dfd40f4384a66f0e3bb30355d1e06c0df Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 20:27:32 -0400
Subject: [PATCH 09/12] Refactoring

---
 .../custos-service-entities-secrets/index.js                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets/index.js b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets/index.js
index 27f78a47..900e6b62 100644
--- a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets/index.js
+++ b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets/index.js
@@ -1,4 +1,4 @@
-import CustosService from "../index";
+import CustosService from "../../index";
 
 export default class CustosServiceEntitiesSecrets {
     /**

From 436b85b83180b1eb8131bb1aa8985bc0ebed4119 Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 21:37:35 -0400
Subject: [PATCH 10/12] Fix the tenant update request

---
 .../service/custos-service/custos-service-tenants.js  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-tenants.js b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-tenants.js
index 006bf14a..ad629927 100644
--- a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-tenants.js
+++ b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-tenants.js
@@ -119,21 +119,22 @@ export default class CustosTenants {
         return axiosInstance.put(
             `${CustosService.ENDPOINTS.TENANTS}/oauth2/tenant`,
             {
+                "id": tenantId,
+                "client_id": clientId,
+                "client_name": tenantName,
+                "requesterEmail": requesterEmail,
                 "admin_username": username,
                 "admin_first_name": firstName,
                 "admin_last_name": lastName,
                 "admin_email": email,
-                "id": tenantId,
-                "client_id": clientId,
-                "client_name": tenantName,
+                "contacts": [email],
                 "redirect_uris": redirectUris,
                 "scope": scope.join(" ").trim(),
                 "domain": domain,
                 "client_uri": clientUri,
                 "logo_uri": logoUri,
                 "application_type": applicationType,
-                "comment": comment,
-                "requesterEmail": requesterEmail
+                "comment": comment
             }
         );
     }

From 8214f71aacdaf25372d1d3334d55e8e2c32df05c Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Tue, 15 Jun 2021 21:38:29 -0400
Subject: [PATCH 11/12] Enable a radio button group for selecting the secret
 type

---
 .../admin-portal/TenantNewEntity.vue          | 16 ++++++
 ...=> custos-service-entities-secrets-ssh.js} | 19 +------
 .../custos-service-entities-secrets.js        | 56 +++++++++++++++++++
 3 files changed, 74 insertions(+), 17 deletions(-)
 rename custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/{custos-service-entities-secrets/index.js => custos-service-entities-secrets-ssh.js} (67%)
 create mode 100644 custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js

diff --git a/custos-demo-gateway/src/components/admin-portal/TenantNewEntity.vue b/custos-demo-gateway/src/components/admin-portal/TenantNewEntity.vue
index b9283526..6e927f94 100644
--- a/custos-demo-gateway/src/components/admin-portal/TenantNewEntity.vue
+++ b/custos-demo-gateway/src/components/admin-portal/TenantNewEntity.vue
@@ -29,6 +29,7 @@
                 size="sm">
             </b-form-input>
           </div>
+
           <div class="pt-3">
             <label class="form-label" for="entityTypeId">Entity Type</label>
             <button-overlay :show="!entityTypes" class="w-100">
@@ -50,6 +51,18 @@
               </b-form-select>
             </button-overlay>
           </div>
+
+          <div class="pt-3" v-if="entityTypeId === 'SECRET'">
+            <label class="form-label" for="secretType">Secret Type</label>
+            <b-form-radio-group
+                v-model="secretType"
+                :options="availableSecretTypes"
+                id="secretType"
+                trim
+                size="sm">
+            </b-form-radio-group>
+          </div>
+
         </div>
       </div>
     </b-overlay>
@@ -73,6 +86,9 @@ export default {
       name: null,
       description: null,
       entityTypeId: null,
+      secretType: "SSH",
+
+      availableSecretTypes: ["SSH"],
 
       inputFieldsList: ["name", "description", "entityTypeId"]
     };
diff --git a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets/index.js b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets-ssh.js
similarity index 67%
rename from custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets/index.js
rename to custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets-ssh.js
index 900e6b62..93c377c0 100644
--- a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets/index.js
+++ b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets-ssh.js
@@ -1,6 +1,6 @@
-import CustosService from "../../index";
+import CustosService from "../index";
 
-export default class CustosServiceEntitiesSecrets {
+export default class CustosServiceEntitiesSecretsSSH {
     /**
      * @type {CustosService}
      */
@@ -44,19 +44,4 @@ export default class CustosServiceEntitiesSecrets {
 
         return data;
     }
-
-    async getSecretMetadata({clientId, entityId = []}) {
-        const axiosInstance = await this.custosService.getAxiosInstanceWithClientAuthorization({clientId});
-        const {data: {metadata}} = await axiosInstance.get(
-            `${CustosService.ENDPOINTS.SECRETS}/secret/summaries`,
-            {
-                params: {
-                    client_id: clientId,
-                    accessible_tokens: entityId
-                }
-            }
-        );
-
-        return metadata[0];
-    }
 }
diff --git a/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js
new file mode 100644
index 00000000..de27666e
--- /dev/null
+++ b/custos-demo-gateway/src/new-service/service/custos-service/custos-service-entities/custos-service-entities-secrets.js
@@ -0,0 +1,56 @@
+import CustosService from "../index";
+import CustosServiceEntitiesSecretsSSH from "./custos-service-entities-secrets-ssh";
+
+export default class CustosServiceEntitiesSecrets {
+    /**
+     * @type {CustosService}
+     */
+    _custosService = null;
+
+    /**
+     * @type {CustosServiceEntitiesSecretsSSH}
+     */
+    _ssh = null;
+
+    constructor(custosService) {
+        this._custosService = custosService;
+        this._ssh = new CustosServiceEntitiesSecretsSSH(this.custosService)
+    }
+
+    get custosService() {
+        return this._custosService;
+    }
+
+    get ssh() {
+        return this._ssh;
+    }
+
+    getSecretModel({type}) {
+        if (type === "SSH") {
+            return this.ssh;
+        }
+    }
+
+    async createSecret({clientId, description, ownerId, type = "SSH"}) {
+        return this.getSecretModel({type}).createSecret({clientId, description, ownerId});
+    }
+
+    async getSecret({clientId, entityId, type = "SSH"}) {
+        return this.getSecretModel({type}).getSecret({clientId, entityId});
+    }
+
+    async getSecretMetadata({clientId, entityId = []}) {
+        const axiosInstance = await this.custosService.getAxiosInstanceWithClientAuthorization({clientId});
+        const {data: {metadata}} = await axiosInstance.get(
+            `${CustosService.ENDPOINTS.SECRETS}/secret/summaries`,
+            {
+                params: {
+                    client_id: clientId,
+                    accessible_tokens: entityId
+                }
+            }
+        );
+
+        return metadata[0];
+    }
+}

From 64c9926b95b26a21eb179236bffd3461405cfb22 Mon Sep 17 00:00:00 2001
From: Dinuka De Silva <l.dinukadesilva@gmail.com>
Date: Wed, 16 Jun 2021 15:36:59 -0400
Subject: [PATCH 12/12] Fix typos

---
 custos-demo-gateway/src/components/admin-portal/NewTenant.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custos-demo-gateway/src/components/admin-portal/NewTenant.vue b/custos-demo-gateway/src/components/admin-portal/NewTenant.vue
index 3760530d..b20de465 100644
--- a/custos-demo-gateway/src/components/admin-portal/NewTenant.vue
+++ b/custos-demo-gateway/src/components/admin-portal/NewTenant.vue
@@ -21,7 +21,7 @@
           </p>
           <br/>
           <router-link :to="`/tenants/${clientId}/child-tenants`" v-slot="{ href, route, navigate}" tag="">
-            <b-button variant="secondary" @click="navigate">Back to Clients</b-button>
+            <b-button variant="secondary" @click="navigate">Back to Tenants</b-button>
           </router-link>
         </div>
         <div v-else class="w-100 text-left" style="width: 600px;max-width: 600px;display: inline-block;">