Changed .sendHttpRequest() to .request()

Author: neroniaky

README.md

@@ -338,19 +338,19 @@ const routerConfig: Routes = [
 ## Advanced Usage
 More advanced methods can be used if a higher degree of customization is required.
 
-### .sendHttpRequest()
-More customized requests can be send with the `.sendHttpRequest()`-function. It accepts the RequestOptions-Class. 
-More information can be found in the Angular2 API Reference [here](https://angular.io/docs/ts/latest/api/http/index/RequestOptions-class.html).
+### .request()
+More customized requests can be send with the `.request()`-function. It accepts the RequestOptionsArgs-Interface. 
+More information can be found in the Angular2 API Reference [here](https://angular.io/docs/ts/latest/api/http/index/RequestOptionsArgs-interface.html).
 
-`sendHttpRequest(options: RequestOptions): Observable<Response>`
+`request(options: RequestOptionsArgs): Observable<Response>`
 
 #### Example:
 ```javascript
-this.sendHttpRequest(new RequestOptions({
+this._tokenService.request({
     method: RequestMethod.Post,
     url:    'my-resource/1',
     data:   mydata
-}));
+});
 ```
 
 ### .userSignedIn()

src/angular2-token.service.ts

@@ -6,7 +6,8 @@ import {
     Headers,
     Request,
     RequestMethod,
-    RequestOptions
+    RequestOptions,
+    RequestOptionsArgs
 } from '@angular/http';
 import { ActivatedRoute, Router }   from '@angular/router';
 import { Observable }       from 'rxjs/Observable';
@@ -248,59 +249,59 @@ export class Angular2TokenService implements CanActivate {
 
     // Standard HTTP requests
     get(path: string): Observable<Response> {
-        return this.sendHttpRequest(new RequestOptions({
+        return this.request({
             method: RequestMethod.Get,
             url:    this._constructApiPath() + path
-        }));
+        });
     }
 
     post(path: string, data: any): Observable<Response> {
-        return this.sendHttpRequest(new RequestOptions({
+        return this.request({
             method: RequestMethod.Post,
             url:    this._constructApiPath() + path,
             body:   data
-        }));
+        });
     }
 
     put(path: string, data: any): Observable<Response> {
-        return this.sendHttpRequest(new RequestOptions({
+        return this.request({
             method: RequestMethod.Put,
             url:    this._constructApiPath() + path,
             body:   data
-        }));
+        });
     }
 
     delete(path: string): Observable<Response> {
-        return this.sendHttpRequest(new RequestOptions({
+        return this.request({
             method: RequestMethod.Delete,
             url:    this._constructApiPath() + path
-        }));
+        });
     }
 
     patch(path: string, data: any): Observable<Response> {
-        return this.sendHttpRequest(new RequestOptions({
+        return this.request({
             method: RequestMethod.Patch,
             url:    this._constructApiPath() + path,
             body:   data
-        }));
+        });
     }
 
     head(path: string): Observable<Response> {
-        return this.sendHttpRequest(new RequestOptions({
+        return this.request({
             method: RequestMethod.Head,
             url:    this._constructApiPath() + path
-        }));
+        });
     }
 
     options(path: string): Observable<Response> {
-        return this.sendHttpRequest(new RequestOptions({
+        return this.request({
             method: RequestMethod.Options,
             url:    this._constructApiPath() + path
-        }));
+        });
     }
 
     // Construct and send Http request
-    sendHttpRequest(requestOptions: RequestOptions): Observable<Response> {
+    request(options: RequestOptionsArgs): Observable<Response> {
 
         let baseRequestOptions: RequestOptions;
         let baseHeaders:        { [key:string]: string; } = this._options.globalOptions.headers;
@@ -321,7 +322,7 @@ export class Angular2TokenService implements CanActivate {
         });
 
         // Merge standard and custom RequestOptions
-        baseRequestOptions = baseRequestOptions.merge(requestOptions);
+        baseRequestOptions = baseRequestOptions.merge(options);
 
         let response = this._http.request(new Request(baseRequestOptions)).share();