X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fwebfinger.ts;h=29ce011660eba651f07efb9158c51c8705cc388a;hb=b42c2c7e89a64ed730d8140840fe74a13c31f2a4;hp=1cea513a181e356d146b226c84180293480345dd;hpb=a2431b7dcbc72c05101dcdbe631ff84a823aeb51;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/webfinger.ts b/server/controllers/webfinger.ts
index 1cea513a1..29ce01166 100644
--- a/server/controllers/webfinger.ts
+++ b/server/controllers/webfinger.ts
@@ -1,10 +1,13 @@
-import * as express from 'express'
-import { asyncMiddleware } from '../middlewares/async'
-import { webfingerValidator } from '../middlewares/validators/webfinger'
-import { AccountInstance } from '../models/account/account-interface'
+import cors from 'cors'
+import express from 'express'
+import { WEBSERVER } from '@server/initializers/constants'
+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 +21,24 @@ 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
+      },
+      {
+        rel: 'http://ostatus.org/schema/1.0/subscribe',
+        template: WEBSERVER.URL + '/remote-interaction?uri={uri}'
       }
     ]
   }
 
-  return res.json(json).end()
+  return res.json(json)
 }