From 390dea4956a39edf2d263d38f378513323f9c8a1 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Thu, 14 Oct 2021 17:34:46 +0200 Subject: [PATCH 01/24] Add sf_mobile_base_auth_api_key: decouple auth Third party modules can now provide their own authentication. A default one via API key is provided by shopfloor_mobile_base_auth_api_key. --- shopfloor_mobile_base_auth_api_key/README.rst | 1 + .../__init__.py | 1 + .../__manifest__.py | 17 ++++ .../controllers/__init__.py | 1 + .../controllers/main.py | 10 +++ .../static/wms/src/login.js | 88 +++++++++++++++++++ .../templates/assets.xml | 21 +++++ 7 files changed, 139 insertions(+) create mode 100644 shopfloor_mobile_base_auth_api_key/README.rst create mode 100644 shopfloor_mobile_base_auth_api_key/__init__.py create mode 100644 shopfloor_mobile_base_auth_api_key/__manifest__.py create mode 100644 shopfloor_mobile_base_auth_api_key/controllers/__init__.py create mode 100644 shopfloor_mobile_base_auth_api_key/controllers/main.py create mode 100644 shopfloor_mobile_base_auth_api_key/static/wms/src/login.js create mode 100644 shopfloor_mobile_base_auth_api_key/templates/assets.xml diff --git a/shopfloor_mobile_base_auth_api_key/README.rst b/shopfloor_mobile_base_auth_api_key/README.rst new file mode 100644 index 00000000000..89bcd6c21c3 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/README.rst @@ -0,0 +1 @@ +wait for the bot ;) diff --git a/shopfloor_mobile_base_auth_api_key/__init__.py b/shopfloor_mobile_base_auth_api_key/__init__.py new file mode 100644 index 00000000000..e046e49fbe2 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/__init__.py @@ -0,0 +1 @@ +from . import controllers diff --git a/shopfloor_mobile_base_auth_api_key/__manifest__.py b/shopfloor_mobile_base_auth_api_key/__manifest__.py new file mode 100644 index 00000000000..4ebcb2e1cc3 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2021 Camptocamp SA (http://www.camptocamp.com) +# @author Simone Orsi +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Shopfloor Mobile Base auth via API key", + "summary": "Provides authentication via API key to Shopfloor base mobile app", + "version": "14.0.1.0.0", + "development_status": "Alpha", + "category": "Inventory", + "website": "https://github.com/OCA/wms", + "author": "Camptocamp, Odoo Community Association (OCA)", + "maintainer": ["simahawk"], + "license": "AGPL-3", + "depends": ["shopfloor_mobile_base", "auth_api_key"], + "data": ["templates/assets.xml"], +} diff --git a/shopfloor_mobile_base_auth_api_key/controllers/__init__.py b/shopfloor_mobile_base_auth_api_key/controllers/__init__.py new file mode 100644 index 00000000000..12a7e529b67 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/controllers/__init__.py @@ -0,0 +1 @@ +from . import main diff --git a/shopfloor_mobile_base_auth_api_key/controllers/main.py b/shopfloor_mobile_base_auth_api_key/controllers/main.py new file mode 100644 index 00000000000..4c25b9811e7 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/controllers/main.py @@ -0,0 +1,10 @@ +# Copyright 2021 Camptocamp SA (http://www.camptocamp.com) +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo.addons.shopfloor_base.controllers.main import ShopfloorController + +# Do not extend the existing controller to not cause this error: +# +# odoo.addons.base_rest.models.rest_service_registration: +# Only one REST controller can be safely declared for root path /shopfloor/ +ShopfloorController._default_auth = "api_key" diff --git a/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js b/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js new file mode 100644 index 00000000000..ae3ad43b7e4 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js @@ -0,0 +1,88 @@ +/** + * @author Simone Orsi + * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + */ + +import { + AuthHandlerMixin, + auth_handler_registry, +} from "/shopfloor_mobile_base/static/wms/src/services/auth_handler_registry.js"; +import {config_registry} from "/shopfloor_mobile_base/static/wms/src/services/config_registry.js"; + +// Register apikey storage +config_registry.add("apikey", {default: "", reset_on_clear: true}); + +// Provide auth handle for Odoo calls +export class ApiKeyAuthHandler extends AuthHandlerMixin { + get_params($root) { + return { + headers: { + "API-KEY": $root.apikey, + }, + }; + } +} +auth_handler_registry.add(new ApiKeyAuthHandler("api_key")); + +/** + * Handle loging via API key. + * + * Conventional name: `login-` + auth_type (from app config) + */ +Vue.component("login-api_key", { + data: function () { + return { + error: "", + apikey: "", + }; + }, + methods: { + login: function (evt) { + evt.preventDefault(); + // Call odoo application load => set the result in the local storage in json + this.$parent.error = ""; + this.$root.apikey = this.apikey; + this.$root + ._loadConfig() + .catch((error) => { + this._handle_invalid_key(); + }) + .then(() => { + // TODO: shall we do this in $root._loadRoutes? + if (this.$root.authenticated) { + this.$router.push({name: "home"}); + } else { + this._handle_invalid_key(); + } + }); + }, + _handle_invalid_key() { + this.error = this.$t("screen.login.error.api_key_invalid"); + this.$root.apikey = ""; + }, + }, + template: ` + + +
+ + + {{ $t('screen.login.action.login') }} + + +
+ + `, +}); + +// TODO: Add translation +// login: { +// api_key_placeholder: "YOUR_API_KEY_HERE", +// api_key_label: "API key", +// }, diff --git a/shopfloor_mobile_base_auth_api_key/templates/assets.xml b/shopfloor_mobile_base_auth_api_key/templates/assets.xml new file mode 100644 index 00000000000..5283661d50c --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/templates/assets.xml @@ -0,0 +1,21 @@ + + + + + From 0743024cb21d4feb012a2c7cb6f70e446e039678 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Tue, 26 Oct 2021 15:56:53 +0200 Subject: [PATCH 02/24] sf_mobile_base: unify logged in check --- shopfloor_mobile_base_auth_api_key/static/wms/src/login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js b/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js index ae3ad43b7e4..c642b220866 100644 --- a/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js +++ b/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js @@ -49,7 +49,7 @@ Vue.component("login-api_key", { }) .then(() => { // TODO: shall we do this in $root._loadRoutes? - if (this.$root.authenticated) { + if (this.$root.is_authenticated()) { this.$router.push({name: "home"}); } else { this._handle_invalid_key(); From 37a858277ac9a4f1756e864a857ae45a01a664d2 Mon Sep 17 00:00:00 2001 From: JuMiSanAr Date: Thu, 28 Oct 2021 17:32:00 +0200 Subject: [PATCH 03/24] sf_mbl_base_auth_api_key: refactor api_key login logic --- .../static/wms/src/login.js | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js b/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js index c642b220866..3e0ce4dd317 100644 --- a/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js +++ b/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js @@ -3,6 +3,7 @@ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). */ +import {translation_registry} from "/shopfloor_mobile_base/static/wms/src/services/translation_registry.js"; import { AuthHandlerMixin, auth_handler_registry, @@ -21,7 +22,17 @@ export class ApiKeyAuthHandler extends AuthHandlerMixin { }, }; } + + // on_login($root, evt, data) { + // No need for a handler as we set the api_key inside the login method + // } + + // on_logout($root) { + // No need for a handler as the reset_on_clear flag in the config_registry + // is going to flush the api_key on appdata cleanup + // } } + auth_handler_registry.add(new ApiKeyAuthHandler("api_key")); /** @@ -32,33 +43,13 @@ auth_handler_registry.add(new ApiKeyAuthHandler("api_key")); Vue.component("login-api_key", { data: function () { return { - error: "", apikey: "", }; }, methods: { login: function (evt) { - evt.preventDefault(); - // Call odoo application load => set the result in the local storage in json - this.$parent.error = ""; this.$root.apikey = this.apikey; - this.$root - ._loadConfig() - .catch((error) => { - this._handle_invalid_key(); - }) - .then(() => { - // TODO: shall we do this in $root._loadRoutes? - if (this.$root.is_authenticated()) { - this.$router.push({name: "home"}); - } else { - this._handle_invalid_key(); - } - }); - }, - _handle_invalid_key() { - this.error = this.$t("screen.login.error.api_key_invalid"); - this.$root.apikey = ""; + this.$root.login(evt); }, }, template: ` @@ -81,8 +72,13 @@ Vue.component("login-api_key", { `, }); -// TODO: Add translation -// login: { -// api_key_placeholder: "YOUR_API_KEY_HERE", -// api_key_label: "API key", -// }, +translation_registry.add("en-US.screen.login.api_key_label", "API key"); +translation_registry.add("fr-FR.screen.login.api_key_label", "Clé API"); +translation_registry.add("de-DE.screen.login.api_key_label", "API-Schlüssel"); + +translation_registry.add("en-US.screen.login.api_key_placeholder", "YOUR_API_KEY_HERE"); +translation_registry.add("fr-FR.screen.login.api_key_placeholder", "VOTRE_CLE_API_ICI"); +translation_registry.add( + "de-DE.screen.login.api_key_placeholder", + "DEIN_API-SCHLÜSSEL_HIER" +); From 0003d3a7464b35865a3938e3769b1c8079edfb92 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Fri, 5 Nov 2021 09:44:06 +0100 Subject: [PATCH 04/24] shopfloor_mobile_base_auth_api_key: add README --- shopfloor_mobile_base_auth_api_key/readme/CONTRIBUTORS.rst | 2 ++ shopfloor_mobile_base_auth_api_key/readme/CREDITS.rst | 3 +++ shopfloor_mobile_base_auth_api_key/readme/DESCRIPTION.rst | 1 + 3 files changed, 6 insertions(+) create mode 100644 shopfloor_mobile_base_auth_api_key/readme/CONTRIBUTORS.rst create mode 100644 shopfloor_mobile_base_auth_api_key/readme/CREDITS.rst create mode 100644 shopfloor_mobile_base_auth_api_key/readme/DESCRIPTION.rst diff --git a/shopfloor_mobile_base_auth_api_key/readme/CONTRIBUTORS.rst b/shopfloor_mobile_base_auth_api_key/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..97a2f863bfe --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Simone Orsi +* Juan Miguel Sánchez Arce diff --git a/shopfloor_mobile_base_auth_api_key/readme/CREDITS.rst b/shopfloor_mobile_base_auth_api_key/readme/CREDITS.rst new file mode 100644 index 00000000000..a9b11d87a77 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/readme/CREDITS.rst @@ -0,0 +1,3 @@ +**Financial support** + +* Camptocamp R&D diff --git a/shopfloor_mobile_base_auth_api_key/readme/DESCRIPTION.rst b/shopfloor_mobile_base_auth_api_key/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..3107ef85cdb --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Provide Shopfloor mobile base authentication via API key. From 2cbcf621d359fd65934c1511b33eb730adce8ae1 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 5 Nov 2021 11:13:38 +0000 Subject: [PATCH 05/24] [UPD] Update shopfloor_mobile_base_auth_api_key.pot --- .../i18n/shopfloor_mobile_base_auth_api_key.pot | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 shopfloor_mobile_base_auth_api_key/i18n/shopfloor_mobile_base_auth_api_key.pot diff --git a/shopfloor_mobile_base_auth_api_key/i18n/shopfloor_mobile_base_auth_api_key.pot b/shopfloor_mobile_base_auth_api_key/i18n/shopfloor_mobile_base_auth_api_key.pot new file mode 100644 index 00000000000..4d8b20f912f --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/i18n/shopfloor_mobile_base_auth_api_key.pot @@ -0,0 +1,13 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" From 2eea371bfd7d79fd76811c501b83c1779914aca8 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 5 Nov 2021 12:28:04 +0000 Subject: [PATCH 06/24] [UPD] README.rst --- shopfloor_mobile_base_auth_api_key/README.rst | 87 +++- .../static/description/index.html | 434 ++++++++++++++++++ 2 files changed, 520 insertions(+), 1 deletion(-) create mode 100644 shopfloor_mobile_base_auth_api_key/static/description/index.html diff --git a/shopfloor_mobile_base_auth_api_key/README.rst b/shopfloor_mobile_base_auth_api_key/README.rst index 89bcd6c21c3..d142c2f9016 100644 --- a/shopfloor_mobile_base_auth_api_key/README.rst +++ b/shopfloor_mobile_base_auth_api_key/README.rst @@ -1 +1,86 @@ -wait for the bot ;) +====================================== +Shopfloor Mobile Base auth via API key +====================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fwms-lightgray.png?logo=github + :target: https://github.com/OCA/wms/tree/14.0/shopfloor_mobile_base_auth_api_key + :alt: OCA/wms +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/wms-14-0/wms-14-0-shopfloor_mobile_base_auth_api_key + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/285/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Provide Shopfloor mobile base authentication via API key. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Camptocamp + +Contributors +~~~~~~~~~~~~ + +* Simone Orsi +* Juan Miguel Sánchez Arce + +Other credits +~~~~~~~~~~~~~ + +**Financial support** + +* Camptocamp R&D + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/wms `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/shopfloor_mobile_base_auth_api_key/static/description/index.html b/shopfloor_mobile_base_auth_api_key/static/description/index.html new file mode 100644 index 00000000000..6ee30469111 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/static/description/index.html @@ -0,0 +1,434 @@ + + + + + + +Shopfloor Mobile Base auth via API key + + + +
+

Shopfloor Mobile Base auth via API key

+ + +

Alpha License: AGPL-3 OCA/wms Translate me on Weblate Try me on Runbot

+

Provide Shopfloor mobile base authentication via API key.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+

Financial support

+
    +
  • Camptocamp R&D
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/wms project on GitHub.

+

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

+
+
+
+ + From 4a4e9a6340e1d86caf0666299bbdaf73a033a2a3 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 5 Nov 2021 12:28:04 +0000 Subject: [PATCH 07/24] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 shopfloor_mobile_base_auth_api_key/static/description/icon.png diff --git a/shopfloor_mobile_base_auth_api_key/static/description/icon.png b/shopfloor_mobile_base_auth_api_key/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 2a4943768988284e7276eb2e183975573d30ba44 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Thu, 18 Nov 2021 12:37:26 +0100 Subject: [PATCH 08/24] sf_mobile_base*: improve auth handler init --- shopfloor_mobile_base_auth_api_key/static/wms/src/login.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js b/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js index 3e0ce4dd317..b8fc8a4cc79 100644 --- a/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js +++ b/shopfloor_mobile_base_auth_api_key/static/wms/src/login.js @@ -15,10 +15,10 @@ config_registry.add("apikey", {default: "", reset_on_clear: true}); // Provide auth handle for Odoo calls export class ApiKeyAuthHandler extends AuthHandlerMixin { - get_params($root) { + get_params() { return { headers: { - "API-KEY": $root.apikey, + "API-KEY": this.$root.apikey, }, }; } @@ -33,7 +33,7 @@ export class ApiKeyAuthHandler extends AuthHandlerMixin { // } } -auth_handler_registry.add(new ApiKeyAuthHandler("api_key")); +auth_handler_registry.add("api_key", ApiKeyAuthHandler); /** * Handle loging via API key. From 45123ad3d79d577ec0f9192bea140b46b60e56a6 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 18 Nov 2021 14:06:37 +0000 Subject: [PATCH 09/24] shopfloor_mobile_base_auth_api_key 14.0.1.0.1 --- shopfloor_mobile_base_auth_api_key/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shopfloor_mobile_base_auth_api_key/__manifest__.py b/shopfloor_mobile_base_auth_api_key/__manifest__.py index 4ebcb2e1cc3..42ab45bb0cd 100644 --- a/shopfloor_mobile_base_auth_api_key/__manifest__.py +++ b/shopfloor_mobile_base_auth_api_key/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Shopfloor Mobile Base auth via API key", "summary": "Provides authentication via API key to Shopfloor base mobile app", - "version": "14.0.1.0.0", + "version": "14.0.1.0.1", "development_status": "Alpha", "category": "Inventory", "website": "https://github.com/OCA/wms", From 9bbcc729b443dfb4a5103af51866799220ba8add Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Tue, 28 Dec 2021 15:01:40 +0000 Subject: [PATCH 10/24] Added translation using Weblate (Portuguese (Brazil)) --- shopfloor_mobile_base_auth_api_key/i18n/pt_BR.po | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 shopfloor_mobile_base_auth_api_key/i18n/pt_BR.po diff --git a/shopfloor_mobile_base_auth_api_key/i18n/pt_BR.po b/shopfloor_mobile_base_auth_api_key/i18n/pt_BR.po new file mode 100644 index 00000000000..592d9a13ab0 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/i18n/pt_BR.po @@ -0,0 +1,14 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" From 5213dac08421b8ba0976925de91ad486c837a8de Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Tue, 26 Oct 2021 14:09:04 +0200 Subject: [PATCH 11/24] shopfloor_base: get rid of static controller Use endpoint_route_handler capabilities to register endpoints on the fly. --- shopfloor_mobile_base_auth_api_key/__init__.py | 1 - .../controllers/__init__.py | 1 - shopfloor_mobile_base_auth_api_key/controllers/main.py | 10 ---------- 3 files changed, 12 deletions(-) delete mode 100644 shopfloor_mobile_base_auth_api_key/controllers/__init__.py delete mode 100644 shopfloor_mobile_base_auth_api_key/controllers/main.py diff --git a/shopfloor_mobile_base_auth_api_key/__init__.py b/shopfloor_mobile_base_auth_api_key/__init__.py index e046e49fbe2..e69de29bb2d 100644 --- a/shopfloor_mobile_base_auth_api_key/__init__.py +++ b/shopfloor_mobile_base_auth_api_key/__init__.py @@ -1 +0,0 @@ -from . import controllers diff --git a/shopfloor_mobile_base_auth_api_key/controllers/__init__.py b/shopfloor_mobile_base_auth_api_key/controllers/__init__.py deleted file mode 100644 index 12a7e529b67..00000000000 --- a/shopfloor_mobile_base_auth_api_key/controllers/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import main diff --git a/shopfloor_mobile_base_auth_api_key/controllers/main.py b/shopfloor_mobile_base_auth_api_key/controllers/main.py deleted file mode 100644 index 4c25b9811e7..00000000000 --- a/shopfloor_mobile_base_auth_api_key/controllers/main.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2021 Camptocamp SA (http://www.camptocamp.com) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -from odoo.addons.shopfloor_base.controllers.main import ShopfloorController - -# Do not extend the existing controller to not cause this error: -# -# odoo.addons.base_rest.models.rest_service_registration: -# Only one REST controller can be safely declared for root path /shopfloor/ -ShopfloorController._default_auth = "api_key" From c25190334cf519a28ab6d6332e7d04021411e55b Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Tue, 2 Nov 2021 10:56:22 +0100 Subject: [PATCH 12/24] shopfloor*_api_key: limit access to specific keys --- .../__init__.py | 2 ++ .../__manifest__.py | 7 +++-- .../models/__init__.py | 1 + .../models/shopfloor_app.py | 23 ++++++++++++++ .../services/__init__.py | 1 + .../services/service.py | 31 +++++++++++++++++++ .../views/shopfloor_app.xml | 17 ++++++++++ 7 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 shopfloor_mobile_base_auth_api_key/models/__init__.py create mode 100644 shopfloor_mobile_base_auth_api_key/models/shopfloor_app.py create mode 100644 shopfloor_mobile_base_auth_api_key/services/__init__.py create mode 100644 shopfloor_mobile_base_auth_api_key/services/service.py create mode 100644 shopfloor_mobile_base_auth_api_key/views/shopfloor_app.xml diff --git a/shopfloor_mobile_base_auth_api_key/__init__.py b/shopfloor_mobile_base_auth_api_key/__init__.py index e69de29bb2d..71a02422d57 100644 --- a/shopfloor_mobile_base_auth_api_key/__init__.py +++ b/shopfloor_mobile_base_auth_api_key/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import services diff --git a/shopfloor_mobile_base_auth_api_key/__manifest__.py b/shopfloor_mobile_base_auth_api_key/__manifest__.py index 42ab45bb0cd..169b998401d 100644 --- a/shopfloor_mobile_base_auth_api_key/__manifest__.py +++ b/shopfloor_mobile_base_auth_api_key/__manifest__.py @@ -12,6 +12,9 @@ "author": "Camptocamp, Odoo Community Association (OCA)", "maintainer": ["simahawk"], "license": "AGPL-3", - "depends": ["shopfloor_mobile_base", "auth_api_key"], - "data": ["templates/assets.xml"], + "depends": [ + "shopfloor_mobile_base", + "auth_api_key_group", + ], + "data": ["templates/assets.xml", "views/shopfloor_app.xml"], } diff --git a/shopfloor_mobile_base_auth_api_key/models/__init__.py b/shopfloor_mobile_base_auth_api_key/models/__init__.py new file mode 100644 index 00000000000..928c5bb7dd9 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/models/__init__.py @@ -0,0 +1 @@ +from . import shopfloor_app diff --git a/shopfloor_mobile_base_auth_api_key/models/shopfloor_app.py b/shopfloor_mobile_base_auth_api_key/models/shopfloor_app.py new file mode 100644 index 00000000000..bcb2c18fa07 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/models/shopfloor_app.py @@ -0,0 +1,23 @@ +# Copyright 2021 Camptcamp SA +# @author: Simone Orsi +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). + +from odoo import fields, models + + +class ShopfloorApp(models.Model): + + # TODO: consider splitting this to new module shopfloor_base_auth_api_key + _inherit = "shopfloor.app" + + def _selection_auth_type(self): + return super()._selection_auth_type() + [("api_key", "API key")] + + # Borrowed from `endpoint_auth_api_key`: shall we define a mixin? + auth_api_key_group_ids = fields.Many2many( + comodel_name="auth.api.key.group", + string="Allowed API key groups", + ) + + def _allowed_api_key_ids(self): + return self.auth_api_key_group_ids.auth_api_key_ids.ids diff --git a/shopfloor_mobile_base_auth_api_key/services/__init__.py b/shopfloor_mobile_base_auth_api_key/services/__init__.py new file mode 100644 index 00000000000..72d6086eee6 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/services/__init__.py @@ -0,0 +1 @@ +from . import service diff --git a/shopfloor_mobile_base_auth_api_key/services/service.py b/shopfloor_mobile_base_auth_api_key/services/service.py new file mode 100644 index 00000000000..65ce2175003 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/services/service.py @@ -0,0 +1,31 @@ +# Copyright 2021 Camptocamp SA (http://www.camptocamp.com) +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +import logging + +from werkzeug.exceptions import Forbidden + +from odoo.addons.component.core import AbstractComponent + +_logger = logging.getLogger(__name__) + + +class BaseShopfloorService(AbstractComponent): + _inherit = "base.shopfloor.service" + + def dispatch(self, method_name, *args, params=None): + self._validate_request(self.request) + return super().dispatch(method_name, *args, params=params) + + def _validate_request(self, request): + if self.collection.auth_type == "api_key": + # request api key is already validated when we reach this point + # Now let's validate it at app level. + if ( + self.request.auth_api_key_id + not in self.collection.sudo()._allowed_api_key_ids() + ): + _logger.error( + "API key not allowed on app '%s'", self.collection.tech_name + ) + raise Forbidden() diff --git a/shopfloor_mobile_base_auth_api_key/views/shopfloor_app.xml b/shopfloor_mobile_base_auth_api_key/views/shopfloor_app.xml new file mode 100644 index 00000000000..adc330df239 --- /dev/null +++ b/shopfloor_mobile_base_auth_api_key/views/shopfloor_app.xml @@ -0,0 +1,17 @@ + + + + shopfloor app form + shopfloor.app + + + + + + + + From b54fcbae096dd1ec1e87ead8878629d4d7ee2c51 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Thu, 18 Nov 2021 11:02:23 +0100 Subject: [PATCH 13/24] sf_mobile_auth_api_key: ease access to groups --- .../models/shopfloor_app.py | 6 ++++++ .../views/shopfloor_app.xml | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/shopfloor_mobile_base_auth_api_key/models/shopfloor_app.py b/shopfloor_mobile_base_auth_api_key/models/shopfloor_app.py index bcb2c18fa07..063fce9719b 100644 --- a/shopfloor_mobile_base_auth_api_key/models/shopfloor_app.py +++ b/shopfloor_mobile_base_auth_api_key/models/shopfloor_app.py @@ -21,3 +21,9 @@ def _selection_auth_type(self): def _allowed_api_key_ids(self): return self.auth_api_key_group_ids.auth_api_key_ids.ids + + def action_manage_api_key_groups(self): + xid = "auth_api_key_group.auth_api_key_group_act_window" + action = self.env["ir.actions.act_window"]._for_xml_id(xid) + action["domain"] = [("id", "in", self.auth_api_key_group_ids.ids)] + return action diff --git a/shopfloor_mobile_base_auth_api_key/views/shopfloor_app.xml b/shopfloor_mobile_base_auth_api_key/views/shopfloor_app.xml index adc330df239..72e0954c9dc 100644 --- a/shopfloor_mobile_base_auth_api_key/views/shopfloor_app.xml +++ b/shopfloor_mobile_base_auth_api_key/views/shopfloor_app.xml @@ -9,6 +9,14 @@ +