adds setUrl fn for path handling

lib/Adaptor.js

@@ -125,9 +125,8 @@ function execute() {
 function get(path, params, callback) {
 
   return function (state) {
-    var baseUrl = state.configuration.baseUrl;
 
-    var url = baseUrl ? baseUrl + path : path;
+    var url = (0, _Utils.setUrl)(state.configuration, path);
 
     var _expandReferences = (0, _languageCommon.expandReferences)(params)(state),
         query = _expandReferences.query,
@@ -166,13 +165,8 @@ function get(path, params, callback) {
 function post(path, params, callback) {
 
   return function (state) {
-    var _state$configuration = state.configuration,
-        baseUrl = _state$configuration.baseUrl,
-        username = _state$configuration.username,
-        password = _state$configuration.password,
-        authType = _state$configuration.authType;
 
-    var url = baseUrl ? baseUrl + path : path;
+    var url = (0, _Utils.setUrl)(state.configuration, path);
 
     var _expandReferences2 = (0, _languageCommon.expandReferences)(params)(state),
         query = _expandReferences2.query,
@@ -212,13 +206,8 @@ function post(path, params, callback) {
 function put(path, params, callback) {
 
   return function (state) {
-    var _state$configuration2 = state.configuration,
-        baseUrl = _state$configuration2.baseUrl,
-        username = _state$configuration2.username,
-        password = _state$configuration2.password,
-        authType = _state$configuration2.authType;
 
-    var url = baseUrl ? baseUrl + path : path;
+    var url = (0, _Utils.setUrl)(state.configuration, path);
 
     var _expandReferences3 = (0, _languageCommon.expandReferences)(params)(state),
         query = _expandReferences3.query,
@@ -258,13 +247,8 @@ function put(path, params, callback) {
 function patch(path, params, callback) {
 
   return function (state) {
-    var _state$configuration3 = state.configuration,
-        baseUrl = _state$configuration3.baseUrl,
-        username = _state$configuration3.username,
-        password = _state$configuration3.password,
-        authType = _state$configuration3.authType;
 
-    var url = baseUrl ? baseUrl + path : path;
+    var url = (0, _Utils.setUrl)(state.configuration, path);
 
     var _expandReferences4 = (0, _languageCommon.expandReferences)(params)(state),
         query = _expandReferences4.query,
@@ -304,13 +288,8 @@ function patch(path, params, callback) {
 function del(path, params, callback) {
 
   return function (state) {
-    var _state$configuration4 = state.configuration,
-        baseUrl = _state$configuration4.baseUrl,
-        username = _state$configuration4.username,
-        password = _state$configuration4.password,
-        authType = _state$configuration4.authType;
 
-    var url = baseUrl ? baseUrl + path : path;
+    var url = (0, _Utils.setUrl)(state.configuration, path);
 
     var _expandReferences5 = (0, _languageCommon.expandReferences)(params)(state),
         query = _expandReferences5.query,

lib/Utils.js

@@ -3,9 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.setUrl = setUrl;
 exports.setAuth = setAuth;
 exports.assembleError = assembleError;
 exports.tryJson = tryJson;
+function setUrl(configuration, path) {
+  if (configuration.baseUrl) return configuration.baseUrl + path;else return path;
+}
+
 function setAuth(configuration, manualAuth) {
   if (manualAuth) return manualAuth;else if (configuration.username) return {
     'username': configuration.username,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "language-http",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "An HTTP request language package for use with Open Function",
   "main": "lib/index.js",
   "scripts": {

src/Adaptor.js

@@ -1,6 +1,6 @@
 /** @module Adaptor */
 import { req } from './Client';
-import { setAuth } from './Utils';
+import { setAuth, setUrl } from './Utils';
 import {
   execute as commonExecute,
   expandReferences,
@@ -54,8 +54,7 @@ export function execute(...operations) {
 
    return state => {
 
-     const { baseUrl } = state.configuration;
-     const url = ( baseUrl ? baseUrl + path : path );
+     const url = setUrl(state.configuration, path);
 
      const { query, headers, authentication } = expandReferences(params)(state);
 
@@ -95,8 +94,7 @@ export function execute(...operations) {
 
    return state => {
 
-     const { baseUrl, username, password, authType } = state.configuration;
-     const url = ( baseUrl ? baseUrl + path : path );
+     const url = setUrl(state.configuration, path);
 
      const { query, headers, authentication, body } = expandReferences(params)(state);
 
@@ -136,8 +134,7 @@ export function put(path, params, callback) {
 
   return state => {
 
-    const { baseUrl, username, password, authType } = state.configuration;
-    const url = ( baseUrl ? baseUrl + path : path );
+    const url = setUrl(state.configuration, path);
 
     const { query, headers, authentication, body } = expandReferences(params)(state);
 
@@ -176,8 +173,7 @@ export function patch(path, params, callback) {
 
   return state => {
 
-    const { baseUrl, username, password, authType } = state.configuration;
-    const url = ( baseUrl ? baseUrl + path : path );
+    const url = setUrl(state.configuration, path);
 
     const { query, headers, authentication, body } = expandReferences(params)(state);
 
@@ -215,8 +211,7 @@ export function del(path, params, callback) {
 
   return state => {
 
-    const { baseUrl, username, password, authType } = state.configuration;
-    const url = ( baseUrl ? baseUrl + path : path );
+    const url = setUrl(state.configuration, path);
 
     const { query, headers, authentication, body } = expandReferences(params)(state);
 

src/Utils.js

@@ -1,3 +1,8 @@
+export function setUrl(configuration, path) {
+  if ( configuration.baseUrl ) return configuration.baseUrl + path
+  else return path
+}
+
 export function setAuth(configuration, manualAuth) {
   if ( manualAuth ) return manualAuth
   else if ( configuration.username ) return {