Stop using multiple apiService instances

src/app/auth/login.component.ts

@@ -7,7 +7,6 @@ import 'rxjs/add/operator/map';
 
 @Component({
   templateUrl: 'login.component.html',
-  providers: [ApiService]
 })
 export class LoginComponent implements OnInit {
   signin: FormGroup;

src/app/auth/register.component.ts

@@ -8,7 +8,6 @@ import 'rxjs/add/operator/map';
 
 @Component({
   templateUrl: 'register.component.html',
-  providers: [ApiService]
 })
 
 export class RegisterComponent {

src/app/dashboard/account-edit.component.ts

@@ -6,7 +6,6 @@ import 'rxjs/add/operator/map';
 
 @Component({
   templateUrl: 'account-edit.component.html',
-  providers: [ApiService]
 })
 export class AccountEditComponent implements OnInit {
   settingForm: FormGroup;

src/app/dashboard/add-data.component.ts

@@ -8,7 +8,6 @@ import 'rxjs/add/operator/map';
 
 @Component({
   templateUrl: 'add-data.component.html',
-  providers: [ApiService]
 })
 export class AddDataComponent {
   payrollForm: FormGroup;

src/app/dashboard/feedback.component.ts

@@ -6,7 +6,6 @@ import 'rxjs/add/operator/map';
 
 @Component({
   templateUrl: 'feedback.component.html',
-  providers: [ApiService]
 })
 export class FeedbackComponent {
   feedbackForm: FormGroup;

src/app/dashboard/transaction-log.component.ts

@@ -11,7 +11,6 @@ import 'rxjs/add/operator/map';
 
 @Component({
   templateUrl: 'transaction-log.component.html',
-  providers: [ApiService]
 })
 export class TransactionLogComponent {
 

src/app/layouts/full-layout.component.ts

@@ -5,7 +5,6 @@ import { Router } from '@angular/router';
 @Component({
   selector: 'app-dashboard',
   templateUrl: './full-layout.component.html',
-  providers: [ApiService]
 })
 export class FullLayoutComponent implements OnInit {
   displayName: any;

src/app/providers/api-service.ts

@@ -19,9 +19,7 @@ export class ApiService {
   }
 
   public post(url: string, data: any = {}) {
-    if ( this.sessionKey != null ) {
     data.session_key = this.sessionKey;
-    }
     return this.http.post(
       this.apiUrl + url,
       data
@@ -77,12 +75,18 @@ export class ApiService {
   public logout() {
     console.log(this.sessionKey);
     const key = this.sessionKey;
-    return this.http.post(
+    return this.http
+      .post(
         this.apiUrl + '/logout',
-      {
+        { session_key : key },
-      session_key : key,
+      )
+      .map(
+        response => {
+          localStorage.clear();
+          this.sessionKey = null;
+          return response.json();
         }
-    ).map( response => { this.removeSessionKey(); return response.json(); } );
+      );
   }
 
   // Submits feedback