rename auth services, remove registration button from landing page wh…

…en user is logged in, reset login state and redirect user to login when requests return 401 or 403.

src/app/chat/data-access/chat-state.service.ts

@@ -20,7 +20,7 @@ import { chatStateAdapter } from './chat-state.adapter';
 import { TimerService } from '@shared/util/time/timer.service';
 import { startWith } from 'rxjs/operators';
 import { ActivatedRoute } from '@angular/router';
-import { AuthStorageService } from '@shared/data-access/auth/auth-storage.service';
+import { AuthService } from '@shared/data-access/auth/auth.service';
 import { OwnProfileService } from '@shared/data-access/profile/own-profile.service';
 
 export type SingleChatState = {
@@ -45,7 +45,7 @@ export type ChatAdaptState = {
 export class ChatStateService {
   private readonly storePath = 'chat';
   private activatedRoute = inject(ActivatedRoute);
-  private authStorageService = inject(AuthStorageService);
+  private authStorageService = inject(AuthService);
   private profileService = inject(OwnProfileService);
 
   private userLoggedOut$ = this.authStorageService.hasLoggedOut$.pipe(

src/app/home/feature/contact/contact.component.ts

@@ -5,8 +5,8 @@ import {
   ReactiveFormsModule,
   Validators,
 } from '@angular/forms';
-import { AuthStorageService } from '@shared/data-access/auth/auth-storage.service';
-import { AuthenticationService } from '@shared/data-access/auth/authentication.service';
+import { AuthService } from '@shared/data-access/auth/auth.service';
+import { AuthHttpService } from '@shared/data-access/auth/auth-http.service';
 import { EventLogService } from '@shared/data-access/log/event-log.service';
 import { ContactService } from '../../data-access/contact.service';
 import { tap } from 'rxjs';
@@ -49,8 +49,8 @@ export class ContactComponent implements OnInit {
   constructor(
     private fb: NonNullableFormBuilder,
     private contactService: ContactService,
-    public authStorageService: AuthStorageService,
-    private authenticationService: AuthenticationService,
+    public authStorageService: AuthService,
+    private authenticationService: AuthHttpService,
     private eventLogService: EventLogService
   ) {}
 

src/app/home/feature/landing-page.component.ts

@@ -1,6 +1,8 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { EventLogService } from '@shared/data-access/log/event-log.service';
+import { AuthService } from '@shared/data-access/auth/auth.service';
+import { NgIf } from '@angular/common';
 
 @Component({
   selector: 'app-landing-page',
@@ -36,6 +38,7 @@ import { EventLogService } from '@shared/data-access/log/event-log.service';
             Wir verbinden Tänzer
           </div>
           <button
+            *ngIf="!isLoggedIn()"
             class="mt-12 cursor-pointer rounded bg-red-900 py-3 px-8 text-xl font-bold text-white transition-all duration-200 ease-in-out hover:bg-white hover:text-red-900 lg:text-2xl"
             (click)="navigateToRegistration()"
           >
@@ -94,9 +97,12 @@ import { EventLogService } from '@shared/data-access/log/event-log.service';
     </main>
   `,
   standalone: true,
+  imports: [NgIf],
 })
 export class LandingPageComponent {
-  constructor(private router: Router, private eventService: EventLogService) {}
+  private router = inject(Router);
+  private eventService = inject(EventLogService);
+  public isLoggedIn = inject(AuthService).isLoggedIn;
 
   navigateToRegistration(): void {
     this.eventService.createAndPublishEvent('navigated_to_page', {

src/app/home/feature/logout-page.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { AuthenticationService } from '@shared/data-access/auth/authentication.service';
+import { AuthHttpService } from '@shared/data-access/auth/auth-http.service';
 import { Subscription } from 'rxjs';
-import { AuthStorageService } from '@shared/data-access/auth/auth-storage.service';
+import { AuthService } from '@shared/data-access/auth/auth.service';
 
 @Component({
   selector: 'app-logout-page',
@@ -13,8 +13,8 @@ export class LogoutPageComponent implements OnInit, OnDestroy {
   logoutSubscription: Subscription | undefined;
 
   constructor(
-    private authService: AuthenticationService,
-    private authStorageService: AuthStorageService,
+    private authService: AuthHttpService,
+    private authStorageService: AuthService,
     private router: Router
   ) {}
 

src/app/home/ui/login-form/login-form.component.ts

@@ -5,7 +5,7 @@ import {
   UntypedFormGroup,
   Validators,
 } from '@angular/forms';
-import { AuthenticationService } from '@shared/data-access/auth/authentication.service';
+import { AuthHttpService } from '@shared/data-access/auth/auth-http.service';
 import { LoginRequest } from '@shared/data-access/auth/authentication.types';
 import { Router, RouterLink } from '@angular/router';
 import { APIError } from '@shared/util/http/response.types';
@@ -40,7 +40,7 @@ export class LoginFormComponent implements OnInit {
 
   constructor(
     private fb: UntypedFormBuilder,
-    private authService: AuthenticationService,
+    private authService: AuthHttpService,
     private router: Router
   ) {}
 

src/app/profile/feature/initial-setup/init-user-name/init-user-name.component.spec.ts

@@ -15,7 +15,7 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { MatInputModule } from '@angular/material/input';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatButtonModule } from '@angular/material/button';
-import { AuthStorageService } from '@shared/data-access/auth/auth-storage.service';
+import { AuthService } from '@shared/data-access/auth/auth.service';
 import { of } from 'rxjs';
 import { Location } from '@angular/common';
 import { InitPersonalDataComponent } from '../init-personal-data/init-personal-data.component';
@@ -61,7 +61,7 @@ describe('Setting up username', () => {
           getApiUrl: () => 'http://test.de',
         }),
       },
-      MockProvider(AuthStorageService, {
+      MockProvider(AuthService, {
         authData$: of({
           isLoggedIn: true,
           isHuman: true,

src/app/registration/feature/register-account/register-user-form/register-user-form.component.ts

@@ -5,7 +5,7 @@ import {
   UntypedFormGroup,
   Validators,
 } from '@angular/forms';
-import { AuthenticationService } from '@shared/data-access/auth/authentication.service';
+import { AuthHttpService } from '@shared/data-access/auth/auth-http.service';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { Subscription } from 'rxjs';
 import { mustMatch } from '@shared/util/mustMatch.validator';
@@ -45,7 +45,7 @@ export class RegisterUserFormComponent implements OnInit, OnDestroy {
 
   constructor(
     private fb: UntypedFormBuilder,
-    private authenticationService: AuthenticationService,
+    private authenticationService: AuthHttpService,
     private route: ActivatedRoute,
     private router: Router
   ) {}

src/app/registration/feature/reset-password/new-password/new-password.component.ts

@@ -6,7 +6,7 @@ import {
   Validators,
 } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import { AuthenticationService } from '@shared/data-access/auth/authentication.service';
+import { AuthHttpService } from '@shared/data-access/auth/auth-http.service';
 import { APIError } from '@shared/util/http/response.types';
 import { mustMatch } from '@shared/util/mustMatch.validator';
 import { switchMap } from 'rxjs';
@@ -48,7 +48,7 @@ export class NewPasswordComponent {
 
   constructor(
     private fb: NonNullableFormBuilder,
-    private authenticationService: AuthenticationService,
+    private authenticationService: AuthHttpService,
     private route: ActivatedRoute,
     private router: Router
   ) {}

src/app/registration/feature/verify-account/verify-account.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { AuthenticationService } from '@shared/data-access/auth/authentication.service';
+import { AuthHttpService } from '@shared/data-access/auth/auth-http.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subscription, switchMap } from 'rxjs';
 
@@ -15,7 +15,7 @@ export class VerifyAccountComponent implements OnInit, OnDestroy {
   constructor(
     private router: Router,
     private route: ActivatedRoute,
-    private authService: AuthenticationService
+    private authService: AuthHttpService
   ) {}
 
   ngOnInit(): void {

src/app/registration/ui/send-verification-link-form/send-verification-link-form.component.spec.ts

@@ -6,7 +6,7 @@ import { MatInputModule } from '@angular/material/input';
 import { MatCardModule } from '@angular/material/card';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MockProvider } from 'ng-mocks';
-import { AuthenticationService } from '@shared/data-access/auth/authentication.service';
+import { AuthHttpService } from '@shared/data-access/auth/auth-http.service';
 import { ActivatedRoute } from '@angular/router';
 
 describe('SendVerificationLinkFormComponent', () => {
@@ -20,8 +20,8 @@ describe('SendVerificationLinkFormComponent', () => {
       ReactiveFormsModule,
     ],
     providers: [
-      MockProvider(AuthenticationService),
-      MockProvider(AuthenticationService),
+      MockProvider(AuthHttpService),
+      MockProvider(AuthHttpService),
       MockProvider(ActivatedRoute),
     ],
   });

src/app/registration/ui/send-verification-link-form/send-verification-link-form.component.ts

@@ -4,12 +4,12 @@ import {
   ReactiveFormsModule,
   Validators,
 } from '@angular/forms';
-import { AuthenticationService } from '@shared/data-access/auth/authentication.service';
+import { AuthHttpService } from '@shared/data-access/auth/auth-http.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { APIError, OldAPIResponse } from '@shared/util/http/response.types';
 import { LinkType } from '../../util/registration.types';
 import { Observable } from 'rxjs';
-import { AuthStorageService } from '@shared/data-access/auth/auth-storage.service';
+import { AuthService } from '@shared/data-access/auth/auth.service';
 import { MatButtonModule } from '@angular/material/button';
 import { RecaptchaModule } from 'ng-recaptcha';
 import { DataTestDirective } from '@shared/util/data-test.directive';
@@ -51,10 +51,10 @@ export class SendVerificationLinkFormComponent implements OnInit {
 
   constructor(
     private fb: NonNullableFormBuilder,
-    private authenticationService: AuthenticationService,
+    private authenticationService: AuthHttpService,
     private router: Router,
     private route: ActivatedRoute,
-    public authStorageService: AuthStorageService
+    public authStorageService: AuthService
   ) {}
 
   ngOnInit(): void {

src/app/shared/data-access/auth/authentication.service.spec.ts → src/app/shared/data-access/auth/auth-http.service.spec.ts

@@ -1,21 +1,21 @@
-import { AuthenticationService } from './authentication.service';
+import { AuthHttpService } from './auth-http.service';
 import {
   createHttpFactory,
   HttpMethod,
   SpectatorHttp,
 } from '@ngneat/spectator/jest';
-import { AuthStorageService } from './auth-storage.service';
+import { AuthService } from './auth.service';
 import { EnvironmentService } from '../environment.service';
 import { LoginRequest, UserRegistration } from './authentication.types';
 import { MockService } from 'ng-mocks';
 import { TestRequest } from '@angular/common/http/testing';
 import { APIError } from '../../util/http/response.types';
 
-describe('AuthenticationService', () => {
-  let spectator: SpectatorHttp<AuthenticationService>;
+describe('AuthHttpService', () => {
+  let spectator: SpectatorHttp<AuthHttpService>;
   const createHttp = createHttpFactory({
-    service: AuthenticationService,
-    mocks: [AuthStorageService],
+    service: AuthHttpService,
+    mocks: [AuthService],
   });
 
   beforeEach(() => {
@@ -110,7 +110,7 @@ describe('AuthenticationService', () => {
     );
 
     it('sets the login state in the auth storage service', () => {
-      const authStorageService = spectator.inject(AuthStorageService);
+      const authStorageService = spectator.inject(AuthService);
       spectator.service.login(loginRequest).subscribe();
 
       spectator
@@ -126,7 +126,7 @@ describe('AuthenticationService', () => {
     });
 
     it("doesn't set the login state in the auth storage service when login fails", () => {
-      const authStorageService = spectator.inject(AuthStorageService);
+      const authStorageService = spectator.inject(AuthService);
       spectator.service.login(loginRequest).subscribe();
 
       spectator
@@ -189,7 +189,7 @@ describe('AuthenticationService', () => {
     });
 
     it('sets the human state in the auth storage service', () => {
-      const authStorageService = spectator.inject(AuthStorageService);
+      const authStorageService = spectator.inject(AuthService);
       spectator.service.loginAsHuman(captchaToken).subscribe();
 
       spectator
@@ -205,7 +205,7 @@ describe('AuthenticationService', () => {
     });
 
     it("doesn't set the human state in the auth storage service when human login fails", () => {
-      const authStorageService = spectator.inject(AuthStorageService);
+      const authStorageService = spectator.inject(AuthService);
       spectator.service.loginAsHuman(captchaToken).subscribe();
 
       spectator

src/app/shared/data-access/auth/authentication.service.ts → src/app/shared/data-access/auth/auth-http.service.ts

@@ -12,7 +12,7 @@ import {
   UserRegistration,
 } from './authentication.types';
 import { catchError, map, Observable, of, shareReplay, tap } from 'rxjs';
-import { AuthStorageService } from './auth-storage.service';
+import { AuthService } from './auth.service';
 import { EnvironmentService } from '../environment.service';
 import {
   asError,
@@ -23,7 +23,7 @@ import {
 @Injectable({
   providedIn: 'root',
 })
-export class AuthenticationService {
+export class AuthHttpService {
   private defaultOptions = {
     withCredentials: true,
   };
@@ -32,7 +32,7 @@ export class AuthenticationService {
 
   constructor(
     private http: HttpClient,
-    private authStorageService: AuthStorageService,
+    private authStorageService: AuthService,
     private environment: EnvironmentService
   ) {
     this.baseUrl = `${this.environment.getApiUrl()}/authentication`;

src/app/shared/data-access/auth/auth-storage.service.spec.ts → src/app/shared/data-access/auth/auth.service.spec.ts

@@ -1,10 +1,10 @@
 import { TestBed } from '@angular/core/testing';
 
-import { AuthData, AuthStorageService } from './auth-storage.service';
+import { AuthData, AuthService } from './auth.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 
-describe('AuthStorageService', () => {
-  let service: AuthStorageService | undefined;
+describe('AuthService', () => {
+  let service: AuthService | undefined;
   let setItemSpy: jest.SpyInstance;
   let getItemSpy: jest.SpyInstance;
 
@@ -31,7 +31,7 @@ describe('AuthStorageService', () => {
   });
 
   it('is created', () => {
-    service = TestBed.inject(AuthStorageService);
+    service = TestBed.inject(AuthService);
     expect(service).toBeTruthy();
   });
 
@@ -48,7 +48,7 @@ describe('AuthStorageService', () => {
       return null;
     });
 
-    service = TestBed.inject(AuthStorageService);
+    service = TestBed.inject(AuthService);
 
     const actualAuthData = service.getSnapshot();
     expect(actualAuthData).toEqual(expectedAuthData);
@@ -59,7 +59,7 @@ describe('AuthStorageService', () => {
       return null;
     });
 
-    service = TestBed.inject(AuthStorageService);
+    service = TestBed.inject(AuthService);
 
     const expectedAuthData: AuthData = {
       isLoggedIn: false,
@@ -75,7 +75,7 @@ describe('AuthStorageService', () => {
 
     beforeEach(() => {
       listener.mockClear();
-      service = TestBed.inject(AuthStorageService);
+      service = TestBed.inject(AuthService);
       service.authData$.subscribe(listener);
 
       service.setLoginState(true);
@@ -107,7 +107,7 @@ describe('AuthStorageService', () => {
 
     beforeEach(() => {
       listener.mockClear();
-      service = TestBed.inject(AuthStorageService);
+      service = TestBed.inject(AuthService);
       service.authData$.subscribe(listener);
       service.setLoginState(false);
       service.setHumanState(true);