From 70ceb82d6eab14143e8b07d408c05da3fb42b1ef Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Mon, 1 Nov 2021 22:54:34 -0600 Subject: [PATCH] fixes #753 --- .../src/app/services/api/mock-api.service.ts | 18 ++++++++---------- setup-wizard/src/app/services/state.service.ts | 8 ++++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/setup-wizard/src/app/services/api/mock-api.service.ts b/setup-wizard/src/app/services/api/mock-api.service.ts index 281630814..c17d77f8c 100644 --- a/setup-wizard/src/app/services/api/mock-api.service.ts +++ b/setup-wizard/src/app/services/api/mock-api.service.ts @@ -150,20 +150,12 @@ export class MockApiService extends ApiService { async importDrive (guid: string) { await pauseFor(3000) - return { - 'tor-address': 'asdfasdfasdf.onion', - 'lan-address': 'embassy-dfasdf.local', - 'root-ca': btoa(rootCA), - } + return setupRes } async setupEmbassy (setupInfo: SetupEmbassyReq) { await pauseFor(3000) - return { - 'tor-address': 'asdfasdfasdf.onion', - 'lan-address': 'embassy-dfasdf.local', - 'root-ca': btoa(rootCA), - } + return setupRes } async getRecoveryDrives () { @@ -206,3 +198,9 @@ Rf3ZOPm9QP92YpWyYDkfAU04xdDo1vR0MYjKPkl4LjRqSU/tcCJnPMbJiwq+bWpX 2WJoEBXB/p15Kn6JxjI0ze2SnSI48JZ8it4fvxrhOo0VoLNIuCuNXJOwU17Rdl1W YJidaq7je6k18AdgPA0Kh8y1XtfUH3fTaVw4 -----END CERTIFICATE-----` + +const setupRes = { + 'tor-address': 'http://asdafsadasdasasdasdfasdfasdf.onion', + 'lan-address': 'https://embassy-abcdefgh.local', + 'root-ca': btoa(rootCA), +} diff --git a/setup-wizard/src/app/services/state.service.ts b/setup-wizard/src/app/services/state.service.ts index 0398581e9..9adbc81a7 100644 --- a/setup-wizard/src/app/services/state.service.ts +++ b/setup-wizard/src/app/services/state.service.ts @@ -62,8 +62,8 @@ export class StateService { async importDrive (guid: string) : Promise { const ret = await this.apiService.importDrive(guid) - this.torAddress = 'http://' + ret['tor-address'] - this.lanAddress = 'https://' + ret['lan-address'] + this.torAddress = ret['tor-address'] + this.lanAddress = ret['lan-address'] this.cert = ret['root-ca'] } @@ -74,8 +74,8 @@ export class StateService { 'recovery-partition': this.recoveryPartition, 'recovery-password': this.recoveryPassword, }) - this.torAddress = 'http://' + ret['tor-address'] - this.lanAddress = 'https://' + ret['lan-address'] + this.torAddress = ret['tor-address'] + this.lanAddress = ret['lan-address'] this.cert = ret['root-ca'] } }