aboutsummaryrefslogtreecommitdiff
path: root/gn2
diff options
context:
space:
mode:
Diffstat (limited to 'gn2')
-rw-r--r--gn2/wqflask/oauth2/client.py7
-rw-r--r--gn2/wqflask/oauth2/session.py7
2 files changed, 1 insertions, 13 deletions
diff --git a/gn2/wqflask/oauth2/client.py b/gn2/wqflask/oauth2/client.py
index 876ecf6b..770777b5 100644
--- a/gn2/wqflask/oauth2/client.py
+++ b/gn2/wqflask/oauth2/client.py
@@ -31,12 +31,7 @@ def oauth2_clientsecret():
def user_logged_in():
"""Check whether the user has logged in."""
suser = session.session_info()["user"]
- if suser["logged_in"]:
- if session.expired():
- session.clear_session_info()
- return False
- return suser["token"].is_right()
- return False
+ return suser["logged_in"] and suser["token"].is_right()
def oauth2_client():
diff --git a/gn2/wqflask/oauth2/session.py b/gn2/wqflask/oauth2/session.py
index 2ef534e2..eec48a7f 100644
--- a/gn2/wqflask/oauth2/session.py
+++ b/gn2/wqflask/oauth2/session.py
@@ -64,13 +64,6 @@ def session_info() -> SessionInfo:
"masquerading": None
}))
-def expired():
- the_session = session_info()
- def __expired__(token):
- return datetime.now() > datetime.fromtimestamp(token["expires_at"])
- return the_session["user"]["token"].either(
- lambda left: False,
- __expired__)
def set_user_token(token: str) -> SessionInfo:
"""Set the user's token."""