You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/26 09:43:20 UTC
[incubator-dlab] 02/02: Merge remote-tracking branch
'remotes/origin/develop' into DLAB-terraform
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ac6b9a381c3b6d2753ceae4c26717545a784d73c
Author: bhliva <bo...@epam.com>
AuthorDate: Thu Sep 26 12:41:28 2019 +0300
Merge remote-tracking branch 'remotes/origin/develop' into DLAB-terraform
# Conflicts:
# services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
# services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.ts
---
.../src/app/core/services/applicationServiceFacade.service.ts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index d01963d..af6d28b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -90,7 +90,7 @@ export class ApplicationServiceFacade {
}
public buildLogoutRequest(): Observable<any> {
- return this.buildRequest(HTTPMethod.Get,
+ return this.buildRequest(HTTPMethod.GET,
this.requestRegistry.Item(ApplicationServiceFacade.LOGOUT),
'',
{ observe: 'response' });
@@ -108,7 +108,7 @@ export class ApplicationServiceFacade {
}
public buildLocationCheck(): Observable<any> {
- return this.buildRequest(RequestMethod.Get,
+ return this.buildRequest(HTTPMethod.GET,
this.requestRegistry.Item(ApplicationServiceFacade.OAUTH),
null,
{ observe: 'response' });
@@ -116,8 +116,8 @@ export class ApplicationServiceFacade {
public buildGetAuthToken(body: any): Observable<any> {
return this.buildRequest(HTTPMethod.POST,
- this.requestRegistry.Item(ApplicationServiceFacade.OAUTH),
- body,
+ this.requestRegistry.Item(ApplicationServiceFacade.OAUTH) + body,
+ null,
{ observe: 'response' });
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org