10 files changed, 84 insertions, 12 deletions

diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
index 627437053..30eb2dbde 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
@@ -15,7 +15,7 @@
 
   <ng-template pTemplate="body" let-expanded="expanded" let-videoAbuse>
     <tr>
-      <td>
+      <td class="expand-cell">
         <span class="expander" [pRowToggler]="videoAbuse">
           <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i>
         </span>
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
index 608dff2d8..a0b89acc6 100644
--- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
+++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
@@ -15,7 +15,7 @@
 
   <ng-template pTemplate="body" let-videoBlacklist let-expanded="expanded">
     <tr>
-      <td>
+      <td class="expand-cell">
         <span *ngIf="videoBlacklist.reason" class="expander" [pRowToggler]="videoBlacklist">
           <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i>
         </span>
diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html
index cd26257dd..de43b6448 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.html
+++ b/client/src/app/+admin/system/jobs/jobs.component.html
@@ -38,7 +38,7 @@
 
   <ng-template pTemplate="body" let-expanded="expanded" let-job>
     <tr>
-      <td>
+      <td class="expand-cell">
         <span class="expander" [pRowToggler]="job">
           <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i>
         </span>
diff --git a/client/src/app/+admin/system/logs/log-row.model.ts b/client/src/app/+admin/system/logs/log-row.model.ts
index 9bc7dafdd..b22581b5a 100644
--- a/client/src/app/+admin/system/logs/log-row.model.ts
+++ b/client/src/app/+admin/system/logs/log-row.model.ts
@@ -8,6 +8,10 @@ export class LogRow {
   message: string
   meta: string
 
+  by: string
+  domain: string
+  action: string
+
   constructor (row: any) {
     this.date = new Date(row.timestamp)
     this.localeDate = this.date.toLocaleString()
@@ -17,5 +21,20 @@ export class LogRow {
     const metaObj = omit(row, 'timestamp', 'level', 'message', 'label')
 
     if (Object.keys(metaObj).length !== 0) this.meta = JSON.stringify(metaObj, undefined, 2)
+
+    if (row.level === 'audit') {
+      try {
+        const message = JSON.parse(row.message)
+
+        this.by = message.user
+        this.domain = message.domain
+        this.action = message.action
+
+        this.meta = JSON.stringify(message, null, 2)
+        this.message = ''
+      } catch (err) {
+        console.error('Cannot parse audit message.', err)
+      }
+    }
   }
 }
diff --git a/client/src/app/+admin/system/logs/logs.component.html b/client/src/app/+admin/system/logs/logs.component.html
index 45723a655..ddad1314f 100644
--- a/client/src/app/+admin/system/logs/logs.component.html
+++ b/client/src/app/+admin/system/logs/logs.component.html
@@ -1,11 +1,17 @@
 <div class="header">
   <div class="peertube-select-container">
+    <select [(ngModel)]="logType" (ngModelChange)="refresh()">
+      <option *ngFor="let logTypeChoice of logTypeChoices" [value]="logTypeChoice.id">{{ logTypeChoice.label }}</option>
+    </select>
+  </div>
+
+  <div class="peertube-select-container">
     <select [(ngModel)]="startDate" (ngModelChange)="refresh()">
       <option *ngFor="let timeChoice of timeChoices" [value]="timeChoice.id">{{ timeChoice.label }}</option>
     </select>
   </div>
 
-  <div class="peertube-select-container">
+  <div class="peertube-select-container" *ngIf="!isAuditLog()">
     <select [(ngModel)]="level" (ngModelChange)="refresh()">
       <option *ngFor="let levelChoice of levelChoices" [value]="levelChoice.id">{{ levelChoice.label }}</option>
     </select>
@@ -23,9 +29,12 @@
 
       <span class="log-date">[{{ log.localeDate }}]</span>
 
+      <strong class="log-by" *ngIf="log.by" i18n>By {{ log.by }} -></strong>
+      <strong class="log-domain-action" *ngIf="log.domain">{{ log.domain }} -> {{ log.action }}</strong>
+
       {{ log.message }}
 
-      {{ log.meta }}
+      <pre>{{ log.meta }}</pre>
     </div>
   </div>
 </div>
diff --git a/client/src/app/+admin/system/logs/logs.component.scss b/client/src/app/+admin/system/logs/logs.component.scss
index 7ad2e853c..dae8b21c7 100644
--- a/client/src/app/+admin/system/logs/logs.component.scss
+++ b/client/src/app/+admin/system/logs/logs.component.scss
@@ -23,6 +23,10 @@
     margin-right: 5px;
   }
 
+  .log-by {
+    margin: 0 5px;
+  }
+
   .warn {
     color: $orange-color;
   }
@@ -30,6 +34,12 @@
   .error {
     color: $red;
   }
+
+  pre {
+    margin-bottom: 5px;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+  }
 }
 
 .header {
diff --git a/client/src/app/+admin/system/logs/logs.component.ts b/client/src/app/+admin/system/logs/logs.component.ts
index b2aca8461..b63f11953 100644
--- a/client/src/app/+admin/system/logs/logs.component.ts
+++ b/client/src/app/+admin/system/logs/logs.component.ts
@@ -17,9 +17,11 @@ export class LogsComponent implements OnInit {
   logs: LogRow[] = []
   timeChoices: { id: string, label: string }[] = []
   levelChoices: { id: LogLevel, label: string }[] = []
+  logTypeChoices: { id: 'audit' | 'standard', label: string }[] = []
 
   startDate: string
   level: LogLevel
+  logType: 'audit' | 'standard'
 
   constructor (
     private logsService: LogsService,
@@ -30,6 +32,7 @@ export class LogsComponent implements OnInit {
   ngOnInit (): void {
     this.buildTimeChoices()
     this.buildLevelChoices()
+    this.buildLogTypeChoices()
 
     this.load()
   }
@@ -42,7 +45,7 @@ export class LogsComponent implements OnInit {
   load () {
     this.loading = true
 
-    this.logsService.getLogs(this.level, this.startDate)
+    this.logsService.getLogs({ isAuditLog: this.isAuditLog(), level: this.level, startDate: this.startDate })
         .subscribe(
           logs => {
             this.logs = logs
@@ -58,6 +61,10 @@ export class LogsComponent implements OnInit {
         )
   }
 
+  isAuditLog () {
+    return this.logType === 'audit'
+  }
+
   buildTimeChoices () {
     const lastHour = new Date()
     lastHour.setHours(lastHour.getHours() - 1)
@@ -108,4 +115,19 @@ export class LogsComponent implements OnInit {
 
     this.level = 'warn'
   }
+
+  buildLogTypeChoices () {
+    this.logTypeChoices = [
+      {
+        id: 'standard',
+        label: this.i18n('Standard logs')
+      },
+      {
+        id: 'audit',
+        label: this.i18n('Audit logs')
+      }
+    ]
+
+    this.logType = 'audit'
+  }
 }
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<any[]> {
+  getLogs (options: {
+    isAuditLog: boolean,
+    startDate: string,
+    level?: LogLevel,
+    endDate?: string
+  }): Observable<any[]> {
+    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<any[]>(LogsService.BASE_LOG_URL, { params })
+    return this.authHttp.get<any[]>(path, { params })
                .pipe(
                  map(rows => rows.map(r => new LogRow(r))),
                  catchError(err => this.restExtractor.handleError(err))
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html
index 822bb53da..885335313 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/users/user-list/user-list.component.html
@@ -49,7 +49,7 @@
   <ng-template pTemplate="body" let-expanded="expanded" let-user>
 
     <tr [pSelectableRow]="user" [ngClass]="{ banned: user.blocked }">
-      <td>
+      <td class="expand-cell">
         <p-tableCheckbox [value]="user"></p-tableCheckbox>
       </td>
 
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 6c3100746..0acffef3c 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -37,7 +37,7 @@ p-table {
   td {
     padding-left: 15px !important;
 
-    &:not(.action-cell) {
+    &:not(.action-cell):not(.expand-cell) {
       overflow: hidden !important;
       text-overflow: ellipsis !important;
       white-space: nowrap !important;