diff --git a/app/API/dashboard.py b/app/API/dashboard.py index 27f0995..83c848f 100644 --- a/app/API/dashboard.py +++ b/app/API/dashboard.py @@ -5,10 +5,10 @@ from bs4 import BeautifulSoup from .generate_cookies import autogenerate_cookies def get_dashboard(register_id, students, s, diary_url, symbol): - if diary_url != 'http://cufs.fakelog.tk/': + if diary_url != 'http://cufs.fakelog.cf/': diary_url = 'http://uonetplus.vulcan.net.pl/' else: - diary_url = 'http://uonetplus.fakelog.tk/' + diary_url = 'http://uonetplus.fakelog.cf/' cookies = autogenerate_cookies(students, s) diff --git a/app/API/messages.py b/app/API/messages.py index ee0e3a3..beb140b 100644 --- a/app/API/messages.py +++ b/app/API/messages.py @@ -11,8 +11,8 @@ def get_received_messages(register_id, students, oun, s, date, school_year, symb now = calendar.timegm(time.gmtime()) - if oun == 'http://uonetplus-uczen.fakelog.tk/powiatwulkanowy/123458': - received_messages = requests.get(f'http://uonetplus-uzytkownik.fakelog.tk/{symbol}/Wiadomosc.mvc/GetInboxMessages?_dc={now}&dataOd=&dataDo=&page=1&start=0&limit=25', headers=headers, cookies=s) + if oun == 'http://uonetplus-uczen.fakelog.cf/powiatwulkanowy/123458': + received_messages = requests.get(f'http://uonetplus-uzytkownik.fakelog.cf/{symbol}/Wiadomosc.mvc/GetInboxMessages?_dc={now}&dataOd=&dataDo=&page=1&start=0&limit=25', headers=headers, cookies=s) else: received_messages = requests.get(f'https://uonetplus-uzytkownik.vulcan.net.pl/{symbol}/Wiadomosc.mvc/GetInboxMessages?_dc={now}&dataOd=&dataDo=&page=1&start=0&limit=25', headers=headers, cookies=s) @@ -24,8 +24,8 @@ def get_sent_messages(register_id, students, oun, s, date, school_year, symbol): now = calendar.timegm(time.gmtime()) - if oun == 'http://uonetplus-uczen.fakelog.tk/powiatwulkanowy/123458': - sent_messages = requests.get(f'http://uonetplus-uzytkownik.fakelog.tk/{symbol}/Wiadomosc.mvc/GetInboxMessages?_dc={now}&dataOd=&dataDo=&page=1&start=0&limit=25', headers=headers, cookies=s) + if oun == 'http://uonetplus-uczen.fakelog.cf/powiatwulkanowy/123458': + sent_messages = requests.get(f'http://uonetplus-uzytkownik.fakelog.cf/{symbol}/Wiadomosc.mvc/GetInboxMessages?_dc={now}&dataOd=&dataDo=&page=1&start=0&limit=25', headers=headers, cookies=s) else: sent_messages = requests.get(f'https://uonetplus-uzytkownik.vulcan.net.pl/{symbol}/Wiadomosc.mvc/GetInboxMessages?_dc={now}&dataOd=&dataDo=&page=1&start=0&limit=25', headers=headers, cookies=s) @@ -37,8 +37,8 @@ def get_deleted_messages(register_id, students, oun, s, date, school_year, symbo now = calendar.timegm(time.gmtime()) - if oun == 'http://uonetplus-uczen.fakelog.tk/powiatwulkanowy/123458': - deleted_messages = requests.get(f'http://uonetplus-uzytkownik.fakelog.tk/{symbol}/Wiadomosc.mvc/GetOutboxMessages?_dc={now}&dataOd=&dataDo=&page=1&start=0&limit=25', headers=headers, cookies=s) + if oun == 'http://uonetplus-uczen.fakelog.cf/powiatwulkanowy/123458': + deleted_messages = requests.get(f'http://uonetplus-uzytkownik.fakelog.cf/{symbol}/Wiadomosc.mvc/GetOutboxMessages?_dc={now}&dataOd=&dataDo=&page=1&start=0&limit=25', headers=headers, cookies=s) else: deleted_messages = requests.get(f'https://uonetplus-uzytkownik.vulcan.net.pl/{symbol}/Wiadomosc.mvc/GetOutboxMessages?_dc={now}&dataOd=&dataDo=&page=1&start=0&limit=25', headers=headers, cookies=s) @@ -48,8 +48,8 @@ def get_recipients(register_id, students, oun, s, date, school_year, symbol): with open('app/API/headers.json') as f: headers = json.load(f) - if oun == 'http://uonetplus-uczen.fakelog.tk/powiatwulkanowy/123458': - link = f'http://uonetplus-uzytkownik.fakelog.tk/{symbol}' + if oun == 'http://uonetplus-uczen.fakelog.cf/powiatwulkanowy/123458': + link = f'http://uonetplus-uzytkownik.fakelog.cf/{symbol}' else: link = f'https://uonetplus-uzytkownik.vulcan.net.pl/{symbol}' @@ -66,8 +66,8 @@ def send_message(register_id, students, oun, s, date, school_year, symbol, send_ with open('app/API/headers.json') as f: headers = json.load(f) - if oun == 'http://uonetplus-uczen.fakelog.tk/powiatwulkanowy/123458': - link = f'http://uonetplus-uzytkownik.fakelog.tk/{symbol}' + if oun == 'http://uonetplus-uczen.fakelog.cf/powiatwulkanowy/123458': + link = f'http://uonetplus-uzytkownik.fakelog.cf/{symbol}' else: link = f'https://uonetplus-uzytkownik.vulcan.net.pl/{symbol}' @@ -142,8 +142,8 @@ def get_message_content(register_id, students, oun, s, date, school_year, symbol with open('app/API/headers.json') as f: headers = json.load(f) - if oun == 'http://uonetplus-uczen.fakelog.tk/powiatwulkanowy/123458': - link = f'http://uonetplus-uzytkownik.fakelog.tk/{symbol}' + if oun == 'http://uonetplus-uczen.fakelog.cf/powiatwulkanowy/123458': + link = f'http://uonetplus-uzytkownik.fakelog.cf/{symbol}' else: link = f'https://uonetplus-uzytkownik.vulcan.net.pl/{symbol}' diff --git a/app/login.py b/app/login.py index d2df732..d483e80 100644 --- a/app/login.py +++ b/app/login.py @@ -27,8 +27,8 @@ def send(url, data, fail, diary_url, symbol, s): if fail in page.text: return {'success': False} else: - if diary_url == 'http://cufs.fakelog.tk/': - page = s.get('http://cufs.fakelog.tk/powiatwulkanowy/FS/LS?wa=wsignin1.0&wtrealm=http://uonetplus.fakelog.localhost:300/powiatwulkanowy/LoginEndpoint.aspx&wctx=http://uonetplus.fakelog.localhost:300/powiatwulkanowy/LoginEndpoint.aspx') + if diary_url == 'http://cufs.fakelog.cf/': + page = s.get('http://cufs.fakelog.cf/powiatwulkanowy/FS/LS?wa=wsignin1.0&wtrealm=http://uonetplus.fakelog.localhost:300/powiatwulkanowy/LoginEndpoint.aspx&wctx=http://uonetplus.fakelog.localhost:300/powiatwulkanowy/LoginEndpoint.aspx') bs = BeautifulSoup(page.text, 'html.parser') wa = bs.find('input', {'name': 'wa'})['value'] cert = bs.find('input', {'name': 'wresult'})['value'] @@ -44,8 +44,8 @@ def send(url, data, fail, diary_url, symbol, s): school_url = a['href'] break - if diary_url == 'http://cufs.fakelog.tk/': - school_url = 'http://uonetplus-uczen.fakelog.tk/powiatwulkanowy/123458' + if diary_url == 'http://cufs.fakelog.cf/': + school_url = 'http://uonetplus-uczen.fakelog.cf/powiatwulkanowy/123458' cookies = get_cookies(symbol, school_url, s, diary_url) diff --git a/app/views.py b/app/views.py index d8d2c4c..5e2d39b 100644 --- a/app/views.py +++ b/app/views.py @@ -33,10 +33,10 @@ def login(request, *args, **kwargs): Password = data['Password'] symbol = data['Symbol'] diary_url = data['diaryUrl'] - if diary_url != 'http://cufs.fakelog.tk/': + if diary_url != 'http://cufs.fakelog.cf/': link = f'{diary_url}{symbol}/Account/LogOn?ReturnUrl=%2F{symbol}%2FFS%2FLS%3Fwa%3Dwsignin1.0%26wtrealm%3Dhttps%253a%252f%252fuonetplus.vulcan.net.pl%252f{symbol}%252fLoginEndpoint.aspx%26wctx%3Dhttps%253a%252f%252fuonetplus.vulcan.net.pl%252f{symbol}%252fLoginEndpoint.aspx' else: - link = 'http://cufs.fakelog.tk/powiatwulkanowy/FS/LS?wa=wsignin1.0&wtrealm=http://uonetplus.fakelog.localhost:300/powiatwulkanowy/LoginEndpoint.aspx&wctx=http://uonetplus.fakelog.localhost:300/powiatwulkanowy/LoginEndpoint.aspx' + link = 'http://cufs.fakelog.cf/powiatwulkanowy/FS/LS?wa=wsignin1.0&wtrealm=http://uonetplus.fakelog.localhost:300/powiatwulkanowy/LoginEndpoint.aspx&wctx=http://uonetplus.fakelog.localhost:300/powiatwulkanowy/LoginEndpoint.aspx' s = requests.Session() sender_return = sender(link, loginName, Password, ('loginName', 'Password'), 'Zła nazwa użytkownika lub hasło', symbol, diary_url, s) if sender_return == {'success': False}: diff --git a/frontend/src/api/login.ts b/frontend/src/api/login.ts index db22654..2150002 100644 --- a/frontend/src/api/login.ts +++ b/frontend/src/api/login.ts @@ -15,7 +15,7 @@ export default { loginName: email, Password: password, Symbol: symbol, - diaryUrl: 'http://cufs.fakelog.tk/', + diaryUrl: 'http://cufs.fakelog.cf/', }, }); diff --git a/tests/test_views.py b/tests/test_views.py index 614dc91..51c742e 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -46,7 +46,7 @@ class TestViews(TestCase): "loginName": "jan@fakelog.cf", "Password": "jan123", "Symbol": "powiatwulkanowy", - "diaryUrl": "http://cufs.fakelog.tk/" + "diaryUrl": "http://cufs.fakelog.cf/" } print("\033[94mTesting login...")