diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-19 17:02:16 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-09-19 17:02:27 +0200 |
| commit | 993cef4b6e000ee425087e5195dfe40cd0840243 (patch) | |
| tree | 9bddf4a2f4fad0ac8cbb9d79445c1c1ec36bd305 /server/controllers/api/videos/import.ts | |
| parent | 606c946e74211c4123b16087288902226306198d (diff) | |
| download | PeerTube-993cef4b6e000ee425087e5195dfe40cd0840243.tar.gz PeerTube-993cef4b6e000ee425087e5195dfe40cd0840243.tar.zst PeerTube-993cef4b6e000ee425087e5195dfe40cd0840243.zip | |
Refractor audit user identifier
Diffstat (limited to 'server/controllers/api/videos/import.ts')
| -rw-r--r-- | server/controllers/api/videos/import.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index 44f15ef74..398fd5a7f 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | import * as express from 'express' | 1 | import * as express from 'express' |
| 2 | import * as magnetUtil from 'magnet-uri' | 2 | import * as magnetUtil from 'magnet-uri' |
| 3 | import 'multer' | 3 | import 'multer' |
| 4 | import { auditLoggerFactory, VideoImportAuditView } from '../../../helpers/audit-logger' | 4 | import { auditLoggerFactory, getAuditIdFromRes, VideoImportAuditView } from '../../../helpers/audit-logger' |
| 5 | import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoImportAddValidator } from '../../../middlewares' | 5 | import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoImportAddValidator } from '../../../middlewares' |
| 6 | import { | 6 | import { |
| 7 | CONFIG, | 7 | CONFIG, |
| @@ -114,7 +114,7 @@ async function addTorrentImport (req: express.Request, res: express.Response, to | |||
| 114 | } | 114 | } |
| 115 | await JobQueue.Instance.createJob({ type: 'video-import', payload }) | 115 | await JobQueue.Instance.createJob({ type: 'video-import', payload }) |
| 116 | 116 | ||
| 117 | auditLogger.create(res.locals.oauth.token.User.Account.Actor.getIdentifier(), new VideoImportAuditView(videoImport.toFormattedJSON())) | 117 | auditLogger.create(getAuditIdFromRes(res), new VideoImportAuditView(videoImport.toFormattedJSON())) |
| 118 | 118 | ||
| 119 | return res.json(videoImport.toFormattedJSON()).end() | 119 | return res.json(videoImport.toFormattedJSON()).end() |
| 120 | } | 120 | } |
| @@ -158,7 +158,7 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) | |||
| 158 | } | 158 | } |
| 159 | await JobQueue.Instance.createJob({ type: 'video-import', payload }) | 159 | await JobQueue.Instance.createJob({ type: 'video-import', payload }) |
| 160 | 160 | ||
| 161 | auditLogger.create(res.locals.oauth.token.User.Account.Actor.getIdentifier(), new VideoImportAuditView(videoImport.toFormattedJSON())) | 161 | auditLogger.create(getAuditIdFromRes(res), new VideoImportAuditView(videoImport.toFormattedJSON())) |
| 162 | 162 | ||
| 163 | return res.json(videoImport.toFormattedJSON()).end() | 163 | return res.json(videoImport.toFormattedJSON()).end() |
| 164 | } | 164 | } |