Fix/log out (CenterForOpenScience#251)

* fix(api-version): updated version

* fix(auth): updated auth and imports

* fix(models): fixed models and services

* fix(tests): fixed some tests

* fix(imports): fixed imports

* fix(unit-tests): fixed unit tests

* fix(imports): fixed imports

Author: nsemets

src/app/app.component.ts

@@ -4,7 +4,6 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
 
 import { GetCurrentUser } from '@core/store/user';
-import { InitializeAuth } from '@osf/features/auth/store';
 
 import { FullScreenLoaderComponent, ToastComponent } from './shared/components';
 
@@ -18,11 +17,9 @@ import { FullScreenLoaderComponent, ToastComponent } from './shared/components';
 export class AppComponent implements OnInit {
   actions = createDispatchMap({
     getCurrentUser: GetCurrentUser,
-    initializeAuth: InitializeAuth,
   });
 
   ngOnInit(): void {
-    this.actions.initializeAuth();
     this.actions.getCurrentUser();
   }
 }

src/app/core/components/footer/footer.component.spec.ts

@@ -6,8 +6,8 @@ import { BehaviorSubject } from 'rxjs';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
+import { IS_WEB } from '@osf/shared/helpers';
 import { IconComponent } from '@shared/components';
-import { IS_WEB } from '@shared/utils';
 
 import { FooterComponent } from './footer.component';
 

src/app/core/components/footer/footer.component.ts

@@ -6,7 +6,7 @@ import { RouterLink } from '@angular/router';
 
 import { SOCIAL_ICONS } from '@osf/core/constants';
 import { IconComponent } from '@osf/shared/components';
-import { IS_WEB } from '@shared/utils';
+import { IS_WEB } from '@osf/shared/helpers';
 
 @Component({
   selector: 'osf-footer',

src/app/core/components/header/header.component.html

@@ -2,7 +2,7 @@
   <osf-breadcrumb />
 
   <div class="header-dropdown-button ml-auto">
-    @if (isAuthenticated()) {
+    @if (currentUser()) {
       <p-button
         class="custom-dark-hover"
         icon="fas fa-chevron-down"

src/app/core/components/header/header.component.ts

@@ -1,4 +1,4 @@
-import { createDispatchMap, select } from '@ngxs/store';
+import { select } from '@ngxs/store';
 
 import { TranslatePipe } from '@ngx-translate/core';
 
@@ -8,9 +8,8 @@ import { Menu } from 'primeng/menu';
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { NavigationService } from '@osf/core/services';
+import { AuthService } from '@osf/core/services';
 import { UserSelectors } from '@osf/core/store/user';
-import { AuthSelectors, Logout } from '@osf/features/auth/store';
 import { LoaderService } from '@osf/shared/services';
 
 import { BreadcrumbComponent } from '../breadcrumb/breadcrumb.component';
@@ -24,12 +23,10 @@ import { BreadcrumbComponent } from '../breadcrumb/breadcrumb.component';
 })
 export class HeaderComponent {
   currentUser = select(UserSelectors.getCurrentUser);
-  isAuthenticated = select(AuthSelectors.isAuthenticated);
 
   private readonly router = inject(Router);
   private readonly loaderService = inject(LoaderService);
-  private readonly navigationService = inject(NavigationService);
-  private readonly actions = createDispatchMap({ logout: Logout });
+  private readonly authService = inject(AuthService);
 
   items = [
     {
@@ -41,12 +38,12 @@ export class HeaderComponent {
       label: 'navigation.logOut',
       command: () => {
         this.loaderService.show();
-        this.actions.logout();
+        this.authService.logout();
       },
     },
   ];
 
   navigateToSignIn() {
-    this.navigationService.navigateToSignIn();
+    this.authService.navigateToSignIn();
   }
 }

src/app/core/components/nav-menu/nav-menu.component.ts

@@ -14,7 +14,7 @@ import { ActivatedRoute, NavigationEnd, Router, RouterLink, RouterLinkActive } f
 import { MENU_ITEMS } from '@core/constants';
 import { filterMenuItems, updateMenuItems } from '@osf/core/helpers';
 import { RouteContext } from '@osf/core/models';
-import { AuthSelectors } from '@osf/features/auth/store';
+import { UserSelectors } from '@osf/core/store/user';
 import { IconComponent } from '@osf/shared/components';
 import { WrapFnPipe } from '@osf/shared/pipes';
 
@@ -30,7 +30,7 @@ export class NavMenuComponent {
   private readonly router = inject(Router);
   private readonly route = inject(ActivatedRoute);
 
-  private readonly isAuthenticated = select(AuthSelectors.isAuthenticated);
+  private readonly isAuthenticated = select(UserSelectors.isAuthenticated);
 
   protected readonly mainMenuItems = computed(() => {
     const isAuthenticated = this.isAuthenticated();

src/app/core/components/request-access/request-access.component.ts

@@ -1,5 +1,3 @@
-import { createDispatchMap } from '@ngxs/store';
-
 import { TranslatePipe } from '@ngx-translate/core';
 
 import { Button } from 'primeng/button';
@@ -13,8 +11,7 @@ import { toSignal } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { RequestAccessService } from '@osf/core/services';
-import { Logout } from '@osf/features/auth/store';
+import { AuthService, RequestAccessService } from '@osf/core/services';
 import { InputLimits } from '@osf/shared/constants';
 import { LoaderService, ToastService } from '@osf/shared/services';
 
@@ -36,7 +33,7 @@ export class RequestAccessComponent {
   private readonly requestAccessService = inject(RequestAccessService);
   private readonly loaderService = inject(LoaderService);
   private readonly toastService = inject(ToastService);
-  private readonly actions = createDispatchMap({ logout: Logout });
+  private readonly authService = inject(AuthService);
 
   requestAccess() {
     this.loaderService.show();
@@ -55,6 +52,6 @@ export class RequestAccessComponent {
   }
 
   switchAccount() {
-    this.actions.logout();
+    this.authService.logout();
   }
 }

src/app/core/components/root/root.component.spec.ts

@@ -11,7 +11,7 @@ import { BreadcrumbComponent } from '@core/components/breadcrumb/breadcrumb.comp
 import { FooterComponent } from '@core/components/footer/footer.component';
 import { HeaderComponent } from '@core/components/header/header.component';
 import { TopnavComponent } from '@core/components/topnav/topnav.component';
-import { IS_WEB, IS_XSMALL } from '@osf/shared/utils';
+import { IS_WEB, IS_XSMALL } from '@osf/shared/helpers';
 
 import { SidenavComponent } from '../sidenav/sidenav.component';
 

src/app/core/components/root/root.component.ts

@@ -10,7 +10,7 @@ import { BreadcrumbComponent } from '@core/components/breadcrumb/breadcrumb.comp
 import { FooterComponent } from '@core/components/footer/footer.component';
 import { HeaderComponent } from '@core/components/header/header.component';
 import { TopnavComponent } from '@core/components/topnav/topnav.component';
-import { IS_MEDIUM, IS_WEB } from '@shared/utils';
+import { IS_MEDIUM, IS_WEB } from '@osf/shared/helpers';
 
 @Component({
   selector: 'osf-root',

src/app/core/constants/index.ts

@@ -1,5 +1,4 @@
 export * from './error-messages';
-export * from './my-projects-table.constants';
 export * from './nav-items.constant';
 export * from './ngxs-states.constant';
 export * from './social-icons.constant';