From 9392a654c0ba27a92978a22aacadd20629048371 Mon Sep 17 00:00:00 2001 From: Ivan Office Date: Fri, 6 Dec 2024 21:30:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=20sso=20=E5=85=BC=E5=AE=B9=E7=A4=BE?= =?UTF-8?q?=E4=BA=A4=E5=8C=96=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_saas/models/res_users.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app_saas/models/res_users.py b/app_saas/models/res_users.py index 0eaca243..c219f5d3 100644 --- a/app_saas/models/res_users.py +++ b/app_saas/models/res_users.py @@ -34,7 +34,7 @@ class ResUsers(models.Model): _inherit = 'res.users' @api.model - def get_token_with_code(self, provider, params): + def get_token_from_code(self, provider, params): # 通过 code 取 token # 这里原生是没处理code模式，此处将增加使用code取token，不在 controller 中处理 oauth_provider = self.env['auth.oauth.provider'].sudo().browse(provider) @@ -64,10 +64,10 @@ class ResUsers(models.Model): access_token = params.get('access_token') oauth_provider = self.env['auth.oauth.provider'].sudo().browse(provider) # 额外code 处理 - kw = {} + kw = params if oauth_provider.code_endpoint and code and not access_token: - ret = self.get_token_with_code(provider, params) - kw = {**ret, **params} + ret = self.get_token_from_code(provider, params) + kw.update(ret) kw.pop('code', False) self = self.with_context(auth_extra=kw)