From 5731f448c9cffbd8a5c847589da49df58a9b8101 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Tue, 11 Feb 2025 15:19:36 +0530 Subject: [PATCH] Revert "Merge pull request #30896 from dhiashalabi/fix/reorder-setlang-initialization" (#31225) This reverts commit 60aa2f918a06f29b4fbf5ca40169314f58ad8679, reversing changes made to d54f5e575ae2f9ecc368475928c9d2d88d513e12. --- frappe/auth.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/auth.py b/frappe/auth.py index bd032addb7..dd7f76d938 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -38,12 +38,12 @@ class HTTPRequest: # load cookies self.set_cookies() - # set request language - self.set_lang() - # login and start/resume user session self.set_session() + # set request language + self.set_lang() + # match csrf token from current session self.validate_csrf_token() @@ -639,7 +639,7 @@ def validate_oauth(authorization_header): Authenticate request using OAuth and set session user Args: - authorization_header (list of str): The 'Authorization' header containing the prefix and token + authorization_header (list of str): The 'Authorization' header containing the prefix and token """ from frappe.integrations.oauth2 import get_oauth_server @@ -679,7 +679,7 @@ def validate_auth_via_api_keys(authorization_header): Authenticate request using API keys and set session user Args: - authorization_header (list of str): The 'Authorization' header containing the prefix and token + authorization_header (list of str): The 'Authorization' header containing the prefix and token """ try: