diff --git a/app_saas/__manifest__.py b/app_saas/__manifest__.py index 2254dcf7..f04e4f27 100644 --- a/app_saas/__manifest__.py +++ b/app_saas/__manifest__.py @@ -26,7 +26,7 @@ { 'name': 'odooapp.cn SaaS Client-Ai Passport.Odoo中文应用商店SaaS云服务客户端', - 'version': '18.0.24.12.06', + 'version': '18.0.25.01.03', 'author': 'odooai.cn', 'category': 'Base', 'website': 'https://www.odooai.cn', diff --git a/app_saas/i18n/zh_CN.po b/app_saas/i18n/zh_CN.po index 51835a3a..5f8900cd 100644 --- a/app_saas/i18n/zh_CN.po +++ b/app_saas/i18n/zh_CN.po @@ -31,6 +31,11 @@ msgstr "勾选后即可启用Odoo中文云翻译,相关服务由 www.odooapp.c msgid "Config Settings" msgstr "设置" +#. module: app_saas +#: model_terms:ir.ui.view,arch_db:app_saas.app_res_config_settings_view_form +msgid "https://www.odooapp.cn/apps/modules/app_cn_po" +msgstr "https://www.odooapp.cn/apps/modules/app_cn_po" + #. module: app_saas #: model_terms:ir.ui.view,arch_db:app_saas.app_res_config_settings_view_form msgid "Or get the app from" @@ -43,6 +48,6 @@ msgid "SaaS Chinese PO" msgstr "中文云翻译PO" #. module: app_saas -#: model_terms:ir.ui.view,arch_db:app_saas.app_res_config_settings_view_form -msgid "https://www.odooapp.cn/apps/modules/app_cn_po" -msgstr "https://www.odooapp.cn/apps/modules/app_cn_po" +#: model:ir.model.fields,field_description:social_login.field_auth_oauth_provider__code_endpoint +msgid "Token by Code Endpoint" +msgstr "Code取Token入口" diff --git a/app_saas/models/res_config_settings.py b/app_saas/models/res_config_settings.py index 01c8ed94..0f9f2582 100644 --- a/app_saas/models/res_config_settings.py +++ b/app_saas/models/res_config_settings.py @@ -12,3 +12,6 @@ class ResConfigSettings(models.TransientModel): _inherit = 'res.config.settings' module_app_cn_po = fields.Boolean('SaaS Chinese PO', help="Checked to Sync Odoo Chinese from www.odooapp.cn") + app_saas_db_token = fields.Char('Cloud DB Token', default=True, config_parameter='app_saas_db_token', + help="The odooapp SaaS Token for this Odoo Database. You can reset in https://www.odooapp.cn") + \ No newline at end of file diff --git a/app_saas/models/res_users.py b/app_saas/models/res_users.py index abf4aa5f..a7d1c414 100644 --- a/app_saas/models/res_users.py +++ b/app_saas/models/res_users.py @@ -50,9 +50,15 @@ class ResUsers(models.Model): response = requests.get(oauth_provider.code_endpoint, params=params, timeout=30) if response.ok: ret = response.json() - # todo: 客户机首次连接时,取到的 server 端 key 写入 provider 的 client_secret - if ret.get('push_client_secret') and hasattr(oauth_provider, 'client_secret'): - oauth_provider.write({'client_secret': ret.get('push_client_secret')}) + # 客户机首次连接时,取到的 server 端 key 写入 provider 的 client_secret + push_client_secret = ret.pop('push_client_secret', False) + if push_client_secret: + ICP = self.env['ir.config_parameter'].sudo() + app_saas_db_token = ICP.get_param('app_saas_db_token', False) + if not app_saas_db_token: + ICP.set_param('app_saas_db_token', push_client_secret) + if hasattr(oauth_provider, 'client_secret') and not oauth_provider.client_secret: + oauth_provider.write({'client_secret': push_client_secret}) self._cr.commit() return ret return {} diff --git a/app_saas/views/auth_oauth_provider_views.xml b/app_saas/views/auth_oauth_provider_views.xml index 83fa29b0..644a8e1b 100644 --- a/app_saas/views/auth_oauth_provider_views.xml +++ b/app_saas/views/auth_oauth_provider_views.xml @@ -8,9 +8,6 @@ - - - diff --git a/app_saas/views/res_config_settings_views.xml b/app_saas/views/res_config_settings_views.xml index 73b96eaf..3ae6a89b 100644 --- a/app_saas/views/res_config_settings_views.xml +++ b/app_saas/views/res_config_settings_views.xml @@ -7,7 +7,8 @@ - + @@ -21,6 +22,17 @@ + + + + + The odooapp SaaS Token. You can get it after first time Login via Ai Passport of odooapp.cn. Also you can set from + https://www.odooapp.cn/my/ + + + +