Auto Parse Json Response

toldsoftware · Jan 30, 2017 · ad15fda · ad15fda
1 parent 12c9ab1
commit ad15fda
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/lib/src/browser.js b/lib/src/browser.js
diff --git a/lib/src/browser.js.map b/lib/src/browser.js.map
diff --git a/lib/src/platform.d.ts b/lib/src/platform.d.ts
@@ -10,11 +10,12 @@ export declare type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD';
 export declare type HttpHeaders = {
     [key: string]: string;
 };
-export interface HttpClientResponse {
-    data: any;
+export interface HttpClientResponse<T> {
+    dataRaw: any;
+    data: T;
     headers: HttpHeaders;
 }
 export interface HttpClient {
-    request(url: string, method?: HttpMethod, data?: any, headers?: HttpHeaders, withCredentials?: boolean): Promise<HttpClientResponse>;
+    request<T>(url: string, method?: HttpMethod, data?: any, headers?: HttpHeaders, withCredentials?: boolean): Promise<HttpClientResponse<T>>;
     resolveUrl(url: string): string;
 }
diff --git a/src/browser.ts b/src/browser.ts
@@ -15,8 +15,8 @@ class BrowserPlatformProvider implements P.PlatformProvider {
 }
 
 class BrowserHttpClient implements P.HttpClient {
-    async request(url: string, method?: P.HttpMethod, data?: any, headers?: P.HttpHeaders, withCredentials = false): Promise<P.HttpClientResponse> {
-        return new Promise<P.HttpClientResponse>((resolve, reject) => {
+    async request<T>(url: string, method?: P.HttpMethod, data?: any, headers?: P.HttpHeaders, withCredentials = false): Promise<P.HttpClientResponse<T>> {
+        return new Promise<P.HttpClientResponse<T>>((resolve, reject) => {
             method = method || 'GET';
 
             if (typeof data === 'object' && data.constructor === Object) {
@@ -40,7 +40,16 @@ class BrowserHttpClient implements P.HttpClient {
                     let headersList = response.getAllResponseHeaders().split('\n').map(x => x.trim().split('='));
                     let headers: P.HttpHeaders = {};
                     headersList.forEach(x => headers[x[0]] = x[1]);
-                    resolve({ data: data, headers: headers });
+
+                    let dataObj = null;
+
+                    try {
+                        dataObj = JSON.parse(data) as T;
+                    } catch (err) {
+
+                    }
+
+                    resolve({ dataRaw: data, data: dataObj, headers: headers });
                 },
                 error: err => reject(err)
             });

diff --git a/src/platform.ts b/src/platform.ts
@@ -11,12 +11,13 @@ export abstract class Platform {
 export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD';
 export type HttpHeaders = { [key: string]: string };
 
-export interface HttpClientResponse {
-    data: any;
+export interface HttpClientResponse<T> {
+    dataRaw: any;
+    data: T;
     headers: HttpHeaders;
 }
 
 export interface HttpClient {
-    request(url: string, method?: HttpMethod, data?: any, headers?: HttpHeaders, withCredentials?: boolean): Promise<HttpClientResponse>;
+    request<T>(url: string, method?: HttpMethod, data?: any, headers?: HttpHeaders, withCredentials?: boolean): Promise<HttpClientResponse<T>>;
     resolveUrl(url: string): string;
 }