Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding back and Commenting Old lines

Browse Source
This commit is contained in:
Silversthorn 2022-03-14 22:27:19 +01:00
parent 5900033134
commit 79f918b877
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/classes/web/public_handler.py
View File

@ -1,3 +1,4 @@
from lib2to3.pgen2 import token
import logging import logging
from app.classes.models.users import Users from app.classes.models.users import Users
@ -28,6 +29,8 @@ class PublicHandler(BaseHandler):
self.set_cookie("token", authentication.generate(user_id), expires_days=int(expire_days)) self.set_cookie("token", authentication.generate(user_id), expires_days=int(expire_days))
else: else:
self.clear_cookie("token") self.clear_cookie("token")
#self.clear_cookie("user")
#self.clear_cookie("user_data")
def get(self, page=None): def get(self, page=None):
@ -57,6 +60,8 @@ class PublicHandler(BaseHandler):
elif page == "logout": elif page == "logout":
self.clear_cookie("token") self.clear_cookie("token")
#self.clear_cookie("user")
#self.clear_cookie("user_data")
self.redirect('/public/login') self.redirect('/public/login')
return return
@ -105,6 +110,8 @@ class PublicHandler(BaseHandler):
# if we don't have a user # if we don't have a user
if not user_data: if not user_data:
error_msg = "Incorrect username or password. Please try again." error_msg = "Incorrect username or password. Please try again."
#self.clear_cookie("user")
#self.clear_cookie("user_data")
self.clear_cookie("token") self.clear_cookie("token")
if (self.request.query): if (self.request.query):
self.redirect(f'/public/login?error_msg={error_msg}&{self.request.query}') self.redirect(f'/public/login?error_msg={error_msg}&{self.request.query}')
@ -115,6 +122,8 @@ class PublicHandler(BaseHandler):
# if they are disabled # if they are disabled
if not user_data.enabled: if not user_data.enabled:
error_msg = "User account disabled. Please contact your system administrator for more info." error_msg = "User account disabled. Please contact your system administrator for more info."
#self.clear_cookie("user")
#self.clear_cookie("user_data")
self.clear_cookie("token") self.clear_cookie("token")
if (self.request.query): if (self.request.query):
self.redirect(f'/public/login?error_msg={error_msg}&{self.request.query}') self.redirect(f'/public/login?error_msg={error_msg}&{self.request.query}')
@ -146,6 +155,8 @@ class PublicHandler(BaseHandler):
self.redirect(next_page) self.redirect(next_page)
else: else:
#self.clear_cookie("user")
#self.clear_cookie("user_data")
self.clear_cookie("token") self.clear_cookie("token")
error_msg = "Inncorrect username or password. Please try again." error_msg = "Inncorrect username or password. Please try again."
# log this failed login attempt # log this failed login attempt