From 093b1e8a675eef665b57f67b63d7bad9d4030f9b Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Mon, 2 Jan 2023 14:40:28 +0100 Subject: [PATCH] [AAE-11891] move auth in auth folder (#8076) move auth and common in a separate folder --- lib/core/auth/src/index.ts | 1 - .../about-repository-info.component.ts | 2 +- .../src/lib/about/about.component.stories.ts | 6 ++- .../src/lib/app-config/app-config.service.ts | 2 +- .../app-config/debug-app-config.service.ts | 2 +- .../auth-bearer.interceptor.ts | 2 +- .../guard}/auth-guard-base.ts | 6 +-- .../guard}/auth-guard-bpm.service.spec.ts | 8 +-- .../guard}/auth-guard-bpm.service.ts | 6 +-- .../guard}/auth-guard-ecm.service.spec.ts | 8 +-- .../guard}/auth-guard-ecm.service.ts | 6 +-- .../auth-guard-sso-role.service.spec.ts | 10 ++-- .../guard}/auth-guard-sso-role.service.ts | 6 +-- .../guard}/auth-guard.service.spec.ts | 10 ++-- .../guard}/auth-guard.service.ts | 8 +-- lib/core/src/lib/auth/index.ts | 51 +++++++++++++++++++ .../mock/authentication.service.mock.ts | 10 ++-- .../{ => auth}/mock/identity-group.mock.ts | 0 .../mock/identity-group.service.mock.ts | 0 .../lib/{ => auth}/mock/identity-user.mock.ts | 0 .../mock/identity-user.service.mock.ts | 0 .../mock/jwt-helper.service.spec.ts | 0 .../{ => auth}/mock/oauth2.service.mock.ts | 0 .../{ => auth}/models/identity-group.model.ts | 0 .../{ => auth}/models/identity-role.model.ts | 0 .../{ => auth}/models/identity-user.model.ts | 0 .../{ => auth}/models/oauth-config.model.ts | 0 .../{ => auth}/models/redirection.model.ts | 0 .../services/authentication.service.spec.ts | 10 ++-- .../services/authentication.service.ts | 26 ++-------- .../services/identity-group.interface.ts | 0 .../services/identity-group.service.spec.ts | 6 +-- .../services/identity-group.service.ts | 2 +- .../services/identity-role.service.spec.ts | 2 +- .../services/identity-role.service.ts | 4 +- .../identity-user.service.interface.ts | 0 .../services/identity-user.service.spec.ts | 6 +-- .../services/identity-user.service.ts | 2 +- .../services/jwt-helper.service.spec.ts | 2 +- .../{ => auth}/services/jwt-helper.service.ts | 2 +- .../lib/{ => auth}/services/oauth2.service.ts | 2 +- .../openid-configuration.interface.ts | 26 ++++++++++ .../card-view-dateitem.component.ts | 6 +-- .../src/lib/clipboard/clipboard.service.ts | 2 +- .../lib/comments/comment-list.component.ts | 2 +- lib/core/src/lib/common/index.ts | 28 ++++++++++ .../mock/app-config.service.mock.ts | 2 +- .../{ => common}/models/log-levels.model.ts | 0 .../{ => common}/services/cookie.service.ts | 0 .../services/language-item.interface.ts | 0 .../{ => common}/services/log.service.spec.ts | 4 +- .../lib/{ => common}/services/log.service.ts | 2 +- .../services/storage.service.spec.ts | 10 ++-- .../{ => common}/services/storage.service.ts | 0 .../services/user-preferences.service.spec.ts | 14 ++--- .../services/user-preferences.service.ts | 4 +- .../src/lib/{ => common}/utils/file-utils.ts | 0 lib/core/src/lib/{ => common}/utils/index.ts | 0 .../{ => common}/utils/moment-date-adapter.ts | 0 .../utils/moment-date-formats.model.ts | 0 .../{ => common}/utils/object-utils.spec.ts | 0 .../lib/{ => common}/utils/object-utils.ts | 0 .../src/lib/{ => common}/utils/public-api.ts | 0 .../{ => common}/utils/string-utils.spec.ts | 0 .../lib/{ => common}/utils/string-utils.ts | 0 lib/core/src/lib/core.module.ts | 2 +- .../datatable-cell.component.spec.ts | 2 +- .../date-cell/date-cell.component.ts | 2 +- .../datatable/data/object-datarow.model.ts | 2 +- .../download-zip/download-zip.dialog.ts | 2 +- .../lib/directives/logout.directive.spec.ts | 2 +- .../src/lib/directives/logout.directive.ts | 2 +- .../src/lib/directives/upload.directive.ts | 2 +- .../widgets/date-time/date-time.widget.ts | 6 +-- .../components/widgets/date/date.widget.ts | 6 +-- .../services/widget-visibility.service.ts | 2 +- .../language-menu.component.spec.ts | 2 +- .../language-menu/language-menu.component.ts | 2 +- .../language-picker.component.ts | 2 +- .../sidenav-layout.component.spec.ts | 2 +- .../sidenav-layout.component.ts | 2 +- .../login-dialog-panel.component.spec.ts | 2 +- .../login-dialog.component.stories.ts | 4 +- .../login/components/login.component.spec.ts | 6 +-- .../components/login.component.stories.ts | 4 +- .../lib/login/components/login.component.ts | 6 +-- .../src/lib/mock/alfresco-api.service.mock.ts | 2 +- lib/core/src/lib/mock/cookie.service.mock.ts | 2 +- .../src/lib/mock/language.service.mock.ts | 2 +- lib/core/src/lib/mock/public-api.ts | 9 +--- lib/core/src/lib/models/general-user.model.ts | 2 +- lib/core/src/lib/models/public-api.ts | 7 --- .../notification-history.component.spec.ts | 2 +- .../notification-history.component.ts | 2 +- .../infinite-pagination.component.ts | 2 +- .../lib/pagination/pagination.component.ts | 2 +- .../src/lib/pipes/decimal-number.pipe.spec.ts | 2 +- lib/core/src/lib/pipes/decimal-number.pipe.ts | 2 +- .../src/lib/pipes/localized-date.pipe.spec.ts | 2 +- lib/core/src/lib/pipes/localized-date.pipe.ts | 2 +- lib/core/src/lib/pipes/time-ago.pipe.spec.ts | 2 +- lib/core/src/lib/pipes/time-ago.pipe.ts | 2 +- .../search-text-input.component.spec.ts | 2 +- .../search-text-input.component.ts | 2 +- .../src/lib/services/alfresco-api.service.ts | 4 +- .../src/lib/services/apps-process.service.ts | 2 +- .../src/lib/services/automation.service.ts | 4 +- lib/core/src/lib/services/bpm-user.service.ts | 2 +- .../lib/services/comment-content.service.ts | 2 +- .../lib/services/comment-process.service.ts | 2 +- .../src/lib/services/content.service.spec.ts | 4 +- lib/core/src/lib/services/content.service.ts | 4 +- .../lib/services/deleted-nodes-api.service.ts | 2 +- .../directionality-config.service.spec.ts | 2 +- .../services/directionality-config.service.ts | 2 +- .../src/lib/services/discovery-api.service.ts | 2 +- .../src/lib/services/download-zip.service.ts | 2 +- .../src/lib/services/ecm-user.service.spec.ts | 2 +- .../src/lib/services/favorites-api.service.ts | 2 +- .../services/language.service.interface.ts | 2 +- lib/core/src/lib/services/language.service.ts | 4 +- .../src/lib/services/nodes-api.service.ts | 2 +- .../services/people-content.service.spec.ts | 4 +- .../lib/services/people-content.service.ts | 4 +- .../lib/services/people-process.service.ts | 2 +- lib/core/src/lib/services/public-api.ts | 19 ------- .../lib/services/shared-links-api.service.ts | 2 +- .../lib/services/translate-loader.service.ts | 2 +- .../lib/services/translation.service.spec.ts | 2 +- .../src/lib/services/translation.service.ts | 2 +- .../lib/services/user-access.service.spec.ts | 4 +- .../src/lib/services/user-access.service.ts | 4 +- .../src/lib/testing/core.testing.module.ts | 4 +- .../components/mocks/user.service.mock.ts | 6 ++- .../components/user-info.component.spec.ts | 5 +- .../components/user-info.component.stories.ts | 4 +- .../components/user-info.component.ts | 6 +-- .../viewer/components/pdf-viewer.component.ts | 2 +- .../lib/viewer/components/viewer.component.ts | 2 +- .../lib/viewer/services/view-util.service.ts | 2 +- lib/core/src/public-api.ts | 5 +- .../components/task-details.component.spec.ts | 11 ++-- .../task-form/task-form.component.spec.ts | 50 ++++++++++++------ .../task-form/task-form.component.ts | 18 +++---- 144 files changed, 353 insertions(+), 271 deletions(-) rename lib/core/src/lib/{services => auth/authentication-interceptor}/auth-bearer.interceptor.ts (97%) rename lib/core/src/lib/{services => auth/guard}/auth-guard-base.ts (96%) rename lib/core/src/lib/{services => auth/guard}/auth-guard-bpm.service.spec.ts (96%) rename lib/core/src/lib/{services => auth/guard}/auth-guard-bpm.service.ts (87%) rename lib/core/src/lib/{services => auth/guard}/auth-guard-ecm.service.spec.ts (96%) rename lib/core/src/lib/{services => auth/guard}/auth-guard-ecm.service.ts (87%) rename lib/core/src/lib/{services => auth/guard}/auth-guard-sso-role.service.spec.ts (96%) rename lib/core/src/lib/{services => auth/guard}/auth-guard-sso-role.service.ts (93%) rename lib/core/src/lib/{services => auth/guard}/auth-guard.service.spec.ts (95%) rename lib/core/src/lib/{services => auth/guard}/auth-guard.service.ts (90%) create mode 100644 lib/core/src/lib/auth/index.ts rename lib/core/src/lib/{ => auth}/mock/authentication.service.mock.ts (86%) rename lib/core/src/lib/{ => auth}/mock/identity-group.mock.ts (100%) rename lib/core/src/lib/{ => auth}/mock/identity-group.service.mock.ts (100%) rename lib/core/src/lib/{ => auth}/mock/identity-user.mock.ts (100%) rename lib/core/src/lib/{ => auth}/mock/identity-user.service.mock.ts (100%) rename lib/core/src/lib/{ => auth}/mock/jwt-helper.service.spec.ts (100%) rename lib/core/src/lib/{ => auth}/mock/oauth2.service.mock.ts (100%) rename lib/core/src/lib/{ => auth}/models/identity-group.model.ts (100%) rename lib/core/src/lib/{ => auth}/models/identity-role.model.ts (100%) rename lib/core/src/lib/{ => auth}/models/identity-user.model.ts (100%) rename lib/core/src/lib/{ => auth}/models/oauth-config.model.ts (100%) rename lib/core/src/lib/{ => auth}/models/redirection.model.ts (100%) rename lib/core/src/lib/{ => auth}/services/authentication.service.spec.ts (98%) rename lib/core/src/lib/{ => auth}/services/authentication.service.ts (93%) rename lib/core/src/lib/{ => auth}/services/identity-group.interface.ts (100%) rename lib/core/src/lib/{ => auth}/services/identity-group.service.spec.ts (98%) rename lib/core/src/lib/{ => auth}/services/identity-group.service.ts (99%) rename lib/core/src/lib/{ => auth}/services/identity-role.service.spec.ts (98%) rename lib/core/src/lib/{ => auth}/services/identity-role.service.ts (96%) rename lib/core/src/lib/{ => auth}/services/identity-user.service.interface.ts (100%) rename lib/core/src/lib/{ => auth}/services/identity-user.service.spec.ts (99%) rename lib/core/src/lib/{ => auth}/services/identity-user.service.ts (99%) rename lib/core/src/lib/{ => auth}/services/jwt-helper.service.spec.ts (98%) rename lib/core/src/lib/{ => auth}/services/jwt-helper.service.ts (98%) rename lib/core/src/lib/{ => auth}/services/oauth2.service.ts (96%) create mode 100644 lib/core/src/lib/auth/services/openid-configuration.interface.ts create mode 100644 lib/core/src/lib/common/index.ts rename lib/core/src/lib/{ => common}/mock/app-config.service.mock.ts (94%) rename lib/core/src/lib/{ => common}/models/log-levels.model.ts (100%) rename lib/core/src/lib/{ => common}/services/cookie.service.ts (100%) rename lib/core/src/lib/{ => common}/services/language-item.interface.ts (100%) rename lib/core/src/lib/{ => common}/services/log.service.spec.ts (97%) rename lib/core/src/lib/{ => common}/services/log.service.ts (98%) rename lib/core/src/lib/{ => common}/services/storage.service.spec.ts (91%) rename lib/core/src/lib/{ => common}/services/storage.service.ts (100%) rename lib/core/src/lib/{ => common}/services/user-preferences.service.spec.ts (94%) rename lib/core/src/lib/{ => common}/services/user-preferences.service.ts (97%) rename lib/core/src/lib/{ => common}/utils/file-utils.ts (100%) rename lib/core/src/lib/{ => common}/utils/index.ts (100%) rename lib/core/src/lib/{ => common}/utils/moment-date-adapter.ts (100%) rename lib/core/src/lib/{ => common}/utils/moment-date-formats.model.ts (100%) rename lib/core/src/lib/{ => common}/utils/object-utils.spec.ts (100%) rename lib/core/src/lib/{ => common}/utils/object-utils.ts (100%) rename lib/core/src/lib/{ => common}/utils/public-api.ts (100%) rename lib/core/src/lib/{ => common}/utils/string-utils.spec.ts (100%) rename lib/core/src/lib/{ => common}/utils/string-utils.ts (100%) diff --git a/lib/core/auth/src/index.ts b/lib/core/auth/src/index.ts index 2858bcd070..28b7be220c 100644 --- a/lib/core/auth/src/index.ts +++ b/lib/core/auth/src/index.ts @@ -17,4 +17,3 @@ export * from './authentication'; export * from './authentication-interceptor/authentication.interceptor'; - diff --git a/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts b/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts index 2cf34a6f45..874882412c 100644 --- a/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts +++ b/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, OnInit } from '@angular/core'; -import { ObjectUtils, StringUtils } from '../../utils'; +import { ObjectUtils, StringUtils } from '../../common/utils'; import { LicenseData, StatusData } from '../interfaces'; import { RepositoryInfo } from './repository-info.interface'; diff --git a/lib/core/src/lib/about/about.component.stories.ts b/lib/core/src/lib/about/about.component.stories.ts index 3e721bb809..b852879dff 100644 --- a/lib/core/src/lib/about/about.component.stories.ts +++ b/lib/core/src/lib/about/about.component.stories.ts @@ -18,11 +18,13 @@ import { Meta, moduleMetadata, Story } from '@storybook/angular'; import { AboutComponent } from './about.component'; import { AboutModule } from './about.module'; -import { AuthenticationService, DiscoveryApiService } from '../services'; -import { AppConfigServiceMock, AuthenticationMock } from '../mock'; +import { DiscoveryApiService } from '../services'; +import { AuthenticationService } from '../auth/services/authentication.service'; +import { AuthenticationMock } from '../auth/mock/authentication.service.mock'; import { DiscoveryApiServiceMock } from '../mock/discovery-api.service.mock'; import { AppExtensionService, AppExtensionServiceMock } from '@alfresco/adf-extensions'; import { AppConfigService } from '../app-config/app-config.service'; +import { AppConfigServiceMock } from '../common/mock/app-config.service.mock'; import { CoreStoryModule } from '../testing/core.story.module'; export default { diff --git a/lib/core/src/lib/app-config/app-config.service.ts b/lib/core/src/lib/app-config/app-config.service.ts index ecd66373cc..dd49dc67e6 100644 --- a/lib/core/src/lib/app-config/app-config.service.ts +++ b/lib/core/src/lib/app-config/app-config.service.ts @@ -17,7 +17,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ObjectUtils } from '../utils/object-utils'; +import { ObjectUtils } from '../common/utils/object-utils'; import { Observable, Subject } from 'rxjs'; import { map, distinctUntilChanged, take } from 'rxjs/operators'; import { ExtensionConfig, ExtensionService, mergeObjects } from '@alfresco/adf-extensions'; diff --git a/lib/core/src/lib/app-config/debug-app-config.service.ts b/lib/core/src/lib/app-config/debug-app-config.service.ts index 43293fa894..4b6f7a48b5 100644 --- a/lib/core/src/lib/app-config/debug-app-config.service.ts +++ b/lib/core/src/lib/app-config/debug-app-config.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { StorageService } from '../services/storage.service'; +import { StorageService } from '../common/services/storage.service'; import { AppConfigService, AppConfigValues } from './app-config.service'; import { ExtensionService } from '@alfresco/adf-extensions'; diff --git a/lib/core/src/lib/services/auth-bearer.interceptor.ts b/lib/core/src/lib/auth/authentication-interceptor/auth-bearer.interceptor.ts similarity index 97% rename from lib/core/src/lib/services/auth-bearer.interceptor.ts rename to lib/core/src/lib/auth/authentication-interceptor/auth-bearer.interceptor.ts index 9c82c2eecc..f7426913de 100644 --- a/lib/core/src/lib/services/auth-bearer.interceptor.ts +++ b/lib/core/src/lib/auth/authentication-interceptor/auth-bearer.interceptor.ts @@ -21,7 +21,7 @@ import { HttpHandler, HttpInterceptor, HttpRequest, HttpSentEvent, HttpHeaderResponse, HttpProgressEvent, HttpResponse, HttpUserEvent, HttpHeaders } from '@angular/common/http'; -import { AuthenticationService } from './authentication.service'; +import { AuthenticationService } from '../services/authentication.service'; import { catchError, mergeMap } from 'rxjs/operators'; @Injectable() diff --git a/lib/core/src/lib/services/auth-guard-base.ts b/lib/core/src/lib/auth/guard/auth-guard-base.ts similarity index 96% rename from lib/core/src/lib/services/auth-guard-base.ts rename to lib/core/src/lib/auth/guard/auth-guard-base.ts index 1af17943fa..8269a1bba6 100644 --- a/lib/core/src/lib/services/auth-guard-base.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-base.ts @@ -23,14 +23,14 @@ import { CanActivateChild, UrlTree } from '@angular/router'; -import { AuthenticationService } from './authentication.service'; +import { AuthenticationService } from '../services/authentication.service'; import { AppConfigService, AppConfigValues -} from '../app-config/app-config.service'; +} from '../../app-config/app-config.service'; import { OauthConfigModel } from '../models/oauth-config.model'; import { MatDialog } from '@angular/material/dialog'; -import { StorageService } from './storage.service'; +import { StorageService } from '../../common/services/storage.service'; import { Observable } from 'rxjs'; export abstract class AuthGuardBase implements CanActivate, CanActivateChild { diff --git a/lib/core/src/lib/services/auth-guard-bpm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts similarity index 96% rename from lib/core/src/lib/services/auth-guard-bpm.service.spec.ts rename to lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts index e8af06457f..6aa09099cc 100644 --- a/lib/core/src/lib/services/auth-guard-bpm.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts @@ -16,12 +16,12 @@ */ import { TestBed } from '@angular/core/testing'; -import { AppConfigService } from '../app-config/app-config.service'; +import { AppConfigService } from '../../app-config/app-config.service'; import { AuthGuardBpm } from './auth-guard-bpm.service'; -import { AuthenticationService } from './authentication.service'; +import { AuthenticationService } from '../services/authentication.service'; import { RouterStateSnapshot, Router } from '@angular/router'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { setupTestBed } from '../../testing/setup-test-bed'; +import { CoreTestingModule } from '../../testing/core.testing.module'; import { MatDialog } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/core/src/lib/services/auth-guard-bpm.service.ts b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.ts similarity index 87% rename from lib/core/src/lib/services/auth-guard-bpm.service.ts rename to lib/core/src/lib/auth/guard/auth-guard-bpm.service.ts index 002728aa38..7f2d9a67e7 100644 --- a/lib/core/src/lib/services/auth-guard-bpm.service.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.ts @@ -17,11 +17,11 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Router, UrlTree } from '@angular/router'; -import { AppConfigService } from '../app-config/app-config.service'; -import { AuthenticationService } from './authentication.service'; +import { AppConfigService } from '../../app-config/app-config.service'; +import { AuthenticationService } from '../services/authentication.service'; import { AuthGuardBase } from './auth-guard-base'; import { MatDialog } from '@angular/material/dialog'; -import { StorageService } from './storage.service'; +import { StorageService } from '../../common/services/storage.service'; @Injectable({ providedIn: 'root' diff --git a/lib/core/src/lib/services/auth-guard-ecm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts similarity index 96% rename from lib/core/src/lib/services/auth-guard-ecm.service.spec.ts rename to lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts index 6500ef8f30..99ba8feef1 100644 --- a/lib/core/src/lib/services/auth-guard-ecm.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts @@ -16,12 +16,12 @@ */ import { TestBed } from '@angular/core/testing'; -import { AppConfigService } from '../app-config/app-config.service'; +import { AppConfigService } from '../../app-config/app-config.service'; import { AuthGuardEcm } from './auth-guard-ecm.service'; -import { AuthenticationService } from './authentication.service'; +import { AuthenticationService } from '../services/authentication.service'; import { RouterStateSnapshot, Router } from '@angular/router'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { setupTestBed } from '../../testing/setup-test-bed'; +import { CoreTestingModule } from '../../testing/core.testing.module'; import { MatDialog } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/core/src/lib/services/auth-guard-ecm.service.ts b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.ts similarity index 87% rename from lib/core/src/lib/services/auth-guard-ecm.service.ts rename to lib/core/src/lib/auth/guard/auth-guard-ecm.service.ts index 308f0e49a7..90e1e94e89 100644 --- a/lib/core/src/lib/services/auth-guard-ecm.service.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.ts @@ -19,11 +19,11 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Router, UrlTree } from '@angular/router'; -import { AuthenticationService } from './authentication.service'; -import { AppConfigService } from '../app-config/app-config.service'; +import { AuthenticationService } from '../services/authentication.service'; +import { AppConfigService } from '../../app-config/app-config.service'; import { AuthGuardBase } from './auth-guard-base'; import { MatDialog } from '@angular/material/dialog'; -import { StorageService } from './storage.service'; +import { StorageService } from '../../common/services/storage.service'; @Injectable({ providedIn: 'root' diff --git a/lib/core/src/lib/services/auth-guard-sso-role.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts similarity index 96% rename from lib/core/src/lib/services/auth-guard-sso-role.service.spec.ts rename to lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts index 0c78288dc3..4230d67b31 100644 --- a/lib/core/src/lib/services/auth-guard-sso-role.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts @@ -17,14 +17,14 @@ import { TestBed } from '@angular/core/testing'; import { ActivatedRouteSnapshot, Router } from '@angular/router'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { setupTestBed } from '../../testing/setup-test-bed'; +import { CoreTestingModule } from '../../testing/core.testing.module'; import { AuthGuardSsoRoleService } from './auth-guard-sso-role.service'; -import { JwtHelperService } from './jwt-helper.service'; +import { JwtHelperService } from '../services/jwt-helper.service'; import { MatDialog } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; -import { UserAccessService } from './user-access.service'; -import { UserContentAccessService } from './user-content-access.service'; +import { UserAccessService } from '../../services/user-access.service'; +import { UserContentAccessService } from '../../services/user-content-access.service'; describe('Auth Guard SSO role service', () => { diff --git a/lib/core/src/lib/services/auth-guard-sso-role.service.ts b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.ts similarity index 93% rename from lib/core/src/lib/services/auth-guard-sso-role.service.ts rename to lib/core/src/lib/auth/guard/auth-guard-sso-role.service.ts index 55436816db..620512b680 100644 --- a/lib/core/src/lib/services/auth-guard-sso-role.service.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.ts @@ -18,9 +18,9 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { MatDialog } from '@angular/material/dialog'; -import { ContentGroups } from './people-content.service'; -import { UserAccessService } from './user-access.service'; -import { UserContentAccessService } from './user-content-access.service'; +import { ContentGroups } from '../../services/people-content.service'; +import { UserAccessService } from '../../services/user-access.service'; +import { UserContentAccessService } from '../../services/user-content-access.service'; @Injectable({ providedIn: 'root' diff --git a/lib/core/src/lib/services/auth-guard.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard.service.spec.ts similarity index 95% rename from lib/core/src/lib/services/auth-guard.service.spec.ts rename to lib/core/src/lib/auth/guard/auth-guard.service.spec.ts index e3223fcee3..c8eda13f26 100644 --- a/lib/core/src/lib/services/auth-guard.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard.service.spec.ts @@ -17,13 +17,13 @@ import { TestBed } from '@angular/core/testing'; import { Router, RouterStateSnapshot } from '@angular/router'; -import { AppConfigService } from '../app-config/app-config.service'; +import { AppConfigService } from '../../app-config/app-config.service'; import { AuthGuard } from './auth-guard.service'; -import { AuthenticationService } from './authentication.service'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { AuthenticationService } from '../services/authentication.service'; +import { setupTestBed } from '../../testing/setup-test-bed'; +import { CoreTestingModule } from '../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; -import { StorageService } from './storage.service'; +import { StorageService } from '../../common/services/storage.service'; describe('AuthGuardService', () => { let state; diff --git a/lib/core/src/lib/services/auth-guard.service.ts b/lib/core/src/lib/auth/guard/auth-guard.service.ts similarity index 90% rename from lib/core/src/lib/services/auth-guard.service.ts rename to lib/core/src/lib/auth/guard/auth-guard.service.ts index 761a901013..bfcd322d94 100644 --- a/lib/core/src/lib/services/auth-guard.service.ts +++ b/lib/core/src/lib/auth/guard/auth-guard.service.ts @@ -17,12 +17,12 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Router, UrlTree } from '@angular/router'; -import { AuthenticationService } from './authentication.service'; -import { AppConfigService } from '../app-config/app-config.service'; +import { AuthenticationService } from '../services/authentication.service'; +import { AppConfigService } from '../../app-config/app-config.service'; import { AuthGuardBase } from './auth-guard-base'; -import { JwtHelperService } from './jwt-helper.service'; +import { JwtHelperService } from '../services/jwt-helper.service'; import { MatDialog } from '@angular/material/dialog'; -import { StorageService } from './storage.service'; +import { StorageService } from '../../common/services/storage.service'; @Injectable({ providedIn: 'root' diff --git a/lib/core/src/lib/auth/index.ts b/lib/core/src/lib/auth/index.ts new file mode 100644 index 0000000000..10512fb5fc --- /dev/null +++ b/lib/core/src/lib/auth/index.ts @@ -0,0 +1,51 @@ +/*! + * @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 * 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'; +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/jwt-helper.service'; +export * from './services/oauth2.service'; + +export * from './services/identity-user.service.interface'; +export * from './services/openid-configuration.interface'; + +export * from './models/oauth-config.model'; +export * from './models/redirection.model'; + +export * from './models/identity-group.model'; +export * from './models/identity-user.model'; +export * from './models/identity-role.model'; + diff --git a/lib/core/src/lib/mock/authentication.service.mock.ts b/lib/core/src/lib/auth/mock/authentication.service.mock.ts similarity index 86% rename from lib/core/src/lib/mock/authentication.service.mock.ts rename to lib/core/src/lib/auth/mock/authentication.service.mock.ts index e5317c3672..9e12ac1fa7 100644 --- a/lib/core/src/lib/mock/authentication.service.mock.ts +++ b/lib/core/src/lib/auth/mock/authentication.service.mock.ts @@ -18,11 +18,11 @@ import { Observable, of, throwError } from 'rxjs'; import { Injectable } from '@angular/core'; import { AuthenticationService } from '../services/authentication.service'; -import { AlfrescoApiService } from '../services/alfresco-api.service'; -import { CookieService } from '../services/cookie.service'; -import { LogService } from '../services/log.service'; -import { StorageService } from '../services/storage.service'; -import { AppConfigService } from '../app-config/app-config.service'; +import { AlfrescoApiService } from '../../services/alfresco-api.service'; +import { CookieService } from '../../common/services/cookie.service'; +import { LogService } from '../../common/services/log.service'; +import { StorageService } from '../../common/services/storage.service'; +import { AppConfigService } from '../../app-config/app-config.service'; @Injectable({ providedIn: 'root' diff --git a/lib/core/src/lib/mock/identity-group.mock.ts b/lib/core/src/lib/auth/mock/identity-group.mock.ts similarity index 100% rename from lib/core/src/lib/mock/identity-group.mock.ts rename to lib/core/src/lib/auth/mock/identity-group.mock.ts diff --git a/lib/core/src/lib/mock/identity-group.service.mock.ts b/lib/core/src/lib/auth/mock/identity-group.service.mock.ts similarity index 100% rename from lib/core/src/lib/mock/identity-group.service.mock.ts rename to lib/core/src/lib/auth/mock/identity-group.service.mock.ts diff --git a/lib/core/src/lib/mock/identity-user.mock.ts b/lib/core/src/lib/auth/mock/identity-user.mock.ts similarity index 100% rename from lib/core/src/lib/mock/identity-user.mock.ts rename to lib/core/src/lib/auth/mock/identity-user.mock.ts diff --git a/lib/core/src/lib/mock/identity-user.service.mock.ts b/lib/core/src/lib/auth/mock/identity-user.service.mock.ts similarity index 100% rename from lib/core/src/lib/mock/identity-user.service.mock.ts rename to lib/core/src/lib/auth/mock/identity-user.service.mock.ts diff --git a/lib/core/src/lib/mock/jwt-helper.service.spec.ts b/lib/core/src/lib/auth/mock/jwt-helper.service.spec.ts similarity index 100% rename from lib/core/src/lib/mock/jwt-helper.service.spec.ts rename to lib/core/src/lib/auth/mock/jwt-helper.service.spec.ts diff --git a/lib/core/src/lib/mock/oauth2.service.mock.ts b/lib/core/src/lib/auth/mock/oauth2.service.mock.ts similarity index 100% rename from lib/core/src/lib/mock/oauth2.service.mock.ts rename to lib/core/src/lib/auth/mock/oauth2.service.mock.ts diff --git a/lib/core/src/lib/models/identity-group.model.ts b/lib/core/src/lib/auth/models/identity-group.model.ts similarity index 100% rename from lib/core/src/lib/models/identity-group.model.ts rename to lib/core/src/lib/auth/models/identity-group.model.ts diff --git a/lib/core/src/lib/models/identity-role.model.ts b/lib/core/src/lib/auth/models/identity-role.model.ts similarity index 100% rename from lib/core/src/lib/models/identity-role.model.ts rename to lib/core/src/lib/auth/models/identity-role.model.ts diff --git a/lib/core/src/lib/models/identity-user.model.ts b/lib/core/src/lib/auth/models/identity-user.model.ts similarity index 100% rename from lib/core/src/lib/models/identity-user.model.ts rename to lib/core/src/lib/auth/models/identity-user.model.ts diff --git a/lib/core/src/lib/models/oauth-config.model.ts b/lib/core/src/lib/auth/models/oauth-config.model.ts similarity index 100% rename from lib/core/src/lib/models/oauth-config.model.ts rename to lib/core/src/lib/auth/models/oauth-config.model.ts diff --git a/lib/core/src/lib/models/redirection.model.ts b/lib/core/src/lib/auth/models/redirection.model.ts similarity index 100% rename from lib/core/src/lib/models/redirection.model.ts rename to lib/core/src/lib/auth/models/redirection.model.ts diff --git a/lib/core/src/lib/services/authentication.service.spec.ts b/lib/core/src/lib/auth/services/authentication.service.spec.ts similarity index 98% rename from lib/core/src/lib/services/authentication.service.spec.ts rename to lib/core/src/lib/auth/services/authentication.service.spec.ts index e47ddf1376..487cd4c6be 100644 --- a/lib/core/src/lib/services/authentication.service.spec.ts +++ b/lib/core/src/lib/auth/services/authentication.service.spec.ts @@ -16,12 +16,12 @@ */ import { fakeAsync, TestBed } from '@angular/core/testing'; -import { AlfrescoApiService } from './alfresco-api.service'; +import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { AuthenticationService } from './authentication.service'; -import { CookieService } from './cookie.service'; -import { AppConfigService } from '../app-config/app-config.service'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { CookieService } from '../../common/services/cookie.service'; +import { AppConfigService } from '../../app-config/app-config.service'; +import { setupTestBed } from '../../testing/setup-test-bed'; +import { CoreTestingModule } from '../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; declare let jasmine: any; diff --git a/lib/core/src/lib/services/authentication.service.ts b/lib/core/src/lib/auth/services/authentication.service.ts similarity index 93% rename from lib/core/src/lib/services/authentication.service.ts rename to lib/core/src/lib/auth/services/authentication.service.ts index db82fd2f59..0198346595 100644 --- a/lib/core/src/lib/services/authentication.service.ts +++ b/lib/core/src/lib/auth/services/authentication.service.ts @@ -18,16 +18,15 @@ import { Authentication } from '@alfresco/adf-core/auth'; import { Injectable } from '@angular/core'; import { Observable, from, throwError, Observer, ReplaySubject } from 'rxjs'; -import { AlfrescoApiService } from './alfresco-api.service'; -import { CookieService } from './cookie.service'; -import { LogService } from './log.service'; +import { AlfrescoApiService } from '../../services/alfresco-api.service'; +import { CookieService } from '../../common/services/cookie.service'; +import { LogService } from '../../common/services/log.service'; import { RedirectionModel } from '../models/redirection.model'; -import { AppConfigService, AppConfigValues } from '../app-config/app-config.service'; -import { UserProfileApi, UserRepresentation } from '@alfresco/js-api'; +import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service'; import { map, catchError, tap } from 'rxjs/operators'; import { HttpHeaders } from '@angular/common/http'; import { JwtHelperService } from './jwt-helper.service'; -import { StorageService } from './storage.service'; +import { StorageService } from '../../common/services/storage.service'; const REMEMBER_ME_COOKIE_KEY = 'ALFRESCO_REMEMBER_ME'; const REMEMBER_ME_UNTIL = 1000 * 60 * 60 * 24 * 30; @@ -49,12 +48,6 @@ export class AuthenticationService extends Authentication { */ onLogout: ReplaySubject = new ReplaySubject(1); - _profileApi: UserProfileApi; - get profileApi(): UserProfileApi { - this._profileApi = this._profileApi ?? new UserProfileApi(this.alfrescoApi.getInstance()); - return this._profileApi; - } - constructor( private appConfig: AppConfigService, private storageService: StorageService, @@ -315,15 +308,6 @@ export class AuthenticationService extends Authentication { return this.hasValidRedirection(provider) ? this.redirectUrl.url : null; } - /** - * Gets information about the user currently logged into APS. - * - * @returns User information - */ - getBpmLoggedUser(): Observable { - return from(this.profileApi.getProfile()); - } - private hasValidRedirection(provider: string): boolean { return this.redirectUrl && (this.redirectUrl.provider === provider || this.hasSelectedProviderAll(provider)); } diff --git a/lib/core/src/lib/services/identity-group.interface.ts b/lib/core/src/lib/auth/services/identity-group.interface.ts similarity index 100% rename from lib/core/src/lib/services/identity-group.interface.ts rename to lib/core/src/lib/auth/services/identity-group.interface.ts diff --git a/lib/core/src/lib/services/identity-group.service.spec.ts b/lib/core/src/lib/auth/services/identity-group.service.spec.ts similarity index 98% rename from lib/core/src/lib/services/identity-group.service.spec.ts rename to lib/core/src/lib/auth/services/identity-group.service.spec.ts index 371a84a71b..2d25f4f925 100644 --- a/lib/core/src/lib/services/identity-group.service.spec.ts +++ b/lib/core/src/lib/auth/services/identity-group.service.spec.ts @@ -16,8 +16,8 @@ */ import { fakeAsync, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { AlfrescoApiService } from './alfresco-api.service'; +import { setupTestBed } from '../../testing/setup-test-bed'; +import { AlfrescoApiService } from './../../services/alfresco-api.service'; import { IdentityGroupService } from './identity-group.service'; import { HttpErrorResponse } from '@angular/common/http'; import { throwError, of } from 'rxjs'; @@ -27,7 +27,7 @@ import { mockIdentityGroup1, mockIdentityGroupsCount } from '../mock/identity-group.mock'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { CoreTestingModule } from '../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { applicationDetailsMockApi, diff --git a/lib/core/src/lib/services/identity-group.service.ts b/lib/core/src/lib/auth/services/identity-group.service.ts similarity index 99% rename from lib/core/src/lib/services/identity-group.service.ts rename to lib/core/src/lib/auth/services/identity-group.service.ts index 55fa49983c..c4c72f2032 100644 --- a/lib/core/src/lib/services/identity-group.service.ts +++ b/lib/core/src/lib/auth/services/identity-group.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { Observable, of } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; -import { AppConfigService } from '../app-config/app-config.service'; +import { AppConfigService } from '../../app-config/app-config.service'; import { IdentityGroupSearchParam, IdentityGroupQueryCloudRequestModel, diff --git a/lib/core/src/lib/services/identity-role.service.spec.ts b/lib/core/src/lib/auth/services/identity-role.service.spec.ts similarity index 98% rename from lib/core/src/lib/services/identity-role.service.spec.ts rename to lib/core/src/lib/auth/services/identity-role.service.spec.ts index 91f1907a5f..1731673e2e 100644 --- a/lib/core/src/lib/services/identity-role.service.spec.ts +++ b/lib/core/src/lib/auth/services/identity-role.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { setupTestBed } from '../testing/setup-test-bed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { HttpClientModule, HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; diff --git a/lib/core/src/lib/services/identity-role.service.ts b/lib/core/src/lib/auth/services/identity-role.service.ts similarity index 96% rename from lib/core/src/lib/services/identity-role.service.ts rename to lib/core/src/lib/auth/services/identity-role.service.ts index 0bd171f7e8..2a4b60c94e 100644 --- a/lib/core/src/lib/services/identity-role.service.ts +++ b/lib/core/src/lib/auth/services/identity-role.service.ts @@ -21,8 +21,8 @@ import { throwError as observableThrowError, Observable, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; import { Pagination } from '@alfresco/js-api'; import { IdentityRoleModel } from '../models/identity-role.model'; -import { AppConfigService } from '../app-config/app-config.service'; -import { LogService } from './log.service'; +import { AppConfigService } from '../../app-config/app-config.service'; +import { LogService } from '../../common/services/log.service'; export interface IdentityRoleResponseModel { entries: IdentityRoleModel[]; diff --git a/lib/core/src/lib/services/identity-user.service.interface.ts b/lib/core/src/lib/auth/services/identity-user.service.interface.ts similarity index 100% rename from lib/core/src/lib/services/identity-user.service.interface.ts rename to lib/core/src/lib/auth/services/identity-user.service.interface.ts diff --git a/lib/core/src/lib/services/identity-user.service.spec.ts b/lib/core/src/lib/auth/services/identity-user.service.spec.ts similarity index 99% rename from lib/core/src/lib/services/identity-user.service.spec.ts rename to lib/core/src/lib/auth/services/identity-user.service.spec.ts index f0b8ccc89f..05568b5cdb 100644 --- a/lib/core/src/lib/services/identity-user.service.spec.ts +++ b/lib/core/src/lib/auth/services/identity-user.service.spec.ts @@ -27,11 +27,11 @@ import { import { mockJoinGroupRequest } from '../mock/identity-group.mock'; import { IdentityUserService } from './identity-user.service'; import { JwtHelperService } from './jwt-helper.service'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { AlfrescoApiService } from './alfresco-api.service'; +import { setupTestBed } from '../../testing/setup-test-bed'; +import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { mockToken } from '../mock/jwt-helper.service.spec'; import { IdentityRoleModel } from '../models/identity-role.model'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { CoreTestingModule } from '../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { assignRolesMockApi, diff --git a/lib/core/src/lib/services/identity-user.service.ts b/lib/core/src/lib/auth/services/identity-user.service.ts similarity index 99% rename from lib/core/src/lib/services/identity-user.service.ts rename to lib/core/src/lib/auth/services/identity-user.service.ts index 7095a7a185..bebd8e67ff 100644 --- a/lib/core/src/lib/services/identity-user.service.ts +++ b/lib/core/src/lib/auth/services/identity-user.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { Observable, of } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; -import { AppConfigService } from '../app-config/app-config.service'; +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'; diff --git a/lib/core/src/lib/services/jwt-helper.service.spec.ts b/lib/core/src/lib/auth/services/jwt-helper.service.spec.ts similarity index 98% rename from lib/core/src/lib/services/jwt-helper.service.spec.ts rename to lib/core/src/lib/auth/services/jwt-helper.service.spec.ts index ae29a7c24d..d4d603d4f0 100644 --- a/lib/core/src/lib/services/jwt-helper.service.spec.ts +++ b/lib/core/src/lib/auth/services/jwt-helper.service.spec.ts @@ -17,7 +17,7 @@ import { JwtHelperService } from './jwt-helper.service'; import { mockToken } from '../mock/jwt-helper.service.spec'; -import { setupTestBed } from '../testing/setup-test-bed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { TestBed } from '@angular/core/testing'; describe('JwtHelperService', () => { diff --git a/lib/core/src/lib/services/jwt-helper.service.ts b/lib/core/src/lib/auth/services/jwt-helper.service.ts similarity index 98% rename from lib/core/src/lib/services/jwt-helper.service.ts rename to lib/core/src/lib/auth/services/jwt-helper.service.ts index 9a4afabbe1..f58802b9d4 100644 --- a/lib/core/src/lib/services/jwt-helper.service.ts +++ b/lib/core/src/lib/auth/services/jwt-helper.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { StorageService } from './storage.service'; +import { StorageService } from '../../common/services/storage.service'; @Injectable({ providedIn: 'root' diff --git a/lib/core/src/lib/services/oauth2.service.ts b/lib/core/src/lib/auth/services/oauth2.service.ts similarity index 96% rename from lib/core/src/lib/services/oauth2.service.ts rename to lib/core/src/lib/auth/services/oauth2.service.ts index 8ec376e5cc..db6fa14a20 100644 --- a/lib/core/src/lib/services/oauth2.service.ts +++ b/lib/core/src/lib/auth/services/oauth2.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoApiService } from './alfresco-api.service'; +import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { Observable, from } from 'rxjs'; import { Oauth2Auth } from '@alfresco/js-api'; diff --git a/lib/core/src/lib/auth/services/openid-configuration.interface.ts b/lib/core/src/lib/auth/services/openid-configuration.interface.ts new file mode 100644 index 0000000000..2d8b6c4089 --- /dev/null +++ b/lib/core/src/lib/auth/services/openid-configuration.interface.ts @@ -0,0 +1,26 @@ +/*! + * @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 interface OpenidConfiguration { + authorization_endpoint: string; + token_endpoint: string; + userinfo_endpoint: string; + end_session_endpoint: string; + check_session_iframe: string; + revocation_endpoint: string; + introspection_endpoint: string; +} diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts index 78ddbb4627..51f026dc51 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts @@ -22,9 +22,9 @@ import { MAT_MOMENT_DATETIME_FORMATS, MomentDatetimeAdapter } from '@mat-datetim import moment, { Moment } from 'moment'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; import { CardViewUpdateService } from '../../services/card-view-update.service'; -import { UserPreferencesService, UserPreferenceValues } from '../../../services/user-preferences.service'; -import { MomentDateAdapter } from '../../../utils/moment-date-adapter'; -import { MOMENT_DATE_FORMATS } from '../../../utils/moment-date-formats.model'; +import { UserPreferencesService, UserPreferenceValues } from '../../../common/services/user-preferences.service'; +import { MomentDateAdapter } from '../../../common/utils/moment-date-adapter'; +import { MOMENT_DATE_FORMATS } from '../../../common/utils/moment-date-formats.model'; import { AppConfigService } from '../../../app-config/app-config.service'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/clipboard/clipboard.service.ts b/lib/core/src/lib/clipboard/clipboard.service.ts index 712d57477e..41cf05c8f3 100644 --- a/lib/core/src/lib/clipboard/clipboard.service.ts +++ b/lib/core/src/lib/clipboard/clipboard.service.ts @@ -17,7 +17,7 @@ import { Injectable, Inject } from '@angular/core'; import { DOCUMENT } from '@angular/common'; -import { LogService } from '../services/log.service'; +import { LogService } from '../common/services/log.service'; import { NotificationService } from '../notifications/services/notification.service'; @Injectable({ providedIn: 'root' }) diff --git a/lib/core/src/lib/comments/comment-list.component.ts b/lib/core/src/lib/comments/comment-list.component.ts index 3adc575eec..cb71891a78 100644 --- a/lib/core/src/lib/comments/comment-list.component.ts +++ b/lib/core/src/lib/comments/comment-list.component.ts @@ -19,7 +19,7 @@ import { Component, EventEmitter, Input, Output, ViewEncapsulation, OnInit, OnDe import { CommentModel } from '../models/comment.model'; import { EcmUserService } from '../services/ecm-user.service'; import { PeopleProcessService } from '../services/people-process.service'; -import { UserPreferencesService, UserPreferenceValues } from '../services/user-preferences.service'; +import { UserPreferencesService, UserPreferenceValues } from '../common/services/user-preferences.service'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/common/index.ts b/lib/core/src/lib/common/index.ts new file mode 100644 index 0000000000..251f7a9fa5 --- /dev/null +++ b/lib/core/src/lib/common/index.ts @@ -0,0 +1,28 @@ +/*! + * @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 * from './services/cookie.service'; +export * from './services/log.service'; +export * from './services/storage.service'; +export * from './services/user-preferences.service'; +export * from './services/language-item.interface'; + +export * from './models/log-levels.model'; + +export * from './mock/app-config.service.mock'; + +export * from './utils'; diff --git a/lib/core/src/lib/mock/app-config.service.mock.ts b/lib/core/src/lib/common/mock/app-config.service.mock.ts similarity index 94% rename from lib/core/src/lib/mock/app-config.service.mock.ts rename to lib/core/src/lib/common/mock/app-config.service.mock.ts index 2be5677b25..383a995c95 100644 --- a/lib/core/src/lib/mock/app-config.service.mock.ts +++ b/lib/core/src/lib/common/mock/app-config.service.mock.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { AppConfigService, Status } from '../app-config/app-config.service'; +import { AppConfigService, Status } from '../../app-config/app-config.service'; import { HttpClient } from '@angular/common/http'; import { ExtensionService } from '@alfresco/adf-extensions'; @Injectable() diff --git a/lib/core/src/lib/models/log-levels.model.ts b/lib/core/src/lib/common/models/log-levels.model.ts similarity index 100% rename from lib/core/src/lib/models/log-levels.model.ts rename to lib/core/src/lib/common/models/log-levels.model.ts diff --git a/lib/core/src/lib/services/cookie.service.ts b/lib/core/src/lib/common/services/cookie.service.ts similarity index 100% rename from lib/core/src/lib/services/cookie.service.ts rename to lib/core/src/lib/common/services/cookie.service.ts diff --git a/lib/core/src/lib/services/language-item.interface.ts b/lib/core/src/lib/common/services/language-item.interface.ts similarity index 100% rename from lib/core/src/lib/services/language-item.interface.ts rename to lib/core/src/lib/common/services/language-item.interface.ts diff --git a/lib/core/src/lib/services/log.service.spec.ts b/lib/core/src/lib/common/services/log.service.spec.ts similarity index 97% rename from lib/core/src/lib/services/log.service.spec.ts rename to lib/core/src/lib/common/services/log.service.spec.ts index e05ffd134b..bcc64f0181 100644 --- a/lib/core/src/lib/services/log.service.spec.ts +++ b/lib/core/src/lib/common/services/log.service.spec.ts @@ -20,9 +20,9 @@ import { HttpClientModule } from '@angular/common/http'; import { Component } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; -import { AppConfigService } from '../app-config/app-config.service'; +import { AppConfigService } from '../../app-config/app-config.service'; import { LogService } from './log.service'; -import { setupTestBed } from '../testing/setup-test-bed'; +import { setupTestBed } from '../../testing/setup-test-bed'; @Component({ template: '', diff --git a/lib/core/src/lib/services/log.service.ts b/lib/core/src/lib/common/services/log.service.ts similarity index 98% rename from lib/core/src/lib/services/log.service.ts rename to lib/core/src/lib/common/services/log.service.ts index 7154f5172a..ea30effa46 100644 --- a/lib/core/src/lib/services/log.service.ts +++ b/lib/core/src/lib/common/services/log.service.ts @@ -18,7 +18,7 @@ /* eslint-disable no-console */ import { Injectable } from '@angular/core'; -import { AppConfigService, AppConfigValues } from '../app-config/app-config.service'; +import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service'; import { logLevels, LogLevelsEnum } from '../models/log-levels.model'; import { Subject } from 'rxjs'; diff --git a/lib/core/src/lib/services/storage.service.spec.ts b/lib/core/src/lib/common/services/storage.service.spec.ts similarity index 91% rename from lib/core/src/lib/services/storage.service.spec.ts rename to lib/core/src/lib/common/services/storage.service.spec.ts index 241d287a99..456dd8f2cf 100644 --- a/lib/core/src/lib/services/storage.service.spec.ts +++ b/lib/core/src/lib/common/services/storage.service.spec.ts @@ -16,13 +16,13 @@ */ import { TestBed } from '@angular/core/testing'; -import { AppConfigService } from '../app-config/app-config.service'; -import { StorageService } from './storage.service'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { AppConfigService } from '../../app-config/app-config.service'; +import { StorageService } from '../../common/services/storage.service'; +import { setupTestBed } from '../../testing/setup-test-bed'; +import { CoreTestingModule } from '../../testing/core.testing.module'; import { AppConfigServiceMock } from '../mock/app-config.service.mock'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreModule } from '../core.module'; +import { CoreModule } from '../../core.module'; describe('StorageService', () => { diff --git a/lib/core/src/lib/services/storage.service.ts b/lib/core/src/lib/common/services/storage.service.ts similarity index 100% rename from lib/core/src/lib/services/storage.service.ts rename to lib/core/src/lib/common/services/storage.service.ts diff --git a/lib/core/src/lib/services/user-preferences.service.spec.ts b/lib/core/src/lib/common/services/user-preferences.service.spec.ts similarity index 94% rename from lib/core/src/lib/services/user-preferences.service.spec.ts rename to lib/core/src/lib/common/services/user-preferences.service.spec.ts index 22a0c940a0..f2a65edb26 100644 --- a/lib/core/src/lib/services/user-preferences.service.spec.ts +++ b/lib/core/src/lib/common/services/user-preferences.service.spec.ts @@ -17,14 +17,14 @@ import { TestBed } from '@angular/core/testing'; import { TranslateService, TranslateModule } from '@ngx-translate/core'; -import { AppConfigService } from '../app-config/app-config.service'; -import { StorageService } from './storage.service'; -import { UserPreferencesService, UserPreferenceValues } from './user-preferences.service'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { AppConfigService } from '../../app-config/app-config.service'; +import { StorageService } from '../../common/services/storage.service'; +import { UserPreferencesService, UserPreferenceValues } from '../../common/services/user-preferences.service'; +import { setupTestBed } from '../../testing/setup-test-bed'; +import { CoreTestingModule } from '../../testing/core.testing.module'; import { AppConfigServiceMock } from '../mock/app-config.service.mock'; -import { AlfrescoApiService } from './alfresco-api.service'; -import { AlfrescoApiServiceMock } from '../mock'; +import { AlfrescoApiService } from '../../services/alfresco-api.service'; +import { AlfrescoApiServiceMock } from '../../mock'; describe('UserPreferencesService', () => { diff --git a/lib/core/src/lib/services/user-preferences.service.ts b/lib/core/src/lib/common/services/user-preferences.service.ts similarity index 97% rename from lib/core/src/lib/services/user-preferences.service.ts rename to lib/core/src/lib/common/services/user-preferences.service.ts index e88be14dc0..aa75207dfc 100644 --- a/lib/core/src/lib/services/user-preferences.service.ts +++ b/lib/core/src/lib/common/services/user-preferences.service.ts @@ -18,10 +18,10 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { Observable, BehaviorSubject } from 'rxjs'; -import { AppConfigService, AppConfigValues } from '../app-config/app-config.service'; +import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service'; import { StorageService } from './storage.service'; import { distinctUntilChanged, map, filter } from 'rxjs/operators'; -import { AlfrescoApiService } from './alfresco-api.service'; +import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { LanguageItem } from './language-item.interface'; // eslint-disable-next-line no-shadow diff --git a/lib/core/src/lib/utils/file-utils.ts b/lib/core/src/lib/common/utils/file-utils.ts similarity index 100% rename from lib/core/src/lib/utils/file-utils.ts rename to lib/core/src/lib/common/utils/file-utils.ts diff --git a/lib/core/src/lib/utils/index.ts b/lib/core/src/lib/common/utils/index.ts similarity index 100% rename from lib/core/src/lib/utils/index.ts rename to lib/core/src/lib/common/utils/index.ts diff --git a/lib/core/src/lib/utils/moment-date-adapter.ts b/lib/core/src/lib/common/utils/moment-date-adapter.ts similarity index 100% rename from lib/core/src/lib/utils/moment-date-adapter.ts rename to lib/core/src/lib/common/utils/moment-date-adapter.ts diff --git a/lib/core/src/lib/utils/moment-date-formats.model.ts b/lib/core/src/lib/common/utils/moment-date-formats.model.ts similarity index 100% rename from lib/core/src/lib/utils/moment-date-formats.model.ts rename to lib/core/src/lib/common/utils/moment-date-formats.model.ts diff --git a/lib/core/src/lib/utils/object-utils.spec.ts b/lib/core/src/lib/common/utils/object-utils.spec.ts similarity index 100% rename from lib/core/src/lib/utils/object-utils.spec.ts rename to lib/core/src/lib/common/utils/object-utils.spec.ts diff --git a/lib/core/src/lib/utils/object-utils.ts b/lib/core/src/lib/common/utils/object-utils.ts similarity index 100% rename from lib/core/src/lib/utils/object-utils.ts rename to lib/core/src/lib/common/utils/object-utils.ts diff --git a/lib/core/src/lib/utils/public-api.ts b/lib/core/src/lib/common/utils/public-api.ts similarity index 100% rename from lib/core/src/lib/utils/public-api.ts rename to lib/core/src/lib/common/utils/public-api.ts diff --git a/lib/core/src/lib/utils/string-utils.spec.ts b/lib/core/src/lib/common/utils/string-utils.spec.ts similarity index 100% rename from lib/core/src/lib/utils/string-utils.spec.ts rename to lib/core/src/lib/common/utils/string-utils.spec.ts diff --git a/lib/core/src/lib/utils/string-utils.ts b/lib/core/src/lib/common/utils/string-utils.ts similarity index 100% rename from lib/core/src/lib/utils/string-utils.ts rename to lib/core/src/lib/common/utils/string-utils.ts diff --git a/lib/core/src/lib/core.module.ts b/lib/core/src/lib/core.module.ts index 70901d4597..aba686a94c 100644 --- a/lib/core/src/lib/core.module.ts +++ b/lib/core/src/lib/core.module.ts @@ -62,7 +62,7 @@ import { AuthenticationInterceptor, Authentication } from '@alfresco/adf-core/au import { LegacyApiClientModule } from './api-factories/legacy-api-client.module'; import { RichTextEditorModule } from './rich-text-editor/rich-text-editor.module'; import { HttpClientModule, HttpClientXsrfModule, HTTP_INTERCEPTORS } from '@angular/common/http'; -import { AuthenticationService } from './services/authentication.service'; +import { AuthenticationService } from './auth/services/authentication.service'; import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar'; @NgModule({ diff --git a/lib/core/src/lib/datatable/components/datatable-cell/datatable-cell.component.spec.ts b/lib/core/src/lib/datatable/components/datatable-cell/datatable-cell.component.spec.ts index 166aa45e41..1e42e1d425 100644 --- a/lib/core/src/lib/datatable/components/datatable-cell/datatable-cell.component.spec.ts +++ b/lib/core/src/lib/datatable/components/datatable-cell/datatable-cell.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { UserPreferencesService } from '../../../services'; +import { UserPreferencesService } from '../../../common/services/user-preferences.service'; import { AppConfigService } from '../../../app-config'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CoreTestingModule } from '../../../testing'; diff --git a/lib/core/src/lib/datatable/components/date-cell/date-cell.component.ts b/lib/core/src/lib/datatable/components/date-cell/date-cell.component.ts index dad58da9ed..aeb02304d2 100644 --- a/lib/core/src/lib/datatable/components/date-cell/date-cell.component.ts +++ b/lib/core/src/lib/datatable/components/date-cell/date-cell.component.ts @@ -20,7 +20,7 @@ import { DataTableCellComponent } from '../datatable-cell/datatable-cell.compone import { UserPreferencesService, UserPreferenceValues -} from '../../../services/user-preferences.service'; +} from '../../../common/services/user-preferences.service'; import { NodesApiService } from '../../../services/nodes-api.service'; import { AppConfigService } from '../../../app-config/app-config.service'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/datatable/data/object-datarow.model.ts b/lib/core/src/lib/datatable/data/object-datarow.model.ts index fcc6ff2dfc..792e6881ae 100644 --- a/lib/core/src/lib/datatable/data/object-datarow.model.ts +++ b/lib/core/src/lib/datatable/data/object-datarow.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ObjectUtils } from '../../utils'; +import { ObjectUtils } from '../../common/utils'; import { DataRow } from './data-row.model'; // Simple implementation of the DataRow interface. diff --git a/lib/core/src/lib/dialogs/download-zip/download-zip.dialog.ts b/lib/core/src/lib/dialogs/download-zip/download-zip.dialog.ts index e0f91d2802..0644faf319 100755 --- a/lib/core/src/lib/dialogs/download-zip/download-zip.dialog.ts +++ b/lib/core/src/lib/dialogs/download-zip/download-zip.dialog.ts @@ -18,7 +18,7 @@ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DownloadEntry, MinimalNode } from '@alfresco/js-api'; -import { LogService } from '../../services/log.service'; +import { LogService } from '../../common/services/log.service'; import { DownloadZipService } from '../../services/download-zip.service'; import { ContentService } from '../../services/content.service'; import { NodesApiService } from '../../services/nodes-api.service'; diff --git a/lib/core/src/lib/directives/logout.directive.spec.ts b/lib/core/src/lib/directives/logout.directive.spec.ts index b9730613a1..be53fe43c2 100644 --- a/lib/core/src/lib/directives/logout.directive.spec.ts +++ b/lib/core/src/lib/directives/logout.directive.spec.ts @@ -19,7 +19,7 @@ import { Component, ContentChildren } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { of, throwError } from 'rxjs'; -import { AuthenticationService } from '../services'; +import { AuthenticationService } from '../auth/services/authentication.service'; import { AppConfigService } from '../app-config/app-config.service'; import { setupTestBed } from '../testing/setup-test-bed'; import { LogoutDirective } from './logout.directive'; diff --git a/lib/core/src/lib/directives/logout.directive.ts b/lib/core/src/lib/directives/logout.directive.ts index abab05470c..915e964eef 100644 --- a/lib/core/src/lib/directives/logout.directive.ts +++ b/lib/core/src/lib/directives/logout.directive.ts @@ -18,7 +18,7 @@ import { Input, Directive, ElementRef, OnInit, Renderer2 } from '@angular/core'; import { Router } from '@angular/router'; import { AppConfigService } from '../app-config/app-config.service'; -import { AuthenticationService } from '../services/authentication.service'; +import { AuthenticationService } from '../auth/services/authentication.service'; @Directive({ selector: '[adf-logout]' diff --git a/lib/core/src/lib/directives/upload.directive.ts b/lib/core/src/lib/directives/upload.directive.ts index 30cb834cee..eb21143f6f 100644 --- a/lib/core/src/lib/directives/upload.directive.ts +++ b/lib/core/src/lib/directives/upload.directive.ts @@ -18,7 +18,7 @@ /* eslint-disable @angular-eslint/no-input-rename */ import { Directive, ElementRef, HostListener, Input, NgZone, OnDestroy, OnInit, Renderer2 } from '@angular/core'; -import { FileInfo, FileUtils } from '../utils/file-utils'; +import { FileInfo, FileUtils } from '../common/utils/file-utils'; @Directive({ selector: '[adf-upload]' diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts index 89afe3dc2a..5d2e9f6122 100644 --- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts +++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts @@ -22,9 +22,9 @@ import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; import { DatetimeAdapter, MAT_DATETIME_FORMATS } from '@mat-datetimepicker/core'; import { MomentDatetimeAdapter, MAT_MOMENT_DATETIME_FORMATS } from '@mat-datetimepicker/moment'; import moment, { Moment } from 'moment'; -import { UserPreferencesService, UserPreferenceValues } from '../../../../services/user-preferences.service'; -import { MomentDateAdapter } from '../../../../utils/moment-date-adapter'; -import { MOMENT_DATE_FORMATS } from '../../../../utils/moment-date-formats.model'; +import { UserPreferencesService, UserPreferenceValues } from '../../../../common/services/user-preferences.service'; +import { MomentDateAdapter } from '../../../../common/utils/moment-date-adapter'; +import { MOMENT_DATE_FORMATS } from '../../../../common/utils/moment-date-formats.model'; import { FormService } from '../../../services/form.service'; import { WidgetComponent } from '../widget.component'; import { Subject } from 'rxjs'; diff --git a/lib/core/src/lib/form/components/widgets/date/date.widget.ts b/lib/core/src/lib/form/components/widgets/date/date.widget.ts index 9c7f1b6ac1..df627650d8 100644 --- a/lib/core/src/lib/form/components/widgets/date/date.widget.ts +++ b/lib/core/src/lib/form/components/widgets/date/date.widget.ts @@ -17,9 +17,9 @@ /* eslint-disable @angular-eslint/component-selector */ -import { UserPreferencesService, UserPreferenceValues } from '../../../../services/user-preferences.service'; -import { MomentDateAdapter } from '../../../../utils/moment-date-adapter'; -import { MOMENT_DATE_FORMATS } from '../../../../utils/moment-date-formats.model'; +import { UserPreferencesService, UserPreferenceValues } from '../../../../common/services/user-preferences.service'; +import { MomentDateAdapter } from '../../../../common/utils/moment-date-adapter'; +import { MOMENT_DATE_FORMATS } from '../../../../common/utils/moment-date-formats.model'; import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; import moment, { Moment } from 'moment'; diff --git a/lib/core/src/lib/form/services/widget-visibility.service.ts b/lib/core/src/lib/form/services/widget-visibility.service.ts index 8576e19ff7..1b1cd6a0b5 100644 --- a/lib/core/src/lib/form/services/widget-visibility.service.ts +++ b/lib/core/src/lib/form/services/widget-visibility.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LogService } from '../../services/log.service'; +import { LogService } from '../../common/services/log.service'; import { Injectable } from '@angular/core'; import moment from 'moment'; import { diff --git a/lib/core/src/lib/language-menu/language-menu.component.spec.ts b/lib/core/src/lib/language-menu/language-menu.component.spec.ts index 6f1e37a2f3..1f7aa4f08d 100644 --- a/lib/core/src/lib/language-menu/language-menu.component.spec.ts +++ b/lib/core/src/lib/language-menu/language-menu.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; import { LanguageMenuComponent } from './language-menu.component'; import { CoreTestingModule } from '../testing/core.testing.module'; -import { UserPreferencesService } from '../services/user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { TranslateModule } from '@ngx-translate/core'; import { LanguageService } from '../services/language.service'; diff --git a/lib/core/src/lib/language-menu/language-menu.component.ts b/lib/core/src/lib/language-menu/language-menu.component.ts index cdd1efa75f..24030f7390 100644 --- a/lib/core/src/lib/language-menu/language-menu.component.ts +++ b/lib/core/src/lib/language-menu/language-menu.component.ts @@ -18,7 +18,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; import { LanguageService } from '../services/language.service'; import { Observable } from 'rxjs'; -import { LanguageItem } from '../services/language-item.interface'; +import { LanguageItem } from '../common/services/language-item.interface'; @Component({ selector: 'adf-language-menu', diff --git a/lib/core/src/lib/language-menu/language-picker.component.ts b/lib/core/src/lib/language-menu/language-picker.component.ts index 385fea956a..f6449250d9 100644 --- a/lib/core/src/lib/language-menu/language-picker.component.ts +++ b/lib/core/src/lib/language-menu/language-picker.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Output } from '@angular/core'; -import { LanguageItem } from '../services/language-item.interface'; +import { LanguageItem } from '../common/services/language-item.interface'; @Component({ selector: 'adf-picker-button', diff --git a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts index 7672f3228c..0e74e0df63 100644 --- a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts +++ b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts @@ -25,7 +25,7 @@ import { MaterialModule } from '../../../material.module'; import { SidenavLayoutContentDirective } from '../../directives/sidenav-layout-content.directive'; import { SidenavLayoutHeaderDirective } from '../../directives/sidenav-layout-header.directive'; import { SidenavLayoutNavigationDirective } from '../../directives/sidenav-layout-navigation.directive'; -import { UserPreferencesService } from '../../../services/user-preferences.service'; +import { UserPreferencesService } from '../../../common/services/user-preferences.service'; import { CommonModule } from '@angular/common'; import { Direction } from '@angular/cdk/bidi'; import { of } from 'rxjs'; diff --git a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.ts b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.ts index 8c7f1331e4..7090ecfed0 100644 --- a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.ts +++ b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.ts @@ -29,7 +29,7 @@ import { ViewEncapsulation } from '@angular/core'; import { MediaMatcher } from '@angular/cdk/layout'; -import { UserPreferencesService } from '../../../services/user-preferences.service'; +import { UserPreferencesService } from '../../../common/services/user-preferences.service'; import { SidenavLayoutContentDirective } from '../../directives/sidenav-layout-content.directive'; import { SidenavLayoutHeaderDirective } from '../../directives/sidenav-layout-header.directive'; import { SidenavLayoutNavigationDirective } from '../../directives/sidenav-layout-navigation.directive'; diff --git a/lib/core/src/lib/login/components/login-dialog-panel.component.spec.ts b/lib/core/src/lib/login/components/login-dialog-panel.component.spec.ts index 555ffa29f8..15f3a007c3 100644 --- a/lib/core/src/lib/login/components/login-dialog-panel.component.spec.ts +++ b/lib/core/src/lib/login/components/login-dialog-panel.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AuthenticationService } from '../../services/authentication.service'; +import { AuthenticationService } from '../../auth/services/authentication.service'; import { LoginDialogPanelComponent } from './login-dialog-panel.component'; import { of } from 'rxjs'; import { setupTestBed } from '../../testing/setup-test-bed'; diff --git a/lib/core/src/lib/login/components/login-dialog.component.stories.ts b/lib/core/src/lib/login/components/login-dialog.component.stories.ts index 2c557ed4d4..f3e93d34ea 100644 --- a/lib/core/src/lib/login/components/login-dialog.component.stories.ts +++ b/lib/core/src/lib/login/components/login-dialog.component.stories.ts @@ -21,8 +21,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { LoginModule } from './../login.module'; import { LoginDialogStorybookComponent } from './login-dialog.stories.component'; import { MatButtonModule } from '@angular/material/button'; -import { AuthenticationService } from './../../services/authentication.service'; -import { AuthenticationMock } from './../../mock/authentication.service.mock'; +import { AuthenticationService } from '../../auth/services/authentication.service'; +import { AuthenticationMock } from '../../auth/mock/authentication.service.mock'; export default { component: LoginDialogStorybookComponent, diff --git a/lib/core/src/lib/login/components/login.component.spec.ts b/lib/core/src/lib/login/components/login.component.spec.ts index 8b39f4abf5..764f68cce1 100644 --- a/lib/core/src/lib/login/components/login.component.spec.ts +++ b/lib/core/src/lib/login/components/login.component.spec.ts @@ -19,9 +19,9 @@ import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { Validators } from '@angular/forms'; import { Router } from '@angular/router'; -import { UserPreferencesService } from '../../services/user-preferences.service'; +import { UserPreferencesService } from '../../common/services/user-preferences.service'; import { AppConfigService } from '../../app-config/app-config.service'; -import { AuthenticationService } from '../../services/authentication.service'; +import { AuthenticationService } from '../../auth/services/authentication.service'; import { LoginErrorEvent } from '../models/login-error.event'; import { LoginSuccessEvent } from '../models/login-success.event'; import { LoginComponent } from './login.component'; @@ -29,7 +29,7 @@ import { of, throwError } from 'rxjs'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; -import { LogService } from '../../services/log.service'; +import { LogService } from '../../common/services/log.service'; describe('LoginComponent', () => { let component: LoginComponent; diff --git a/lib/core/src/lib/login/components/login.component.stories.ts b/lib/core/src/lib/login/components/login.component.stories.ts index 5a362ef6de..55f2c9401e 100644 --- a/lib/core/src/lib/login/components/login.component.stories.ts +++ b/lib/core/src/lib/login/components/login.component.stories.ts @@ -20,8 +20,8 @@ import { CoreStoryModule } from '../../testing/core.story.module'; import { LoginModule } from '../login.module'; import { LoginComponent } from './login.component'; import { RouterModule } from '@angular/router'; -import { AuthenticationService } from './../../services/authentication.service'; -import { AuthenticationMock } from './../../mock/authentication.service.mock'; +import { AuthenticationService } from './../../auth/services/authentication.service'; +import { AuthenticationMock } from '../../auth/mock/authentication.service.mock'; export default { component: LoginComponent, diff --git a/lib/core/src/lib/login/components/login.component.ts b/lib/core/src/lib/login/components/login.component.ts index 20f40ec932..ddafcd2d93 100644 --- a/lib/core/src/lib/login/components/login.component.ts +++ b/lib/core/src/lib/login/components/login.component.ts @@ -21,9 +21,10 @@ import { } from '@angular/core'; import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { Router, ActivatedRoute, Params } from '@angular/router'; -import { AuthenticationService } from '../../services/authentication.service'; +import { AuthenticationService } from '../../auth/services/authentication.service'; +import { OauthConfigModel } from '../../auth/models/oauth-config.model'; import { TranslationService } from '../../services/translation.service'; -import { UserPreferencesService } from '../../services/user-preferences.service'; +import { UserPreferencesService } from '../../common/services/user-preferences.service'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { LoginErrorEvent } from '../models/login-error.event'; @@ -33,7 +34,6 @@ import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service'; -import { OauthConfigModel } from '../../models/oauth-config.model'; import { DomSanitizer, SafeStyle } from '@angular/platform-browser'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/mock/alfresco-api.service.mock.ts b/lib/core/src/lib/mock/alfresco-api.service.mock.ts index fb86a75123..fd4e7b32c8 100644 --- a/lib/core/src/lib/mock/alfresco-api.service.mock.ts +++ b/lib/core/src/lib/mock/alfresco-api.service.mock.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { AppConfigService } from '../app-config/app-config.service'; import { AlfrescoApiService } from '../services/alfresco-api.service'; -import { StorageService } from '../services/storage.service'; +import { StorageService } from '../common/services/storage.service'; @Injectable() export class AlfrescoApiServiceMock extends AlfrescoApiService { diff --git a/lib/core/src/lib/mock/cookie.service.mock.ts b/lib/core/src/lib/mock/cookie.service.mock.ts index ce276c02ac..18a9aecf59 100644 --- a/lib/core/src/lib/mock/cookie.service.mock.ts +++ b/lib/core/src/lib/mock/cookie.service.mock.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { CookieService } from '../services/cookie.service'; +import { CookieService } from '../common/services/cookie.service'; @Injectable() export class CookieServiceMock extends CookieService { diff --git a/lib/core/src/lib/mock/language.service.mock.ts b/lib/core/src/lib/mock/language.service.mock.ts index 84736ae723..b71b5afa31 100644 --- a/lib/core/src/lib/mock/language.service.mock.ts +++ b/lib/core/src/lib/mock/language.service.mock.ts @@ -18,7 +18,7 @@ import { LanguageServiceInterface } from '../services/language.service.interface'; import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; -import { LanguageItem } from '../services/language-item.interface'; +import { LanguageItem } from '../common/services/language-item.interface'; @Injectable() export class LanguageServiceMock implements LanguageServiceInterface { diff --git a/lib/core/src/lib/mock/public-api.ts b/lib/core/src/lib/mock/public-api.ts index af8ffc2b78..5209e29c64 100644 --- a/lib/core/src/lib/mock/public-api.ts +++ b/lib/core/src/lib/mock/public-api.ts @@ -16,9 +16,8 @@ */ export * from './alfresco-api.mock'; -export * from './app-config.service.mock'; +export * from '../common/mock/app-config.service.mock'; export * from './apps-service.mock'; -export * from './authentication.service.mock'; export * from './bpm-user.service.mock'; export * from './comment-process-service.mock'; export * from './cookie.service.mock'; @@ -36,9 +35,5 @@ export * from './form/form-definition-visibility.mock'; export * from './form/start-form.component.mock'; export * from './form/form.service.mock'; export * from './form/widget-visibility.service.mock'; -export * from './jwt-helper.service.spec'; -export * from './identity-group.mock'; -export * from './identity-user.mock'; -export * from './identity-group.service.mock'; -export * from './identity-user.service.mock'; + export * from './data-column.mock'; diff --git a/lib/core/src/lib/models/general-user.model.ts b/lib/core/src/lib/models/general-user.model.ts index e5643e4d1c..c0c0b45e6e 100644 --- a/lib/core/src/lib/models/general-user.model.ts +++ b/lib/core/src/lib/models/general-user.model.ts @@ -16,7 +16,7 @@ */ import { EcmUserModel } from './ecm-user.model'; -import { IdentityUserModel } from './identity-user.model'; +import { IdentityUserModel } from '../auth/models/identity-user.model'; import { UserProcessModel } from './user-process.model'; export type User = (EcmUserModel | UserProcessModel | IdentityUserModel) & { displayName?: string } & { username?: string }; diff --git a/lib/core/src/lib/models/public-api.ts b/lib/core/src/lib/models/public-api.ts index feaad21ebd..e1d583b14a 100644 --- a/lib/core/src/lib/models/public-api.ts +++ b/lib/core/src/lib/models/public-api.ts @@ -22,20 +22,13 @@ export * from './product-version.model'; export * from './user-process.model'; export * from './comment.model'; export * from './ecm-company.model'; -export * from './redirection.model'; export * from './pagination.model'; -export * from './oauth-config.model'; export * from './request-pagination.model'; export * from './decimal-number.model'; export * from './bpm-user.model'; export * from './ecm-user.model'; -export * from './identity-group.model'; -export * from './identity-user.model'; -export * from './identity-role.model'; -export * from './identity-group.model'; export * from './search-text-input.model'; export * from './node-metadata.model'; export * from './application-access.model'; export * from './user-access.model'; export * from './general-user.model'; -export * from './comment.model'; diff --git a/lib/core/src/lib/notifications/components/notification-history.component.spec.ts b/lib/core/src/lib/notifications/components/notification-history.component.spec.ts index a44f62d5e1..bf189ad814 100644 --- a/lib/core/src/lib/notifications/components/notification-history.component.spec.ts +++ b/lib/core/src/lib/notifications/components/notification-history.component.spec.ts @@ -21,7 +21,7 @@ import { CoreTestingModule } from '../../testing/core.testing.module'; import { NotificationHistoryComponent } from './notification-history.component'; import { OverlayContainer } from '@angular/cdk/overlay'; import { NotificationService } from '../services/notification.service'; -import { StorageService } from '../../services/storage.service'; +import { StorageService } from '../../common/services/storage.service'; import { TranslateModule } from '@ngx-translate/core'; import { NotificationModel, NOTIFICATION_TYPE } from '../models/notification.model'; diff --git a/lib/core/src/lib/notifications/components/notification-history.component.ts b/lib/core/src/lib/notifications/components/notification-history.component.ts index 3e413c5105..afbeea5c3b 100644 --- a/lib/core/src/lib/notifications/components/notification-history.component.ts +++ b/lib/core/src/lib/notifications/components/notification-history.component.ts @@ -21,7 +21,7 @@ import { NotificationModel, NOTIFICATION_TYPE } from '../models/notification.mod import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu'; import { takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; -import { StorageService } from '../../services/storage.service'; +import { StorageService } from '../../common/services/storage.service'; import { Pagination } from '@alfresco/js-api'; @Component({ diff --git a/lib/core/src/lib/pagination/infinite-pagination.component.ts b/lib/core/src/lib/pagination/infinite-pagination.component.ts index 579eed76d8..de1bb2f122 100644 --- a/lib/core/src/lib/pagination/infinite-pagination.component.ts +++ b/lib/core/src/lib/pagination/infinite-pagination.component.ts @@ -27,7 +27,7 @@ import { PaginatedComponent } from './paginated-component.interface'; import { Subject } from 'rxjs'; import { PaginationComponentInterface } from './pagination-component.interface'; import { RequestPaginationModel } from '../models/request-pagination.model'; -import { UserPreferencesService, UserPreferenceValues } from '../services/user-preferences.service'; +import { UserPreferencesService, UserPreferenceValues } from '../common/services/user-preferences.service'; import { PaginationModel } from '../models/pagination.model'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/pagination/pagination.component.ts b/lib/core/src/lib/pagination/pagination.component.ts index 2c93f4a906..b273156ca6 100644 --- a/lib/core/src/lib/pagination/pagination.component.ts +++ b/lib/core/src/lib/pagination/pagination.component.ts @@ -20,7 +20,7 @@ import { PaginatedComponent } from './paginated-component.interface'; import { PaginationComponentInterface } from './pagination-component.interface'; import { Subject } from 'rxjs'; import { PaginationModel } from '../models/pagination.model'; -import { UserPreferencesService, UserPreferenceValues } from '../services/user-preferences.service'; +import { UserPreferencesService, UserPreferenceValues } from '../common/services/user-preferences.service'; import { takeUntil } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; diff --git a/lib/core/src/lib/pipes/decimal-number.pipe.spec.ts b/lib/core/src/lib/pipes/decimal-number.pipe.spec.ts index 6ea3ded3dd..75cf1e02f8 100644 --- a/lib/core/src/lib/pipes/decimal-number.pipe.spec.ts +++ b/lib/core/src/lib/pipes/decimal-number.pipe.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; -import { UserPreferencesService } from '../services/user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { of } from 'rxjs'; import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; diff --git a/lib/core/src/lib/pipes/decimal-number.pipe.ts b/lib/core/src/lib/pipes/decimal-number.pipe.ts index b78b009346..e623713bde 100644 --- a/lib/core/src/lib/pipes/decimal-number.pipe.ts +++ b/lib/core/src/lib/pipes/decimal-number.pipe.ts @@ -18,7 +18,7 @@ import { DecimalPipe } from '@angular/common'; import { Pipe, PipeTransform, OnDestroy } from '@angular/core'; import { AppConfigService } from '../app-config/app-config.service'; -import { UserPreferencesService, UserPreferenceValues } from '../services/user-preferences.service'; +import { UserPreferencesService, UserPreferenceValues } from '../common/services/user-preferences.service'; import { DecimalNumberModel } from '../models/decimal-number.model'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/pipes/localized-date.pipe.spec.ts b/lib/core/src/lib/pipes/localized-date.pipe.spec.ts index 6db24e1c62..d6f4a63b54 100644 --- a/lib/core/src/lib/pipes/localized-date.pipe.spec.ts +++ b/lib/core/src/lib/pipes/localized-date.pipe.spec.ts @@ -18,7 +18,7 @@ import { LocalizedDatePipe } from './localized-date.pipe'; import { TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; -import { UserPreferencesService } from '../services/user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { of } from 'rxjs'; import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; diff --git a/lib/core/src/lib/pipes/localized-date.pipe.ts b/lib/core/src/lib/pipes/localized-date.pipe.ts index 83695935a9..470536def4 100644 --- a/lib/core/src/lib/pipes/localized-date.pipe.ts +++ b/lib/core/src/lib/pipes/localized-date.pipe.ts @@ -18,7 +18,7 @@ import { DatePipe } from '@angular/common'; import { Pipe, PipeTransform, OnDestroy } from '@angular/core'; import { AppConfigService } from '../app-config/app-config.service'; -import { UserPreferencesService, UserPreferenceValues } from '../services/user-preferences.service'; +import { UserPreferencesService, UserPreferenceValues } from '../common/services/user-preferences.service'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/pipes/time-ago.pipe.spec.ts b/lib/core/src/lib/pipes/time-ago.pipe.spec.ts index 88e7a4cc9e..c7820d4710 100644 --- a/lib/core/src/lib/pipes/time-ago.pipe.spec.ts +++ b/lib/core/src/lib/pipes/time-ago.pipe.spec.ts @@ -18,7 +18,7 @@ import { TimeAgoPipe } from './time-ago.pipe'; import { TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; -import { UserPreferencesService } from '../services/user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { of } from 'rxjs'; diff --git a/lib/core/src/lib/pipes/time-ago.pipe.ts b/lib/core/src/lib/pipes/time-ago.pipe.ts index a2597f87e0..1b6714d505 100644 --- a/lib/core/src/lib/pipes/time-ago.pipe.ts +++ b/lib/core/src/lib/pipes/time-ago.pipe.ts @@ -18,7 +18,7 @@ import moment from 'moment'; import { Pipe, PipeTransform, OnDestroy } from '@angular/core'; import { AppConfigService } from '../app-config/app-config.service'; -import { UserPreferenceValues, UserPreferencesService } from '../services/user-preferences.service'; +import { UserPreferenceValues, UserPreferencesService } from '../common/services/user-preferences.service'; import { DatePipe } from '@angular/common'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/search-text/search-text-input.component.spec.ts b/lib/core/src/lib/search-text/search-text-input.component.spec.ts index 396824221c..ab7af3db7d 100644 --- a/lib/core/src/lib/search-text/search-text-input.component.spec.ts +++ b/lib/core/src/lib/search-text/search-text-input.component.spec.ts @@ -22,7 +22,7 @@ import { DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { Subject } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; -import { UserPreferencesService } from '../services/user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { setupTestBed } from '../testing/setup-test-bed'; describe('SearchTextInputComponent', () => { diff --git a/lib/core/src/lib/search-text/search-text-input.component.ts b/lib/core/src/lib/search-text/search-text-input.component.ts index 84ca05a33d..1d443f5df7 100644 --- a/lib/core/src/lib/search-text/search-text-input.component.ts +++ b/lib/core/src/lib/search-text/search-text-input.component.ts @@ -20,7 +20,7 @@ import { Subject, Observable, Subscription } from 'rxjs'; import { debounceTime, takeUntil, filter } from 'rxjs/operators'; import { Direction } from '@angular/cdk/bidi'; import { searchAnimation } from './animations'; -import { UserPreferencesService } from '../services/user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { SearchTextStateEnum, SearchAnimationState, SearchAnimationDirection } from '../models/search-text-input.model'; @Component({ diff --git a/lib/core/src/lib/services/alfresco-api.service.ts b/lib/core/src/lib/services/alfresco-api.service.ts index 6ebd9d8dc3..6a7d53a075 100644 --- a/lib/core/src/lib/services/alfresco-api.service.ts +++ b/lib/core/src/lib/services/alfresco-api.service.ts @@ -19,8 +19,8 @@ import { Injectable } from '@angular/core'; import { AlfrescoApi, AlfrescoApiConfig } from '@alfresco/js-api'; import { AppConfigService, AppConfigValues } from '../app-config/app-config.service'; import { ReplaySubject } from 'rxjs'; -import { OauthConfigModel } from '../models/oauth-config.model'; -import { StorageService } from './storage.service'; +import { OauthConfigModel } from '../auth/models/oauth-config.model'; +import { StorageService } from '../common/services/storage.service'; import { OpenidConfiguration } from './openid-configuration.interface'; @Injectable({ diff --git a/lib/core/src/lib/services/apps-process.service.ts b/lib/core/src/lib/services/apps-process.service.ts index a919534326..1bebe157a0 100644 --- a/lib/core/src/lib/services/apps-process.service.ts +++ b/lib/core/src/lib/services/apps-process.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { RuntimeAppDefinitionsApi, AppDefinitionRepresentation } from '@alfresco/js-api'; import { Observable, from, throwError } from 'rxjs'; import { AlfrescoApiService } from './alfresco-api.service'; -import { LogService } from './log.service'; +import { LogService } from '../common/services/log.service'; import { map, catchError } from 'rxjs/operators'; @Injectable({ diff --git a/lib/core/src/lib/services/automation.service.ts b/lib/core/src/lib/services/automation.service.ts index 739f822c21..d8f01f3749 100644 --- a/lib/core/src/lib/services/automation.service.ts +++ b/lib/core/src/lib/services/automation.service.ts @@ -18,8 +18,8 @@ import { Injectable } from '@angular/core'; import { AppConfigService } from '../app-config/app-config.service'; import { AlfrescoApiService } from './alfresco-api.service'; -import { StorageService } from './storage.service'; -import { UserPreferencesService } from './user-preferences.service'; +import { StorageService } from '../common/services/storage.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { DemoForm } from '../mock/form/demo-form.mock'; @Injectable({ diff --git a/lib/core/src/lib/services/bpm-user.service.ts b/lib/core/src/lib/services/bpm-user.service.ts index 3951859a15..a91eac4c6d 100644 --- a/lib/core/src/lib/services/bpm-user.service.ts +++ b/lib/core/src/lib/services/bpm-user.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { Observable, from, throwError } from 'rxjs'; import { AlfrescoApiService } from './alfresco-api.service'; -import { LogService } from './log.service'; +import { LogService } from '../common/services/log.service'; import { BpmUserModel } from '../models/bpm-user.model'; import { map, catchError } from 'rxjs/operators'; import { UserProfileApi } from '@alfresco/js-api'; diff --git a/lib/core/src/lib/services/comment-content.service.ts b/lib/core/src/lib/services/comment-content.service.ts index af48694d20..ca92f480ce 100644 --- a/lib/core/src/lib/services/comment-content.service.ts +++ b/lib/core/src/lib/services/comment-content.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { Observable, from, throwError } from 'rxjs'; import { CommentModel } from '../models/comment.model'; import { AlfrescoApiService } from './alfresco-api.service'; -import { LogService } from './log.service'; +import { LogService } from '../common/services/log.service'; import { map, catchError } from 'rxjs/operators'; import { CommentEntry, CommentsApi } from '@alfresco/js-api'; import { CommentContentServiceInterface } from './comment-content.service.interface'; diff --git a/lib/core/src/lib/services/comment-process.service.ts b/lib/core/src/lib/services/comment-process.service.ts index 5b4111752b..423e52a50e 100644 --- a/lib/core/src/lib/services/comment-process.service.ts +++ b/lib/core/src/lib/services/comment-process.service.ts @@ -20,7 +20,7 @@ import { Observable, from, throwError } from 'rxjs'; import { CommentModel } from '../models/comment.model'; import { UserProcessModel } from '../models/user-process.model'; import { AlfrescoApiService } from './alfresco-api.service'; -import { LogService } from './log.service'; +import { LogService } from '../common/services/log.service'; import { map, catchError } from 'rxjs/operators'; import { ActivitiCommentsApi } from '@alfresco/js-api'; import { CommentProcessServiceInterface } from './comment-process.service.interface'; diff --git a/lib/core/src/lib/services/content.service.spec.ts b/lib/core/src/lib/services/content.service.spec.ts index acb5fe5860..0648add1ea 100644 --- a/lib/core/src/lib/services/content.service.spec.ts +++ b/lib/core/src/lib/services/content.service.spec.ts @@ -18,8 +18,8 @@ import { TestBed } from '@angular/core/testing'; import { ContentService } from './content.service'; import { AppConfigService } from '../app-config/app-config.service'; -import { AuthenticationService } from './authentication.service'; -import { StorageService } from './storage.service'; +import { AuthenticationService } from '../auth/services/authentication.service'; +import { StorageService } from '../common/services/storage.service'; import { setupTestBed } from '../testing/setup-test-bed'; import { Node } from '@alfresco/js-api'; import { CoreTestingModule } from '../testing'; diff --git a/lib/core/src/lib/services/content.service.ts b/lib/core/src/lib/services/content.service.ts index 736d75a428..f3aa18d9c8 100644 --- a/lib/core/src/lib/services/content.service.ts +++ b/lib/core/src/lib/services/content.service.ts @@ -21,8 +21,8 @@ import { ContentApi, MinimalNode, Node, NodeEntry, NodesApi } from '@alfresco/js import { Observable, Subject, from, throwError } from 'rxjs'; import { FolderCreatedEvent } from '../events/folder-created.event'; import { AlfrescoApiService } from './alfresco-api.service'; -import { AuthenticationService } from './authentication.service'; -import { LogService } from './log.service'; +import { AuthenticationService } from '../auth/services/authentication.service'; +import { LogService } from '../common/services/log.service'; import { catchError } from 'rxjs/operators'; import { PermissionsEnum } from '../models/permissions.enum'; import { AllowableOperationsEnum } from '../models/allowable-operations.enum'; diff --git a/lib/core/src/lib/services/deleted-nodes-api.service.ts b/lib/core/src/lib/services/deleted-nodes-api.service.ts index 91eeb908c7..6900a02b2f 100644 --- a/lib/core/src/lib/services/deleted-nodes-api.service.ts +++ b/lib/core/src/lib/services/deleted-nodes-api.service.ts @@ -20,7 +20,7 @@ import { Observable, from, of } from 'rxjs'; import { NodePaging, NodesApi, TrashcanApi } from '@alfresco/js-api'; import { AlfrescoApiService } from './alfresco-api.service'; -import { UserPreferencesService } from './user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { catchError } from 'rxjs/operators'; @Injectable({ diff --git a/lib/core/src/lib/services/directionality-config.service.spec.ts b/lib/core/src/lib/services/directionality-config.service.spec.ts index 4cf9dfb069..110f0cb756 100644 --- a/lib/core/src/lib/services/directionality-config.service.spec.ts +++ b/lib/core/src/lib/services/directionality-config.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { CoreTestingModule } from '../testing/core.testing.module'; import { setupTestBed } from '../testing/setup-test-bed'; -import { UserPreferencesService } from './user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { TranslateModule } from '@ngx-translate/core'; import { CoreModule } from '../core.module'; diff --git a/lib/core/src/lib/services/directionality-config.service.ts b/lib/core/src/lib/services/directionality-config.service.ts index ee72b36893..5a0a0efe59 100644 --- a/lib/core/src/lib/services/directionality-config.service.ts +++ b/lib/core/src/lib/services/directionality-config.service.ts @@ -17,7 +17,7 @@ import { Injectable, Inject, Renderer2, RendererFactory2 } from '@angular/core'; import { Directionality, Direction } from '@angular/cdk/bidi'; -import { UserPreferencesService } from './user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { DOCUMENT } from '@angular/common'; @Injectable({ diff --git a/lib/core/src/lib/services/discovery-api.service.ts b/lib/core/src/lib/services/discovery-api.service.ts index 7585b057f7..841023f561 100644 --- a/lib/core/src/lib/services/discovery-api.service.ts +++ b/lib/core/src/lib/services/discovery-api.service.ts @@ -22,7 +22,7 @@ import { RepositoryInfo, SystemPropertiesRepresentation } from '@alfresco/js-api import { BpmProductVersionModel } from '../models/product-version.model'; import { AlfrescoApiService } from './alfresco-api.service'; -import { AuthenticationService } from './authentication.service'; +import { AuthenticationService } from '../auth/services/authentication.service'; import { ApiClientsService } from '@alfresco/adf-core/api'; @Injectable({ diff --git a/lib/core/src/lib/services/download-zip.service.ts b/lib/core/src/lib/services/download-zip.service.ts index cde08a77b3..3524d738b0 100755 --- a/lib/core/src/lib/services/download-zip.service.ts +++ b/lib/core/src/lib/services/download-zip.service.ts @@ -18,7 +18,7 @@ import { DownloadEntry, DownloadBodyCreate, DownloadsApi } from '@alfresco/js-api'; import { Injectable } from '@angular/core'; import { Observable, from, throwError } from 'rxjs'; -import { LogService } from './log.service'; +import { LogService } from '../common/services/log.service'; import { AlfrescoApiService } from './alfresco-api.service'; import { catchError } from 'rxjs/operators'; diff --git a/lib/core/src/lib/services/ecm-user.service.spec.ts b/lib/core/src/lib/services/ecm-user.service.spec.ts index 8d311125de..cb9d29d2de 100644 --- a/lib/core/src/lib/services/ecm-user.service.spec.ts +++ b/lib/core/src/lib/services/ecm-user.service.spec.ts @@ -20,7 +20,7 @@ import { fakeEcmUser } from '../mock/ecm-user.service.mock'; import { EcmUserService } from './ecm-user.service'; import { CoreTestingModule } from '../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; -import { AuthenticationService } from './authentication.service'; +import { AuthenticationService } from '../auth/services/authentication.service'; import { ContentService } from './content.service'; describe('EcmUserService', () => { diff --git a/lib/core/src/lib/services/favorites-api.service.ts b/lib/core/src/lib/services/favorites-api.service.ts index f59d210bb7..ea5eddda3d 100644 --- a/lib/core/src/lib/services/favorites-api.service.ts +++ b/lib/core/src/lib/services/favorites-api.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { FavoritesApi, NodePaging, FavoritePaging } from '@alfresco/js-api'; import { Observable, from, of } from 'rxjs'; import { AlfrescoApiService } from './alfresco-api.service'; -import { UserPreferencesService } from './user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { catchError } from 'rxjs/operators'; @Injectable({ diff --git a/lib/core/src/lib/services/language.service.interface.ts b/lib/core/src/lib/services/language.service.interface.ts index 9694758535..3bde69d9e9 100644 --- a/lib/core/src/lib/services/language.service.interface.ts +++ b/lib/core/src/lib/services/language.service.interface.ts @@ -16,7 +16,7 @@ */ import { Observable } from 'rxjs'; -import { LanguageItem } from './language-item.interface'; +import { LanguageItem } from '../common/services/language-item.interface'; export interface LanguageServiceInterface { diff --git a/lib/core/src/lib/services/language.service.ts b/lib/core/src/lib/services/language.service.ts index 3199a573b1..57e6e7ea9c 100644 --- a/lib/core/src/lib/services/language.service.ts +++ b/lib/core/src/lib/services/language.service.ts @@ -19,8 +19,8 @@ import { LanguageServiceInterface } from './language.service.interface'; import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; import { AppConfigService, AppConfigValues } from '../app-config/app-config.service'; -import { LanguageItem } from './language-item.interface'; -import { UserPreferencesService } from './user-preferences.service'; +import { LanguageItem } from '../common/services/language-item.interface'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; @Injectable({providedIn: 'root'}) export class LanguageService implements LanguageServiceInterface { diff --git a/lib/core/src/lib/services/nodes-api.service.ts b/lib/core/src/lib/services/nodes-api.service.ts index 2551e47546..7da81f8001 100644 --- a/lib/core/src/lib/services/nodes-api.service.ts +++ b/lib/core/src/lib/services/nodes-api.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { MinimalNode, NodeEntry, NodePaging, NodesApi, TrashcanApi, Node } from '@alfresco/js-api'; import { Subject, from, Observable, throwError } from 'rxjs'; import { AlfrescoApiService } from './alfresco-api.service'; -import { UserPreferencesService } from './user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { catchError, map } from 'rxjs/operators'; import { NodeMetadata } from '../models/node-metadata.model'; diff --git a/lib/core/src/lib/services/people-content.service.spec.ts b/lib/core/src/lib/services/people-content.service.spec.ts index 71b56d4198..2c1d483a88 100644 --- a/lib/core/src/lib/services/people-content.service.spec.ts +++ b/lib/core/src/lib/services/people-content.service.spec.ts @@ -22,8 +22,8 @@ import { PeopleContentService, PeopleContentQueryRequestModel } from './people-c import { AlfrescoApiService } from './alfresco-api.service'; import { TranslateModule } from '@ngx-translate/core'; import { TestBed } from '@angular/core/testing'; -import { LogService } from './log.service'; -import { AuthenticationService } from './authentication.service'; +import { LogService } from '../common/services/log.service'; +import { AuthenticationService } from '../auth/services/authentication.service'; describe('PeopleContentService', () => { diff --git a/lib/core/src/lib/services/people-content.service.ts b/lib/core/src/lib/services/people-content.service.ts index c9fd86e9e9..536452021e 100644 --- a/lib/core/src/lib/services/people-content.service.ts +++ b/lib/core/src/lib/services/people-content.service.ts @@ -21,8 +21,8 @@ import { AlfrescoApiService } from './alfresco-api.service'; import { catchError, map, tap } from 'rxjs/operators'; import { PeopleApi, PersonBodyCreate, Pagination, PersonBodyUpdate } from '@alfresco/js-api'; import { EcmUserModel } from '../models/ecm-user.model'; -import { LogService } from './log.service'; -import { AuthenticationService } from './authentication.service'; +import { LogService } from '../common/services/log.service'; +import { AuthenticationService } from '../auth/services/authentication.service'; import { ContentService } from './content.service'; // eslint-disable-next-line no-shadow diff --git a/lib/core/src/lib/services/people-process.service.ts b/lib/core/src/lib/services/people-process.service.ts index 2e790ab55f..e909e37c94 100644 --- a/lib/core/src/lib/services/people-process.service.ts +++ b/lib/core/src/lib/services/people-process.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { Observable, from, throwError, of } from 'rxjs'; import { UserProcessModel } from '../models/user-process.model'; import { AlfrescoApiService } from './alfresco-api.service'; -import { LogService } from './log.service'; +import { LogService } from '../common/services/log.service'; import { catchError, combineAll, defaultIfEmpty, map, switchMap } from 'rxjs/operators'; import { TaskActionsApi, diff --git a/lib/core/src/lib/services/public-api.ts b/lib/core/src/lib/services/public-api.ts index 90be1ba814..eb9136ca82 100644 --- a/lib/core/src/lib/services/public-api.ts +++ b/lib/core/src/lib/services/public-api.ts @@ -15,26 +15,16 @@ * limitations under the License. */ -export * from './auth-guard-base'; -export * from './authentication.service'; export * from './alfresco-api.service'; export * from './content.service'; -export * from './auth-guard.service'; -export * from './auth-guard-ecm.service'; -export * from './auth-guard-bpm.service'; -export * from './auth-guard-sso-role.service'; export * from './apps-process.service'; export * from './page-title.service'; -export * from './storage.service'; -export * from './cookie.service'; export * from './renditions.service'; -export * from './log.service'; export * from './translation.service'; export * from './translate-loader.service'; export * from './thumbnail.service'; export * from './upload.service'; export * from './dynamic-component-mapper.service'; -export * from './user-preferences.service'; export * from './highlight-transform.service'; export * from './deleted-nodes-api.service'; export * from './favorites-api.service'; @@ -49,7 +39,6 @@ export * from './search-configuration.service'; export * from './comment-content.service'; export * from './login-dialog.service'; export * from './external-alfresco-api.service'; -export * from './jwt-helper.service'; export * from './download-zip.service'; export * from './lock.service'; export * from './automation.service'; @@ -57,15 +46,7 @@ export * from './automation.service'; export * from './download.service'; export * from './bpm-user.service'; export * from './ecm-user.service'; -export * from './identity-user.service'; -export * from './identity-group.service'; -export * from './identity-role.service'; -export * from './auth-bearer.interceptor'; -export * from './oauth2.service'; export * from './language.service'; -export * from './identity-user.service.interface'; -export * from './identity-group.interface'; -export * from './language-item.interface'; export * from './sort-by-category.service'; export * from './user-access.service'; export * from './user-info-resolver.service'; diff --git a/lib/core/src/lib/services/shared-links-api.service.ts b/lib/core/src/lib/services/shared-links-api.service.ts index e88c3409f9..9eeeeb6067 100644 --- a/lib/core/src/lib/services/shared-links-api.service.ts +++ b/lib/core/src/lib/services/shared-links-api.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { NodePaging, SharedLinkEntry, SharedlinksApi } from '@alfresco/js-api'; import { Observable, from, of, Subject } from 'rxjs'; import { AlfrescoApiService } from './alfresco-api.service'; -import { UserPreferencesService } from './user-preferences.service'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; import { catchError } from 'rxjs/operators'; @Injectable({ diff --git a/lib/core/src/lib/services/translate-loader.service.ts b/lib/core/src/lib/services/translate-loader.service.ts index 0da70e8a9c..553a34aaff 100644 --- a/lib/core/src/lib/services/translate-loader.service.ts +++ b/lib/core/src/lib/services/translate-loader.service.ts @@ -20,7 +20,7 @@ import { Injectable } from '@angular/core'; import { TranslateLoader } from '@ngx-translate/core'; import { Observable, forkJoin, throwError, of } from 'rxjs'; import { ComponentTranslationModel } from '../models/component.model'; -import { ObjectUtils } from '../utils/object-utils'; +import { ObjectUtils } from '../common/utils/object-utils'; import { map, catchError, retry } from 'rxjs/operators'; @Injectable({ diff --git a/lib/core/src/lib/services/translation.service.spec.ts b/lib/core/src/lib/services/translation.service.spec.ts index 502228b98c..a2fd98da0b 100644 --- a/lib/core/src/lib/services/translation.service.spec.ts +++ b/lib/core/src/lib/services/translation.service.spec.ts @@ -23,7 +23,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderService } from './translate-loader.service'; import { TRANSLATION_PROVIDER, TranslationService } from './translation.service'; import { AppConfigService } from '../app-config/app-config.service'; -import { AppConfigServiceMock } from '../mock/app-config.service.mock'; +import { AppConfigServiceMock } from '../common/mock/app-config.service.mock'; import { AlfrescoApiService } from './alfresco-api.service'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; diff --git a/lib/core/src/lib/services/translation.service.ts b/lib/core/src/lib/services/translation.service.ts index a13da74d7a..4b044ed83a 100644 --- a/lib/core/src/lib/services/translation.service.ts +++ b/lib/core/src/lib/services/translation.service.ts @@ -19,7 +19,7 @@ import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { TranslateLoaderService } from './translate-loader.service'; -import { UserPreferencesService, UserPreferenceValues } from './user-preferences.service'; +import { UserPreferencesService, UserPreferenceValues } from '../common/services/user-preferences.service'; export const TRANSLATION_PROVIDER = new InjectionToken('Injection token for translation providers.'); diff --git a/lib/core/src/lib/services/user-access.service.spec.ts b/lib/core/src/lib/services/user-access.service.spec.ts index 62af867c23..04cd15460f 100644 --- a/lib/core/src/lib/services/user-access.service.spec.ts +++ b/lib/core/src/lib/services/user-access.service.spec.ts @@ -18,8 +18,8 @@ import { CoreTestingModule, setupTestBed } from '../testing'; import { TestBed } from '@angular/core/testing'; import { UserAccessService } from './user-access.service'; -import { JwtHelperService } from './jwt-helper.service'; -import { OAuth2Service } from './oauth2.service'; +import { JwtHelperService } from '../auth/services/jwt-helper.service'; +import { OAuth2Service } from '../auth/services/oauth2.service'; import { of, throwError } from 'rxjs'; import { userAccessMock } from '../mock/user-access.mock'; import { AppConfigService } from '../app-config'; diff --git a/lib/core/src/lib/services/user-access.service.ts b/lib/core/src/lib/services/user-access.service.ts index 73643e0a48..857b836c97 100644 --- a/lib/core/src/lib/services/user-access.service.ts +++ b/lib/core/src/lib/services/user-access.service.ts @@ -16,11 +16,11 @@ */ import { Injectable } from '@angular/core'; -import { JwtHelperService } from './jwt-helper.service'; +import { JwtHelperService } from '../auth/services/jwt-helper.service'; import { ApplicationAccessModel } from '../models/application-access.model'; import { UserAccessModel } from '../models/user-access.model'; import { AppConfigService } from '../app-config/app-config.service'; -import { OAuth2Service } from './oauth2.service'; +import { OAuth2Service } from '../auth/services/oauth2.service'; import { catchError } from 'rxjs/operators'; import { of } from 'rxjs'; diff --git a/lib/core/src/lib/testing/core.testing.module.ts b/lib/core/src/lib/testing/core.testing.module.ts index 2e6d0e9080..33cbd6b7e8 100644 --- a/lib/core/src/lib/testing/core.testing.module.ts +++ b/lib/core/src/lib/testing/core.testing.module.ts @@ -23,11 +23,11 @@ import { CoreModule } from '../core.module'; import { AlfrescoApiService } from '../services/alfresco-api.service'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; import { AppConfigService } from '../app-config/app-config.service'; -import { AppConfigServiceMock } from '../mock/app-config.service.mock'; +import { AppConfigServiceMock } from '../common/mock/app-config.service.mock'; import { TranslationService } from '../services/translation.service'; import { TranslationMock } from '../mock/translation.service.mock'; import { DatePipe } from '@angular/common'; -import { CookieService } from '../services/cookie.service'; +import { CookieService } from '../common/services/cookie.service'; import { CookieServiceMock } from '../mock/cookie.service.mock'; import { HttpClientModule } from '@angular/common/http'; import { directionalityConfigFactory } from '../services/directionality-config-factory'; diff --git a/lib/core/src/lib/userinfo/components/mocks/user.service.mock.ts b/lib/core/src/lib/userinfo/components/mocks/user.service.mock.ts index f4c9bad9d1..25bbe8ad1e 100644 --- a/lib/core/src/lib/userinfo/components/mocks/user.service.mock.ts +++ b/lib/core/src/lib/userinfo/components/mocks/user.service.mock.ts @@ -17,9 +17,11 @@ import { BpmUserModel, - EcmUserModel, - IdentityUserModel + EcmUserModel } from './../../../models'; +import { + IdentityUserModel +} from './../../../auth/models/identity-user.model'; import { of } from 'rxjs'; export class PeopleContentServiceMock { diff --git a/lib/core/src/lib/userinfo/components/user-info.component.spec.ts b/lib/core/src/lib/userinfo/components/user-info.component.spec.ts index 24ae281b42..fed9436671 100644 --- a/lib/core/src/lib/userinfo/components/user-info.component.spec.ts +++ b/lib/core/src/lib/userinfo/components/user-info.component.spec.ts @@ -17,12 +17,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By, DomSanitizer } from '@angular/platform-browser'; -import { AuthenticationService, ContentService, PeopleContentService } from '../../services'; +import { ContentService, PeopleContentService } from '../../services'; +import { AuthenticationService } from '../../auth/services/authentication.service'; +import { IdentityUserService } from '../../auth/services/identity-user.service'; import { InitialUsernamePipe } from '../../pipes'; import { fakeBpmUser } from '../../mock/bpm-user.service.mock'; import { fakeEcmEditedUser, fakeEcmUser, fakeEcmUserNoImage } from '../../mock/ecm-user.service.mock'; import { BpmUserService } from '../../services/bpm-user.service'; -import { IdentityUserService } from '../../services/identity-user.service'; import { BpmUserModel } from '../../models/bpm-user.model'; import { EcmUserModel } from '../../models/ecm-user.model'; import { UserInfoComponent } from './user-info.component'; diff --git a/lib/core/src/lib/userinfo/components/user-info.component.stories.ts b/lib/core/src/lib/userinfo/components/user-info.component.stories.ts index 7d4f91c2ce..cce7dcd3b2 100644 --- a/lib/core/src/lib/userinfo/components/user-info.component.stories.ts +++ b/lib/core/src/lib/userinfo/components/user-info.component.stories.ts @@ -25,8 +25,8 @@ import { UserInfoComponent } from './user-info.component'; import { UserInfoModule } from '../userinfo.module'; import { PeopleContentService } from './../../services/people-content.service'; import { BpmUserService } from './../../services/bpm-user.service'; -import { IdentityUserService } from './../../services/identity-user.service'; -import { AuthenticationService } from './../../services/authentication.service'; +import { IdentityUserService } from '../../auth/services/identity-user.service'; +import { AuthenticationService } from '../../auth/services/authentication.service'; import { AuthenticationServiceMock } from './mocks/authentication.service.mock'; import { BpmUserServiceMock, diff --git a/lib/core/src/lib/userinfo/components/user-info.component.ts b/lib/core/src/lib/userinfo/components/user-info.component.ts index b84a9ef5ff..0b7fe1e5ba 100644 --- a/lib/core/src/lib/userinfo/components/user-info.component.ts +++ b/lib/core/src/lib/userinfo/components/user-info.component.ts @@ -16,12 +16,12 @@ */ import { Component, Input, OnInit, ViewEncapsulation, ViewChild, OnDestroy } from '@angular/core'; -import { AuthenticationService } from '../../services/authentication.service'; +import { AuthenticationService } from '../../auth/services/authentication.service'; import { BpmUserModel } from '../../models/bpm-user.model'; import { EcmUserModel } from '../../models/ecm-user.model'; -import { IdentityUserModel } from '../../models/identity-user.model'; +import { IdentityUserModel } from '../../auth/models/identity-user.model'; import { BpmUserService } from '../../services/bpm-user.service'; -import { IdentityUserService } from '../../services/identity-user.service'; +import { IdentityUserService } from '../../auth/services/identity-user.service'; import { of, Observable, Subject } from 'rxjs'; import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu'; import { PeopleContentService } from '../../services/people-content.service'; diff --git a/lib/core/src/lib/viewer/components/pdf-viewer.component.ts b/lib/core/src/lib/viewer/components/pdf-viewer.component.ts index aef2c56cf5..f7871f3b3d 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer.component.ts +++ b/lib/core/src/lib/viewer/components/pdf-viewer.component.ts @@ -32,7 +32,7 @@ import { SimpleChanges } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { LogService } from '../../services/log.service'; +import { LogService } from '../../common/services/log.service'; import { RenderingQueueServices } from '../services/rendering-queue.services'; import { PdfPasswordDialogComponent } from './pdf-viewer-password-dialog'; import { AppConfigService } from '../../app-config/app-config.service'; diff --git a/lib/core/src/lib/viewer/components/viewer.component.ts b/lib/core/src/lib/viewer/components/viewer.component.ts index f1dac30304..0f6ad0685a 100644 --- a/lib/core/src/lib/viewer/components/viewer.component.ts +++ b/lib/core/src/lib/viewer/components/viewer.component.ts @@ -31,7 +31,7 @@ import { } from '@alfresco/js-api'; import { BaseEvent } from '../../events'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; -import { LogService } from '../../services/log.service'; +import { LogService } from '../../common/services/log.service'; import { ViewerMoreActionsComponent } from './viewer-more-actions.component'; import { ViewerOpenWithComponent } from './viewer-open-with.component'; import { ViewerSidebarComponent } from './viewer-sidebar.component'; diff --git a/lib/core/src/lib/viewer/services/view-util.service.ts b/lib/core/src/lib/viewer/services/view-util.service.ts index 50d276bdc6..b5977e1641 100644 --- a/lib/core/src/lib/viewer/services/view-util.service.ts +++ b/lib/core/src/lib/viewer/services/view-util.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { ContentApi, RenditionEntry, RenditionPaging, RenditionsApi, VersionsApi } from '@alfresco/js-api'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; -import { LogService } from '../../services/log.service'; +import { LogService } from '../../common/services/log.service'; import { Subject } from 'rxjs'; import { Track } from '../models/viewer.model'; import { TranslationService } from '../../services/translation.service'; diff --git a/lib/core/src/public-api.ts b/lib/core/src/public-api.ts index dbd0337a6b..c4353608a6 100644 --- a/lib/core/src/public-api.ts +++ b/lib/core/src/public-api.ts @@ -46,12 +46,15 @@ export * from './lib/blank-page/index'; export * from './lib/rich-text-editor/index'; export * from './lib/snackbar-content/index'; -export * from './lib/utils/index'; +export * from './lib/common/utils/index'; export * from './lib/interface/index'; export * from './lib/models/index'; export * from './lib/events/index'; export * from './lib/mock/index'; export * from './lib/testing'; +export * from './lib/auth'; +export * from './lib/common'; + export * from './lib/material.module'; export * from './lib/core.module'; diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts index dd81cf0cfe..5d127ac32e 100644 --- a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts @@ -25,7 +25,7 @@ import { FormOutcomeModel, setupTestBed, BpmUserService, - CommentProcessService, LogService, AuthenticationService, + CommentProcessService, LogService, UserProcessModel, PeopleProcessService, CommentModel @@ -72,7 +72,7 @@ describe('TaskDetailsComponent', () => { let logService: LogService; let commentProcessService: CommentProcessService; let peopleProcessService: PeopleProcessService; - let authService: AuthenticationService; + let bpmUserService: BpmUserService; setupTestBed({ imports: [ @@ -85,8 +85,8 @@ describe('TaskDetailsComponent', () => { beforeEach(() => { logService = TestBed.inject(LogService); - const userService: BpmUserService = TestBed.inject(BpmUserService); - spyOn(userService, 'getCurrentUserInfo').and.returnValue(of(null)); + bpmUserService = TestBed.inject(BpmUserService); + spyOn(bpmUserService, 'getCurrentUserInfo').and.returnValue(of({ email: 'fake-email' })); taskListService = TestBed.inject(TaskListService); spyOn(taskListService, 'getTaskChecklist').and.returnValue(of(noDataMock)); @@ -103,9 +103,6 @@ describe('TaskDetailsComponent', () => { assignTaskSpy = spyOn(taskListService, 'assignTask').and.returnValue(of(fakeTaskAssignResponse)); commentProcessService = TestBed.inject(CommentProcessService); - authService = TestBed.inject(AuthenticationService); - spyOn(authService, 'getBpmLoggedUser').and.returnValue(of({ email: 'fake-email' })); - spyOn(commentProcessService, 'getTaskComments').and.returnValue(of([ new CommentModel({ message: 'Test1', created: Date.now(), createdBy: { firstName: 'Admin', lastName: 'User' } }), new CommentModel({ message: 'Test2', created: Date.now(), createdBy: { firstName: 'Admin', lastName: 'User' } }), diff --git a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts index 7973b4a33d..6e53b84502 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TaskFormComponent } from './task-form.component'; import { - AuthenticationService, + BpmUserService, FormModel, FormOutcomeEvent, FormOutcomeModel, @@ -63,7 +63,7 @@ describe('TaskFormComponent', () => { let getTaskDetailsSpy: jasmine.Spy; let completeTaskSpy: jasmine.Spy; let element: HTMLElement; - let authService: AuthenticationService; + let bpmUserService: BpmUserService; let getBpmLoggedUserSpy: jasmine.Spy; setupTestBed({ @@ -88,8 +88,8 @@ describe('TaskFormComponent', () => { spyOn(taskFormService, 'getTaskForm').and.returnValue(of(taskFormMock)); taskDetailsMock.processDefinitionId = null; spyOn(taskService, 'getTask').and.returnValue(of(taskDetailsMock)); - authService = TestBed.inject(AuthenticationService); - getBpmLoggedUserSpy = spyOn(authService, 'getBpmLoggedUser').and.returnValue(of(fakeUser)); + bpmUserService = TestBed.inject(BpmUserService); + getBpmLoggedUserSpy = spyOn(bpmUserService, 'getCurrentUserInfo').and.returnValue(of(fakeUser)); }); afterEach(async () => { @@ -123,7 +123,12 @@ describe('TaskFormComponent', () => { }); it('Should be able to complete assigned task', async () => { - getBpmLoggedUserSpy.and.returnValue(of({ id: 1001, firstName: 'Wilbur', lastName: 'Adams', email: 'wilbur@app.activiti.com' })); + getBpmLoggedUserSpy.and.returnValue(of({ + id: 1001, + firstName: 'Wilbur', + lastName: 'Adams', + email: 'wilbur@app.activiti.com' + })); getTaskDetailsSpy.and.returnValue(of(taskDetailsMock)); const formCompletedSpy: jasmine.Spy = spyOn(component.formCompleted, 'emit'); const completeTaskFormSpy = spyOn(taskFormService, 'completeTaskForm').and.returnValue(of({})); @@ -166,14 +171,14 @@ describe('TaskFormComponent', () => { it('should fetch new task details when taskId changed', () => { const change = new SimpleChange('123', '456', true); - component.ngOnChanges({ taskId: change }); + component.ngOnChanges({taskId: change}); fixture.detectChanges(); expect(getTaskDetailsSpy).toHaveBeenCalledWith('123'); }); it('should NOT fetch new task details when taskId changed to null', async () => { const nullChange = new SimpleChange('123', null, true); - component.ngOnChanges({ taskId: nullChange }); + component.ngOnChanges({taskId: nullChange}); fixture.detectChanges(); await fixture.whenStable(); expect(getTaskDetailsSpy).not.toHaveBeenCalled(); @@ -551,7 +556,12 @@ describe('TaskFormComponent', () => { describe('Complete task', () => { it('Should be able to complete the assigned task in case process initiator not allowed to complete the task', async () => { - getBpmLoggedUserSpy.and.returnValue(of({ id: 1002, firstName: 'Wilbur', lastName: 'Adams', email: 'wilbur@app.activiti.com' })); + getBpmLoggedUserSpy.and.returnValue(of({ + id: 1002, + firstName: 'Wilbur', + lastName: 'Adams', + email: 'wilbur@app.activiti.com' + })); getTaskDetailsSpy.and.returnValue(of(taskDetailsMock)); const formCompletedSpy: jasmine.Spy = spyOn(component.formCompleted, 'emit'); @@ -574,7 +584,12 @@ describe('TaskFormComponent', () => { }); it('Should be able to complete the task if process initiator allowed to complete the task', async () => { - getBpmLoggedUserSpy.and.returnValue(of({ id: 1001, firstName: 'Wilbur', lastName: 'Adams', email: 'wilbur@app.activiti.com' })); + getBpmLoggedUserSpy.and.returnValue(of({ + id: 1001, + firstName: 'Wilbur', + lastName: 'Adams', + email: 'wilbur@app.activiti.com' + })); const formCompletedSpy: jasmine.Spy = spyOn(component.formCompleted, 'emit'); const completeTaskFormSpy = spyOn(taskFormService, 'completeTaskForm').and.returnValue(of({})); getTaskDetailsSpy.and.returnValue(of(initiatorCanCompleteTaskDetailsMock)); @@ -616,7 +631,12 @@ describe('TaskFormComponent', () => { it('Should be able to complete a task with candidates users if process initiator not allowed to complete the task', async () => { const formCompletedSpy: jasmine.Spy = spyOn(component.formCompleted, 'emit'); - getBpmLoggedUserSpy.and.returnValue(of({ id: 1001, firstName: 'Wilbur', lastName: 'Adams', email: 'wilbur@app.activiti.com' })); + getBpmLoggedUserSpy.and.returnValue(of({ + id: 1001, + firstName: 'Wilbur', + lastName: 'Adams', + email: 'wilbur@app.activiti.com' + })); const completeTaskFormSpy = spyOn(taskFormService, 'completeTaskForm').and.returnValue(of({})); getTaskDetailsSpy.and.returnValue(of(claimedTaskDetailsMock)); @@ -741,7 +761,7 @@ describe('TaskFormComponent', () => { }); it('should emit error event in case claim task api fails', (done) => { - const mockError = { message: 'Api Failed' }; + const mockError = {message: 'Api Failed'}; spyOn(taskListService, 'claimTask').and.returnValue(throwError(mockError)); getTaskDetailsSpy.and.returnValue(of(claimableTaskDetailsMock)); @@ -779,7 +799,7 @@ describe('TaskFormComponent', () => { }); it('should emit error event in case unclaim task api fails', (done) => { - const mockError = { message: 'Api Failed' }; + const mockError = {message: 'Api Failed'}; spyOn(taskListService, 'unclaimTask').and.returnValue(throwError(mockError)); getBpmLoggedUserSpy.and.returnValue(of(claimedTaskDetailsMock.assignee)); getTaskDetailsSpy.and.returnValue(of(claimedTaskDetailsMock)); @@ -806,7 +826,7 @@ describe('TaskFormComponent', () => { spyOn(taskFormService, 'saveTaskForm').and.returnValue(of({})); }); - it('[T14599423] Form in unassigned task is read-only', async () => { + it('[T14599423] Form in unassigned task is read-only', async () => { getTaskDetailsSpy.and.returnValue(of(involvedUserTaskForm)); fixture.detectChanges(); await fixture.whenStable(); @@ -990,7 +1010,7 @@ describe('TaskFormComponent', () => { }); it('Should show only the Claim button as enabled before claiming a task without form', async () => { - const claimableTaskDetailsWithoutFormMock = { ...claimableTaskDetailsMock, formKey: null }; + const claimableTaskDetailsWithoutFormMock = {...claimableTaskDetailsMock, formKey: null}; getTaskDetailsSpy.and.returnValue(of(claimableTaskDetailsWithoutFormMock)); component.taskId = 'mock-task-id'; fixture.detectChanges(); @@ -1010,7 +1030,7 @@ describe('TaskFormComponent', () => { }); it('Should show only Complete/Release buttons as enabled after claiming a task without form', async () => { - const claimedTaskDetailsWithoutFormMock = { ...claimedTaskDetailsMock, formKey: null }; + const claimedTaskDetailsWithoutFormMock = {...claimedTaskDetailsMock, formKey: null}; getBpmLoggedUserSpy.and.returnValue(of(claimedTaskDetailsWithoutFormMock.assignee)); getTaskDetailsSpy.and.returnValue(of(claimedTaskDetailsWithoutFormMock)); component.taskId = 'mock-task-id'; diff --git a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts index 8fa7853b0d..810638dbce 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts @@ -17,13 +17,13 @@ import { Component, OnInit, Input, Output, EventEmitter, SimpleChanges, ViewEncapsulation, OnChanges } from '@angular/core'; import { - FormModel, - ContentLinkModel, - FormFieldValidator, - FormOutcomeEvent, - AuthenticationService, - TranslationService, - FormFieldModel + FormModel, + ContentLinkModel, + FormFieldValidator, + FormOutcomeEvent, + TranslationService, + FormFieldModel, + BpmUserService } from '@alfresco/adf-core'; import { TaskDetailsModel } from '../../models/task-details.model'; import { TaskListService } from '../../services/tasklist.service'; @@ -134,13 +134,13 @@ export class TaskFormComponent implements OnInit, OnChanges { constructor( private taskListService: TaskListService, - private authService: AuthenticationService, + private bpmUserService: BpmUserService, private translationService: TranslationService ) { } ngOnInit() { - this.authService.getBpmLoggedUser().subscribe(user => { + this.bpmUserService.getCurrentUserInfo().subscribe(user => { this.currentLoggedUser = user; }); this.loadTask(this.taskId);