Saves token

Author: Bernardo

src/app/authentication/authentication.module.ts

@@ -1,11 +1,8 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { NgModule } from '@angular/core';
 import { AuthenticationInterceptor } from './interceptor/authentication.interceptor';
 import { AuthenticationService } from './service/authentication.service';
-import { AuthenticationTokenService } from './service/authentication-token.service';
-
-
 
 @NgModule({
   declarations: [],
@@ -14,7 +11,6 @@ import { AuthenticationTokenService } from './service/authentication-token.servi
   ],
   providers: [
     AuthenticationService,
-    AuthenticationTokenService,
     { provide: HTTP_INTERCEPTORS, useClass: AuthenticationInterceptor, multi: true }
   ]
 })

src/app/authentication/interceptor/authentication.interceptor.ts

@@ -1,19 +1,19 @@
 import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { AuthenticationTokenService } from '../service/authentication-token.service';
+import { AuthenticationService } from '../service/authentication.service';
 
 
 @Injectable()
 export class AuthenticationInterceptor implements HttpInterceptor {
 
   private tokenHeaderKey = 'Authorization';
 
-  constructor(private token: AuthenticationTokenService) { }
+  constructor(private authenticationService: AuthenticationService) { }
 
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     let authReq = req;
-    const token = this.token.getToken();
+    const token = this.authenticationService.getToken();
     if (token != null) {
       authReq = req.clone({ headers: req.headers.set(this.tokenHeaderKey, 'Bearer ' + token) });
     }

src/app/authentication/service/authentication-token.service.spec.ts

@@ -1,56 +1,20 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
-import { environment } from '@environments/environment';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { User } from '../model/user';
 
-@Injectable({
-    providedIn: 'root'
-})
+@Injectable()
 export class AuthenticationService {
 
-    private userSubject: BehaviorSubject<User>;
+    private tokenId: string = 'access_token';
 
     constructor(
-        private router: Router,
-        private http: HttpClient
     ) {
-        this.userSubject = new BehaviorSubject<User>(new User());
     }
 
-    public get user(): User {
-        return this.userSubject.value;
+    getToken(): string | null {
+        return localStorage.getItem(this.tokenId);
     }
 
-    login(username: string, password: string): Observable<User> {
-        return this.http.post<User>(`${environment.apiUrl}/login`, { username, password })
-            .pipe(map(user => {
-                let loggedUser;
-
-                if (user) {
-                    loggedUser = user;
-                    loggedUser.authdata = window.btoa(username + ':' + password);
-                    loggedUser.logged = true;
-                } else {
-                    loggedUser = new User();
-                }
-
-                this.userSubject.next(loggedUser);
-                return loggedUser;
-            }));
-    }
-
-    logout() {
-        // remove user from local storage and set current user to null
-        localStorage.removeItem('user');
-        this.userSubject.next(new User());
-        this.router.navigate(['/login']);
-    }
-
-    register(user: User) {
-        return this.http.post(`${environment.apiUrl}/users/register`, user);
+    saveToken(token: string) {
+        return localStorage.setItem(this.tokenId, token);
     }
 
 }

src/app/authentication/service/authentication-token.service.ts

@@ -3,6 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AuthenticationService } from '@app/authentication/service/authentication.service';
 import { first } from 'rxjs/operators';
+import { LoginService } from '../service/login.service';
 
 @Component({
   selector: 'dahs-login-form',
@@ -21,10 +22,11 @@ export class LoginFormComponent implements OnInit {
     private formBuilder: FormBuilder,
     private route: ActivatedRoute,
     private router: Router,
+    private loginService: LoginService,
     private authenticationService: AuthenticationService
   ) {
     // redirect to home if already logged in
-    if (this.authenticationService.user.logged) {
+    if (this.loginService.user.logged) {
       this.router.navigate(['/']);
     }
 
@@ -51,12 +53,17 @@ export class LoginFormComponent implements OnInit {
     }
 
     this.loading = true;
-    this.authenticationService.login(this.f['username'].value, this.f['password'].value)
+    this.loginService.login(this.f['username'].value, this.f['password'].value)
       .subscribe({
         next: user => {
           this.loading = false;
           if (user.logged) {
+            if(user.authdata){
+              this.authenticationService.saveToken(user.authdata);
+            }
             this.router.navigate([this.returnUrl]);
+          } else {
+            this.authenticationService.saveToken('');
           }
         },
         error: error => {

src/app/authentication/service/authentication.service.ts

@@ -4,6 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { AuthenticationModule } from '@app/authentication/authentication.module';
 import { LoginFormComponent } from './login-form/login-form.component';
 import { LoginRoutingModule } from './login-routing.module';
+import { LoginService } from './service/login.service';
 
 
 
@@ -17,6 +18,9 @@ import { LoginRoutingModule } from './login-routing.module';
     CommonModule,
     FormsModule,
     ReactiveFormsModule
+  ],
+  providers: [
+    LoginService
   ]
 })
 export class LoginModule { }

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

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { LoginService } from './login.service';
+
+describe('LoginService', () => {
+  let service: LoginService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(LoginService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/login/login.module.ts

@@ -0,0 +1,43 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { User } from '@app/authentication/model/user';
+import { environment } from '@environments/environment';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Injectable()
+export class LoginService {
+
+  public user: User = new User();
+
+  constructor(
+    private router: Router,
+    private http: HttpClient
+  ) { }
+
+  login(username: string, password: string): Observable<User> {
+    return this.http.post<User>(`${environment.apiUrl}/login`, { username, password })
+      .pipe(map(user => {
+        let loggedUser;
+
+        if (user) {
+          loggedUser = user;
+          loggedUser.authdata = window.btoa(username + ':' + password);
+          loggedUser.logged = true;
+        } else {
+          loggedUser = new User();
+        }
+
+        this.user = loggedUser;
+        return this.user;
+      }));
+  }
+
+  logout() {
+    // remove user from local storage and set current user to null
+    localStorage.removeItem('user');
+    this.user = new User();
+    this.router.navigate(['/login']);
+  }
+}