From 8b4f216f27f3742a390ef9c24b20fa5fed04ca6e Mon Sep 17 00:00:00 2001 From: edescalona Date: Fri, 6 Dec 2024 08:20:48 -0500 Subject: [PATCH 01/15] [ADD] website_recaptcha_v2_form: Adding recaptcha version 2 for the form snippets and also in the login, password reset and register forms. [FIX] Tests [FIX] Ttests [IMP] Add new tests [IMP] Add new tests --- .../odoo/addons/website_recaptcha_v2_form | 1 + setup/website_recaptcha_v2_form/setup.py | 6 + website_recaptcha_v2_form/README.rst | 83 +++++++ website_recaptcha_v2_form/__init__.py | 2 + website_recaptcha_v2_form/__manifest__.py | 29 +++ .../controllers/__init__.py | 2 + website_recaptcha_v2_form/controllers/form.py | 30 +++ website_recaptcha_v2_form/controllers/main.py | 85 +++++++ website_recaptcha_v2_form/i18n/es.po | 28 +++ website_recaptcha_v2_form/models/__init__.py | 1 + website_recaptcha_v2_form/models/website.py | 25 ++ .../static/description/recaptcha_ico.png | Bin 0 -> 2228 bytes .../static/src/css/recaptcha.css | 5 + .../static/src/css/recaptcha.css.map | 1 + .../static/src/scss/recaptcha.scss | 5 + .../static/src/snippets/s_website_form/000.js | 222 ++++++++++++++++++ .../src/snippets/s_website_form/options.js | 44 ++++ .../static/src/xml/website_form_editor.xml | 24 ++ website_recaptcha_v2_form/tests/__init__.py | 2 + .../tests/test_controller_form.py | 54 +++++ .../tests/test_recaptcha.py | 54 +++++ .../views/auth_signup_login_templates.xml | 14 ++ .../views/s_website_form.xml | 16 ++ .../views/webclient_templates.xml | 8 + 24 files changed, 741 insertions(+) create mode 120000 setup/website_recaptcha_v2_form/odoo/addons/website_recaptcha_v2_form create mode 100644 setup/website_recaptcha_v2_form/setup.py create mode 100644 website_recaptcha_v2_form/README.rst create mode 100644 website_recaptcha_v2_form/__init__.py create mode 100644 website_recaptcha_v2_form/__manifest__.py create mode 100644 website_recaptcha_v2_form/controllers/__init__.py create mode 100644 website_recaptcha_v2_form/controllers/form.py create mode 100644 website_recaptcha_v2_form/controllers/main.py create mode 100644 website_recaptcha_v2_form/i18n/es.po create mode 100644 website_recaptcha_v2_form/models/__init__.py create mode 100644 website_recaptcha_v2_form/models/website.py create mode 100644 website_recaptcha_v2_form/static/description/recaptcha_ico.png create mode 100644 website_recaptcha_v2_form/static/src/css/recaptcha.css create mode 100644 website_recaptcha_v2_form/static/src/css/recaptcha.css.map create mode 100644 website_recaptcha_v2_form/static/src/scss/recaptcha.scss create mode 100644 website_recaptcha_v2_form/static/src/snippets/s_website_form/000.js create mode 100644 website_recaptcha_v2_form/static/src/snippets/s_website_form/options.js create mode 100644 website_recaptcha_v2_form/static/src/xml/website_form_editor.xml create mode 100644 website_recaptcha_v2_form/tests/__init__.py create mode 100644 website_recaptcha_v2_form/tests/test_controller_form.py create mode 100644 website_recaptcha_v2_form/tests/test_recaptcha.py create mode 100644 website_recaptcha_v2_form/views/auth_signup_login_templates.xml create mode 100644 website_recaptcha_v2_form/views/s_website_form.xml create mode 100644 website_recaptcha_v2_form/views/webclient_templates.xml diff --git a/setup/website_recaptcha_v2_form/odoo/addons/website_recaptcha_v2_form b/setup/website_recaptcha_v2_form/odoo/addons/website_recaptcha_v2_form new file mode 120000 index 0000000000..c5585f7f8b --- /dev/null +++ b/setup/website_recaptcha_v2_form/odoo/addons/website_recaptcha_v2_form @@ -0,0 +1 @@ +../../../../website_recaptcha_v2_form \ No newline at end of file diff --git a/setup/website_recaptcha_v2_form/setup.py b/setup/website_recaptcha_v2_form/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/website_recaptcha_v2_form/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/website_recaptcha_v2_form/README.rst b/website_recaptcha_v2_form/README.rst new file mode 100644 index 0000000000..ac2d92592c --- /dev/null +++ b/website_recaptcha_v2_form/README.rst @@ -0,0 +1,83 @@ +==================== +Website reCAPTCHA v2 +==================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:55856dbbdf9c9efc1b9b1ebbb33638a0018eda0d91bd6c8c9e30805aa8f2e5b0 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |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%2Fwebsite-lightgray.png?logo=github + :target: https://github.com/OCA/website/tree/16.0/website_recaptcha_v2 + :alt: OCA/website +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/website-16-0/website-16-0-website_recaptcha_v2 + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/website&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows you to use reCAPTCHA v2 in the login form. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +reCAPTCHA is configured in Settings > Website. It can be enabled or disabled +using the checkbox, and the site and secret keys can be defined there when it +is enabled. + +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Binhex + +Contributors +~~~~~~~~~~~~ + + * `Binhex `_: + +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/website `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/website_recaptcha_v2_form/__init__.py b/website_recaptcha_v2_form/__init__.py new file mode 100644 index 0000000000..f7209b1710 --- /dev/null +++ b/website_recaptcha_v2_form/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import controllers diff --git a/website_recaptcha_v2_form/__manifest__.py b/website_recaptcha_v2_form/__manifest__.py new file mode 100644 index 0000000000..b71b8c0d78 --- /dev/null +++ b/website_recaptcha_v2_form/__manifest__.py @@ -0,0 +1,29 @@ +{ + "name": "Website reCAPTCHA v2 form", + "version": "16.0.1.0.0", + "category": "Website", + "depends": ["web", "auth_signup", "website", "website_recaptcha_v2"], + "author": """ + Binhex, + Odoo Community Association (OCA) + """, + "license": "AGPL-3", + "website": "https://github.com/OCA/website", + "summary": "Module to add reCAPTCHA v2 to the login form on the website", + "data": [ + "views/webclient_templates.xml", + "views/auth_signup_login_templates.xml", + "views/s_website_form.xml", + ], + "assets": { + "website.assets_wysiwyg": [ + "website_recaptcha_v2_form/static/src/xml/website_form_editor.xml", + "website_recaptcha_v2_form/static/src/snippets/s_website_form/options.js", + "website_recaptcha_v2_form/static/src/snippets/s_website_form/000.js", + ], + "web.assets_frontend": [ + "website_recaptcha_v2_form/static/src/css/recaptcha.css", + ], + }, + "installable": True, +} diff --git a/website_recaptcha_v2_form/controllers/__init__.py b/website_recaptcha_v2_form/controllers/__init__.py new file mode 100644 index 0000000000..b26463d6cb --- /dev/null +++ b/website_recaptcha_v2_form/controllers/__init__.py @@ -0,0 +1,2 @@ +from . import main +from . import form diff --git a/website_recaptcha_v2_form/controllers/form.py b/website_recaptcha_v2_form/controllers/form.py new file mode 100644 index 0000000000..477881d3d7 --- /dev/null +++ b/website_recaptcha_v2_form/controllers/form.py @@ -0,0 +1,30 @@ +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import json + +from odoo import http + +from odoo.addons.website.controllers.form import WebsiteForm + +from .main import BinhexHome + + +class WebsiteRecaptchaForm(WebsiteForm): + @http.route( + "/website/form/", + type="http", + auth="public", + methods=["POST"], + website=True, + csrf=False, + ) + def website_form(self, model_name, **kwargs): + if kwargs.get("recaptcha_enabled", False): + valid = BinhexHome.verify_recaptcha_v2(self, values=kwargs) + if not isinstance(valid, bool): + return json.dumps( + { + "error": valid, + } + ) + return super().website_form(model_name, **kwargs) diff --git a/website_recaptcha_v2_form/controllers/main.py b/website_recaptcha_v2_form/controllers/main.py new file mode 100644 index 0000000000..0aac83a320 --- /dev/null +++ b/website_recaptcha_v2_form/controllers/main.py @@ -0,0 +1,85 @@ +import logging + +from odoo import _, http +from odoo.exceptions import AccessDenied +from odoo.http import request + +from odoo.addons.auth_signup.controllers.main import AuthSignupHome +from odoo.addons.web.controllers.home import SIGN_UP_REQUEST_PARAMS, Home + +logger = logging.getLogger(__name__) + +SIGN_UP_REQUEST_PARAMS.add("g-recaptcha-response") + + +class BinhexHome(Home): + def verify_recaptcha_v2(self, args=None, kw=None, template="", values=None): + Website = request.env["website"].sudo() + try: + request.env["ir.http"]._auth_method_public() + valid = Website.get_current_website().valid_recaptcha(values) + if valid: + if template == "web.login": + return super().web_login(values.get("redirect", ""), **kw) + else: + return True + except AccessDenied as e: + message_error = str( + e.args[0] if len(e.args) > 0 else _("Recaptcha is not valid.") + ) + if template in ( + "web.login", + "auth_signup.reset_password", + "auth_signup.signup", + ): + values.update({"error": message_error}) + response = request.render(template, values) + response.headers["X-Frame-Options"] = "SAMEORIGIN" + response.headers["Content-Security-Policy"] = "frame-ancestors 'self'" + return response + else: + return message_error + + @http.route("/web/login", type="http", auth="none") + def web_login(self, redirect=None, **kw): + if request.httprequest.method == "POST": + values = { + k: v for k, v in request.params.items() if k in SIGN_UP_REQUEST_PARAMS + } + # Checking that if the request comes from the creation of the account, + # that the recaptcha is not checked again to avoid errors. + + if ( + values.get("confirm_password", "") == "" + and request.httprequest.url.find("web/signup") == -1 + ): + return self.verify_recaptcha_v2( + kw=kw, template="web.login", values=values + ) + return super().web_login(redirect, **kw) + + +class BinhexAuthSignupHome(AuthSignupHome): + @http.route( + "/web/reset_password", type="http", auth="public", website=True, sitemap=False + ) + def web_auth_reset_password(self, *args, **kw): + qcontext = self.get_auth_signup_qcontext() + if request.httprequest.method == "POST": + valid = self.verify_recaptcha_v2( + kw=kw, template="auth_signup.reset_password", values=qcontext, args=args + ) + if not isinstance(valid, bool): + return valid + return super().web_auth_reset_password(*args, **kw) + + @http.route("/web/signup", type="http", auth="public", website=True, sitemap=False) + def web_auth_signup(self, *args, **kw): + qcontext = self.get_auth_signup_qcontext() + if request.httprequest.method == "POST": + valid = self.verify_recaptcha_v2( + kw=kw, template="auth_signup.signup", values=qcontext, args=args + ) + if not isinstance(valid, bool): + return valid + return super().web_auth_signup(*args, **kw) diff --git a/website_recaptcha_v2_form/i18n/es.po b/website_recaptcha_v2_form/i18n/es.po new file mode 100644 index 0000000000..ad619481ec --- /dev/null +++ b/website_recaptcha_v2_form/i18n/es.po @@ -0,0 +1,28 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * binhex_website_recaptcha_v2 +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-12-02 16:23+0000\n" +"PO-Revision-Date: 2024-12-02 16:23+0000\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" + +#. module: binhex_website_recaptcha_v2 +#. odoo-python +#: code:addons/binhex_website_recaptcha_v2/controllers/main.py:0 +#, python-format +msgid "Recaptcha is not valid." +msgstr "Recaptcha no es válido." + +#. module: binhex_website_recaptcha_v2 +#: model:ir.model,name:binhex_website_recaptcha_v2.model_website +msgid "Website" +msgstr "Sitio web" diff --git a/website_recaptcha_v2_form/models/__init__.py b/website_recaptcha_v2_form/models/__init__.py new file mode 100644 index 0000000000..bd190fa80b --- /dev/null +++ b/website_recaptcha_v2_form/models/__init__.py @@ -0,0 +1 @@ +from . import website diff --git a/website_recaptcha_v2_form/models/website.py b/website_recaptcha_v2_form/models/website.py new file mode 100644 index 0000000000..3920285635 --- /dev/null +++ b/website_recaptcha_v2_form/models/website.py @@ -0,0 +1,25 @@ +from odoo import api, models +from odoo.exceptions import AccessDenied + + +class Website(models.Model): + _inherit = "website" + + # -------------------------------------------------- + # METHODS + # -------------------------------------------------- + """ + Validating that the recaptcha sent is correct + @params: + kw: Data sent from the form + """ + + def valid_recaptcha(self, values): + valid, message = self.is_recaptcha_v2_valid(values) + if not valid: + raise AccessDenied(message) + return True + + @api.model + def get_recaptcha_v2_site_key(self): + return self.sudo().get_current_website().recaptcha_v2_site_key diff --git a/website_recaptcha_v2_form/static/description/recaptcha_ico.png b/website_recaptcha_v2_form/static/description/recaptcha_ico.png new file mode 100644 index 0000000000000000000000000000000000000000..65f4e0147fd40aca822db867dee902794e30db33 GIT binary patch literal 2228 zcmV;l2ut^gP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv00000008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_00T1qZoK+t#nD+} z6P+$96in@nLDI6u_g+?MtV}(pYrij#{$=R%pmiFgrN9DM6M857q z!IJRsRBhu2fACbGlqsM=0)0fXW{i+C1Xil2?a9zjzPb5@k#t|Th+U$1-+OPf;oT9~ z@G1xt_5gT4Ay*F*$!epMK%xpqJw;@eSVpU=nwGhc5Y^X@O57DiKMD~qU7DdkaN`D7 z?Yk0427zQXB_LNpE2zz!0tu=qGIEXWE8W(iCvj^y@#yt0NK@8Zthn2`b%=j@@ST@X z7b^F#|C24CK>~dM{u%@cj1x&9;ZXYwffWT)&>GW(vV6Rf1u4?$wo6kqrjxPCNdnHL z?!fz3w*U1&xvQ?jQ~PrQ{c{2uBw&D8IpOKZ@}~$z*?0{-z;(JRX-c8#6oSVBp|0Tl zo@@QMh7aDI+9$h^njxTJ3K)r%Dl4Y|f~TV>8{V3eQx=+BXqt)3qu{YXm=OHp?XSG0 z;_LIS;JF2cNr5Ew1SOy{fq)4FY`g;T0F2II+_B8``PcbPB_l zI0>Af1XM;0Zvt=>E3ZI224}*@=Gp`W#1$={O}d2d5bip(K#Jxl!1v7ws0^e)qJw}L zz^y(J5IwtZW^EZ)O?v^40%hg~EQ!!W%W}5K(yF@?lmmAX9R$o&3QPcRbAtC&KvH(( z);pep>kfZ8tKRp~H8wmJcpT3d5s({!6dB;3(SPT)Q3=5tRkkhNA){!QrW@m)?DghGz({pYBLxX;4_i zlX2PIpD+bv@Hals1hLxT-4aMrC_?pZU;jr4*a5!n?sw6$)djeq#rCxmNaWZ3@%I7( z_Nf|u7ap0Yh*O-HrQs<76pLMg-F>(OM8&&@GfD-3*#kAR;!q=8w+w?gE&xNqS0M?# zumJh6Oh`zJUYR%eAsappMM+7p;bRoe0)ERHbm;Rt0RaIro&^<_ zShgy^;e$(PG06A4DKGzdXj;+O3=J>Kx8Rzm;89}9zc!ZwlA@+hMrpv3wtG~Le8ZXS zpN(|knMEYD6c1dwJQkJB_5G$zI{^N~DIs{&3b9Hn8Bzkna|r}#58nI`!Re2DP3T+i zQfc{;jE=fChL7ijhvcGjeu3ciuiXAh2hh61|00SH{e#e< z9K6MusKm55R^NB~C8@mJ86M63Z1}i57JRN1!09*(gz8)V`9OF0HU-)IIidaS4MKb1 zI-z~}Q!+)2!0#X9*?kavCCtfrCMa$F@acs7ahNhuCLjhvriA1gi1^$IkU%j2G&+YU zCWttNflO=;l^6(nIURQS@@2x4T)K40DMq95-I9_Lp%)D_9-e??K+yAJtrtPptw!D6 zLEyrL3xu~hfBrl%Ffed6BqT)6GiaIPLV|BTp9Hd7I?P*el-}OnKTD<33>P!gf*xU> z05gN(e}v%|FM32r7#EzY0Q@zvSp3N0y%HE38@mbcnLdCQRaaL_=iBu>7C3qGB8&~?O-{|sd^0jO*4@?BrQEY;Pn29Pm!P1} z-QC^F(b3VPr%#{0#|6%osH>}6<%xt(1eifBb@AdwGU(hDG>?SaW5VYG-as>R=FAxw zU#C!aN_J0J8e$zri3&Gdd*Pp^%l30Wbh}pDxb2aqG?-vpr#bU91UsPPY z3)g(0yHEK5IO6dZh=}JUBq};OT6OH$vG>u97NXWWIy(LY_fW&Vmg9T6y+q;LL2!8d zL(ps>*J`!fp}T$NjR+TbUtizfluG4`sBC->|Akt1)8ir%lA4{Jy{)yi^$oMx{9jMO zZ8qEemX?+`GBba?4V8s=u>&90dxalXd$;&k(c*8OnJvUJ3Ft8jEwxIkl^3=4EldJL-i{tl@l)j0000 div.g-recaptcha { + margin-left: 18% !important; +} + +/*# sourceMappingURL=recaptcha.css.map */ diff --git a/website_recaptcha_v2_form/static/src/css/recaptcha.css.map b/website_recaptcha_v2_form/static/src/css/recaptcha.css.map new file mode 100644 index 0000000000..5b27d9f714 --- /dev/null +++ b/website_recaptcha_v2_form/static/src/css/recaptcha.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["../scss/recaptcha.scss"],"names":[],"mappings":"AACI;EACI","file":"recaptcha.css"} diff --git a/website_recaptcha_v2_form/static/src/scss/recaptcha.scss b/website_recaptcha_v2_form/static/src/scss/recaptcha.scss new file mode 100644 index 0000000000..918be7fe04 --- /dev/null +++ b/website_recaptcha_v2_form/static/src/scss/recaptcha.scss @@ -0,0 +1,5 @@ +div.s_website_form_recaptcha_v2 { + > div.g-recaptcha { + margin-left: 18% !important; + } +} diff --git a/website_recaptcha_v2_form/static/src/snippets/s_website_form/000.js b/website_recaptcha_v2_form/static/src/snippets/s_website_form/000.js new file mode 100644 index 0000000000..42322bc7fd --- /dev/null +++ b/website_recaptcha_v2_form/static/src/snippets/s_website_form/000.js @@ -0,0 +1,222 @@ +odoo.define("website_recaptcha_v2_form.s_website_form", function (require) { + "use strict"; + + var core = require("web.core"); + const session = require("web.session"); + var ajax = require("web.ajax"); + var publicWidget = require("web.public.widget"); + const dom = require("web.dom"); + const concurrency = require("web.concurrency"); + require("website.s_website_form"); + var _t = core._t; + + publicWidget.registry.s_website_form.include({ + send: async function (e) { + e.preventDefault(); + // Prevent users from crazy clicking + const $button = this.$target.find( + ".s_website_form_send, .o_website_form_send" + ); + $button.addClass("disabled").attr("disabled", "disabled"); + this.restoreBtnLoading = dom.addButtonLoadingEffect($button[0]); + + var self = this; + + self.$target.find("#s_website_form_result, #o_website_form_result").empty(); + if (!self.check_error_fields({})) { + self.update_status("error", _t("Please fill in the form correctly.")); + return false; + } + + // Prepare form inputs + this.form_fields = this.$target.serializeArray(); + $.each( + this.$target.find("input[type=file]:not([disabled])"), + (outer_index, input) => { + $.each($(input).prop("files"), function (index, file) { + // Index field name as ajax won't accept arrays of files + // when aggregating multiple files into a single field value + self.form_fields.push({ + name: input.name + "[" + outer_index + "][" + index + "]", + value: file, + }); + }); + } + ); + + // Serialize form inputs into a single object + // Aggregate multiple values into arrays + var form_values = {}; + _.each(this.form_fields, function (input) { + if (input.name in form_values) { + // If a value already exists for this field, + // we are facing a x2many field, so we store + // the values in an array. + if (Array.isArray(form_values[input.name])) { + form_values[input.name].push(input.value); + } else { + form_values[input.name] = [ + form_values[input.name], + input.value, + ]; + } + } else if (input.value !== "") { + form_values[input.name] = input.value; + } + }); + + // Force server date format usage for existing fields + this.$target + .find(".s_website_form_field:not(.s_website_form_custom)") + .find(".s_website_form_date, .s_website_form_datetime") + .each(function () { + const inputEl = this.querySelector("input"); + + // Datetimepicker('viewDate') will return `new Date()` if the + // input is empty but we want to keep the empty value + if (!inputEl.value) { + return; + } + + var date = $(this).datetimepicker("viewDate").clone().locale("en"); + var format = "YYYY-MM-DD"; + if ($(this).hasClass("s_website_form_datetime")) { + date = date.utc(); + format = "YYYY-MM-DD HH:mm:ss"; + } + form_values[inputEl.getAttribute("name")] = date.format(format); + }); + + if (this._recaptchaLoaded) { + const tokenObj = await this._recaptcha.getToken("website_form"); + if (tokenObj.token) { + form_values.recaptcha_token_response = tokenObj.token; + } else if (tokenObj.error) { + self.update_status("error", tokenObj.error); + return false; + } + } + + if (this.$target.find("div.s_website_form_recaptcha_v2").length > 0) { + form_values.recaptcha_enabled = true; + } + + // Post form and handle result + ajax.post( + this.$target.attr("action") + + (this.$target.data("force_action") || + this.$target.data("model_name")), + form_values + ) + .then(async function (data) { + // Restore send button behavior + self.$target + .find(".s_website_form_send, .o_website_form_send") + .removeAttr("disabled") + .removeClass("disabled"); + var result_data = JSON.parse(data); + if (!result_data.id) { + // Failure, the server didn't return the created record ID + self.update_status( + "error", + result_data.error ? result_data.error : false + ); + if (result_data.error_fields) { + // If the server return a list of bad fields, show these fields for users + self.check_error_fields(result_data.error_fields); + } + } else { + // Success, redirect or update status + let successMode = self.$target[0].dataset.successMode; + let successPage = self.$target[0].dataset.successPage; + if (!successMode) { + successPage = self.$target.attr("data-success_page"); + successMode = successPage ? "redirect" : "nothing"; + } + switch (successMode) { + case "redirect": { + let hashIndex = successPage.indexOf("#"); + if (hashIndex > 0) { + // URL containing an anchor detected: extract + // the anchor from the URL if the URL is the + // same as the current page URL so we can scroll + // directly to the element (if found) later + // instead of redirecting. + // Note that both currentUrlPath and successPage + // can exist with or without a trailing slash + // before the hash (e.g. "domain.com#footer" or + // "domain.com/#footer"). Therefore, if they are + // not present, we add them to be able to + // compare the two variables correctly. + let currentUrlPath = window.location.pathname; + if (!currentUrlPath.endsWith("/")) { + currentUrlPath += "/"; + } + if (!successPage.includes("/#")) { + successPage = successPage.replace("#", "/#"); + hashIndex++; + } + if ( + [ + successPage, + "/" + session.lang_url_code + successPage, + ].some((link) => + link.startsWith(currentUrlPath + "#") + ) + ) { + successPage = successPage.substring(hashIndex); + } + } + if (successPage.charAt(0) === "#") { + const successAnchorEl = document.getElementById( + successPage.substring(1) + ); + if (successAnchorEl) { + await dom.scrollTo(successAnchorEl, { + duration: 500, + extraOffset: 0, + }); + } + break; + } + $(window.location).attr("href", successPage); + return; + } + case "message": { + // Prevent double-clicking on the send button and + // add a upload loading effect (delay before success + // message) + await concurrency.delay(dom.DEBOUNCE); + + self.$target[0].classList.add("d-none"); + self.$target[0].parentElement + .querySelector(".s_website_form_end_message") + .classList.remove("d-none"); + break; + } + default: { + // Prevent double-clicking on the send button and + // add a upload loading effect (delay before success + // message) + await concurrency.delay(dom.DEBOUNCE); + + self.update_status("success"); + break; + } + } + + self.$target[0].reset(); + self.restoreBtnLoading(); + } + }) + .guardedCatch((error) => { + this.update_status( + "error", + error.status && error.status === 413 + ? _t("Uploaded file is too large.") + : "" + ); + }); + }, + }); +}); diff --git a/website_recaptcha_v2_form/static/src/snippets/s_website_form/options.js b/website_recaptcha_v2_form/static/src/snippets/s_website_form/options.js new file mode 100644 index 0000000000..e9cffdefaa --- /dev/null +++ b/website_recaptcha_v2_form/static/src/snippets/s_website_form/options.js @@ -0,0 +1,44 @@ +odoo.define("website_recaptcha_v2_form.form_editor", function (require) { + "use strict"; + + var options = require("web_editor.snippets.options"); + const core = require("web.core"); + const rpc = require("web.rpc"); + const qweb = core.qweb; + require("website.form_editor"); + + options.registry.WebsiteFormEditor.include({ + willStart: async function () { + var res = this._super(...arguments); + this.recaptcha_site_key = await rpc.query({ + model: "website", + method: "get_recaptcha_v2_site_key", + }); + return res; + }, + toggleRecaptchaV2: async function () { + const recaptchaV2 = this.$target[0].querySelector( + ".s_website_form_recaptcha_v2" + ); + if (recaptchaV2) { + recaptchaV2.remove(); + } else { + const legal = qweb.render("website_recaptcha_v2_form.recaptcha_v2", { + recaptcha_site_key: this.recaptcha_site_key, + }); + this.$target.find(".s_website_form_submit").before(legal); + } + }, + _computeWidgetState: function (methodName, params) { + switch (methodName) { + case "toggleRecaptchaV2": + return ( + !this.$target[0].querySelector( + ".s_website_form_recaptcha_v2" + ) || "" + ); + } + return this._super(methodName, params); + }, + }); +}); diff --git a/website_recaptcha_v2_form/static/src/xml/website_form_editor.xml b/website_recaptcha_v2_form/static/src/xml/website_form_editor.xml new file mode 100644 index 0000000000..02150a753f --- /dev/null +++ b/website_recaptcha_v2_form/static/src/xml/website_form_editor.xml @@ -0,0 +1,24 @@ + + + + +
+ +