matu
/
Heroku
mirror of https://github.com/coddrago/Heroku
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update web

pull/1/head
hikari.ftg 2022-03-23 13:11:05 +00:00
parent 53791435e3
commit 71f77a8038
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hikka/web/initial_setup.py
View File

@ -31,7 +31,6 @@ from .. import utils
class Web: class Web:
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.heroku_api_token = os.environ.get("heroku_api_token")
self.api_token = kwargs.pop("api_token") self.api_token = kwargs.pop("api_token")
self.data_root = kwargs.pop("data_root") self.data_root = kwargs.pop("data_root")
self.connection = kwargs.pop("connection") self.connection = kwargs.pop("connection")
@ -66,7 +65,6 @@ class Web:
return { return {
"api_done": self.api_token is not None, "api_done": self.api_token is not None,
"tg_done": bool(self.client_data), "tg_done": bool(self.client_data),
"heroku_token": self.heroku_api_token,
"hosting": self.hosting, "hosting": self.hosting,
"default_app": self.default_app, "default_app": self.default_app,
} }
@ -161,12 +159,5 @@ class Web:
async def finish_login(self, request): async def finish_login(self, request):
if not self.clients: if not self.clients:
return web.Response(status=400) return web.Response(status=400)
text = await request.text()
if text:
if not re.fullmatch(r"[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}", text):
return web.Response(status=400)
self.heroku_api_token = text
else:
self.heroku_api_token = None
self.clients_set.set() self.clients_set.set()
return web.Response() return web.Response()

2
web-resources/initial_root.jinja2
View File

@ -203,7 +203,6 @@
} else { } else {
return fetch("/finishLogin", { return fetch("/finishLogin", {
method: "POST", method: "POST",
body: heroku_token,
credentials: "include" credentials: "include"
}) })
.then(function(response) { .then(function(response) {
@ -273,7 +272,6 @@
} else { } else {
fetch("/finishLogin", { fetch("/finishLogin", {
method: "POST", method: "POST",
body: '',
credentials: "include" credentials: "include"
}) })
.then(function(response) { .then(function(response) {