[AAE-11891] move auth in auth folder (#8076)

move auth and common in a separate folder

lib/core/auth/src/index.ts

@@ -17,4 +17,3 @@
 
 export * from './authentication';
 export * from './authentication-interceptor/authentication.interceptor';
-

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';
 

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 { DiscoveryApiService } from '../services';
-import { AppConfigServiceMock, AuthenticationMock } from '../mock';
+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 {

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';

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';
 

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()

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 {

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 { setupTestBed } from '../../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
+import { CoreTestingModule } from '../../testing/core.testing.module';
 import { MatDialog } from '@angular/material/dialog';
 import { TranslateModule } from '@ngx-translate/core';
 

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 { AppConfigService } from '../../app-config/app-config.service';
-import { AuthenticationService } from './authentication.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'

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 { setupTestBed } from '../../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
+import { CoreTestingModule } from '../../testing/core.testing.module';
 import { MatDialog } from '@angular/material/dialog';
 import { TranslateModule } from '@ngx-translate/core';
 

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 { AuthenticationService } from '../services/authentication.service';
-import { AppConfigService } from '../app-config/app-config.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'

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 { setupTestBed } from '../../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
+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 { UserAccessService } from '../../services/user-access.service';
-import { UserContentAccessService } from './user-content-access.service';
+import { UserContentAccessService } from '../../services/user-content-access.service';
 
 describe('Auth Guard SSO role service', () => {
 

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 { ContentGroups } from '../../services/people-content.service';
-import { UserAccessService } from './user-access.service';
+import { UserAccessService } from '../../services/user-access.service';
-import { UserContentAccessService } from './user-content-access.service';
+import { UserContentAccessService } from '../../services/user-content-access.service';
 
 @Injectable({
     providedIn: 'root'

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 { AuthenticationService } from '../services/authentication.service';
-import { setupTestBed } from '../testing/setup-test-bed';
+import { setupTestBed } from '../../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
+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;

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 { AuthenticationService } from '../services/authentication.service';
-import { AppConfigService } from '../app-config/app-config.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'

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';
+

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 { AlfrescoApiService } from '../../services/alfresco-api.service';
-import { CookieService } from '../services/cookie.service';
+import { CookieService } from '../../common/services/cookie.service';
-import { LogService } from '../services/log.service';
+import { LogService } from '../../common/services/log.service';
-import { StorageService } from '../services/storage.service';
+import { StorageService } from '../../common/services/storage.service';
-import { AppConfigService } from '../app-config/app-config.service';
+import { AppConfigService } from '../../app-config/app-config.service';
 
 @Injectable({
     providedIn: 'root'

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 { CookieService } from '../../common/services/cookie.service';
-import { AppConfigService } from '../app-config/app-config.service';
+import { AppConfigService } from '../../app-config/app-config.service';
-import { setupTestBed } from '../testing/setup-test-bed';
+import { setupTestBed } from '../../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
+import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
 declare let jasmine: any;

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 { AlfrescoApiService } from '../../services/alfresco-api.service';
-import { CookieService } from './cookie.service';
+import { CookieService } from '../../common/services/cookie.service';
-import { LogService } from './log.service';
+import { LogService } from '../../common/services/log.service';
 import { RedirectionModel } from '../models/redirection.model';
-import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
+import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service';
-import { UserProfileApi, UserRepresentation } from '@alfresco/js-api';
 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<any> = new ReplaySubject<any>(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<UserRepresentation> {
-        return from(this.profileApi.getProfile());
-    }
-
     private hasValidRedirection(provider: string): boolean {
         return this.redirectUrl && (this.redirectUrl.provider === provider || this.hasSelectedProviderAll(provider));
     }

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 { setupTestBed } from '../../testing/setup-test-bed';
-import { AlfrescoApiService } from './alfresco-api.service';
+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,

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,

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';

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 { AppConfigService } from '../../app-config/app-config.service';
-import { LogService } from './log.service';
+import { LogService } from '../../common/services/log.service';
 
 export interface IdentityRoleResponseModel {
     entries: IdentityRoleModel[];

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 { setupTestBed } from '../../testing/setup-test-bed';
-import { AlfrescoApiService } from './alfresco-api.service';
+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,

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';

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', () => {

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'

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';
 

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;
+}

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 { UserPreferencesService, UserPreferenceValues } from '../../../common/services/user-preferences.service';
-import { MomentDateAdapter } from '../../../utils/moment-date-adapter';
+import { MomentDateAdapter } from '../../../common/utils/moment-date-adapter';
-import { MOMENT_DATE_FORMATS } from '../../../utils/moment-date-formats.model';
+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';

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' })

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';
 

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';

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()

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: '',

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';
 

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 { AppConfigService } from '../../app-config/app-config.service';
-import { StorageService } from './storage.service';
+import { StorageService } from '../../common/services/storage.service';
-import { setupTestBed } from '../testing/setup-test-bed';
+import { setupTestBed } from '../../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
+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', () => {
 

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 { AppConfigService } from '../../app-config/app-config.service';
-import { StorageService } from './storage.service';
+import { StorageService } from '../../common/services/storage.service';
-import { UserPreferencesService, UserPreferenceValues } from './user-preferences.service';
+import { UserPreferencesService, UserPreferenceValues } from '../../common/services/user-preferences.service';
-import { setupTestBed } from '../testing/setup-test-bed';
+import { setupTestBed } from '../../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
+import { CoreTestingModule } from '../../testing/core.testing.module';
 import { AppConfigServiceMock } from '../mock/app-config.service.mock';
-import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
-import { AlfrescoApiServiceMock } from '../mock';
+import { AlfrescoApiServiceMock } from '../../mock';
 
 describe('UserPreferencesService', () => {
 

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

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({

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';

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';

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.

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';

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';

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]'

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]'

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 { UserPreferencesService, UserPreferenceValues } from '../../../../common/services/user-preferences.service';
-import { MomentDateAdapter } from '../../../../utils/moment-date-adapter';
+import { MomentDateAdapter } from '../../../../common/utils/moment-date-adapter';
-import { MOMENT_DATE_FORMATS } from '../../../../utils/moment-date-formats.model';
+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';

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 { UserPreferencesService, UserPreferenceValues } from '../../../../common/services/user-preferences.service';
-import { MomentDateAdapter } from '../../../../utils/moment-date-adapter';
+import { MomentDateAdapter } from '../../../../common/utils/moment-date-adapter';
-import { MOMENT_DATE_FORMATS } from '../../../../utils/moment-date-formats.model';
+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';

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 {

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';
 

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',

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',

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';

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';

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';

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 { AuthenticationService } from '../../auth/services/authentication.service';
-import { AuthenticationMock } from './../../mock/authentication.service.mock';
+import { AuthenticationMock } from '../../auth/mock/authentication.service.mock';
 
 export default {
     component: LoginDialogStorybookComponent,

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;

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 { AuthenticationService } from './../../auth/services/authentication.service';
-import { AuthenticationMock } from './../../mock/authentication.service.mock';
+import { AuthenticationMock } from '../../auth/mock/authentication.service.mock';
 
 export default {
     component: LoginComponent,

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';

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 {

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 {

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 {

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';

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 };

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';

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';
 

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({

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';
 

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';
 

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';

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';

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';

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';