fix:return util configs and change docs

Signed-off-by: Hunter Achieng ([email protected])

Signed-off-by: Hunter Achieng <[email protected]>

packages/openmrs/README.md

@@ -3,6 +3,8 @@
 Language Pack for building expressions and operations for working with the
 [OpenMRS API](https://wiki.openmrs.org/display/docs/API).
 
+[OpenMRS Rest API](https://rest.openmrs.org/?javascript#openmrs-rest-api)
+
 [OpenMRS Data Model Explorer](http://burkeware.com/openmrs-data-model/openmrs-data-model-1.11.html#)
 
 ## Documentation

packages/openmrs/src/Adaptor.js

@@ -5,6 +5,7 @@ import {
 import request from 'superagent';
 import { Log, handleError, handleResponse } from './Utils';
 
+
 let agent = null;
 
 /**

packages/openmrs/src/Utils.js

@@ -1,4 +1,10 @@
 import { composeNextState } from '@openfn/language-common';
+import {
+  request as commonRequest,
+  expandReferences,
+  logResponse,
+  makeBasicAuthHeader,
+} from '@openfn/language-common/util';
 
 export const Log = {
   success: message => console.log(`✓ Success at ${new Date()}:\n∟ ${message}`),
@@ -42,3 +48,84 @@ const isArray = variable => !!variable && variable.constructor === Array;
 export function nestArray(data, key) {
   return isArray(data) ? { [key]: data } : data;
 }
+
+export function addBasicAuth(configuration = {}, headers) {
+  const { username, password } = configuration;
+  if (username && password) {
+    Object.assign(headers, makeBasicAuthHeader(username, password));
+  }
+}
+
+function encodeFormBody(data) {
+  const form = new FormData();
+  for (const [key, value] of Object.entries(data)) {
+    form.append(key, value);
+  }
+  return form;
+}
+
+export function request(method, path, params, callback = s => s) {
+  return state => {
+    const [resolvedPath, resolvedParams = {}] = expandReferences(
+      state,
+      path,
+      params
+    );
+
+    let { body, headers = {} } = resolvedParams;
+
+    if (resolvedParams.json) {
+      console.warn(
+        'WARNING: The `json` option has been deprecated. Use `body` instead'
+      );
+      body = resolvedParams.json;
+    }
+
+    if (resolvedParams.form) {
+      body = encodeFormBody(resolvedParams.form);
+    }
+
+    const baseUrl = state.configuration?.baseUrl;
+
+    addBasicAuth(state.configuration, headers);
+
+    const maxRedirections =
+      resolvedParams.maxRedirections ??
+      (resolvedParams.followAllRedirects === false ? 0 : 5);
+
+    const tls = resolvedParams.tls ?? resolvedParams.agentOptions;
+
+    if (resolvedParams.agentOptions) {
+      console.warn(
+        'WARNING: The `agentOptions` option has been deprecated. Use `tls` instead'
+      );
+    }
+
+    const options = {
+      ...resolvedParams,
+      headers,
+      baseUrl,
+      body,
+      tls,
+      maxRedirections,
+    };
+
+    return commonRequest(method, resolvedPath, options)
+      .then(response => {
+        logResponse(response);
+
+        return {
+          ...composeNextState(state, response.body),
+          response,
+        };
+      })
+      .then(callback)
+      .catch(err => {
+        logResponse(err);
+
+        throw err;
+      });
+  };
+}
+
+