3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow access token in URI (#3208)

signup-info-prompt
happycoloredbanana 2017-05-21 22:13:11 +03:00 committed by Eugen Rochko
parent a4c757767f
commit 7fba4cb3d1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
streaming/index.js
View File

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