Merge 880f0eb into c8d5fc8

src/app/app.component.spec.ts

@@ -8,6 +8,8 @@ import { MailchainTestService } from './test/test-helpers/mailchain-test.service
 import { ModalConnectivityErrorComponent } from './modals/modal-connectivity-error/modal-connectivity-error.component';
 import { NgModule } from '@angular/core';
 import { errorMessages } from './services/helpers/error-messages/error-messages'
+import { HttpHelpersService } from './services/helpers/http-helpers/http-helpers.service';
+
 
 // Workaround:
 // Error from entryComponents not present in TestBed. Fix ref: https://stackoverflow.com/a/42399718
@@ -34,6 +36,9 @@ describe('AppComponent', () => {
       ],
       declarations: [
         AppComponent,
+      ],
+      providers: [
+        HttpHelpersService,
       ]
     }).compileComponents();
   }));

src/app/services/mailchain/addresses/addresses.service.spec.ts

@@ -3,6 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 
 import { AddressesService } from './addresses.service';
 import { MailchainTestService } from 'src/app/test/test-helpers/mailchain-test.service';
+import { HttpHelpersService } from '../../helpers/http-helpers/http-helpers.service';
 
 
 describe('AddressesService', () => {
@@ -13,13 +14,14 @@ describe('AddressesService', () => {
   let serverResponse
   let expectedAddresses
 
-  const desiredUrl = `http://127.0.0.1:8080/api/addresses`
+  const desiredUrl = `http://127.0.0.1:8080/api/addresses?protocol=ethereum&network=mainnet`
 
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
         AddressesService,
+        HttpHelpersService,
       ],
       imports: [HttpClientTestingModule]
     });
@@ -51,7 +53,7 @@ describe('AddressesService', () => {
     addressesService.getAddresses().then(res => {
       expect(res).toEqual(expectedAddresses)
     });
-
+    
     // handle open connections
     const req = httpTestingController.expectOne(desiredUrl);
     expect(req.request.method).toBe("GET");

src/app/services/mailchain/addresses/addresses.service.ts

@@ -1,17 +1,23 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { LocalStorageServerService } from '../../helpers/local-storage-server/local-storage-server.service';
+import { LocalStorageProtocolService } from '../../helpers/local-storage-protocol/local-storage-protocol.service';
+import { HttpHelpersService } from '../../helpers/http-helpers/http-helpers.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class AddressesService {
 
   private url: string
+  private protocol: string
+  private network: string
 
   constructor(
     private http: HttpClient,
+    private httpHelpersService: HttpHelpersService,
     private localStorageServerService: LocalStorageServerService,
+    private localStorageProtocolService: LocalStorageProtocolService,
     ) {
       this.initUrl()
     }
@@ -20,19 +26,27 @@ export class AddressesService {
      * Initialize URL from local storage
      */
     initUrl(){
-      this.url = `${this.localStorageServerService.getCurrentServerDetails()}/api`
+      this.url = `${this.localStorageServerService.getCurrentServerDetails()}/api`,
+      this.protocol = this.localStorageProtocolService.getCurrentProtocol()
+      this.network = this.localStorageServerService.getCurrentNetwork()
     }
 
   /**
    * Get and return the public addresses from my wallet to send from
    */
   async getAddresses() {
+    var httpOptions = this.httpHelpersService.getHttpOptions([
+      ['protocol',this.protocol],
+      ['network',this.network]
+    ])
+
     var addresses = []
     let res = await this.http.get(
-      this.url + `/addresses`
+      this.url + `/addresses`,
+      httpOptions
       // TODO handle failure
     ).toPromise();      
-    res["addresses"].forEach(address => {
+    res["body"]["addresses"].forEach(address => {
       addresses.push(this.handleAddressFormatting(address,'ethereum'))
     });
     return addresses
@@ -51,9 +65,14 @@ export class AddressesService {
    * Returns the addresses response with status codes
    */
   public getAddressesResponse(){
+    var httpOptions = this.httpHelpersService.getHttpOptions([
+      ['protocol',this.protocol],
+      ['network',this.network]
+    ])
+
     return this.http.get(
       this.url + `/addresses`,
-      {observe: 'response'}
+      httpOptions
     )
   }