diff --git a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts index 25190f26f8..c144c68b94 100644 --- a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts @@ -41,8 +41,7 @@ export class FormCloudService extends BaseCloudService { apiService: AlfrescoApiService, appConfigService: AppConfigService ) { - super(apiService); - this.contextRoot = appConfigService.get('bpmHost', ''); + super(apiService, appConfigService); } /** diff --git a/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.ts b/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.ts index 4bb6335c1f..178451a7df 100644 --- a/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.ts @@ -29,8 +29,7 @@ export class FormDefinitionSelectorCloudService extends BaseCloudService { constructor(apiService: AlfrescoApiService, appConfigService: AppConfigService) { - super(apiService); - this.contextRoot = appConfigService.get('bpmHost', ''); + super(apiService, appConfigService); } /** diff --git a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts b/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts index 3bd71fee57..98bce1c6e8 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts @@ -27,8 +27,7 @@ export class ProcessListCloudService extends BaseCloudService { constructor(apiService: AlfrescoApiService, appConfigService: AppConfigService, private logService: LogService) { - super(apiService); - this.contextRoot = appConfigService.get('bpmHost', ''); + super(apiService, appConfigService); } /** diff --git a/lib/process-services-cloud/src/lib/process/services/process-cloud.service.ts b/lib/process-services-cloud/src/lib/process/services/process-cloud.service.ts index 2495abbc9f..6161d0c7fe 100644 --- a/lib/process-services-cloud/src/lib/process/services/process-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/process/services/process-cloud.service.ts @@ -32,8 +32,7 @@ export class ProcessCloudService extends BaseCloudService { constructor(apiService: AlfrescoApiService, appConfigService: AppConfigService, private logService: LogService) { - super(apiService); - this.contextRoot = appConfigService.get('bpmHost', ''); + super(apiService, appConfigService); } /** diff --git a/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.ts b/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.ts index 8c966e1359..735b2bcd2b 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.ts @@ -32,8 +32,7 @@ export class StartProcessCloudService extends BaseCloudService { constructor(apiService: AlfrescoApiService, private logService: LogService, appConfigService: AppConfigService) { - super(apiService); - this.contextRoot = appConfigService.get('bpmHost', ''); + super(apiService, appConfigService); } /** diff --git a/lib/process-services-cloud/src/lib/services/base-cloud.service.ts b/lib/process-services-cloud/src/lib/services/base-cloud.service.ts index 0934cc38d3..71208cd77e 100644 --- a/lib/process-services-cloud/src/lib/services/base-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/services/base-cloud.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService } from '@alfresco/adf-core'; +import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core'; import { from, Observable } from 'rxjs'; export interface CallApiParams { @@ -35,8 +35,6 @@ export interface CallApiParams { export class BaseCloudService { - protected contextRoot: string; - protected defaultParams: CallApiParams = { path: '', httpMethod: '', @@ -45,7 +43,9 @@ export class BaseCloudService { returnType: Object }; - constructor(protected apiService: AlfrescoApiService) {} + constructor( + protected apiService: AlfrescoApiService, + protected appConfigService: AppConfigService) {} getBasePath(appName: string): string { return appName @@ -113,4 +113,8 @@ export class BaseCloudService { params.responseType ); } + + protected get contextRoot() { + return this.appConfigService.get('bpmHost', ''); + } } diff --git a/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.ts b/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.ts index 24cb01cf3c..ec32a1800e 100644 --- a/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.ts @@ -28,8 +28,7 @@ export class UserPreferenceCloudService extends BaseCloudService implements Pref apiService: AlfrescoApiService, appConfigService: AppConfigService, private logService: LogService) { - super(apiService); - this.contextRoot = appConfigService.get('bpmHost', ''); + super(apiService, appConfigService); } /** diff --git a/lib/process-services-cloud/src/lib/task/services/start-task-cloud.service.ts b/lib/process-services-cloud/src/lib/task/services/start-task-cloud.service.ts index f5c249c9b0..6b1efade19 100644 --- a/lib/process-services-cloud/src/lib/task/services/start-task-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/task/services/start-task-cloud.service.ts @@ -29,8 +29,7 @@ export class StartTaskCloudService extends BaseCloudService { constructor( apiService: AlfrescoApiService, appConfigService: AppConfigService) { - super(apiService); - this.contextRoot = appConfigService.get('bpmHost'); + super(apiService, appConfigService); } /** diff --git a/lib/process-services-cloud/src/lib/task/services/task-cloud.service.ts b/lib/process-services-cloud/src/lib/task/services/task-cloud.service.ts index 81c52631ca..5aec665460 100644 --- a/lib/process-services-cloud/src/lib/task/services/task-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/task/services/task-cloud.service.ts @@ -36,8 +36,7 @@ export class TaskCloudService extends BaseCloudService { private logService: LogService, private identityUserService: IdentityUserService ) { - super(apiService); - this.contextRoot = appConfigService.get('bpmHost', ''); + super(apiService, appConfigService); } /** diff --git a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.ts b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.ts index f80ac6b4c3..809431fc56 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.ts @@ -28,8 +28,7 @@ export class TaskListCloudService extends BaseCloudService { constructor(apiService: AlfrescoApiService, appConfigService: AppConfigService, private logService: LogService) { - super(apiService); - this.contextRoot = appConfigService.get('bpmHost', ''); + super(apiService, appConfigService); } /**