inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-9311] Use new micro service ingress for people/group (#7708)

Browse Source 
* [AAE-9311] Use new micro service ingress for people/group

* [AAE-9311] change ingress for user-access-service

* [AAE-9311] fix unit test

* Trigger travis

* [AAE-9311] fix unit test
This commit is contained in:
Tomasz Gnyp
2022-07-14 12:55:21 +02:00
committed by GitHub
parent 3fab3cd630
commit 1f82230b0e
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/services/user-access.service.spec.ts
View File

@@ -152,7 +152,7 @@ describe('UserAccessService', () => {
appConfigService.config.bpmHost = fakeIdentityHost; appConfigService.config.bpmHost = fakeIdentityHost;
await userAccessService.fetchUserAccess(); await userAccessService.fetchUserAccess();
expect(getAccessFromApiSpy).toHaveBeenCalledWith({ url: `${fakeIdentityHost}/modeling-service/v1/identity/roles` }); expect(getAccessFromApiSpy).toHaveBeenCalledWith({ url: `${fakeIdentityHost}/identity-adapter-service/v1/roles` });
}); });
it('should not fetch the access from the API if is not configured with OAUTH', async () => { it('should not fetch the access from the API if is not configured with OAUTH', async () => {

4
lib/core/services/user-access.service.ts
View File

@@ -22,7 +22,7 @@ import { UserAccessModel } from '../models/user-access.model';
import { AppConfigService } from '../app-config/app-config.service'; import { AppConfigService } from '../app-config/app-config.service';
import { OAuth2Service } from './oauth2.service'; import { OAuth2Service } from './oauth2.service';
const IDENTITY_MICRO_SERVICE_INGRESS = 'modeling-service'; const IDENTITY_MICRO_SERVICE_INGRESS = 'identity-adapter-service';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -52,7 +52,7 @@ export class UserAccessService {
} }
private async fetchAccessFromApi() { private async fetchAccessFromApi() {
const url = `${this.identityHost}/${IDENTITY_MICRO_SERVICE_INGRESS}/v1/identity/roles`; const url = `${this.identityHost}/${IDENTITY_MICRO_SERVICE_INGRESS}/v1/roles`;
await this.oAuth2Service.get({ url }) await this.oAuth2Service.get({ url })
.toPromise() .toPromise()
.then((response: UserAccessModel) => { .then((response: UserAccessModel) => {

4
lib/process-services-cloud/src/lib/group/services/identity-group.service.ts
View File

@@ -23,7 +23,7 @@ import { IdentityGroupServiceInterface } from './identity-group.service.interfac
import { IdentityGroupFilterInterface } from './identity-group-filter.interface'; import { IdentityGroupFilterInterface } from './identity-group-filter.interface';
import { IdentityGroupModel } from '../models/identity-group.model'; import { IdentityGroupModel } from '../models/identity-group.model';
const IDENTITY_MICRO_SERVICE_INGRESS = 'modeling-service'; const IDENTITY_MICRO_SERVICE_INGRESS = 'identity-adapter-service';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class IdentityGroupService implements IdentityGroupServiceInterface { export class IdentityGroupService implements IdentityGroupServiceInterface {
@@ -72,7 +72,7 @@ export class IdentityGroupService implements IdentityGroupServiceInterface {
} }
private invokeIdentityGroupApi(): Observable<IdentityGroupModel[]> { private invokeIdentityGroupApi(): Observable<IdentityGroupModel[]> {
const url = `${this.identityHost}/${IDENTITY_MICRO_SERVICE_INGRESS}/v1/identity/groups`; const url = `${this.identityHost}/${IDENTITY_MICRO_SERVICE_INGRESS}/v1/groups`;
return this.oAuth2Service.get({ url, queryParams: this.queryParams }); return this.oAuth2Service.get({ url, queryParams: this.queryParams });
} }

4
lib/process-services-cloud/src/lib/people/services/identity-user.service.ts
View File

@@ -27,7 +27,7 @@ import { IdentityUserServiceInterface } from './identity-user.service.interface'
import { IdentityUserModel } from '../models/identity-user.model'; import { IdentityUserModel } from '../models/identity-user.model';
import { IdentityUserFilterInterface } from './identity-user-filter.interface'; import { IdentityUserFilterInterface } from './identity-user-filter.interface';
const IDENTITY_MICRO_SERVICE_INGRESS = 'modeling-service'; const IDENTITY_MICRO_SERVICE_INGRESS = 'identity-adapter-service';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -110,7 +110,7 @@ export class IdentityUserService implements IdentityUserServiceInterface {
} }
private invokeIdentityUserApi(): Observable<any> { private invokeIdentityUserApi(): Observable<any> {
const url = `${this.identityHost}/${IDENTITY_MICRO_SERVICE_INGRESS}/v1/identity/users`; const url = `${this.identityHost}/${IDENTITY_MICRO_SERVICE_INGRESS}/v1/users`;
return this.oAuth2Service.get({ url, queryParams: this.queryParams }); return this.oAuth2Service.get({ url, queryParams: this.queryParams });
} }