Skip to content

Commit 71d07a5

Browse files
committed
[MIG] auth_oauth_multi_token: Migration to v14.0
1 parent cb3effb commit 71d07a5

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

auth_oauth_multi_token/README.rst

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ OAuth Multi Token
1414
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1515
:alt: License: AGPL-3
1616
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github
17-
:target: https://github.com/OCA/server-auth/tree/13.0/auth_oauth_multi_token
17+
:target: https://github.com/OCA/server-auth/tree/14.0/auth_oauth_multi_token
1818
:alt: OCA/server-auth
1919
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
20-
:target: https://translation.odoo-community.org/projects/server-auth-13-0/server-auth-13-0-auth_oauth_multi_token
20+
:target: https://translation.odoo-community.org/projects/server-auth-14-0/server-auth-14-0-auth_oauth_multi_token
2121
:alt: Translate me on Weblate
22-
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
23-
:target: https://runbot.odoo-community.org/runbot/251/13.0
24-
:alt: Try me on Runbot
22+
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
23+
:target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/server-auth&target_branch=14.0
24+
:alt: Try me on Runboat
2525

2626
|badge1| |badge2| |badge3| |badge4| |badge5|
2727

@@ -46,7 +46,7 @@ Bug Tracker
4646
Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-auth/issues>`_.
4747
In case of trouble, please check there if your issue has already been reported.
4848
If you spotted it first, help us smashing it by providing a detailed and welcomed
49-
`feedback <https://github.com/OCA/server-auth/issues/new?body=module:%20auth_oauth_multi_token%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
49+
`feedback <https://github.com/OCA/server-auth/issues/new?body=module:%20auth_oauth_multi_token%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
5050

5151
Do not contact contributors directly about support or help with technical issues.
5252

@@ -67,8 +67,10 @@ Contributors
6767
* `Tecnativa <https://www.tecnativa.com/>`__:
6868

6969
* Jairo Llopis
70+
* Sergio Teruel
7071

71-
* Stéphane Bidoul <[email protected]>
72+
* Stéphane Bidoul <[email protected]>
73+
* Dan Tillinghast
7274

7375
Maintainers
7476
~~~~~~~~~~~
@@ -83,6 +85,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
8385
mission is to support the collaborative development of Odoo features and
8486
promote its widespread use.
8587

86-
This module is part of the `OCA/server-auth <https://github.com/OCA/server-auth/tree/13.0/auth_oauth_multi_token>`_ project on GitHub.
88+
This module is part of the `OCA/server-auth <https://github.com/OCA/server-auth/tree/14.0/auth_oauth_multi_token>`_ project on GitHub.
8789

8890
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

auth_oauth_multi_token/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{
66
"name": "OAuth Multi Token",
7-
"version": "13.0.2.0.0",
7+
"version": "14.0.1.0.0",
88
"license": "AGPL-3",
99
"author": "Florent de Labarre, Camptocamp, Odoo Community Association (OCA)",
1010
"summary": """Allow multiple connection with the same OAuth account""",

auth_oauth_multi_token/models/res_users.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ def action_oauth_clear_token(self):
6666
res.oauth_master_uuid = self._generate_oauth_master_uuid()
6767

6868
@api.model
69-
def _check_credentials(self, password):
69+
def _check_credentials(self, password, env):
7070
"""Override to check credentials against multi tokens."""
7171
try:
72-
return super()._check_credentials(password)
72+
return super()._check_credentials(password, env)
7373
except exceptions.AccessDenied:
7474
res = self.multi_token_model.sudo().search(
7575
[("user_id", "=", self.env.uid), ("oauth_access_token", "=", password)]

auth_oauth_multi_token/readme/CONTRIBUTORS.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
* `Tecnativa <https://www.tecnativa.com/>`__:
44

55
* Jairo Llopis
6+
* Sergio Teruel
67

7-
* Stéphane Bidoul <[email protected]>
8+
* Stéphane Bidoul <[email protected]>
9+
* Dan Tillinghast

auth_oauth_multi_token/static/description/index.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6-
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
6+
<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
77
<title>OAuth Multi Token</title>
88
<style type="text/css">
99

@@ -367,7 +367,7 @@ <h1 class="title">OAuth Multi Token</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
370-
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-auth/tree/13.0/auth_oauth_multi_token"><img alt="OCA/server-auth" src="https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-auth-13-0/server-auth-13-0-auth_oauth_multi_token"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/251/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
370+
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-auth/tree/14.0/auth_oauth_multi_token"><img alt="OCA/server-auth" src="https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-auth-14-0/server-auth-14-0-auth_oauth_multi_token"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/server-auth&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
371371
<p>This module adds the possibility to connect with the same account
372372
on more than one device at the same time.</p>
373373
<p>All providers are supported (Google, Facebook, Odoo, etc).</p>
@@ -393,7 +393,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
393393
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-auth/issues">GitHub Issues</a>.
394394
In case of trouble, please check there if your issue has already been reported.
395395
If you spotted it first, help us smashing it by providing a detailed and welcomed
396-
<a class="reference external" href="https://github.com/OCA/server-auth/issues/new?body=module:%20auth_oauth_multi_token%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
396+
<a class="reference external" href="https://github.com/OCA/server-auth/issues/new?body=module:%20auth_oauth_multi_token%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
397397
<p>Do not contact contributors directly about support or help with technical issues.</p>
398398
</div>
399399
<div class="section" id="credits">
@@ -412,9 +412,11 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
412412
<li>Simone Orsi &lt;<a class="reference external" href="mailto:simone.orsi&#64;camptocamp.com">simone.orsi&#64;camptocamp.com</a>&gt;</li>
413413
<li><a class="reference external" href="https://www.tecnativa.com/">Tecnativa</a>:<ul>
414414
<li>Jairo Llopis</li>
415-
<li>Stéphane Bidoul &lt;<a class="reference external" href="mailto:stephane.bidoul&#64;acsone.eu">stephane.bidoul&#64;acsone.eu</a>&gt;</li>
415+
<li>Sergio Teruel</li>
416416
</ul>
417417
</li>
418+
<li>Stéphane Bidoul &lt;<a class="reference external" href="mailto:stephane.bidoul&#64;acsone.eu">stephane.bidoul&#64;acsone.eu</a>&gt;</li>
419+
<li>Dan Tillinghast</li>
418420
</ul>
419421
</div>
420422
<div class="section" id="maintainers">
@@ -424,7 +426,7 @@ <h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
424426
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
425427
mission is to support the collaborative development of Odoo features and
426428
promote its widespread use.</p>
427-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-auth/tree/13.0/auth_oauth_multi_token">OCA/server-auth</a> project on GitHub.</p>
429+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-auth/tree/14.0/auth_oauth_multi_token">OCA/server-auth</a> project on GitHub.</p>
428430
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
429431
</div>
430432
</div>

auth_oauth_multi_token/tests/test_multi_token.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import json
55

66
from odoo import exceptions
7-
from odoo.tests.common import SavepointCase
7+
from odoo.tests import SavepointCase
88

99

1010
class TestMultiToken(SavepointCase):

0 commit comments

Comments
 (0)