@@ -47,8 +47,7 @@ def __call__(self, request):
47
47
],
48
48
)
49
49
return JsonResponse (
50
- data = error_response .model_dump (mode = "json" , exclude_none = True ),
51
- status = status .HTTP_401_UNAUTHORIZED
50
+ data = error_response .model_dump (mode = "json" , exclude_none = True ), status = status .HTTP_401_UNAUTHORIZED
52
51
)
53
52
54
53
except (TokenMissingError , TokenExpiredError , TokenInvalidError ) as e :
@@ -67,8 +66,7 @@ def __call__(self, request):
67
66
],
68
67
)
69
68
return JsonResponse (
70
- data = error_response .model_dump (mode = "json" , exclude_none = True ),
71
- status = status .HTTP_401_UNAUTHORIZED
69
+ data = error_response .model_dump (mode = "json" , exclude_none = True ), status = status .HTTP_401_UNAUTHORIZED
72
70
)
73
71
74
72
def _try_authentication (self , request ) -> bool :
@@ -103,28 +101,28 @@ def _try_google_refresh(self, request) -> bool:
103
101
"""Try to refresh Google access token"""
104
102
try :
105
103
refresh_token = request .COOKIES .get ("ext-refresh" )
106
-
104
+
107
105
if not refresh_token :
108
106
return False
109
-
107
+
110
108
payload = validate_google_refresh_token (refresh_token )
111
-
109
+
112
110
user_data = {
113
111
"user_id" : payload ["user_id" ],
114
112
"google_id" : payload ["google_id" ],
115
113
"email" : payload ["email" ],
116
114
"name" : payload .get ("name" , "" ),
117
115
}
118
-
116
+
119
117
new_access_token = generate_google_access_token (user_data )
120
-
118
+
121
119
self ._set_google_user_data (request , payload )
122
120
123
121
request ._new_access_token = new_access_token
124
122
request ._access_token_expires = settings .GOOGLE_JWT ["ACCESS_TOKEN_LIFETIME" ]
125
-
123
+
126
124
return True
127
-
125
+
128
126
except (GoogleRefreshTokenExpiredError , GoogleTokenInvalidError ):
129
127
return False
130
128
except Exception :
@@ -161,13 +159,10 @@ def _try_rds_auth(self, request) -> bool:
161
159
162
160
def _process_response (self , request , response ):
163
161
"""Process response and set new cookies if Google token was refreshed"""
164
- if hasattr (request , ' _new_access_token' ):
162
+ if hasattr (request , " _new_access_token" ):
165
163
config = self ._get_cookie_config ()
166
164
response .set_cookie (
167
- "ext-access" ,
168
- request ._new_access_token ,
169
- max_age = request ._access_token_expires ,
170
- ** config
165
+ "ext-access" , request ._new_access_token , max_age = request ._access_token_expires , ** config
171
166
)
172
167
return response
173
168
@@ -191,8 +186,7 @@ def _handle_rds_auth_error(self, exception):
191
186
errors = [ApiErrorDetail (title = ApiErrors .AUTHENTICATION_FAILED , detail = str (exception ))],
192
187
)
193
188
return JsonResponse (
194
- data = error_response .model_dump (mode = "json" , exclude_none = True ),
195
- status = status .HTTP_401_UNAUTHORIZED
189
+ data = error_response .model_dump (mode = "json" , exclude_none = True ), status = status .HTTP_401_UNAUTHORIZED
196
190
)
197
191
198
192
def _handle_google_auth_error (self , exception ):
@@ -202,8 +196,7 @@ def _handle_google_auth_error(self, exception):
202
196
errors = [ApiErrorDetail (title = ApiErrors .AUTHENTICATION_FAILED , detail = str (exception ))],
203
197
)
204
198
return JsonResponse (
205
- data = error_response .model_dump (mode = "json" , exclude_none = True ),
206
- status = status .HTTP_401_UNAUTHORIZED
199
+ data = error_response .model_dump (mode = "json" , exclude_none = True ), status = status .HTTP_401_UNAUTHORIZED
207
200
)
208
201
209
202
@@ -240,4 +233,4 @@ def get_current_user_info(request) -> dict:
240
233
}
241
234
)
242
235
243
- return user_info
236
+ return user_info
0 commit comments