Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: create api routes for /admin (#1318)
- Loading branch information
1 parent
3c1e684
commit da5f289
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GitHub Actions
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { ChangeDetectionStrategy, Component } from '@angular/core'; | ||
| import { Router } from '@angular/router'; | ||
| import { RouteConstants } from '@dasch-swiss/vre/shared/app-config'; | ||
|
|
||
| // empty component used as a redirect when the user logs in | ||
| @Component({ | ||
| changeDetection: ChangeDetectionStrategy.OnPush, | ||
| template: '' | ||
| }) | ||
| export class AuthGuardComponent { | ||
| constructor(private router: Router) { | ||
| this.router.navigate([RouteConstants.home], { replaceUrl: true }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,58 @@ | ||
| import { Inject, Injectable } from '@angular/core'; | ||
| import { CanActivate } from '@angular/router'; | ||
| import { DOCUMENT } from '@angular/common'; | ||
| import { Actions, ofActionCompleted, Select, Store } from '@ngxs/store'; | ||
| import { Observable, of } from 'rxjs'; | ||
| import { map, switchMap } from 'rxjs/operators'; | ||
| import { ReadUser } from '@dasch-swiss/dsp-js'; | ||
| import { AuthService } from '@dasch-swiss/vre/shared/app-session'; | ||
| import { | ||
| CurrentPageSelectors, | ||
| SetUserAction, | ||
| UserSelectors, | ||
| } from '@dasch-swiss/vre/shared/app-state'; | ||
|
|
||
| @Injectable({ | ||
| providedIn: 'root', | ||
| }) | ||
| export class AuthGuard implements CanActivate { | ||
| @Select(UserSelectors.user) user$: Observable<ReadUser>; | ||
|
|
||
| constructor( | ||
| private store: Store, | ||
| private _authService: AuthService, | ||
| private actions$: Actions, | ||
| @Inject(DOCUMENT) private document: Document | ||
| ) {} | ||
|
|
||
| canActivate(): Observable<boolean> { | ||
| return this.user$.pipe( | ||
| switchMap((user) => { | ||
| if (user) return of(null); | ||
|
|
||
| if (this.store.selectSnapshot(UserSelectors.isLoading)) { | ||
| return this.actions$.pipe(ofActionCompleted(SetUserAction)); | ||
| } else { | ||
| return this.store.dispatch(new SetUserAction(user)); | ||
| } | ||
| }), | ||
| switchMap(() => this._authService.isLoggedIn$), | ||
| map((isLoggedIn) => { | ||
| if (isLoggedIn) { | ||
| return true; | ||
| } else { | ||
| this._goToHomePage(); | ||
| return false; | ||
| } | ||
| }) | ||
| ); | ||
| } | ||
|
|
||
| private _goToHomePage() { | ||
| this.document.defaultView.location.href = | ||
| `${this.document.defaultView.location.href}?` + | ||
| `returnLink=${this.store.selectSnapshot( | ||
| CurrentPageSelectors.loginReturnLink | ||
| )}`; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import { | ||
| HttpHandler, | ||
| HttpInterceptor, | ||
| HttpRequest, | ||
| } from '@angular/common/http'; | ||
| import { Injectable } from '@angular/core'; | ||
| import { AuthService } from '@dasch-swiss/vre/shared/app-session'; | ||
| import { AppConfigService } from '@dasch-swiss/vre/shared/app-config'; | ||
|
|
||
| @Injectable() | ||
| export class AuthInterceptor implements HttpInterceptor { | ||
| constructor( | ||
| private _authService: AuthService, | ||
| private _appConfigService: AppConfigService | ||
| ) {} | ||
|
|
||
| intercept(req: HttpRequest<any>, next: HttpHandler) { | ||
| if (!req.url.startsWith(this._appConfigService.dspApiConfig.apiUrl)) { | ||
| return next.handle(req); | ||
| } | ||
|
|
||
| const authToken = this._authService.getAccessToken(); | ||
| if (!authToken) return next.handle(req); | ||
|
|
||
| const authReq = req.clone({ | ||
| headers: req.headers.set( | ||
| 'Authorization', | ||
| `Bearer ${this._authService.getAccessToken()}` | ||
| ), | ||
| }); | ||
| return next.handle(authReq); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.