Restructure login to use common session

merge-requests/1/head
Pierros Papadeas 2018-12-02 15:54:33 +02:00
parent e7611f46d6
commit 1d0d1be680
No known key found for this signature in database
GPG Key ID: 8DB97129D9982991
1 changed files with 14 additions and 14 deletions

View File

@ -288,23 +288,12 @@ def get_last_update(fname):
def schedule_observation(
username,
password,
session,
norad_cat_id,
uuid,
ground_station_id,
starttime,
endtime):
loginUrl = "https://network.satnogs.org/accounts/login/" # login URL
session = requests.session()
login = session.get(loginUrl) # Get login page for CSFR token
login_html = lxml.html.fromstring(login.text)
login_hidden_inputs = login_html.xpath(
r'//form//input[@type="hidden"]') # Get CSFR token
form = {x.attrib["name"]: x.attrib["value"] for x in login_hidden_inputs}
form["login"] = username
form["password"] = password
session.post(loginUrl, data=form, headers={'referer': loginUrl}) # Login
obsURL = "https://network.satnogs.org/observations/new/" # Observation URL
# Get the observation/new/ page to get the CSFR token
@ -588,12 +577,23 @@ if __name__ == "__main__":
satpass['uuid'],
satpass['name'].rstrip()))
# Login
loginUrl = "https://network.satnogs.org/accounts/login/" # login URL
session = requests.session()
login = session.get(loginUrl) # Get login page for CSFR token
login_html = lxml.html.fromstring(login.text)
login_hidden_inputs = login_html.xpath(
r'//form//input[@type="hidden"]') # Get CSFR token
form = {x.attrib["name"]: x.attrib["value"] for x in login_hidden_inputs}
form["login"] = username
form["password"] = password
session.post(loginUrl, data=form, headers={'referer': loginUrl}) # Login
# Schedule passes
for satpass in sorted(scheduledpasses, key=lambda satpass: satpass['tr']):
if not satpass['scheduled']:
if schedule:
schedule_observation(username,
password,
schedule_observation(session,
int(satpass['id']),
satpass['uuid'],
ground_station_id,