From a0aab47090df85fa6783b2a295c7851aef6bfd79 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 4 Jan 2023 17:04:57 +0100 Subject: [PATCH] export identity-group.service (#8099) --- .../identity-group.interface.ts | 0 .../identity-user.service.interface.ts | 0 .../src/lib/auth/mock/identity-group.mock.ts | 2 +- .../auth/mock/identity-group.service.mock.ts | 2 +- .../auth/mock/identity-user.service.mock.ts | 2 +- lib/core/src/lib/auth/public-api.ts | 16 ++++---------- .../auth/services/identity-group.service.ts | 2 +- .../auth/services/identity-user.service.ts | 2 +- .../people/mock/jwt-helper.service.spec.ts | 22 +++++++++++++++++++ .../services/identity-user.service.spec.ts | 3 ++- 10 files changed, 33 insertions(+), 18 deletions(-) rename lib/core/src/lib/auth/{services => interfaces}/identity-group.interface.ts (100%) rename lib/core/src/lib/auth/{services => interfaces}/identity-user.service.interface.ts (100%) create mode 100644 lib/process-services-cloud/src/lib/people/mock/jwt-helper.service.spec.ts diff --git a/lib/core/src/lib/auth/services/identity-group.interface.ts b/lib/core/src/lib/auth/interfaces/identity-group.interface.ts similarity index 100% rename from lib/core/src/lib/auth/services/identity-group.interface.ts rename to lib/core/src/lib/auth/interfaces/identity-group.interface.ts diff --git a/lib/core/src/lib/auth/services/identity-user.service.interface.ts b/lib/core/src/lib/auth/interfaces/identity-user.service.interface.ts similarity index 100% rename from lib/core/src/lib/auth/services/identity-user.service.interface.ts rename to lib/core/src/lib/auth/interfaces/identity-user.service.interface.ts diff --git a/lib/core/src/lib/auth/mock/identity-group.mock.ts b/lib/core/src/lib/auth/mock/identity-group.mock.ts index 9953c649a8..0a0d4cd291 100644 --- a/lib/core/src/lib/auth/mock/identity-group.mock.ts +++ b/lib/core/src/lib/auth/mock/identity-group.mock.ts @@ -17,7 +17,7 @@ import { IdentityGroupModel, IdentityGroupCountModel } from '../models/identity-group.model'; import { IdentityRoleModel } from '../models/identity-role.model'; -import { IdentityJoinGroupRequestModel } from '../services/identity-user.service.interface'; +import { IdentityJoinGroupRequestModel } from '../interfaces/identity-user.service.interface'; export const mockIdentityGroup1 = { id: 'mock-group-id-1', name: 'Mock Group 1', path: '/mock', subGroups: [] diff --git a/lib/core/src/lib/auth/mock/identity-group.service.mock.ts b/lib/core/src/lib/auth/mock/identity-group.service.mock.ts index 38d6b58ef8..99ec5b7595 100644 --- a/lib/core/src/lib/auth/mock/identity-group.service.mock.ts +++ b/lib/core/src/lib/auth/mock/identity-group.service.mock.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { mockIdentityGroups, mockIdentityGroupsCount, mockIdentityRoles } from './identity-group.mock'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; -import { IdentityGroupServiceInterface } from '../services/identity-group.interface'; +import { IdentityGroupServiceInterface } from '../interfaces/identity-group.interface'; import { IdentityGroupModel, IdentityGroupQueryResponse, diff --git a/lib/core/src/lib/auth/mock/identity-user.service.mock.ts b/lib/core/src/lib/auth/mock/identity-user.service.mock.ts index 94006b612c..04a69eaa93 100644 --- a/lib/core/src/lib/auth/mock/identity-user.service.mock.ts +++ b/lib/core/src/lib/auth/mock/identity-user.service.mock.ts @@ -25,7 +25,7 @@ import { IdentityUserQueryResponse, IdentityUserPasswordModel, IdentityJoinGroupRequestModel -} from '../services/identity-user.service.interface'; +} from '../interfaces/identity-user.service.interface'; import { mockIdentityGroups } from './identity-group.mock'; import { Observable, of } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; diff --git a/lib/core/src/lib/auth/public-api.ts b/lib/core/src/lib/auth/public-api.ts index c59ee3c35a..c7df01d12b 100644 --- a/lib/core/src/lib/auth/public-api.ts +++ b/lib/core/src/lib/auth/public-api.ts @@ -17,14 +17,6 @@ export * from './authentication-interceptor/auth-bearer.interceptor'; -export * from './mock/authentication.service.mock'; -export * from './mock/identity-group.mock'; -export * from './mock/identity-group.service.mock'; -export * from './mock/identity-user.mock'; -export * from './mock/identity-user.service.mock'; -export * from './mock/jwt-helper.service.spec'; -export * from './mock/oauth2.service.mock'; - export * from './guard/auth-guard-base'; export * from './guard/auth-guard.service'; export * from './guard/auth-guard-ecm.service'; @@ -32,14 +24,15 @@ export * from './guard/auth-guard-bpm.service'; export * from './guard/auth-guard-sso-role.service'; export * from './services/authentication.service'; -export * from './services/identity-group.interface'; export * from './services/identity-role.service'; - export * from './services/identity-user.service'; +export * from './services/identity-group.service'; export * from './services/jwt-helper.service'; export * from './services/oauth2.service'; -export * from './services/identity-user.service.interface'; +export * from './interfaces/identity-user.service.interface'; +export * from './interfaces/identity-group.interface'; +export * from './interfaces/openid-configuration.interface'; export * from './models/oauth-config.model'; export * from './models/redirection.model'; @@ -48,5 +41,4 @@ export * from './models/identity-group.model'; export * from './models/identity-user.model'; export * from './models/identity-role.model'; -export * from './interfaces/openid-configuration.interface'; diff --git a/lib/core/src/lib/auth/services/identity-group.service.ts b/lib/core/src/lib/auth/services/identity-group.service.ts index c4c72f2032..fe20aead48 100644 --- a/lib/core/src/lib/auth/services/identity-group.service.ts +++ b/lib/core/src/lib/auth/services/identity-group.service.ts @@ -27,7 +27,7 @@ import { IdentityGroupCountModel } from '../models/identity-group.model'; import { IdentityRoleModel } from '../models/identity-role.model'; -import { IdentityGroupServiceInterface } from './identity-group.interface'; +import { IdentityGroupServiceInterface } from '../interfaces/identity-group.interface'; import { OAuth2Service } from './oauth2.service'; @Injectable({ providedIn: 'root' }) diff --git a/lib/core/src/lib/auth/services/identity-user.service.ts b/lib/core/src/lib/auth/services/identity-user.service.ts index bebd8e67ff..c7caddf0f7 100644 --- a/lib/core/src/lib/auth/services/identity-user.service.ts +++ b/lib/core/src/lib/auth/services/identity-user.service.ts @@ -22,7 +22,7 @@ import { AppConfigService } from '../../app-config/app-config.service'; import { IdentityGroupModel } from '../models/identity-group.model'; import { IdentityRoleModel } from '../models/identity-role.model'; import { IdentityUserModel } from '../models/identity-user.model'; -import { IdentityJoinGroupRequestModel, IdentityUserServiceInterface, IdentityUserPasswordModel, IdentityUserQueryCloudRequestModel, IdentityUserQueryResponse } from './identity-user.service.interface'; +import { IdentityJoinGroupRequestModel, IdentityUserServiceInterface, IdentityUserPasswordModel, IdentityUserQueryCloudRequestModel, IdentityUserQueryResponse } from '../interfaces/identity-user.service.interface'; import { JwtHelperService } from './jwt-helper.service'; import { OAuth2Service } from './oauth2.service'; diff --git a/lib/process-services-cloud/src/lib/people/mock/jwt-helper.service.spec.ts b/lib/process-services-cloud/src/lib/people/mock/jwt-helper.service.spec.ts new file mode 100644 index 0000000000..3a2a4deb34 --- /dev/null +++ b/lib/process-services-cloud/src/lib/people/mock/jwt-helper.service.spec.ts @@ -0,0 +1,22 @@ +/*! + * @license + * Copyright 2019 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export const mockToken = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ' + + 'zdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiZmFtaWx5X25hbWUiOiJEb2UiLCJnaXZ' + + 'lbl9uYW1lIjoiSm9obiIsImFkbWluIjp0cnVlLCJlbWFpbCI6ImpvaG5Eb2VAZ21haWwuY29tIiwicHJ' + + 'lZmVycmVkX3VzZXJuYW1lIjoiam9obkRvZTEiLCJqdGkiOiI2MmQ3YjA4NS1hNTJjLTRjZmEtYjA2Zi1' + + 'hODFhN2IwNjRjZDIiLCJpYXQiOjE1NDM0MTA0NzcsImV4cCI6MTU0MzQxNTIxM30.pSP86kmX3keuU5E3ndaOUq2TzKdJRsuMnBdFz3Y-UEU'; diff --git a/lib/process-services-cloud/src/lib/people/services/identity-user.service.spec.ts b/lib/process-services-cloud/src/lib/people/services/identity-user.service.spec.ts index fa72124e71..5ccf1fa0b0 100644 --- a/lib/process-services-cloud/src/lib/people/services/identity-user.service.spec.ts +++ b/lib/process-services-cloud/src/lib/people/services/identity-user.service.spec.ts @@ -17,8 +17,9 @@ import { TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { AlfrescoApiService, JwtHelperService, mockToken, setupTestBed } from '@alfresco/adf-core'; +import { AlfrescoApiService, JwtHelperService, setupTestBed } from '@alfresco/adf-core'; import { IdentityUserService } from './identity-user.service'; +import { mockToken } from '../mock/jwt-helper.service.spec'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { mockSearchUserByApp,