selective route permission to use embeds with x-frame-deny

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

diff --git a/server/controllers/webfinger.ts b/server/controllers/webfinger.ts
index cc28a8909663223b94acb42e4ff8f8423ed651da..ed781c21b4608570a74a7c33e2a4f47167425c0b 100644 (file)
--- a/server/controllers/webfinger.ts
+++ b/server/controllers/webfinger.ts
@@ -1,11 +1,12 @@
 import * as express from 'express'
-import { webfingerValidator } from '../middlewares/validators/webfinger'
-import { AccountInstance } from '../models/account/account-interface'
+import { asyncMiddleware } from '../middlewares'
+import { webfingerValidator } from '../middlewares/validators'
+import { ActorModel } from '../models/activitypub/actor'
 
 const webfingerRouter = express.Router()
 
 webfingerRouter.get('/.well-known/webfinger',
-  webfingerValidator,
+  asyncMiddleware(webfingerValidator),
   webfingerController
 )
 
@@ -18,15 +19,16 @@ export {
 // ---------------------------------------------------------------------------
 
 function webfingerController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const account: AccountInstance = res.locals.account
+  const actor = res.locals.actor as ActorModel
 
   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
       }
     ]
   }