From 566c125d6eee3bd907404523d94e1e0b5e403a46 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 11 Dec 2019 14:14:01 +0100 Subject: Serve audit logs to client --- client/src/app/+admin/system/logs/logs.service.ts | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'client/src/app/+admin/system/logs/logs.service.ts') diff --git a/client/src/app/+admin/system/logs/logs.service.ts b/client/src/app/+admin/system/logs/logs.service.ts index 24b9cb6d1..41b38c7ba 100644 --- a/client/src/app/+admin/system/logs/logs.service.ts +++ b/client/src/app/+admin/system/logs/logs.service.ts @@ -10,6 +10,7 @@ import { LogLevel } from '@shared/models/server/log-level.type' @Injectable() export class LogsService { private static BASE_LOG_URL = environment.apiUrl + '/api/v1/server/logs' + private static BASE_AUDIT_LOG_URL = environment.apiUrl + '/api/v1/server/audit-logs' constructor ( private authHttp: HttpClient, @@ -17,14 +18,25 @@ export class LogsService { private restExtractor: RestExtractor ) {} - getLogs (level: LogLevel, startDate: string, endDate?: string): Observable { + getLogs (options: { + isAuditLog: boolean, + startDate: string, + level?: LogLevel, + endDate?: string + }): Observable { + const { isAuditLog, startDate } = options + let params = new HttpParams() params = params.append('startDate', startDate) - params = params.append('level', level) - if (endDate) params.append('endDate', endDate) + if (!isAuditLog) params = params.append('level', options.level) + if (options.endDate) params.append('endDate', options.endDate) + + const path = isAuditLog + ? LogsService.BASE_AUDIT_LOG_URL + : LogsService.BASE_LOG_URL - return this.authHttp.get(LogsService.BASE_LOG_URL, { params }) + return this.authHttp.get(path, { params }) .pipe( map(rows => rows.map(r => new LogRow(r))), catchError(err => this.restExtractor.handleError(err)) -- cgit v1.2.3