Feature/deactivate account fix

src/FhirClientProvider.tsx

@@ -42,18 +42,23 @@ export default function FhirClientProvider(props: Props): JSX.Element {
     if (!client) return;
     //this is a workaround for when patient id is not embedded within the JWT token
     let queryPatientId = sessionStorage.getItem(queryPatientIdKey);
+    const INACTIVE_ACCOUNT_ERROR_MSG = "Inactive account. No patient data returned.";
     if (queryPatientId) {
       console.log("Using stored patient id ", queryPatientId);
       return getFhirData(client, "/Patient/" + queryPatientId).then(
         (value: any) => {
-          return Patient.from(value);
+          let patient: Patient = Patient.from(value)
+          if (!patient.isActive()) throw new Error(INACTIVE_ACCOUNT_ERROR_MSG);
+          return patient;
         }
       );
     }
     // Get the Patient resource
     return await client.patient.read().then((value: any) => {
-      return Patient.from(value);
-    });
+      let patient: Patient = Patient.from(value)
+      if (!patient.isActive()) throw new Error(INACTIVE_ACCOUNT_ERROR_MSG);
+      return patient;
+});
   }
 
   async function getPractitioner(
@@ -184,7 +189,11 @@ export default function FhirClientProvider(props: Props): JSX.Element {
             (result) => result.value && result.value.resourceType === "Patient"
           );
           if (!hasPatientResult) {
-            setError("No matching patient data returned.");
+            const errorReason =
+              results[1] && results[1].reason
+                ? results[1].reason
+                : "No matching patient data returned.";
+            setError(errorReason);
             setLoaded(true);
           }
           results.forEach((result) => {

src/components/ScheduleSetup.tsx

@@ -488,7 +488,7 @@ export default class ScheduleSetup extends React.Component<
                   }
                 }
               );
-              if (patients.find((o) => o.id !== patient.id)) {
+              if ((patients.find((o:Patient) => o.id !== patient.id && o.isActive()))) {
                 // exclude current patient, workaround for above FIXME
                 reject(
                   `Phone number is already associated with: ${patients

src/model/CommunicationRequest.ts

@@ -61,14 +61,15 @@ export class CommunicationRequest implements ICommunicationRequest {
     sender: Patient | Practitioner = null,
     note: string = ""
   ) {
-    return this.createNewOutgoingMessage(
+    let c = this.createNewOutgoingMessage(
       messageContent,
       patient,
       carePlan,
       IsaccMessageCategory.isaccManuallySentMessage,
       sender,
       note
     );
+    return c
   }
 
   static createNewOutgoingMessage(

src/model/Patient.ts

@@ -469,4 +469,9 @@ export default class Patient implements IPatient {
       this.meta.security.push(existingMetaSecurity);
     }
   }
+
+  isActive () {
+    if (typeof this.active === "undefined") return true;
+    return this.active;
+  }
 }