pezi_gi/rossa-tech
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and add interceptor; adjust service

Browse Source
This commit is contained in:
Peter Rossa
2023-05-11 13:06:17 +02:00
parent 54905ed995
commit 2ab8331640
6 changed files with 177 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rossa-tech-cli/src/app/services/database.service.ts
View File

@@ -1,34 +1,26 @@
import { Injectable } from "@angular/core";
import { Injectable } from '@angular/core';
import {
HttpClient,
HttpErrorResponse,
HttpHeaders,
} from "@angular/common/http";
import { Observable, throwError } from "rxjs";
import { catchError } from "rxjs/operators";
import { environment } from "src/environments/environment";
import { MeterData } from "../dataModels/Meterdata";
import { Meter } from "../dataModels/Meter";
import { LoginService } from "../auth/login.service";
} from '@angular/common/http';
import { Observable, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { environment } from 'src/environments/environment';
import { MeterData } from '../dataModels/Meterdata';
import { Meter } from '../dataModels/Meter';
@Injectable({
providedIn: "root",
providedIn: 'root',
})
export class DatabaseService {
private baseUrl = environment.apiBaseUrl;
constructor(private http: HttpClient, private userService: LoginService) {}
constructor(private http: HttpClient) {}
getMeterData(): Observable<MeterData[]> {
const url = `${this.baseUrl}/meter-data`;
let jwtToken: String = this.userService.getUserSecurityToken(),
headers: HttpHeaders = new HttpHeaders({
authorization: "bearer " + jwtToken,
}),
options = { headers: headers };
return this.http
.get<MeterData[]>(url, options)
.pipe(catchError(this.handleError));
return this.http.get<MeterData[]>(url).pipe(catchError(this.handleError));
}
getMeterDataByType(usageType: string): Observable<MeterData[]> {
@@ -53,7 +45,7 @@ export class DatabaseService {
if (error.error instanceof ErrorEvent) {
// A client-side or network error occurred. Handle it accordingly.
console.error("An error occurred:", error.error.message);
console.error('An error occurred:', error.error.message);
} else {
// The backend returned an unsuccessful response code.
// The response body may contain clues as to what went wrong.