Fix path creation

Author: neroniaky

README.md

@@ -112,6 +112,7 @@ Configuration options can be passed as `Angular2TokenOptions` via `.init()`.
 ```javascript
 constructor(private _tokenService: Angular2TokenService) {
     this._tokenService.init({
+        apiBase:                    null,
         apiPath:                    null,
 
         signInPath:                 'auth/sign_in',

src/angular2-token.service.ts

@@ -102,7 +102,7 @@ export class Angular2TokenService implements CanActivate {
 
         let defaultOptions: Angular2TokenOptions = {
             apiPath:                    null,
-            apiBase:                    '',
+            apiBase:                    null,
 
             signInPath:                 'auth/sign_in',
             signInRedirect:             null,
@@ -528,16 +528,21 @@ export class Angular2TokenService implements CanActivate {
 
     private _constructUserPath(): string {
         if (this._currentUserType == null)
-            return '/';
+            return '';
         else
             return this._currentUserType.path + '/';
     }
 
     private _constructApiPath(): string {
-        if (this._options.apiPath == null)
-            return this._options.apiBase + '/';
-        else
-            return this._options.apiBase + '/' + this._options.apiPath + '/';
+        let constructedPath = '';
+
+        if (this._options.apiBase != null)
+            constructedPath += this._options.apiBase + '/';
+
+        if (this._options.apiPath != null)
+            constructedPath += this._options.apiPath + '/';
+
+        return constructedPath;
     }
 
     private _getOAuthPath(oAuthType: string): string {

src/angular2-token.spec.ts

@@ -5,7 +5,7 @@ import { ActivatedRoute, RouterOutletMap, RouterState, Router } from '@angular/r
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { Angular2TokenService } from './angular2-token.service';
-import { 
+import {
 	SignInData,
 	RegisterData
 } from './angular2-token.model';
@@ -22,6 +22,7 @@ describe('Angular2TokenService', () => {
 	let emptyHeaders = new Headers({
 		'content-Type': 'application/json'
 	});
+
 	let tokenHeaders = new Headers({
 		'content-Type': 'application/json',
 		'token-type': tokenType,
@@ -181,25 +182,25 @@ describe('Angular2TokenService', () => {
 	}));
 
 	it('validateToken should call signOut when it returns status 401', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
-		
+
 		mockBackend.connections.subscribe(
 			c => c.mockError(new Response(new ResponseOptions({ status: 401, headers: new Headers() })))
 		);
 
 		spyOn(tokenService, 'signOut');
-		
+
 		tokenService.init({ apiPath: 'myapi', signOutFailedValidate: true });
 		tokenService.validateToken().subscribe(res => null, err => expect(tokenService.signOut).toHaveBeenCalled());
 	}));
 
 	it('validateToken should not call signOut when it returns status 401', inject([Angular2TokenService, MockBackend], (tokenService, mockBackend) => {
-		
+
 		mockBackend.connections.subscribe(
 			c => c.mockError(new Response(new ResponseOptions({ status: 401, headers: new Headers() })))
 		);
 
 		spyOn(tokenService, 'signOut');
-		
+
 		tokenService.init({ apiPath: 'myapi', signOutFailedValidate: false });
 		tokenService.validateToken().subscribe(res => null, err => expect(tokenService.signOut).not.toHaveBeenCalled());
 	}));