liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: take token in Authorization header rather than X-Token

Browse Source
This commit is contained in:
Ske 2019-04-25 18:53:15 +02:00
parent e85776fae6
commit 50f1186d25
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api_main.py
View File

@ -36,7 +36,7 @@ async def db_middleware(request, handler):
@web.middleware @web.middleware
async def auth_middleware(request, handler): async def auth_middleware(request, handler):
token = request.headers.get("X-Token") or request.query.get("token") token = request.headers.get("Authorization") or request.query.get("token")
if token: if token:
system = await System.get_by_token(request["conn"], token) system = await System.get_by_token(request["conn"], token)
if system: if system:
@ -51,7 +51,7 @@ async def cors_middleware(request, handler):
resp = r resp = r
resp.headers["Access-Control-Allow-Origin"] = "*" resp.headers["Access-Control-Allow-Origin"] = "*"
resp.headers["Access-Control-Allow-Methods"] = "GET, POST, PATCH" resp.headers["Access-Control-Allow-Methods"] = "GET, POST, PATCH"
resp.headers["Access-Control-Allow-Headers"] = "X-Token" resp.headers["Access-Control-Allow-Headers"] = "Authorization"
return resp return resp
class Handlers: class Handlers:
@ -229,7 +229,7 @@ class Handlers:
async def run(): async def run():
app = web.Application(middlewares=[cors_middleware, db_middleware, auth_middleware, error_middleware]) app = web.Application(middlewares=[cors_middleware, db_middleware, auth_middleware, error_middleware])
def cors_fallback(req): def cors_fallback(req):
return web.Response(headers={"Access-Control-Allow-Origin": "*", "Access-Control-Allow-Headers": "x-token", "Access-Control-Allow-Methods": "GET, POST, PATCH"}, status=404 if req.method != "OPTIONS" else 200) return web.Response(headers={"Access-Control-Allow-Origin": "*", "Access-Control-Allow-Headers": "Authorization", "Access-Control-Allow-Methods": "GET, POST, PATCH"}, status=404 if req.method != "OPTIONS" else 200)
app.add_routes([ app.add_routes([
web.get("/s", Handlers.get_system), web.get("/s", Handlers.get_system),
web.post("/s/switches", Handlers.post_switch), web.post("/s/switches", Handlers.post_switch),