From 5404ebce1cf6bff54e67881437eb19c84d9f73b5 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Fri, 29 Jul 2022 15:43:19 -0600 Subject: [PATCH] observe response not events in http reqs to effectively use firstValueFrom --- .../setup-wizard/src/app/services/api/http.service.ts | 7 ++----- frontend/projects/ui/src/app/services/http.service.ts | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/frontend/projects/setup-wizard/src/app/services/api/http.service.ts b/frontend/projects/setup-wizard/src/app/services/api/http.service.ts index e1ce31cfb..9d75e5197 100644 --- a/frontend/projects/setup-wizard/src/app/services/api/http.service.ts +++ b/frontend/projects/setup-wizard/src/app/services/api/http.service.ts @@ -54,9 +54,7 @@ export class HttpService { const options = { responseType: 'arraybuffer', body: encryptedBody.buffer, - observe: 'events', - reportProgress: false, - + observe: 'response', headers: { 'Content-Encoding': 'aesctr256', 'Content-Type': 'application/json', @@ -92,8 +90,7 @@ export class HttpService { const options = { responseType: 'json', body: httpOpts.body, - observe: 'events', - reportProgress: false, + observe: 'response', headers: { 'content-type': 'application/json', accept: 'application/json', diff --git a/frontend/projects/ui/src/app/services/http.service.ts b/frontend/projects/ui/src/app/services/http.service.ts index b05895938..b17edf1a5 100644 --- a/frontend/projects/ui/src/app/services/http.service.ts +++ b/frontend/projects/ui/src/app/services/http.service.ts @@ -70,8 +70,7 @@ export class HttpService { const options = { responseType: httpOpts.responseType || 'json', body: httpOpts.body, - observe: 'events', - reportProgress: false, + observe: 'response', withCredentials: httpOpts.withCredentials, headers: httpOpts.headers, params: httpOpts.params,