Merge branch 'feature/authentication' into develop

Author: mckenziearts

src/app/app.module.ts

@@ -1,5 +1,5 @@
 import { APP_INITIALIZER, ErrorHandler, NgModule } from '@angular/core';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -13,8 +13,8 @@ import { environment } from '../environments/environment';
 import { AppRoutingModule } from './core/routes/app-routing.module';
 import { AppComponent } from './core/components/app/app.component';
 import { ROOT_REDUCERS } from './core/store/app.store';
-import { ROOT_EFFECTS } from './core/store/app.effects';
 import { Router } from '@angular/router';
+import { AuthInterceptor } from './modules/authentication/interceptors/auth.interceptor';
 
 @NgModule({
   declarations: [
@@ -24,7 +24,7 @@ import { Router } from '@angular/router';
     AppRoutingModule,
     BrowserAnimationsModule,
     BrowserModule,
-    EffectsModule.forRoot(ROOT_EFFECTS),
+    EffectsModule.forRoot(),
     FormsModule,
     HttpClientModule,
     ReactiveFormsModule,
@@ -49,6 +49,11 @@ import { Router } from '@angular/router';
       deps: [Sentry.TraceService],
       multi: true,
     },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: AuthInterceptor,
+      multi: true,
+    }
   ],
   bootstrap: [AppComponent],
 })

src/app/core/guards/admin.guard.ts

@@ -1,19 +1,36 @@
 import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { first, map, Observable } from 'rxjs';
+
+import { getCurrentUserAction } from '@app/modules/authentication/store/auth.actions';
+import { selectCurrentUser } from '@app/modules/authentication/store/auth.selectors';
+import { User } from '@app/modules/user/interfaces/user.interface';
 
 @Injectable({
   providedIn: 'root'
 })
 export class AdminGuard implements CanActivate {
 
+  constructor(private store: Store) {}
+
   emails: string[] = [
     'manfouothierno@isdg-sarl.com',
     'patouossaibrahim@yahoo.com',
     'monneylobe@gmail.com',
   ];
 
-  canActivate(): boolean {
-    return true;
+  canActivate(): Observable<boolean> {
+    return this.store.select(selectCurrentUser).pipe(
+      first(),
+      map((user: User | null) => {
+        if (!user) {
+          this.store.dispatch(getCurrentUserAction());
+          return false;
+        }
+        return this.emails.includes(user.email);
+      })
+    );
   }
 
 }

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

@@ -1,16 +1,32 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivateChild, RouterStateSnapshot } from '@angular/router';
+import { CanActivateChild, Router } from '@angular/router';
+import { AccessTokenService } from '@app/modules/authentication/services/access-token.service';
+import { selectIsLoggedIn } from '@app/modules/authentication/store/auth.selectors';
+import { Store } from '@ngrx/store';
+import { filter, first, map, Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
 export class AuthGuard implements CanActivateChild {
+  constructor(
+    private store: Store,
+    private router: Router,
+    private accessTokenService: AccessTokenService
+  ) {}
 
-  canActivateChild(
-    childRoute: ActivatedRouteSnapshot, 
-    state: RouterStateSnapshot
-  ): boolean {
-    return true;
+  canActivateChild(): Observable<boolean> {
+    return this.store.select(selectIsLoggedIn).pipe(
+      first((value) => value !== null),
+      map(() => {
+        if ( ! this.accessTokenService.getAccessToken()) {
+          this.router.navigateByUrl('/auth/login')
+          return false;
+        }
+
+        return true;
+      })
+    );
   }
 
 }

src/app/core/guards/guest.guard.ts

@@ -1,16 +1,32 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivateChild, RouterStateSnapshot } from '@angular/router';
+import { CanActivateChild, Router } from '@angular/router';
+import { AccessTokenService } from '@app/modules/authentication/services/access-token.service';
+import { selectIsLoggedIn } from '@app/modules/authentication/store/auth.selectors';
+import { Store } from '@ngrx/store';
+import { first, map, Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
 export class GuestGuard implements CanActivateChild {
+  constructor(
+    private store: Store,
+    private router: Router,
+    private accessTokenService: AccessTokenService
+  ) {}
 
-  canActivateChild(
-    route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot
-  ): boolean {
-    return true;
+  canActivateChild(): Observable<boolean> {
+    return this.store.select(selectIsLoggedIn).pipe(
+      first((value) => value !== null),
+      map(() => {
+        if (! this.accessTokenService.tokenExpired()) {
+          this.router.navigateByUrl('/dashboard')
+          return false
+        }
+
+        return true;
+      })
+    );
   }
 
 } 

src/app/core/guards/user-data.guard.ts

@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { first, map, Observable } from 'rxjs';
+import { CanActivateChild } from '@angular/router';
+
+import { selectCurrentUser } from '@app/modules/authentication/store/auth.selectors';
+import { getCurrentUserAction } from '@app/modules/authentication/store/auth.actions';
+import { User } from '@app/modules/user/interfaces/user.interface';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UserDataGuard implements CanActivateChild {
+  constructor(private store: Store) {}
+
+  canActivateChild(): Observable<boolean> {
+    return this.store.select(selectCurrentUser).pipe(
+      first(),
+      map((user: User | null) => {
+        if (! user) {
+          this.store.dispatch(getCurrentUserAction());
+        }
+        console.log(user);
+        return true;
+      })  
+    );
+  }
+
+}

src/app/core/store/app.effects.ts

@@ -1,10 +1,15 @@
 import { routerReducer, RouterState } from '@ngrx/router-store';
 import { Action, ActionReducerMap } from '@ngrx/store';
 
+import { AuthState } from '@app/modules/authentication/interfaces/state.interface';
+import { authFeatureKey, authReducer } from '@app/modules/authentication/store/auth.reducer';
+
 export interface AppState {
   router: RouterState;
+  [authFeatureKey]: AuthState;
 }
 
 export const ROOT_REDUCERS: ActionReducerMap<AppState, Action> = {
   router: routerReducer,
+  [authFeatureKey]: authReducer,
 };

src/app/core/store/app.store.ts

@@ -1,3 +1,3 @@
 import { getSelectors } from '@ngrx/router-store';
 
-export const { selectRouteParams } = getSelectors();
+export const { selectRouteParams, selectQueryParams } = getSelectors();

src/app/core/store/router.selectors.ts

@@ -1,13 +1,17 @@
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
+import { StoreModule } from '@ngrx/store';
+import { EffectsModule } from '@ngrx/effects';
 
 import { SharedModule } from '@shared/shared.module';
 import { authRoutes } from './routes/authenticate.routes';
 
 import { ForgotPasswordComponent } from './pages/forgot-password/forgot-password.component';
 import { LoginComponent } from './pages/login/login.component';
 import { ResetPasswordComponent } from './pages/reset-password/reset-password.component';
+import { authReducer, authFeatureKey } from './store/auth.reducer';
+import { AuthEffects } from './store/auth.effects';
 
 @NgModule({
   declarations: [
@@ -16,10 +20,12 @@ import { ResetPasswordComponent } from './pages/reset-password/reset-password.co
     ResetPasswordComponent
   ],
   imports: [
+    EffectsModule.forFeature([AuthEffects]),
     FormsModule,
     ReactiveFormsModule,
-    SharedModule,
     RouterModule.forChild(authRoutes),
+    SharedModule,
+    StoreModule.forFeature(authFeatureKey, authReducer)
   ],
   exports: [],
   providers: [],

src/app/modules/authentication/authentication.module.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+import {
+  HttpEvent,
+  HttpInterceptor,
+  HttpHandler,
+  HttpRequest
+} from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+import { AccessTokenService } from '../services/access-token.service';
+import { environment } from 'environments/environment';
+
+@Injectable()
+export class AuthInterceptor implements HttpInterceptor {
+
+  constructor(private accessTokenService: AccessTokenService) { }
+
+  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    const isApiUrl = request.url.startsWith(environment.apiUrl);
+    const accessToken = this.accessTokenService.getAccessToken();
+
+    if (accessToken && isApiUrl) {
+      request = request.clone({
+        setHeaders: { Authorization: `Bearer ${accessToken}` }
+      });
+    }
+
+    return next.handle(request);
+  }
+}