Merge pull request #71 from ConvertAPI/feature/normalize-base-uri

Normalize base uri

Author: laurynas-convertapi

src/client.js

@@ -103,7 +103,7 @@ export default class Client {
   }
 
   url(path) {
-    return `${this.api.baseUri}/${path}?secret=${this.api.secret}`;
+    return `${this.api.baseUri}${path}?secret=${this.api.secret}`;
   }
 
   static handleError(error) {

src/index.js

@@ -2,15 +2,15 @@ import path from 'path';
 import pkg from '../package.json';
 import Task from './task';
 import Client from './client';
-import { getReadableStream } from './utils';
+import { getReadableStream, normalizeBaseUri } from './utils';
 
 function ConvertAPI(secret, options = {}) {
   if (!(this instanceof ConvertAPI)) {
     return new ConvertAPI(secret, options);
   }
 
   this.secret = secret;
-  this.baseUri = options.baseUri || 'https://v2.convertapi.com';
+  this.baseUri = normalizeBaseUri(options.baseUri || 'https://v2.convertapi.com/');
   this.conversionTimeout = options.conversionTimeout;
   this.conversionTimeoutDelta = options.conversionTimeoutDelta || 10;
   this.uploadTimeout = options.uploadTimeout || 1800;

src/utils.js

@@ -21,6 +21,14 @@ export const normalizeFilesParam = async (promise) => {
   return Promise.all(value);
 };
 
+export const normalizeBaseUri = (baseUri) => {
+  if (baseUri[baseUri.length - 1] !== '/') {
+    return `${baseUri}/`;
+  }
+
+  return baseUri;
+};
+
 export const buildFileParam = async (api, value) => {
   if (URI_REGEXP.test(value)) {
     return value;