Merge pull request #110 from melgish/feature/relative-batch-urls

Feature/relative batch urls

README.md

@@ -121,6 +121,7 @@ Basic configuration is based on [RequestInit](https://developer.mozilla.org/en-U
         "Content-Type": "multipart/mixed",
       }),
       useChangset: false,
+      useRelativeURLs: false,
     },
     credentials: "omit",
     fragment: "value",

src/OBatch.ts

@@ -41,7 +41,7 @@ export class OBatch {
         "Content-Transfer-Encoding: binary",
         `Content-ID: ${contentId}`,
         "",
-        `${req.config.method} ${req.url.href} HTTP/1.1`,
+        `${req.config.method} ${this.getRequestURL(req)} HTTP/1.1`,
         `${this.getHeaders(req)}`,
         `${this.getBody(req)}`
       ].join(CRLF);
@@ -172,4 +172,13 @@ export class OBatch {
     }
     return mapped.join(CRLF);
   }
+
+  private getRequestURL(req: ORequest): string {
+    let href = req.url.href;
+    if (this.batchConfig.batch.useRelativeURLs) {
+      // Strip away matching root from request.
+      href = href.replace(this.batchConfig.rootUrl.href, '');
+    }
+    return href;
+  }
 }

src/OdataConfig.ts

@@ -6,6 +6,10 @@ export interface OdataBatchConfig {
   boundaryPrefix?: string;
   useChangset: boolean;
   changsetBoundaryPrefix?: string;
+  /**
+   * When truthy, relative URL's will be used in batch elements
+   */
+  useRelativeURLs: boolean;
 }
 
 export type OdataConfig = RequestInit & {

src/__snapshots__/o.spec.ts.snap

@@ -12,6 +12,7 @@ Object {
       },
     },
     "useChangset": false,
+    "useRelativeURLs": false,
   },
   "credentials": "omit",
   "fragment": "value",

src/o.ts

@@ -40,7 +40,8 @@ export function o(rootUrl: string | URL, config: OdataConfig | any = {}) {
       headers: new Headers({
         "Content-Type": "multipart/mixed"
       }),
-      useChangset: false
+      useChangset: false,
+      useRelativeURLs: false
     },
     credentials: "omit",
     fragment: "value",