You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/20 10:54:30 UTC
[incubator-dlab] 03/06: [DLAB-1079]: generate key service fixes
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e680da21a66f4f89b1571f172bb24cdb1aeea6ee
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Sep 20 12:44:23 2019 +0300
[DLAB-1079]: generate key service fixes
---
.../src/app/core/services/applicationServiceFacade.service.ts | 8 ++++----
.../webapp/src/app/core/services/userAccessKey.service.ts | 8 ++++----
2 files changed, 8 insertions(+), 8 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 6c94e94..addc5c5 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
@@ -40,7 +40,7 @@ export class ApplicationServiceFacade {
private static readonly ACTIVE_LIST = 'active_list';
private static readonly FULL_ACTIVE_LIST = 'full_active_list';
private static readonly ENV = 'environment';
- private static readonly ACCESS_KEY_GENERATE = 'access_key_generate';
+ private static readonly PROJECT_KEY_GENERATE = 'access_key_generate';
private static readonly PROVISIONED_RESOURCES = 'provisioned_resources';
private static readonly EXPLORATORY_ENVIRONMENT = 'exploratory_environment';
private static readonly IMAGE = 'image';
@@ -123,14 +123,14 @@ export class ApplicationServiceFacade {
public buildGenerateAccessKey(): Observable<any> {
return this.buildRequest(RequestMethod.Post,
- this.requestRegistry.Item(ApplicationServiceFacade.ACCESS_KEY_GENERATE),
+ this.requestRegistry.Item(ApplicationServiceFacade.PROJECT_KEY_GENERATE),
null,
{ observe: 'response', responseType: 'text' });
}
public buildRegenerateAccessKey(option): Observable<any> {
return this.buildRequest(RequestMethod.Post,
- this.requestRegistry.Item(ApplicationServiceFacade.ACCESS_KEY_GENERATE) + option,
+ this.requestRegistry.Item(ApplicationServiceFacade.PROJECT_KEY_GENERATE) + option,
null,
{ observe: 'response', responseType: 'text' });
}
@@ -587,7 +587,7 @@ export class ApplicationServiceFacade {
this.requestRegistry.Add(ApplicationServiceFacade.OAUTH, '/api/user/azure/oauth');
this.requestRegistry.Add(ApplicationServiceFacade.ACCESS_KEY, '/api/user/access_key');
- this.requestRegistry.Add(ApplicationServiceFacade.ACCESS_KEY_GENERATE, '/api/user/access_key/generate');
+ this.requestRegistry.Add(ApplicationServiceFacade.PROJECT_KEY_GENERATE, '/api/project/keys');
// Exploratory Environment
this.requestRegistry.Add(ApplicationServiceFacade.PROVISIONED_RESOURCES,
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/userAccessKey.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/userAccessKey.service.ts
index 51ce115..81e8008 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/userAccessKey.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/userAccessKey.service.ts
@@ -42,10 +42,10 @@ export class UserAccessKeyService {
public initialUserAccessKeyCheck() {
this.checkUserAccessKey().subscribe(
response => {
- this._accessKeyEmitter.next(response);
- }, error => {
- this._accessKeyEmitter.next(error);
- });
+ this._accessKeyEmitter.next(response);
+ }, error => {
+ this._accessKeyEmitter.next(error);
+ });
}
public checkUserAccessKey(): Observable<{}> {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org