Fixed compilation errors with request headers which can contain 'stri…

…ng[]'
OpenMarshal · Dec 26, 2017 · 1fcbbe2 · 1fcbbe2
1 parent 3f26a18
commit 1fcbbe2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/lib/server/MethodCallArgs.js b/lib/server/MethodCallArgs.js
@@ -149,7 +149,7 @@ var MethodCallArgs = (function () {
         name = name.replace(/(-| )/g, '').toLowerCase();
         for (var k in this.request.headers)
             if (k.replace(/(-| )/g, '').toLowerCase() === name)
-                return this.request.headers[k];
+                return this.request.headers[k].toString();
         return defaultValue;
     };
     MethodCallArgs.prototype.getResource = function (callback) {

diff --git a/lib/server/v2/RequestContext.d.ts b/lib/server/v2/RequestContext.d.ts
@@ -9,14 +9,14 @@ import { IUser } from '../../user/v2/IUser';
 import * as http from 'http';
 export declare class RequestContextHeaders {
     protected headers: {
-        [name: string]: string;
+        [name: string]: string | string[];
     };
     contentLength: number;
     isSource: boolean;
     depth: number;
     host: string;
     constructor(headers: {
-        [name: string]: string;
+        [name: string]: string | string[];
     });
     find(name: string, defaultValue?: string): string;
     findBestAccept(defaultType?: string): string;
@@ -48,7 +48,7 @@ export declare class RequestContext {
     server: WebDAVServer;
     user: IUser;
     protected constructor(server: WebDAVServer, uri: string, headers: {
-        [name: string]: string;
+        [name: string]: string | string[];
     }, rootPath?: string);
     getResource(callback: ReturnCallback<Resource>): void;
     getResource(path: Path | string, callback: ReturnCallback<Resource>): void;

diff --git a/lib/server/v2/RequestContext.js b/lib/server/v2/RequestContext.js
@@ -44,7 +44,7 @@ var RequestContextHeaders = (function () {
         name = name.replace(/(-| )/g, '').toLowerCase();
         for (var k in this.headers)
             if (k.replace(/(-| )/g, '').toLowerCase() === name) {
-                var value = this.headers[k].trim();
+                var value = this.headers[k].toString().trim();
                 if (value.length !== 0)
                     return value;
             }

diff --git a/src/server/MethodCallArgs.ts b/src/server/MethodCallArgs.ts
@@ -218,7 +218,7 @@ export class MethodCallArgs
 
         for(const k in this.request.headers)
             if(k.replace(/(-| )/g, '').toLowerCase() === name)
-                return this.request.headers[k];
+                return this.request.headers[k].toString();
 
         return defaultValue;
     }

diff --git a/src/server/v2/RequestContext.ts b/src/server/v2/RequestContext.ts
@@ -18,7 +18,7 @@ export class RequestContextHeaders
     depth : number
     host : string
 
-    constructor(protected headers : { [name : string] : string })
+    constructor(protected headers : { [name : string] : string | string[] })
     {
         this.isSource = this.find('source', 'F').toUpperCase() === 'T' || this.find('translate', 'T').toUpperCase() === 'F';
         this.host = this.find('Host', 'localhost');
@@ -53,7 +53,7 @@ export class RequestContextHeaders
         for(const k in this.headers)
             if(k.replace(/(-| )/g, '').toLowerCase() === name)
             {
-                const value = this.headers[k].trim();
+                const value = this.headers[k].toString().trim();
                 if(value.length !== 0)
                     return value;
             }
@@ -117,7 +117,7 @@ export class RequestContext
     server : WebDAVServer
     user : IUser
 
-    protected constructor(server : WebDAVServer, uri : string, headers : { [name : string] : string }, rootPath ?: string)
+    protected constructor(server : WebDAVServer, uri : string, headers : { [name : string] : string | string[] }, rootPath ?: string)
     {
         this.overridePrivileges = false;
         this.rootPath = rootPath;