From: happycoloredbanana <happycoloredbanana@users.noreply.github.com>
Date: Sun, 21 May 2017 19:13:11 +0000 (+0300)
Subject: Allow access token in URI (#3208)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7fba4cb3d1a4a4d0ba6713b4e01584faef9c369a;p=mastodon.git

Allow access token in URI (#3208)
---

diff --git a/streaming/index.js b/streaming/index.js
index b020d59fc..627b677a8 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -199,8 +199,9 @@ if (cluster.isMaster) {
     }
 
     const authorization = req.get('Authorization');
+    const accessToken = req.query.access_token;
 
-    if (!authorization) {
+    if (!authorization && !accessToken) {
       const err = new Error('Missing access token');
       err.statusCode = 401;
 
@@ -208,7 +209,7 @@ if (cluster.isMaster) {
       return;
     }
 
-    const token = authorization.replace(/^Bearer /, '');
+    const token = authorization ? authorization.replace(/^Bearer /, '') : accessToken;
 
     accountFromToken(token, req, next);
   };