feat: improve how we connect to the client

bluehalo · Jun 4, 2020 · a9d5306 · a9d5306
1 parent ef2567e
commit a9d5306
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/src/containers/App/sagas.js b/src/containers/App/sagas.js
@@ -10,7 +10,7 @@ import {
   addSmartInformationErrorAction,
 } from './actions';
 
-import FhirClient from '../../services/FhirClient';
+import connect from '../../services/FhirClient';
 
 import config from '../../config';
 
@@ -20,7 +20,7 @@ export function* loadConfig() {
 
 export function* loadSmartInfo() {
   try {
-    const client = yield call(FhirClient.connect);
+    const client = yield call(connect);
     yield put(addSmartInformationAction(client));
   } catch (e) {
     yield put(addSmartInformationErrorAction(e));

diff --git a/src/containers/Home/sagas.js b/src/containers/Home/sagas.js
@@ -3,14 +3,15 @@
  */
 
 import { all, put, call, takeEvery } from 'redux-saga/effects';
-import FhirClient from '../../services/FhirClient';
+import connect from '../../services/FhirClient';
 
 import { LOAD_PATIENT_INFO } from './constants';
 import { loadPatientInfoActionError, loadPatientInfoActionSuccess } from './actions';
 
 function* loadPatientInfo() {
   try {
-    const patient = yield call(FhirClient.getPatient);
+    const client = yield call(connect);
+    const patient = yield call(client.patient.read);
     yield put(loadPatientInfoActionSuccess(patient));
   } catch (e) {
     yield put(loadPatientInfoActionError(e));

diff --git a/src/services/FhirClient.js b/src/services/FhirClient.js
@@ -1,8 +1,7 @@
 import FHIR from 'fhirclient';
 
 let loaded = false;
-
-let client = {};
+let client;
 
 const connect = async () => {
   if (loaded) {
@@ -15,12 +14,4 @@ const connect = async () => {
   });
 };
 
-export default {
-  client,
-  connect,
-  getPatient: () => {
-    return connect().then(smart => {
-      return smart.patient.read();
-    });
-  },
-};
+export default connect;