-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from zazuko/angular_18
Angular 18
- Loading branch information
Showing
8 changed files
with
2,484 additions
and
1,946 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
50 changes: 50 additions & 0 deletions
50
...cts/blueprint/src/app/core/http-interceptor/auth-interceptor/auth-interceptor.function.ts
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,50 @@ | ||
| /* eslint-disable @typescript-eslint/no-explicit-any */ | ||
| import { inject } from '@angular/core'; | ||
| import { HttpRequest, HttpEvent, HttpHandlerFn } from '@angular/common/http'; | ||
| import { Observable, catchError, throwError } from 'rxjs'; | ||
| import { Router } from '@angular/router'; | ||
| import { LibraryConfigurationService } from '@blueprint/service/library-configuration/library-configuration.service'; | ||
| import { AuthService } from '@blueprint/service/auth/auth.service'; | ||
|
|
||
| /** | ||
| * An HTTP interceptor that adds basic auth credentials to requests to the library configuration service. | ||
| */ | ||
|
|
||
|
|
||
| /** | ||
| * Intercepts HTTP requests and adds basic auth credentials to requests to the library configuration service. | ||
| * @param req The HTTP request. | ||
| * @param next The HTTP handler. | ||
| * @returns An observable of the HTTP event. | ||
| */ | ||
| export function authInterceptor(req: HttpRequest<unknown>, next: HttpHandlerFn): Observable<HttpEvent<any>> { | ||
| const libraryConfig = inject(LibraryConfigurationService); | ||
| const authService = inject(AuthService); | ||
| const router = inject(Router); | ||
| // If the request is for the sparql endpoint, add the basic auth credentials. | ||
| if (req.url.includes(libraryConfig.endpointUrl)) { | ||
| // Create the authorization header by base64-encoding the username and password separated by a colon. | ||
| const credentials = authService.getCredentials(); | ||
| const authHeader = `Basic ${btoa(`${credentials ? credentials.username : ''}:${credentials ? credentials.password : ''}`)}`; | ||
|
|
||
| // Clone the original request and add the authorization header to the headers. | ||
| const authReq = req.clone({ | ||
| headers: req.headers.set('Authorization', authHeader) | ||
| }); | ||
|
|
||
| // Pass the modified request to the next handler in the chain. | ||
| return next(authReq).pipe( | ||
| catchError(error => { | ||
| // If the response returns an HTTP 401 status code (Unauthorized), navigate to the login page. | ||
| if (error.status === 401) { | ||
| router.navigate(['/login']); | ||
| } | ||
| // Rethrow the error. | ||
| return throwError(() => new Error(error.message)) | ||
| }) | ||
| ); | ||
| } else { | ||
| // If the request is not for the library configuration service, pass the original request to the next handler in the chain. | ||
| return next(req); | ||
| } | ||
| } |
53 changes: 0 additions & 53 deletions
53
...ects/blueprint/src/app/core/http-interceptor/auth-interceptor/auth-interceptor.service.ts
This file was deleted.
Oops, something went wrong.
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 +1 @@ | ||
| export * from './auth-interceptor/auth-interceptor.service' | ||
| export * from './auth-interceptor/auth-interceptor.function' |
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