Merge branch 'develop' of git.digitaltelepresence.com:digital-telepresence/dtp-base into develop

app/services/core-node.js

@@ -474,15 +474,23 @@ class CoreNodeService extends SiteService {
     // provides an abort point if any listener throws
     await this.emitDtpEvent('disconnect-pre', { core });
 
-    const disconnect = await this.sendRequest(core, {
+    let disconnect;
-      method: 'DELETE',
+    try {
-      url: `/core/connect/node/${core.oauth.clientId}`,
+      disconnect = await this.sendRequest(core, {
-    });
+        method: 'DELETE',
-    this.log.alert('Core disconnect request complete', {
+        url: `/core/connect/node/${core.oauth.clientId}`,
-      name: core.meta.name,
+      });
-      domain: core.meta.domain,
+    } catch (error) {
-      disconnect,
+      if ((error.code !== 'EPROTO') && (error.statusCode !== 404)) {
-    });
+        throw new SiteError(error.statusCode, 'Failed to disconnect from Core');
+      }
+    } finally {
+      this.log.alert('Core disconnect request complete', {
+        name: core.meta.name,
+        domain: core.meta.domain,
+        disconnect,
+      });
+    }
 
     try {
       await this.emitDtpEvent('disconnect-post', { core, disconnect });
@@ -496,8 +504,8 @@ class CoreNodeService extends SiteService {
       .cursor()
       .eachAsync(this.removeUser.bind(this, core), 1);
 
-    // await CoreNodeConnect.deleteMany({ 'site.domainKey': core.meta.domainKey });
+    await CoreNodeConnect.deleteMany({ 'site.domainKey': core.meta.domainKey });
-    // await CoreNodeRequest.deleteMany({ core: core._id });
+    await CoreNodeRequest.deleteMany({ core: core._id });
 
     try {
       await this.emitDtpEvent('disconnect', { core, disconnect });
@@ -506,6 +514,8 @@ class CoreNodeService extends SiteService {
       // keep going
     }
 
+    await CoreNode.deleteOne({ _id: core._id });
+
     return disconnect;
   }
 

app/views/admin/core-node/components/list-item.pug

@@ -10,6 +10,8 @@ mixin renderCoreNodeListItem (coreNode)
           +renderCell('Domain', coreNode.meta.domain)
         .uk-width-auto
           +renderCell('Domain Key', coreNode.meta.domainKey)
+        .uk-width-auto
+          +renderCell('id', coreNode._id)
 
     .uk-margin
       div(uk-grid).uk-flex-between