[DURACOM-327] Remove reference to AppState

Author: atarix83

src/app/core/auth/auth-blocking.guard.spec.ts

@@ -12,18 +12,15 @@ import {
 } from '@ngrx/store/testing';
 import { cold } from 'jasmine-marbles';
 
-import {
-  AppState,
-  storeModuleConfig,
-} from '../../app.reducer';
+import { CoreState } from '../core-state.model';
 import { authReducer } from './auth.reducer';
 import { authBlockingGuard } from './auth-blocking.guard';
 
 describe('authBlockingGuard', () => {
   let guard: any;
   let initialState;
-  let store: Store<AppState>;
-  let mockStore: MockStore<AppState>;
+  let store: Store<CoreState>;
+  let mockStore: MockStore<CoreState>;
 
   initialState = {
     core: {
@@ -37,10 +34,17 @@ describe('authBlockingGuard', () => {
     },
   };
 
+  const mockStoreModuleConfig = {
+    runtimeChecks: {
+      strictStateImmutability: true,
+      strictActionImmutability: true,
+    },
+  };
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot(authReducer, storeModuleConfig),
+        StoreModule.forRoot(authReducer, mockStoreModuleConfig),
       ],
       providers: [
         provideMockStore({ initialState }),
@@ -51,7 +55,7 @@ describe('authBlockingGuard', () => {
 
   beforeEach(() => {
     store = TestBed.inject(Store);
-    mockStore = store as MockStore<AppState>;
+    mockStore = store as MockStore<CoreState>;
     guard = authBlockingGuard;
   });
 

src/app/core/auth/auth-blocking.guard.ts

@@ -16,7 +16,7 @@ import {
   take,
 } from 'rxjs/operators';
 
-import { AppState } from '../../app.reducer';
+import { CoreState } from '../core-state.model';
 import { isAuthenticationBlocking } from './selectors';
 
 /**
@@ -27,7 +27,7 @@ import { isAuthenticationBlocking } from './selectors';
 export const authBlockingGuard: CanActivateFn = (
   route: ActivatedRouteSnapshot,
   state: RouterStateSnapshot,
-  store: Store<AppState> = inject(Store<AppState>),
+  store: Store<CoreState> = inject(Store<CoreState>),
 ): Observable<boolean> => {
   return store.pipe(select(isAuthenticationBlocking)).pipe(
     map((isBlocking: boolean) => isBlocking === false),

src/app/core/auth/auth-methods.service.ts

@@ -7,9 +7,9 @@ import uniqBy from 'lodash/uniqBy';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { AppState } from '../../app.reducer';
 import { AuthMethodTypeComponent } from '../../shared/log-in/methods/auth-methods.type';
 import { rendersAuthMethodType } from '../../shared/log-in/methods/log-in.methods-decorator.utils';
+import { CoreState } from '../core-state.model';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
 import { getAuthenticationMethods } from './selectors';
@@ -22,7 +22,7 @@ import { getAuthenticationMethods } from './selectors';
  * Provides methods to retrieve and process authentication methods from the application store.
  */
 export class AuthMethodsService {
-  constructor(protected store: Store<AppState>) {
+  constructor(protected store: Store<CoreState>) {
   }
 
   /**

src/app/core/auth/auth.effects.spec.ts

@@ -22,16 +22,13 @@ import {
   throwError as observableThrow,
 } from 'rxjs';
 
-import {
-  AppState,
-  storeModuleConfig,
-} from '../../app.reducer';
 import {
   authMethodsMock,
   AuthServiceStub,
 } from '../../shared/testing/auth-service.stub';
 import { EPersonMock } from '../../shared/testing/eperson.mock';
 import { StoreActionTypes } from '../../store.actions';
+import { CoreState } from '../core-state.model';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import {
   AuthActionTypes,
@@ -68,10 +65,17 @@ describe('AuthEffects', () => {
   let authServiceStub;
   let initialState;
   let token;
-  let store: MockStore<AppState>;
+  let store: MockStore<CoreState>;
 
   const authorizationService = jasmine.createSpyObj(['invalidateAuthorizationsRequestCache']);
 
+  const mockStoreModuleConfig = {
+    runtimeChecks: {
+      strictStateImmutability: true,
+      strictActionImmutability: true,
+    },
+  };
+
   function init() {
     authServiceStub = new AuthServiceStub();
     token = authServiceStub.getToken();
@@ -91,7 +95,7 @@ describe('AuthEffects', () => {
     init();
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
+        StoreModule.forRoot({ auth: authReducer }, mockStoreModuleConfig),
       ],
       providers: [
         AuthEffects,

src/app/core/auth/auth.effects.ts

@@ -33,10 +33,10 @@ import {
 } from 'rxjs/operators';
 
 import { environment } from '../../../environments/environment';
-import { AppState } from '../../app.reducer';
 import { hasValue } from '../../shared/empty.util';
 import { NotificationsActionTypes } from '../../shared/notifications/notifications.actions';
 import { StoreActionTypes } from '../../store.actions';
+import { CoreState } from '../core-state.model';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import { RequestActionTypes } from '../data/request.actions';
 import { EPerson } from '../eperson/models/eperson.model';
@@ -322,6 +322,6 @@ export class AuthEffects {
               private zone: NgZone,
               private authorizationsService: AuthorizationDataService,
               private authService: AuthService,
-              private store: Store<AppState>) {
+              private store: Store<CoreState>) {
   }
 }

src/app/core/auth/auth.interceptor.ts

@@ -24,12 +24,12 @@ import {
   map,
 } from 'rxjs/operators';
 
-import { AppState } from '../../app.reducer';
 import {
   hasValue,
   isNotEmpty,
   isNotNull,
 } from '../../shared/empty.util';
+import { CoreState } from '../core-state.model';
 import { RedirectWhenTokenExpiredAction } from './auth.actions';
 import { AuthService } from './auth.service';
 import { AuthMethod } from './models/auth.method';
@@ -45,7 +45,7 @@ export class AuthInterceptor implements HttpInterceptor {
   // we're creating a refresh token request list
   protected refreshTokenRequestUrls = [];
 
-  constructor(private inj: Injector, private router: Router, private store: Store<AppState>) {
+  constructor(private inj: Injector, private router: Router, private store: Store<CoreState>) {
   }
 
   /**

src/app/core/auth/auth.service.spec.ts

@@ -20,7 +20,6 @@ import {
 } from 'rxjs';
 
 import { REQUEST } from '../../../express.tokens';
-import { AppState } from '../../app.reducer';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -36,6 +35,7 @@ import {
   SpecialGroupDataMock$,
 } from '../../shared/testing/special-group.mock';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CoreState } from '../core-state.model';
 import { RemoteData } from '../data/remote-data';
 import { EPersonDataService } from '../eperson/eperson-data.service';
 import { EPerson } from '../eperson/models/eperson.model';
@@ -282,7 +282,7 @@ describe('AuthService test', () => {
       }).compileComponents();
     }));
 
-    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
+    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<CoreState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
       store
         .subscribe((state) => {
           (state as any).core = Object.create({});
@@ -358,7 +358,7 @@ describe('AuthService test', () => {
       }).compileComponents();
     }));
 
-    beforeEach(inject([ClientCookieService, AuthRequestService, Store, Router, RouteService], (cookieService: ClientCookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
+    beforeEach(inject([ClientCookieService, AuthRequestService, Store, Router, RouteService], (cookieService: ClientCookieService, authReqService: AuthRequestService, store: Store<CoreState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
       const expiredToken: AuthTokenInfo = new AuthTokenInfo('test_token');
       expiredToken.expires = Date.now() - (1000 * 60 * 60);
       authenticatedState = {
@@ -587,7 +587,7 @@ describe('AuthService test', () => {
       }).compileComponents();
     }));
 
-    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
+    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<CoreState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
       store
         .subscribe((state) => {
           (state as any).core = Object.create({});
@@ -627,7 +627,7 @@ describe('AuthService test', () => {
       }).compileComponents();
     }));
 
-    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
+    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<CoreState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
       store
         .subscribe((state) => {
           (state as any).core = Object.create({});

src/app/core/auth/auth.service.ts

@@ -23,7 +23,6 @@ import {
 } from 'rxjs/operators';
 
 import { environment } from '../../../environments/environment';
-import { AppState } from '../../app.reducer';
 import {
   hasNoValue,
   hasValue,
@@ -36,6 +35,7 @@ import {
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { followLink } from '../../shared/utils/follow-link-config.model';
+import { CoreState } from '../core-state.model';
 import {
   buildPaginatedList,
   PaginatedList,
@@ -115,7 +115,7 @@ export class AuthService {
     protected router: Router,
     protected routeService: RouteService,
     protected storage: CookieService,
-    protected store: Store<AppState>,
+    protected store: Store<CoreState>,
     protected hardRedirectService: HardRedirectService,
     protected notificationService: NotificationsService,
     protected translateService: TranslateService,

src/app/core/auth/authenticated.guard.ts

@@ -18,7 +18,7 @@ import {
   switchMap,
 } from 'rxjs/operators';
 
-import { AppState } from '../../app.reducer';
+import { CoreState } from '../core-state.model';
 import {
   AuthService,
   LOGIN_ROUTE,
@@ -39,7 +39,7 @@ export const authenticatedGuard: CanActivateFn = (
   state: RouterStateSnapshot,
   authService: AuthService = inject(AuthService),
   router: Router = inject(Router),
-  store: Store<AppState> = inject(Store<AppState>),
+  store: Store<CoreState> = inject(Store<CoreState>),
 ): Observable<boolean | UrlTree> => {
   const url = state.url;
   // redirect to sign in page if user is not authenticated

src/app/core/auth/server-auth.service.ts

@@ -14,12 +14,12 @@ import {
   REQUEST,
   RESPONSE,
 } from '../../../express.tokens';
-import { AppState } from '../../app.reducer';
 import {
   hasValue,
   isNotEmpty,
 } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { CoreState } from '../core-state.model';
 import { RemoteData } from '../data/remote-data';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { EPersonDataService } from '../eperson/eperson-data.service';
@@ -53,7 +53,7 @@ export class ServerAuthService extends AuthService {
     protected router: Router,
     protected routeService: RouteService,
     protected storage: CookieService,
-    protected store: Store<AppState>,
+    protected store: Store<CoreState>,
     protected hardRedirectService: HardRedirectService,
     protected notificationService: NotificationsService,
     protected translateService: TranslateService,