Adding self revoke

Author: perki

dr-lib.js

@@ -170,20 +170,17 @@ async function getPatientDetails(invite, itemDefs) {
   const patient = {
     invite,
     status: invite.status,
+    username: null,
     inviteName: invite.displayName,
     createdAt: invite.dateCreation.toLocaleString(),
     dateCreation: invite.dateCreation // keep it as a date for sorting
   };
+  console.log('## getPatientDetails.invite', invite, invite.status, invite.eventData.streamIds);
 
-  // -- get patient info
-  try {
-    const patientInfo = await invite.connection.accessInfo();
-    patient.username = patientInfo.user.username;
-  } catch (e) {
-    console.error("## Error getting patient info from invite ", patient, invite, e);
-    // -- mark as revoked
-    // TODO call invite.markRevoked();
-  }
+  // -- 
+  const patientInfo = await invite.checkAndGetAccessInfo();
+  if (patientInfo === null) return patient;
+  patient.username = patientInfo.user.username;
 
   // -- get data
 

patient-home-controler.js

@@ -148,7 +148,7 @@ async function showFormDetails(collectorClient) {
     buttonRevoke.innerHTML = 'Revoke';
     buttonRevoke.onclick = async function () {
       const doRevoke = confirm('Revoke ?');
-      if (doRevoke) patientHomeLib.revokeAccess(collectorClient);
+      if (doRevoke)  await collectorClient.revoke();;
       refresh();
     };
   }
@@ -168,8 +168,8 @@ async function showFormDetails(collectorClient) {
     };
     buttonRevoke.innerHTML = 'Refuse';
     buttonRevoke.onclick = async function () {
-      const doRevoke = confirm('Refuse ?');
-      if (doRevoke) patientHomeLib.revokeAccess(requestData);
+      const deRefuse = confirm('Refuse ?');
+      if (deRefuse) await collectorClient.refuse();
       refresh();
     }
   }