From 67edb98ee5d2c55e55d8927c0634f2b133db1f2a Mon Sep 17 00:00:00 2001
From: Ivan Office <guohuadeng@hotmail.com>
Date: Tue, 3 Dec 2024 23:10:06 +0800
Subject: [PATCH] update oauth server

---
 ai_saas_client/__manifest__.py               |  2 +-
 ai_saas_client/data/auth_oauth_data.xml      |  5 +--
 app_saas/__manifest__.py                     |  5 ++-
 app_saas/data/auth_oauth_data.xml            | 23 ++++++++++
 app_saas/data/model_new_demo.xml             | 46 --------------------
 app_saas/models/__init__.py                  |  2 +
 app_saas/models/auth_oauth_provider.py       | 14 ++++++
 app_saas/views/auth_oauth_provider_views.xml | 13 ++++++
 8 files changed, 58 insertions(+), 52 deletions(-)
 create mode 100644 app_saas/data/auth_oauth_data.xml
 delete mode 100644 app_saas/data/model_new_demo.xml
 create mode 100644 app_saas/models/auth_oauth_provider.py
 create mode 100644 app_saas/views/auth_oauth_provider_views.xml

diff --git a/ai_saas_client/__manifest__.py b/ai_saas_client/__manifest__.py
index 0b2899fe..3b24fa95 100644
--- a/ai_saas_client/__manifest__.py
+++ b/ai_saas_client/__manifest__.py
@@ -57,7 +57,7 @@
         # 'website',
     ],
     'data': [
-        'data/auth_oauth_data.xml',
+        # 'data/auth_oauth_data.xml',
     ],
     'assets': {
         'web.assets_frontend': [
diff --git a/ai_saas_client/data/auth_oauth_data.xml b/ai_saas_client/data/auth_oauth_data.xml
index 44043234..35ed2803 100644
--- a/ai_saas_client/data/auth_oauth_data.xml
+++ b/ai_saas_client/data/auth_oauth_data.xml
@@ -3,14 +3,13 @@
     <data noupdate="1">
         <record id="provider_ai_saas" model="auth.oauth.provider">
             <field name="name">Ai Passport of odooai.cn</field>
-            <field name="body">Ai Passport SSO</field>
+            <field name="body">Log in with Ai Passport</field>
             <field name="auth_endpoint">https://www.odooai.cn/oauth/authorize</field>
             <field name="code_endpoint">https://www.odooai.cn/oauth/token</field>
-            <field name="scope">profile</field>
+            <field name="scope">odoo,profile</field>
             <field name="validation_endpoint">https://www.odooai.cn/oauth/profile</field>
             <field name="data_endpoint"></field>
             <field name="css_class">fa fa-2x fa-fw fa-sign-in text-primary</field>
-            <field name="body">Log in with Ai Passport</field>
             <field name="enabled" eval="True"/>
         </record>
         <!-- Use database uuid as client_id for OpenERP oauth provider -->
diff --git a/app_saas/__manifest__.py b/app_saas/__manifest__.py
index ef075292..d35acecc 100644
--- a/app_saas/__manifest__.py
+++ b/app_saas/__manifest__.py
@@ -52,9 +52,12 @@
     ''',
     'depends': [
         'app_common',
+        'auth_oauth',
         # 'website',
     ],
     'data': [
+        'data/auth_oauth_data.xml',
+        'views/auth_oauth_provider_views.xml',
         'views/res_config_settings_views.xml',
     ],
     'assets': {
@@ -66,8 +69,6 @@
         ],
     },
     'demo': [
-        # 'data/model_new_demo.xml',
-        # 'views/website_templates.xml',
     ],
     # 'pre_init_hook': 'pre_init_hook',
     # 'post_init_hook': 'post_init_hook',
diff --git a/app_saas/data/auth_oauth_data.xml b/app_saas/data/auth_oauth_data.xml
new file mode 100644
index 00000000..851af0c7
--- /dev/null
+++ b/app_saas/data/auth_oauth_data.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="provider_app_saas" model="auth.oauth.provider">
+            <field name="name">Ai Passport of odooapp.cn</field>
+            <field name="body">Ai通行证-Odoo中文应用商店</field>
+            <field name="auth_endpoint">https://www.odooapp.cn/oauth/authorize</field>
+            <field name="code_endpoint">https://www.odooapp.cn/oauth/token</field>
+            <field name="scope">odoo,profile</field>
+            <field name="validation_endpoint">https://www.odooapp.cn/oauth/profile</field>
+            <field name="data_endpoint"></field>
+            <field name="css_class">fa fa-2x fa-fw fa-sign-in text-primary</field>
+            <field name="enabled" eval="True"/>
+        </record>
+        <!-- Use database uuid as client_id for OpenERP oauth provider -->
+        <function model="auth.oauth.provider" name="write">
+            <value eval="[ref('app_saas.provider_app_saas')]"/>
+            <value model="ir.config_parameter" eval="{
+                'client_id': obj().env['ir.config_parameter'].get_param('database.uuid'),
+            }"/>
+        </function>
+    </data>
+</odoo>
diff --git a/app_saas/data/model_new_demo.xml b/app_saas/data/model_new_demo.xml
deleted file mode 100644
index e2eca3bc..00000000
--- a/app_saas/data/model_new_demo.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <!-- Demo data -->
-        <record id="model_new_data_01" model="model.new">
-            <field name="name">demo1</field>
-            <field name="ref">demo1</field>
-            <field name="amount">888</field>
-            <field name="date">2023-09-13</field>
-            <field name="image" type="base64" file="app_sample/static/img/icon_odooai.png"/>
-            <field name="w_progressbar">0.5</field>
-            <field name="state">draft</field>
-            <field name="user_id" ref="base.user_admin"/>
-        </record>
-        <record id="model_new_data_02" model="model.new">
-            <field name="name">demo2</field>
-            <field name="ref">demo2</field>
-            <field name="amount">1600</field>
-            <field name="date">2023-10-03</field>
-            <field name="image" type="base64" file="app_sample/static/img/icon_odooai.png"/>
-            <field name="w_progressbar">0.6</field>
-            <field name="state">done</field>
-            <field name="user_id" ref="base.user_admin"/>
-        </record>
-        <record id="model_new_data_03" model="model.new">
-            <field name="name">demo3</field>
-            <field name="ref">demo3</field>
-            <field name="amount">3000</field>
-            <field name="date">2023-09-16</field>
-            <field name="image" type="base64" file="app_sample/static/img/icon_odooapp.png"/>
-            <field name="w_progressbar">0.3</field>
-            <field name="state">cancel</field>
-            <field name="user_id" ref="base.user_demo"/>
-        </record>
-        <record id="model_new_data_04" model="model.new">
-            <field name="name">demo4</field>
-            <field name="ref">demo4</field>
-            <field name="amount">40000</field>
-            <field name="date">2023-10-06</field>
-            <field name="image" type="base64" file="app_sample/static/img/icon_odooapp.png"/>
-            <field name="w_progressbar">0.99</field>
-            <field name="state">draft</field>
-            <field name="user_id" ref="base.user_demo"/>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/app_saas/models/__init__.py b/app_saas/models/__init__.py
index ce7ed9e5..158965f8 100644
--- a/app_saas/models/__init__.py
+++ b/app_saas/models/__init__.py
@@ -2,3 +2,5 @@
 # Part of odooAi.cn. See LICENSE file for full copyright and licensing details.
 
 from . import res_config_settings
+from . import auth_oauth_provider
+
diff --git a/app_saas/models/auth_oauth_provider.py b/app_saas/models/auth_oauth_provider.py
new file mode 100644
index 00000000..062608d1
--- /dev/null
+++ b/app_saas/models/auth_oauth_provider.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, modules, tools, _
+
+import base64
+from datetime import timedelta
+
+class AuthOAuthProvider(models.Model):
+
+    _inherit = 'auth.oauth.provider'
+    _order = 'sequence, name'
+
+    # 取code的url，主要针对国内的先取code，再拿Token的方式
+    code_endpoint = fields.Char(string='Token by Code Endpoint', help='Get Token from Code. Only for Code response type.')
diff --git a/app_saas/views/auth_oauth_provider_views.xml b/app_saas/views/auth_oauth_provider_views.xml
new file mode 100644
index 00000000..644a8e1b
--- /dev/null
+++ b/app_saas/views/auth_oauth_provider_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="app_view_oauth_provider_form" model="ir.ui.view">
+        <field name="name">app.auth.oauth.provider.form</field>
+        <field name="model">auth.oauth.provider</field>
+        <field name="inherit_id" ref="auth_oauth.view_oauth_provider_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='auth_endpoint']" position="after">
+                <field name="code_endpoint"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>