-
-
Notifications
You must be signed in to change notification settings - Fork 193
[17.0][MIG] auth_oauth_environment: Migration to 17.0 #254
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
vvrossem
wants to merge
5
commits into
OCA:17.0
Choose a base branch
from
camptocamp:17.0-mig-auth_oauth_environment
base: 17.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
800da9e
Create module auth_oauth_environment
grindtildeath 1df0cc5
Do not store enabled, code improvements
grindtildeath 2cfe882
Fix list type error on section_name
yvaucher 583c9fa
[IMP] auth_oauth_environment: pre-commit auto fixes
vvrossem dd7e861
[MIG] auth_oauth_environment: Migration to 17.0
vvrossem File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <odoo noupdate="1"> | ||
| <record id="auth_oauth.provider_openerp" model="auth.oauth.provider"> | ||
| <field name="tech_name">provider_openerp</field> | ||
| </record> | ||
| <record id="auth_oauth.provider_facebook" model="auth.oauth.provider"> | ||
| <field name="tech_name">provider_facebook</field> | ||
| </record> | ||
| <record id="auth_oauth.provider_google" model="auth.oauth.provider"> | ||
| <field name="tech_name">provider_google</field> | ||
| </record> | ||
| </odoo> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| from . import auth_oauth_provider | ||
| from . import res_config_settings |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,36 @@ | ||
| # Copyright 2017 Camptocamp SA | ||
| # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
|
||
| import json | ||
|
|
||
| from lxml import etree | ||
|
|
||
| from odoo import _, api, fields, models | ||
|
|
||
| from odoo.addons.server_environment import serv_config | ||
| from odoo.exceptions import UserError | ||
|
|
||
|
|
||
| class AuthOAuthProvider(models.Model): | ||
| _inherit = "auth.oauth.provider" | ||
|
|
||
| managed_by_env = fields.Boolean(compute="_compute_server_env") | ||
| provider_simple_name = fields.Char(compute="_compute_simple_name") | ||
| client_id = fields.Char(string="Client ID", compute="_compute_server_env") | ||
| enabled = fields.Boolean( | ||
| string="Allowed", compute="_compute_server_env", search="_search_enabled" | ||
| ) | ||
| _name = "auth.oauth.provider" | ||
| _inherit = ["auth.oauth.provider", "server.env.techname.mixin", "server.env.mixin"] | ||
|
|
||
| def _compute_server_env(self): | ||
| for provider in self: | ||
| provider_section_name = provider._get_provider_section_name() | ||
| vals = {} | ||
| enabled = fields.Boolean(search="_search_enabled") | ||
|
|
||
| if serv_config.has_section(provider_section_name): | ||
| vals.update({"managed_by_env": True}) | ||
| vals.update(serv_config.items(provider_section_name)) | ||
| else: | ||
| vals.update({"managed_by_env": False, "enabled": False}) | ||
| provider.update(vals) | ||
|
|
||
| def _search_enabled(self, operator, value): | ||
| enabled_provider_ids = [] | ||
| for provider in self.search([]): | ||
| provider_section_name = provider._get_provider_section_name() | ||
| if serv_config.has_option( | ||
| provider_section_name, "enabled" | ||
| ) and serv_config.get(provider_section_name, "enabled"): | ||
| enabled_provider_ids.append(provider.id) | ||
| return [("id", "in", enabled_provider_ids)] | ||
|
|
||
| @api.multi | ||
| def _compute_simple_name(self): | ||
| for provider in self: | ||
| provider.provider_simple_name = provider.name.split(" ")[0].lower() | ||
|
|
||
| @api.multi | ||
| def _get_provider_section_name(self): | ||
| self.ensure_one() | ||
| return ".".join(["auth_oauth", self.provider_simple_name]) | ||
| @property | ||
| def _server_env_fields(self): | ||
| base_fields = super()._server_env_fields | ||
| oauth_fields = { | ||
| "client_id": {}, | ||
| "enabled": {}, | ||
| } | ||
| oauth_fields.update(base_fields) | ||
| return oauth_fields | ||
|
|
||
| @api.model | ||
| def fields_view_get( | ||
| self, view_id=None, view_type="form", toolbar=False, submenu=False | ||
| ): | ||
| res = super().fields_view_get( | ||
| view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu | ||
| ) | ||
| readonly_fields = ["enabled", "client_id"] | ||
| doc = etree.XML(res["arch"]) | ||
| for ro_field in readonly_fields: | ||
| for node in doc.xpath("//field[@name='%s']" % ro_field): | ||
| node.set("readonly", "1") | ||
| modifiers = json.loads(node.get("modifiers")) | ||
| modifiers["readonly"] = True | ||
| node.set("modifiers", json.dumps(modifiers)) | ||
| def _server_env_global_section_name(self): | ||
| return "auth_oauth" | ||
|
|
||
| node.set( | ||
| "help", _("This field is managed through server " "environment") | ||
| ) | ||
| res["arch"] = etree.tostring(doc, encoding="unicode") | ||
| return res | ||
| @api.model | ||
| def _search_enabled(self, operator, value): | ||
| if operator not in ["=", "!="] or not isinstance(value, bool): | ||
| raise UserError(_("Operation not supported")) | ||
| if operator != "=": | ||
| value = not value | ||
| enabled = self.search([]).filtered(lambda p: p.enabled) | ||
| return [("id", "in" if value else "not in", enabled.ids)] |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| To configure this module, you need to add a section | ||
| ``[auth_oauth.provider_name]`` to you server_environment_files | ||
| configurations, where 'provider_name' match the tech_name field on | ||
| auth.oauth.provider. | ||
|
|
||
| 'provider_name' is the first part (until first space character) in | ||
| lower case of provider name. Using existing providers, it could be either | ||
| ``provider_google``, ``provider_openerp``, or ``provider_facebook``. | ||
|
|
||
| For example, if you want to activate Google and Odoo.com, your | ||
| server_environment_files should look like this: | ||
| ``` | ||
| [auth_oauth.provider_google] | ||
| client_id=123456789101-abcdefghijklmnopqrstuvwxyz000000 | ||
| enabled=True | ||
|
|
||
| [auth_oauth.provider_openerp] | ||
| enabled=True | ||
| ``` | ||
|
|
||
| Any provider not being enabled through server_environment_files will be set as | ||
| disabled automatically. | ||
|
|
||
| If you want to define a new custom provider, you should pay attention to the | ||
| tech name to use in the server_environment_files. If you create a provider with | ||
| 'provider_dummy' as its tech_name, then the section should be named | ||
| ``[auth_oauth.provider_dummy]``. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| - [Camptocamp](https://www.camptocamp.com) | ||
| - Akim Juillerat <akim.juillerat@camptocamp.com> | ||
| - Vincent Van Rossem <vincent.vanrossem@camptocamp.com>> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| This module extends the functionality of server environment to support OAuth | ||
| providers, and allows you to enable providers and set client_id key according | ||
| to environment. (Refer to module server_environment for more informations) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| To install this module, you need to have the server_environment module | ||
| installed and properly configured. |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to your server_environment_files