Fix job queue tests

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

diff --git a/server/controllers/webfinger.ts b/server/controllers/webfinger.ts
index ed781c21b4608570a74a7c33e2a4f47167425c0b..29ce011660eba651f07efb9158c51c8705cc388a 100644 (file)
--- a/server/controllers/webfinger.ts
+++ b/server/controllers/webfinger.ts
@@ -1,10 +1,13 @@
-import * as express from 'express'
+import cors from 'cors'
+import express from 'express'
+import { WEBSERVER } from '@server/initializers/constants'
 import { asyncMiddleware } from '../middlewares'
 import { webfingerValidator } from '../middlewares/validators'
-import { ActorModel } from '../models/activitypub/actor'
 
 const webfingerRouter = express.Router()
 
+webfingerRouter.use(cors())
+
 webfingerRouter.get('/.well-known/webfinger',
   asyncMiddleware(webfingerValidator),
   webfingerController
@@ -18,8 +21,8 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function webfingerController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const actor = res.locals.actor as ActorModel
+function webfingerController (req: express.Request, res: express.Response) {
+  const actor = res.locals.actorUrl
 
   const json = {
     subject: req.query.resource,
@@ -29,9 +32,13 @@ function webfingerController (req: express.Request, res: express.Response, next:
         rel: 'self',
         type: 'application/activity+json',
         href: actor.url
+      },
+      {
+        rel: 'http://ostatus.org/schema/1.0/subscribe',
+        template: WEBSERVER.URL + '/remote-interaction?uri={uri}'
       }
     ]
   }
 
-  return res.json(json).end()
+  return res.json(json)
 }