Add search for video, reporter and channel name fields

[github/Chocobozzz/PeerTube.git] / server / controllers / webfinger.ts

diff --git a/server/controllers/webfinger.ts b/server/controllers/webfinger.ts
index 1cea513a181e356d146b226c84180293480345dd..5c308d9ad1f0b8a8dcce864e6a4121a830ff7110 100644 (file)
--- a/server/controllers/webfinger.ts
+++ b/server/controllers/webfinger.ts
@@ -1,10 +1,12 @@
+import * as cors from 'cors'
 import * as express from 'express'
-import { asyncMiddleware } from '../middlewares/async'
-import { webfingerValidator } from '../middlewares/validators/webfinger'
-import { AccountInstance } from '../models/account/account-interface'
+import { asyncMiddleware } from '../middlewares'
+import { webfingerValidator } from '../middlewares/validators'
 
 const webfingerRouter = express.Router()
 
+webfingerRouter.use(cors())
+
 webfingerRouter.get('/.well-known/webfinger',
   asyncMiddleware(webfingerValidator),
   webfingerController
@@ -18,19 +20,20 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function webfingerController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const account: AccountInstance = res.locals.account
+function webfingerController (req: express.Request, res: express.Response) {
+  const actor = res.locals.actorUrl
 
   const json = {
     subject: req.query.resource,
-    aliases: [ account.url ],
+    aliases: [ actor.url ],
     links: [
       {
         rel: 'self',
-        href: account.url
+        type: 'application/activity+json',
+        href: actor.url
       }
     ]
   }
 
-  return res.json(json).end()
+  return res.json(json)
 }