From c755a6c9c85db0d01a606dd542475c0c2a1d1cbc Mon Sep 17 00:00:00 2001
From: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
Date: Wed, 31 Jul 2024 15:34:02 -0700
Subject: [PATCH 1/5] Add REST endpoints for hard deleting tenants

Signed-off-by: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
---
 .../v1_0/innkeeper/routes.py                  | 51 +++++++++++++++----
 .../traction_innkeeper/v1_0/tenant/routes.py  | 28 ++++++++++
 2 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/plugins/traction_innkeeper/traction_innkeeper/v1_0/innkeeper/routes.py b/plugins/traction_innkeeper/traction_innkeeper/v1_0/innkeeper/routes.py
index c763a8d14..89eac03c2 100644
--- a/plugins/traction_innkeeper/traction_innkeeper/v1_0/innkeeper/routes.py
+++ b/plugins/traction_innkeeper/traction_innkeeper/v1_0/innkeeper/routes.py
@@ -809,7 +809,35 @@ async def innkeeper_tenant_delete(request: web.BaseRequest):
             return web.json_response({"success": f"Tenant {tenant_id} soft deleted."})
         else:
             raise web.HTTPNotFound(reason=f"Tenant {tenant_id} not found.")
-    
+
+
+@docs(
+    tags=[SWAGGER_CATEGORY],
+)
+@match_info_schema(TenantIdMatchInfoSchema())
+@response_schema(TenantRecordSchema(), 200, description="")
+@innkeeper_only
+@error_handler
+async def innkeeper_tenant_hard_delete(request: web.BaseRequest):
+    context: AdminRequestContext = request["context"]
+    tenant_id = request.match_info["tenant_id"]
+
+    mgr = context.inject(TenantManager)
+    profile = mgr.profile
+    async with profile.session() as session:
+        rec = await TenantRecord.retrieve_by_id(session, tenant_id)
+        if rec:
+            multitenant_mgr = context.profile.inject(BaseMultitenantManager)
+            wallet_id = rec.wallet_id
+            wallet_record = await WalletRecord.retrieve_by_id(session, wallet_id)
+
+            await multitenant_mgr.remove_wallet(wallet_id)
+            await rec.delete_record(session)
+            LOGGER.info("Tenant %s rd deleted.", tenant_id)
+            return web.json_response({"success": f"Tenant {tenant_id} hard deleted."})
+        else:
+            raise web.HTTPNotFound(reason=f"Tenant {tenant_id} not found.")
+
 
 @docs(
     tags=[SWAGGER_CATEGORY],
@@ -822,10 +850,10 @@ async def innkeeper_tenant_delete(request: web.BaseRequest):
 async def innkeeper_tenant_restore(request: web.BaseRequest):
     context: AdminRequestContext = request["context"]
     tenant_id = request.match_info["tenant_id"]
-    
+
     mgr = context.inject(TenantManager)
     profile = mgr.profile
-    
+
     async with profile.session() as session:
         rec = await TenantRecord.retrieve_by_id(session, tenant_id)
         if rec:
@@ -837,7 +865,7 @@ async def innkeeper_tenant_restore(request: web.BaseRequest):
                 return web.json_response({"success": f"Tenant {tenant_id} restored."})
         else:
             raise web.HTTPNotFound(reason=f"Tenant {tenant_id} not found.")
- 
+
 
 @docs(tags=[SWAGGER_CATEGORY], summary="Create API Key Record")
 @request_schema(TenantAuthenticationsApiRequestSchema())
@@ -960,9 +988,7 @@ async def innkeeper_config_handler(request: web.BaseRequest):
     profile = mgr.profile
 
     config = {
-        key: (
-           profile.context.settings[key]
-        )
+        key: (profile.context.settings[key])
         for key in profile.context.settings
         if key
         not in [
@@ -975,9 +1001,13 @@ async def innkeeper_config_handler(request: web.BaseRequest):
         ]
     }
     try:
-      del config["plugin_config"]["traction_innkeeper"]["innkeeper_wallet"]["wallet_key"]
+        del config["plugin_config"]["traction_innkeeper"]["innkeeper_wallet"][
+            "wallet_key"
+        ]
     except KeyError as e:
-      LOGGER.warn(f"The key to be removed: '{e.args[0]}' is missing from the dictionary.")
+        LOGGER.warn(
+            f"The key to be removed: '{e.args[0]}' is missing from the dictionary."
+        )
     config["version"] = __version__
 
     return web.json_response({"config": config})
@@ -1033,6 +1063,9 @@ async def register(app: web.Application):
             ),
             web.put("/innkeeper/tenants/{tenant_id}/config", tenant_config_update),
             web.delete("/innkeeper/tenants/{tenant_id}", innkeeper_tenant_delete),
+            web.delete(
+                "/innkeeper/tenants/{tenant_id}/hard", innkeeper_tenant_hard_delete
+            ),
             web.put("/innkeeper/tenants/{tenant_id}/restore", innkeeper_tenant_restore),
             web.get(
                 "/innkeeper/default-config",
diff --git a/plugins/traction_innkeeper/traction_innkeeper/v1_0/tenant/routes.py b/plugins/traction_innkeeper/traction_innkeeper/v1_0/tenant/routes.py
index 993403793..87d9f4c85 100644
--- a/plugins/traction_innkeeper/traction_innkeeper/v1_0/tenant/routes.py
+++ b/plugins/traction_innkeeper/traction_innkeeper/v1_0/tenant/routes.py
@@ -80,6 +80,7 @@ class TenantLedgerIdConfigSchema(OpenAPISchema):
         required=True,
     )
 
+
 @web.middleware
 async def setup_tenant_context(request: web.Request, handler):
     """Middle ware to extract tenant_id and provide it to log formatter
@@ -465,6 +466,32 @@ async def tenant_server_config_handler(request: web.BaseRequest):
     return web.json_response({"config": config})
 
 
+@docs(
+    tags=[SWAGGER_CATEGORY],
+)
+@response_schema(TenantRecordSchema(), 200, description="")
+@error_handler
+async def tenant_delete(request: web.BaseRequest):
+    context: AdminRequestContext = request["context"]
+    wallet_id = context.profile.settings.get("wallet.id")
+
+    mgr = context.inject(TenantManager)
+    profile = mgr.profile
+    async with profile.session() as session:
+        rec = await TenantRecord.query_by_wallet_id(session, wallet_id)
+        if rec:
+            multitenant_mgr = context.profile.inject(BaseMultitenantManager)
+
+            await multitenant_mgr.remove_wallet(rec.wallet_id)
+            await rec.delete_record(session)
+            LOGGER.info("Tenant %s rd deleted.", rec.tenant_id)
+            return web.json_response(rec.serialize())
+        else:
+            raise web.HTTPNotFound(
+                reason=f"Tenant with wallet id {wallet_id} not found."
+            )
+
+
 async def register(app: web.Application):
     """Register routes."""
     LOGGER.info("> registering routes")
@@ -499,6 +526,7 @@ async def register(app: web.Application):
                 tenant_server_config_handler,
                 allow_head=False,
             ),
+            web.delete("/tenant", tenant_delete),
         ]
     )
     LOGGER.info("< registering routes")

From 2a0efae55b1ec8d0f4905ee99e0b6c966ca44a8f Mon Sep 17 00:00:00 2001
From: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
Date: Wed, 31 Jul 2024 15:34:51 -0700
Subject: [PATCH 2/5] Add options for hard deleting tenants in tenant UI

Signed-off-by: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
---
 .../deleteTenant/ConfirmTenantDeletion.vue    | 18 +++++++++++--
 .../frontend/src/helpers/constants.ts         |  2 ++
 .../store/innkeeper/innkeeperTenantsStore.ts  | 16 +++++++++++
 .../frontend/src/store/tenantStore.ts         | 20 ++++++++++++++
 .../frontend/src/views/tenant/Profile.vue     | 27 ++++++++++++++++++-
 5 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue b/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
index 88a658761..d93766ab7 100644
--- a/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
+++ b/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
@@ -14,11 +14,19 @@
         placeholder="Type the tenant name here"
         class="w-full mb-4"
       />
+
+      <div class="flex items-center">
+        <Checkbox v-model="perminant" :binary="true" />
+        <label class="ml-2" for="">
+          Perminently Delete
+        </label>
+      </div>
+
       <Button
         :disabled="!isTenantNameCorrect"
         label="Delete"
         severity="danger"
-        class="w-full"
+        class="w-full my-2"
         type="submit"
       />
     </div>
@@ -29,6 +37,7 @@
 import { ref, computed } from 'vue';
 
 import InputText from 'primevue/inputtext';
+import Checkbox from 'primevue/checkbox';
 import Button from 'primevue/button';
 
 import { useInnkeeperTenantsStore } from '@/store';
@@ -48,6 +57,7 @@ const emit = defineEmits(['closed', 'success']);
 const innkeeperTenantsStore = useInnkeeperTenantsStore();
 
 const confirmationTenantName = ref('');
+const perminant = ref(false)
 const isTenantNameCorrect = computed(
   () => confirmationTenantName.value === props.tenant.tenant_name
 );
@@ -60,7 +70,11 @@ async function handleDelete() {
     return;
   }
   try {
-    await innkeeperTenantsStore.deleteTenant(props.tenant.tenant_id);
+    if (perminant.value) {
+      await innkeeperTenantsStore.hardDeleteTenant(props.tenant.tenant_id);
+    } else {
+      await innkeeperTenantsStore.deleteTenant(props.tenant.tenant_id);
+    }
     toast.success(
       t('tenants.settings.confirmDeletionSuccess', [props.tenant.tenant_name])
     );
diff --git a/services/tenant-ui/frontend/src/helpers/constants.ts b/services/tenant-ui/frontend/src/helpers/constants.ts
index 0d9285bb1..7ebd46802 100644
--- a/services/tenant-ui/frontend/src/helpers/constants.ts
+++ b/services/tenant-ui/frontend/src/helpers/constants.ts
@@ -60,6 +60,7 @@ export const API_PATH = {
   INNKEEPER_TOKEN: '/innkeeper/token',
   INNKEEPER_TENANTS: '/innkeeper/tenants/',
   INNKEEPER_TENANT: (id: string) => `/innkeeper/tenants/${id}`,
+  INNKEEPER_HARD_DELETE_TENANT: (id: string) => `/innkeeper/tenants/${id}/hard`,
   INNKEEPER_TENANT_CONFIG: (id: string) => `/innkeeper/tenants/${id}/config`,
   INNKEEPER_TENANT_DEFAULT_CONFIG: '/innkeeper/default-config',
   INNKEEPER_TENANT_RESTORE: (id: string) => `/innkeeper/tenants/${id}/restore`,
@@ -130,6 +131,7 @@ export const API_PATH = {
   SCHEMA_STORAGE_ITEM: (id: string) => `/schema-storage/${id}`,
 
   TENANT_SELF: '/tenant',
+  TENANT_DELETE: '/tenant',
   TENANT_ENDORSER_CONNECTION: '/tenant/endorser-connection',
   TENANT_ENDORSER_INFO: '/tenant/endorser-info',
   TENANT_REGISTER_PUBLIC_DID: '/ledger/register-nym',
diff --git a/services/tenant-ui/frontend/src/store/innkeeper/innkeeperTenantsStore.ts b/services/tenant-ui/frontend/src/store/innkeeper/innkeeperTenantsStore.ts
index 83b7a0350..41276f170 100644
--- a/services/tenant-ui/frontend/src/store/innkeeper/innkeeperTenantsStore.ts
+++ b/services/tenant-ui/frontend/src/store/innkeeper/innkeeperTenantsStore.ts
@@ -321,6 +321,21 @@ export const useInnkeeperTenantsStore = defineStore('innkeeperTenants', () => {
     }
   }
 
+  async function hardDeleteTenant(id: string) {
+    loading.value = true;
+    try {
+      await acapyApi.deleteHttp(API_PATH.INNKEEPER_HARD_DELETE_TENANT(id));
+      await listTenants();
+    } catch (err: any) {
+      error.value = err;
+    } finally {
+      loading.value = false;
+    }
+    if (error.value != null) {
+      throw error.value;
+    }
+  }
+
   // Create an API key for a tenant
   async function createApiKey(payload: TenantAuthenticationsApiRequest) {
     error.value = null;
@@ -423,6 +438,7 @@ export const useInnkeeperTenantsStore = defineStore('innkeeperTenants', () => {
     listTenants,
     refreshCheckInPassword,
     restoreTenant,
+    hardDeleteTenant,
     updateTenantConfig,
   };
 });
diff --git a/services/tenant-ui/frontend/src/store/tenantStore.ts b/services/tenant-ui/frontend/src/store/tenantStore.ts
index 2cd0e70ce..88e281d8c 100644
--- a/services/tenant-ui/frontend/src/store/tenantStore.ts
+++ b/services/tenant-ui/frontend/src/store/tenantStore.ts
@@ -259,6 +259,25 @@ export const useTenantStore = defineStore('tenant', () => {
     console.log('< tenantStore.getPublicDid');
   }
 
+  async function deleteTenant() {
+    console.log('> tenantStore.deleteTenant');
+    let result = null;
+    error.value = null;
+    loading.value = true;
+    await acapyApi
+      .deleteHttp(API_PATH.TENANT_DELETE)
+      .then((res) => (result = res.data))
+      .catch((err) => (error.value = err))
+      .finally(() => (loading.value = false));
+
+    if (error.value != null) {
+      // throw error so $onAction.onError listeners can add their own handler
+      throw error.value;
+    }
+    // return data so $onAction.after listeners can add their own handler
+    return result;
+  }
+
   async function getWalletcDids() {
     console.log('> tenantStore.getWalletDids');
     await fetchList(
@@ -639,6 +658,7 @@ export const useTenantStore = defineStore('tenant', () => {
     getTransactions,
     getWalletcDids,
     getWriteLedger,
+    deleteTenant,
     registerPublicDid,
     setTenantLoginDataFromLocalStorage,
     setWriteLedger,
diff --git a/services/tenant-ui/frontend/src/views/tenant/Profile.vue b/services/tenant-ui/frontend/src/views/tenant/Profile.vue
index 4d46c07c0..79580d3e7 100644
--- a/services/tenant-ui/frontend/src/views/tenant/Profile.vue
+++ b/services/tenant-ui/frontend/src/views/tenant/Profile.vue
@@ -12,6 +12,18 @@
           <ProfileForm />
           <Issuance />
         </div>
+        <ConfirmPopup group="templating">
+          <template #message="slotProps">
+            <div class="flex-col items-center w-full gap-4 border-b border-surface-200 dark:border-surface-700 p-4 mb-4 pb-0">
+              <i :class="slotProps.message.icon" class=""></i>
+              <p>{{ slotProps.message.message }}</p>
+            </div>
+          </template>
+        </ConfirmPopup>
+        <Button
+          class="my-4 w-full"
+          @click="showTenentDeletionWarning($event)" label="Delete Tenant"
+        />
         <div class="col text-right">
           <img v-if="isIssuer" src="/img/badges/issuer.png" />
         </div>
@@ -26,6 +38,8 @@
 import Issuance from '@/components/profile/issuance/Issuance.vue';
 import MainCardContent from '@/components/layout/mainCard/MainCardContent.vue';
 import ProgressSpinner from 'primevue/progressspinner';
+import Button from 'primevue/button';
+import ConfirmPopup from 'primevue/confirmpopup';
 import ProfileForm from '@/components/profile/ProfileForm.vue';
 import ProfileFooter from '@/components/profile/ProfileFooter.vue';
 import { useToast } from 'vue-toastification';
@@ -34,9 +48,20 @@ import { storeToRefs } from 'pinia';
 import { useTenantStore } from '@/store';
 const tenantStore = useTenantStore();
 const { tenant, isIssuer, loading } = storeToRefs(useTenantStore());
+import { useConfirm } from "primevue/useconfirm";
 
+const confirm = useConfirm();
 const toast = useToast();
-
+const showTenentDeletionWarning = (event: any) => {
+  confirm.require({
+    message: "WARNING: Deletion of a tenant is permanent. Would you like to proceed?",
+    icon: 'pi pi-exclamation-circle',
+    accept: () => {
+      tenantStore.deleteTenant();
+      window.location.href = '/logout';
+    },
+  })
+}
 const reloadProfileDetails = async () => {
   try {
     await Promise.allSettled([

From 5debe84e8522fb4990cf1f2501d9d5a38ac98155 Mon Sep 17 00:00:00 2001
From: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
Date: Wed, 31 Jul 2024 16:04:23 -0700
Subject: [PATCH 3/5] apply eslint changes

Signed-off-by: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
---
 .../deleteTenant/ConfirmTenantDeletion.vue       |  4 ++--
 .../frontend/src/plugins/i18n/locales/en.json    |  3 ++-
 .../frontend/src/views/tenant/Profile.vue        | 16 ++++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue b/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
index d93766ab7..3ac614c81 100644
--- a/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
+++ b/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
@@ -18,7 +18,7 @@
       <div class="flex items-center">
         <Checkbox v-model="perminant" :binary="true" />
         <label class="ml-2" for="">
-          Perminently Delete
+          {{ $t('tenants.settings.perminentDelete') }}
         </label>
       </div>
 
@@ -57,7 +57,7 @@ const emit = defineEmits(['closed', 'success']);
 const innkeeperTenantsStore = useInnkeeperTenantsStore();
 
 const confirmationTenantName = ref('');
-const perminant = ref(false)
+const perminant = ref(false);
 const isTenantNameCorrect = computed(
   () => confirmationTenantName.value === props.tenant.tenant_name
 );
diff --git a/services/tenant-ui/frontend/src/plugins/i18n/locales/en.json b/services/tenant-ui/frontend/src/plugins/i18n/locales/en.json
index cbf371d1a..b25d46846 100644
--- a/services/tenant-ui/frontend/src/plugins/i18n/locales/en.json
+++ b/services/tenant-ui/frontend/src/plugins/i18n/locales/en.json
@@ -524,6 +524,7 @@
       "confirmDeletionIncorrect": "Incorrect tenant name. Please confirm the correct name before deletion.",
       "confirmDeletionSuccess": "Tenant {0} successfully marked as deleted",
       "deleteTenant": "Delete Tenant",
+      "perminentDelete": "Perminently Delete",
       "editSettings": "Edit Tenant Config",
       "enableLedgerSwitch": "Tenant can switch endorser/ledger",
       "endorserAlias": "Endorser Alias:",
@@ -561,4 +562,4 @@
     "verification": "Verification",
     "verifications": "Verifications"
   }
-}
\ No newline at end of file
+}
diff --git a/services/tenant-ui/frontend/src/views/tenant/Profile.vue b/services/tenant-ui/frontend/src/views/tenant/Profile.vue
index 79580d3e7..2803a70cd 100644
--- a/services/tenant-ui/frontend/src/views/tenant/Profile.vue
+++ b/services/tenant-ui/frontend/src/views/tenant/Profile.vue
@@ -14,7 +14,9 @@
         </div>
         <ConfirmPopup group="templating">
           <template #message="slotProps">
-            <div class="flex-col items-center w-full gap-4 border-b border-surface-200 dark:border-surface-700 p-4 mb-4 pb-0">
+            <div
+              class="flex-col items-center w-full gap-4 border-b border-surface-200 dark:border-surface-700 p-4 mb-4 pb-0"
+            >
               <i :class="slotProps.message.icon" class=""></i>
               <p>{{ slotProps.message.message }}</p>
             </div>
@@ -22,7 +24,8 @@
         </ConfirmPopup>
         <Button
           class="my-4 w-full"
-          @click="showTenentDeletionWarning($event)" label="Delete Tenant"
+          label="Delete Tenant"
+          @click="showTenentDeletionWarning($event)"
         />
         <div class="col text-right">
           <img v-if="isIssuer" src="/img/badges/issuer.png" />
@@ -48,20 +51,21 @@ import { storeToRefs } from 'pinia';
 import { useTenantStore } from '@/store';
 const tenantStore = useTenantStore();
 const { tenant, isIssuer, loading } = storeToRefs(useTenantStore());
-import { useConfirm } from "primevue/useconfirm";
+import { useConfirm } from 'primevue/useconfirm';
 
 const confirm = useConfirm();
 const toast = useToast();
 const showTenentDeletionWarning = (event: any) => {
   confirm.require({
-    message: "WARNING: Deletion of a tenant is permanent. Would you like to proceed?",
+    message:
+      'WARNING: Deletion of a tenant is permanent. Would you like to proceed?',
     icon: 'pi pi-exclamation-circle',
     accept: () => {
       tenantStore.deleteTenant();
       window.location.href = '/logout';
     },
-  })
-}
+  });
+};
 const reloadProfileDetails = async () => {
   try {
     await Promise.allSettled([

From cd9177ac227a867715108292e8a69e442ec714ab Mon Sep 17 00:00:00 2001
From: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
Date: Thu, 1 Aug 2024 16:21:01 -0700
Subject: [PATCH 4/5] add soft delete to tenants and ui tweeks

Signed-off-by: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
---
 .../traction_innkeeper/v1_0/tenant/routes.py  | 26 ++++++-
 .../deleteTenant/ConfirmTenantDeletion.vue    | 69 +++++++++++++++----
 .../tenants/deleteTenant/DeleteTenant.vue     |  1 +
 .../frontend/src/helpers/constants.ts         |  3 +-
 .../frontend/src/plugins/i18n/locales/en.json |  7 +-
 .../frontend/src/store/tenantStore.ts         | 19 +++++
 .../frontend/src/views/tenant/Profile.vue     | 49 +++++++------
 7 files changed, 131 insertions(+), 43 deletions(-)

diff --git a/plugins/traction_innkeeper/traction_innkeeper/v1_0/tenant/routes.py b/plugins/traction_innkeeper/traction_innkeeper/v1_0/tenant/routes.py
index 87d9f4c85..eaf84cdbb 100644
--- a/plugins/traction_innkeeper/traction_innkeeper/v1_0/tenant/routes.py
+++ b/plugins/traction_innkeeper/traction_innkeeper/v1_0/tenant/routes.py
@@ -466,6 +466,29 @@ async def tenant_server_config_handler(request: web.BaseRequest):
     return web.json_response({"config": config})
 
 
+@docs(
+    tags=[SWAGGER_CATEGORY],
+)
+@response_schema(TenantRecordSchema(), 200, description="")
+@error_handler
+async def tenant_delete_soft(request: web.BaseRequest):
+    context: AdminRequestContext = request["context"]
+    wallet_id = context.profile.settings.get("wallet.id")
+
+    mgr = context.inject(TenantManager)
+    profile = mgr.profile
+    async with profile.session() as session:
+        rec = await TenantRecord.query_by_wallet_id(session, wallet_id)
+        if rec:
+            await rec.soft_delete(session)
+            LOGGER.info("Tenant %s soft deleted.", rec.tenant_id)
+            return web.json_response(
+                {"success": f"Tenant {rec.tenant_id} soft deleted."}
+            )
+        else:
+            raise web.HTTPNotFound(reason=f"Tenant not found.")
+
+
 @docs(
     tags=[SWAGGER_CATEGORY],
 )
@@ -526,7 +549,8 @@ async def register(app: web.Application):
                 tenant_server_config_handler,
                 allow_head=False,
             ),
-            web.delete("/tenant", tenant_delete),
+            web.delete("/tenant/hard", tenant_delete),
+            web.delete("/tenant/soft", tenant_delete_soft),
         ]
     )
     LOGGER.info("< registering routes")
diff --git a/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue b/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
index 3ac614c81..4b20e2930 100644
--- a/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
+++ b/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
@@ -14,14 +14,29 @@
         placeholder="Type the tenant name here"
         class="w-full mb-4"
       />
-
-      <div class="flex items-center">
-        <Checkbox v-model="perminant" :binary="true" />
-        <label class="ml-2" for="">
-          {{ $t('tenants.settings.perminentDelete') }}
-        </label>
+      <div>
+        <div class="flex items-center">
+          <RadioButton v-model="perminant" value="Hard" />
+          <label class="ml-2" for="">
+            {{ $t('tenants.settings.permanentDelete') }}
+          </label>
+        </div>
+        <div class="flex items-center my-2">
+          <RadioButton v-model="perminant" value="Soft" />
+          <label class="ml-2" for="">
+            {{ $t('tenants.settings.softDelete') }}
+          </label>
+        </div>
+      </div>
+      <div v-if="displayWarning" class="ml-2 my-2 flex flex-row">
+        <i class="pi pi-info-circle mr-2"></i>
+        <div class="text-yellow-500 flex flex-row font-bold">
+          <div class="font-bold">{{ $t('common.warning') }}</div>
+          <div class="font-semibold">
+            {{ $t('tenants.settings.tenantDeletionWarning') }}
+          </div>
+        </div>
       </div>
-
       <Button
         :disabled="!isTenantNameCorrect"
         label="Delete"
@@ -34,21 +49,24 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue';
+import { ref, computed, Ref } from 'vue';
 
 import InputText from 'primevue/inputtext';
-import Checkbox from 'primevue/checkbox';
+import RadioButton from 'primevue/radiobutton';
 import Button from 'primevue/button';
 
 import { useInnkeeperTenantsStore } from '@/store';
 import { TenantRecord } from '@/types/acapyApi/acapyInterface';
+import { useTenantStore } from '@/store';
 
 import { useToast } from 'vue-toastification';
 import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
 
+type DeletionAPI = 'Innkeeper' | 'Tenant';
 const props = defineProps<{
   tenant: TenantRecord;
+  api: DeletionAPI;
 }>();
 
 const emit = defineEmits(['closed', 'success']);
@@ -57,23 +75,48 @@ const emit = defineEmits(['closed', 'success']);
 const innkeeperTenantsStore = useInnkeeperTenantsStore();
 
 const confirmationTenantName = ref('');
-const perminant = ref(false);
 const isTenantNameCorrect = computed(
   () => confirmationTenantName.value === props.tenant.tenant_name
 );
+const displayWarning = computed(() => {
+  if (perminant.value == 'Hard') return true;
+  else return false;
+});
+// toast.info("hello");
 
 const toast = useToast();
 
+type DeletionType = 'Hard' | 'Soft';
+const perminant: Ref<DeletionType> = ref('Soft');
+
+const tenantDelete = async () => {
+  const tenantStore = useTenantStore();
+  if (perminant.value == 'Hard') {
+    tenantStore.deleteTenant();
+    window.location.href = '/logout';
+  } else {
+    tenantStore.softDeleteTenant();
+    window.location.href = '/logout';
+  }
+};
+const innkeeperDelete = async () => {
+  if (perminant.value == 'Hard') {
+    await innkeeperTenantsStore.hardDeleteTenant(props.tenant.tenant_id);
+  } else {
+    await innkeeperTenantsStore.deleteTenant(props.tenant.tenant_id);
+  }
+};
+
 async function handleDelete() {
   if (!isTenantNameCorrect.value) {
     toast.error(t('tenants.settings.confirmDeletionIncorrect'));
     return;
   }
   try {
-    if (perminant.value) {
-      await innkeeperTenantsStore.hardDeleteTenant(props.tenant.tenant_id);
+    if (props.api == 'Tenant') {
+      await tenantDelete();
     } else {
-      await innkeeperTenantsStore.deleteTenant(props.tenant.tenant_id);
+      await innkeeperDelete();
     }
     toast.success(
       t('tenants.settings.confirmDeletionSuccess', [props.tenant.tenant_name])
diff --git a/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/DeleteTenant.vue b/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/DeleteTenant.vue
index 3cc2d1965..44cab11a1 100644
--- a/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/DeleteTenant.vue
+++ b/services/tenant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/DeleteTenant.vue
@@ -16,6 +16,7 @@
     >
       <ConfirmTenantDeletion
         :tenant="props.tenant"
+        api="Innkeeper"
         @success="$emit('success')"
         @closed="handleClose"
       />
diff --git a/services/tenant-ui/frontend/src/helpers/constants.ts b/services/tenant-ui/frontend/src/helpers/constants.ts
index eeeff6752..f3c86c79b 100644
--- a/services/tenant-ui/frontend/src/helpers/constants.ts
+++ b/services/tenant-ui/frontend/src/helpers/constants.ts
@@ -144,7 +144,8 @@ export const API_PATH = {
   SCHEMA_STORAGE_ITEM: (id: string) => `/schema-storage/${id}`,
 
   TENANT_SELF: '/tenant',
-  TENANT_DELETE: '/tenant',
+  TENANT_DELETE: '/tenant/hard',
+  TENANT_DELETE_SOFT: '/tenant/soft',
   TENANT_ENDORSER_CONNECTION: '/tenant/endorser-connection',
   TENANT_ENDORSER_INFO: '/tenant/endorser-info',
   TENANT_REGISTER_PUBLIC_DID: '/ledger/register-nym',
diff --git a/services/tenant-ui/frontend/src/plugins/i18n/locales/en.json b/services/tenant-ui/frontend/src/plugins/i18n/locales/en.json
index b25d46846..14ec456ca 100644
--- a/services/tenant-ui/frontend/src/plugins/i18n/locales/en.json
+++ b/services/tenant-ui/frontend/src/plugins/i18n/locales/en.json
@@ -88,7 +88,8 @@
     "tenantName": "Tenant Name",
     "tenantReason": "Tenant Reason",
     "toggleCardExpand": "Toggle Expanded",
-    "walletId": "Wallet ID"
+    "walletId": "Wallet ID",
+    "warning": "Warning"
   },
   "configuration": {
     "configuration": "Configuration",
@@ -524,7 +525,9 @@
       "confirmDeletionIncorrect": "Incorrect tenant name. Please confirm the correct name before deletion.",
       "confirmDeletionSuccess": "Tenant {0} successfully marked as deleted",
       "deleteTenant": "Delete Tenant",
-      "perminentDelete": "Perminently Delete",
+      "permanentDelete": "Permanently Delete",
+      "softDelete": "Suspend Tenant",
+      "tenantDeletionWarning": ": This will delete all data associated with this tenant.",
       "editSettings": "Edit Tenant Config",
       "enableLedgerSwitch": "Tenant can switch endorser/ledger",
       "endorserAlias": "Endorser Alias:",
diff --git a/services/tenant-ui/frontend/src/store/tenantStore.ts b/services/tenant-ui/frontend/src/store/tenantStore.ts
index 88e281d8c..f0ff39e99 100644
--- a/services/tenant-ui/frontend/src/store/tenantStore.ts
+++ b/services/tenant-ui/frontend/src/store/tenantStore.ts
@@ -277,6 +277,24 @@ export const useTenantStore = defineStore('tenant', () => {
     // return data so $onAction.after listeners can add their own handler
     return result;
   }
+  async function softDeleteTenant() {
+    console.log('> tenantStore.softDeleteTenant');
+    let result = null;
+    error.value = null;
+    loading.value = true;
+    await acapyApi
+      .deleteHttp(API_PATH.TENANT_DELETE_SOFT)
+      .then((res) => (result = res.data))
+      .catch((err) => (error.value = err))
+      .finally(() => (loading.value = false));
+
+    if (error.value != null) {
+      // throw error so $onAction.onError listeners can add their own handler
+      throw error.value;
+    }
+    // return data so $onAction.after listeners can add their own handler
+    return result;
+  }
 
   async function getWalletcDids() {
     console.log('> tenantStore.getWalletDids');
@@ -659,6 +677,7 @@ export const useTenantStore = defineStore('tenant', () => {
     getWalletcDids,
     getWriteLedger,
     deleteTenant,
+    softDeleteTenant,
     registerPublicDid,
     setTenantLoginDataFromLocalStorage,
     setWriteLedger,
diff --git a/services/tenant-ui/frontend/src/views/tenant/Profile.vue b/services/tenant-ui/frontend/src/views/tenant/Profile.vue
index 2803a70cd..c352706da 100644
--- a/services/tenant-ui/frontend/src/views/tenant/Profile.vue
+++ b/services/tenant-ui/frontend/src/views/tenant/Profile.vue
@@ -12,21 +12,20 @@
           <ProfileForm />
           <Issuance />
         </div>
-        <ConfirmPopup group="templating">
-          <template #message="slotProps">
-            <div
-              class="flex-col items-center w-full gap-4 border-b border-surface-200 dark:border-surface-700 p-4 mb-4 pb-0"
-            >
-              <i :class="slotProps.message.icon" class=""></i>
-              <p>{{ slotProps.message.message }}</p>
-            </div>
-          </template>
-        </ConfirmPopup>
-        <Button
-          class="my-4 w-full"
-          label="Delete Tenant"
-          @click="showTenentDeletionWarning($event)"
-        />
+        <Button class="my-4 w-full" label="Delete Tenant" @click="openModal" />
+        <Dialog
+          v-model:visible="displayModal"
+          :style="{ minWidth: '500px' }"
+          :header="'Delete Tenant'"
+          :modal="true"
+          @update:visible="handleClose"
+        >
+          <ConfirmTenantDeletion
+            :tenant="tenant"
+            api="Tenant"
+            @closed="handleClose"
+          />
+        </Dialog>
         <div class="col text-right">
           <img v-if="isIssuer" src="/img/badges/issuer.png" />
         </div>
@@ -42,9 +41,11 @@ import Issuance from '@/components/profile/issuance/Issuance.vue';
 import MainCardContent from '@/components/layout/mainCard/MainCardContent.vue';
 import ProgressSpinner from 'primevue/progressspinner';
 import Button from 'primevue/button';
-import ConfirmPopup from 'primevue/confirmpopup';
+import Dialog from 'primevue/dialog';
 import ProfileForm from '@/components/profile/ProfileForm.vue';
 import ProfileFooter from '@/components/profile/ProfileFooter.vue';
+import ConfirmTenantDeletion from '@/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue';
+import { ref, computed } from 'vue';
 import { useToast } from 'vue-toastification';
 // State
 import { storeToRefs } from 'pinia';
@@ -55,16 +56,12 @@ import { useConfirm } from 'primevue/useconfirm';
 
 const confirm = useConfirm();
 const toast = useToast();
-const showTenentDeletionWarning = (event: any) => {
-  confirm.require({
-    message:
-      'WARNING: Deletion of a tenant is permanent. Would you like to proceed?',
-    icon: 'pi pi-exclamation-circle',
-    accept: () => {
-      tenantStore.deleteTenant();
-      window.location.href = '/logout';
-    },
-  });
+const displayModal = ref(false);
+const openModal = async () => {
+  displayModal.value = true;
+};
+const handleClose = async () => {
+  displayModal.value = false;
 };
 const reloadProfileDetails = async () => {
   try {

From 36e161cda5cd666fcdc6fc3d26b57bfdb67a523a Mon Sep 17 00:00:00 2001
From: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
Date: Fri, 2 Aug 2024 11:08:35 -0700
Subject: [PATCH 5/5] Change tenant deletion button colour and proportions

Signed-off-by: Gavin Jaeger-Freeborn <gavinfreeborn@gmail.com>
---
 .../frontend/src/assets/primevueOverrides/buttons.scss    | 2 +-
 services/tenant-ui/frontend/src/views/tenant/Profile.vue  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/services/tenant-ui/frontend/src/assets/primevueOverrides/buttons.scss b/services/tenant-ui/frontend/src/assets/primevueOverrides/buttons.scss
index 7faeeb697..68d980667 100644
--- a/services/tenant-ui/frontend/src/assets/primevueOverrides/buttons.scss
+++ b/services/tenant-ui/frontend/src/assets/primevueOverrides/buttons.scss
@@ -2,7 +2,7 @@
 
 button {
   &.p-button {
-    &:not(.p-button-rounded):not(.p-button-text):not(.p-button-link) {
+    &:not(.p-button-rounded):not(.p-danger):not(.p-button-text):not(.p-button-link) {
       padding: 0.5rem 1rem;
       background-color: $tenant-ui-secondary-color;
       border-color: $tenant-ui-secondary-color;
diff --git a/services/tenant-ui/frontend/src/views/tenant/Profile.vue b/services/tenant-ui/frontend/src/views/tenant/Profile.vue
index c352706da..61a569379 100644
--- a/services/tenant-ui/frontend/src/views/tenant/Profile.vue
+++ b/services/tenant-ui/frontend/src/views/tenant/Profile.vue
@@ -11,8 +11,14 @@
         <div class="col-fixed" style="width: 50rem">
           <ProfileForm />
           <Issuance />
+          <Button
+            class="my-4 w-full p-danger"
+            :style="{ padding: '0.5rem 1rem', fontWeight: 'normal' }"
+            severity="danger"
+            label="Delete Tenant"
+            @click="openModal"
+          />
         </div>
-        <Button class="my-4 w-full" label="Delete Tenant" @click="openModal" />
         <Dialog
           v-model:visible="displayModal"
           :style="{ minWidth: '500px' }"