0003-fields-prefill-users-phone-number-value-69838.patch

Paul Marillonnet, 29 novembre 2022 10:05

Voir les différences: en ligne côte à côte

Subject: [PATCH 3/4] fields: prefill users' phone number value (#69838)

 tests/form_pages/test_all.py | 91 +++++++++++++++++++++++++++++++++---
 tests/test_prefill.py        | 51 +++++++++++++++++++-
 wcs/fields.py                |  6 +++
 wcs/users.py                 | 20 ++++++++
 4 files changed, 161 insertions(+), 7 deletions(-)

     from webtest import Hidden, Radio, Upload
     from wcs import fields
     from wcs.admin.settings import UserFieldsFormDef
     from wcs.blocks import BlockDef
     from wcs.carddef import CardDef
     from wcs.categories import Category
-...
         pub = create_temporary_pub(lazy_mode=bool('lazy' in request.param))
         pub.cfg['identification'] = {'methods': ['password']}
         pub.cfg['language'] = {'language': 'en'}
         pub.cfg['users'] = {
             'field_phone': '_phone',
+        }
         pub.write_cfg()
         formdef = UserFieldsFormDef(pub)
         formdef.fields = [fields.StringField(id='_phone', label='phone', type='string', varname='phone')]
         formdef.store()
         Category.wipe()
         cat = Category(name='foobar')
         cat.store()
-...
         user = pub.user_class()
         user.name = 'User Name'
         user.email = 'foo@localhost'
         user.form_data = {'_phone': '+33123456789'}
         user.store()
         account = PasswordAccount(id='foo')
         account.set_password('foo')
-...
         resp = app.get('/code/%s/load' % tracking_code, headers={'User-agent': 'Googlebot'}, status=403)
     def test_form_phone_prefill(pub, nocache):
         create_user(pub)
         formdef = create_formdef()
         formdef.data_class().wipe()
         formdef.fields = [fields.StringField(id='0', label='string', prefill={'type': 'user', 'value': 'phone'})]
         formdef.store()
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         assert resp.pyquery('input#form_f0').val() == '01 23 45 67 89'
         resp.forms[0]['f0'] = '+33987654321'
         resp = resp.forms[0].submit('submit')
         assert resp.pyquery('button.form-submit').val() == 'Submit'
     def test_form_phone_prefill_phone_fr_validation(pub, nocache):
         create_user(pub)
         pub.load_site_options()
         if not pub.site_options.has_section('options'):
             pub.site_options.add_section('options')
         pub.site_options.set('options', 'default-country-code', 'FR')
         with open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w') as fd:
             pub.site_options.write(fd)
         formdef = create_formdef()
         formdef.data_class().wipe()
         field = fields.StringField(id='0', label='string', prefill={'type': 'user', 'value': 'phone'})
         field.validation = {'type': 'phone-fr'}
         formdef.fields = [field]
         formdef.store()
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         assert resp.pyquery('input#form_f0').val() == '01 23 45 67 89'
         resp.forms[0]['f0'] = '0987654321'
         resp = resp.forms[0].submit('submit')
         assert resp.pyquery('button.form-submit').val() == 'Submit'
     def test_form_phone_prefill_phone_validation(pub, nocache):
         user = create_user(pub)
         pub.load_site_options()
         if not pub.site_options.has_section('options'):
             pub.site_options.add_section('options')
         pub.site_options.set('options', 'default-country-code', 'BE')
         with open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w') as fd:
             pub.site_options.write(fd)
         formdef = create_formdef()
         formdef.data_class().wipe()
         field = fields.StringField(id='0', label='string', prefill={'type': 'user', 'value': 'phone'})
         field.validation = {'type': 'phone'}
         formdef.fields = [field]
         formdef.store()
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         assert resp.pyquery('input#form_f0').val() == '01 23 45 67 89'
         resp.forms[0]['f0'] = '0987654321'
         resp = resp.forms[0].submit('submit')
         assert resp.pyquery('button.form-submit').val() == 'Submit'
         user.form_data['_phone'] = '+3281000000'
         user.store()
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         assert resp.pyquery('input#form_f0').val() == '081 00 00 00'
         resp.forms[0]['f0'] = '0987654321'
         resp = resp.forms[0].submit('submit')
         assert resp.pyquery('button.form-submit').val() == 'Submit'
         user.form_data['_phone'] = '+99981000000'
         user.store()
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         assert resp.pyquery('input#form_f0').val() == '+99981000000'
         resp.forms[0]['f0'] = '0987654321'
         resp = resp.forms[0].submit('submit')
         assert resp.pyquery('button.form-submit').val() == 'Submit'
     def test_form_tracking_code_prefill(pub, nocache):
         create_user(pub)
         formdef = create_formdef()
-...
     def test_form_page_profile_first_name_prefill(pub):
         user = create_user(pub)
         from wcs.admin.settings import UserFieldsFormDef
         user_formdef = UserFieldsFormDef(pub)
         user_formdef.fields = [
             fields.StringField(
-...
     def test_form_page_profile_verified_date_prefill(pub):
         user = create_user(pub)
         from wcs.admin.settings import UserFieldsFormDef
         user_formdef = UserFieldsFormDef(pub)
         user_formdef.fields.append(fields.DateField(id='_date', label='date', type='date'))
         user_formdef.store()
-...
     def test_form_page_profile_date_as_locked_string_prefill(pub):
         user = create_user(pub)
         from wcs.admin.settings import UserFieldsFormDef
         user_formdef = UserFieldsFormDef(pub)
         user_formdef.fields.append(fields.DateField(id='_date', label='date', type='date'))
         user_formdef.store()

     import datetime
     import os
     import shutil
     import pytest
-...
         req = HTTPRequest(None, {'SCRIPT_NAME': '/', 'SERVER_NAME': 'example.net'})
         pub._set_request(req)
         pub.cfg['users'] = {
             'field_phone': '_phone',
+        }
         pub.write_cfg()
     @pytest.fixture
-...
         pub.user_class.wipe()
         user = pub.user_class(name='user')
         user.email = 'test@example.net'
         user.form_data = {'_phone': '+33123456789'}
         user.store()
         get_request()._user = user
         return user
-...
         assert field.get_prefill_value() == ('{{cards|objects:"unknown"|first|get:"foo"}}', False)
     def test_prefill_user(user):
     def test_prefill_user_email(user):
         field = fields.Field()
         field.prefill = {'type': 'user', 'value': 'email'}
         assert field.get_prefill_value(user=get_request().user) == ('test@example.net', False)
     def test_prefill_user_phone(user):
         field = fields.Field()
         field.prefill = {'type': 'user', 'value': 'phone'}
         assert field.get_prefill_value(user=get_request().user) == ('01 23 45 67 89', False)
     def test_prefill_user_phone_fr_validation(user):
         pub.load_site_options()
         if not pub.site_options.has_section('options'):
             pub.site_options.add_section('options')
         pub.site_options.set('options', 'default-country-code', 'FR')
         with open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w') as fd:
             pub.site_options.write(fd)
         field = fields.Field()
         field.validation = {'type': 'phone-fr'}
         field.prefill = {'type': 'user', 'value': 'phone'}
         assert field.get_prefill_value(user=get_request().user) == ('01 23 45 67 89', False)
     def test_prefill_user_phone_validation(user):
         pub.load_site_options()
         if not pub.site_options.has_section('options'):
             pub.site_options.add_section('options')
         pub.site_options.set('options', 'default-country-code', 'BE')
         with open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w') as fd:
             pub.site_options.write(fd)
         field = fields.Field()
         field.validation = {'type': 'phone'}
         field.prefill = {'type': 'user', 'value': 'phone'}
         assert field.get_prefill_value(user=get_request().user) == ('01 23 45 67 89', False)
         user = get_request().user
         user.form_data['_phone'] = '+3281000000'
         user.store()
         assert field.get_prefill_value(user=get_request().user) == ('081 00 00 00', False)
         user.form_data['_phone'] = '+99981000000'
         user.store()
         assert field.get_prefill_value(user=get_request().user) == ('+99981000000', False)
     def test_prefill_user_attribute(user):
         from wcs.admin.settings import UserFieldsFormDef

                 x = self.prefill.get('value')
                 if x == 'email':
                     return (user.email, explicit_lock or 'email' in (user.verified_fields or []))
                 elif x == 'phone':
                     country_code = get_publisher().get_site_option('default-country-code')
                     if getattr(self, 'validation', None) and self.validation.get('type') == 'phone-fr':
                         country_code = 'FR'
                     phone = user.get_formatted_phone(country_code=country_code)
                     return (phone, explicit_lock or 'phone' in (user.verified_fields or []))
                 elif user.form_data:
                     userform = user.get_formdef()
                     for userfield in userform.fields:

     import json
     import urllib.parse
     import phonenumbers
     from quixote import get_publisher
     import wcs.qommon.storage as st
-...
             self.verified_fields = []
             self.roles = []
         def get_formatted_phone(self, country_code):
             users_cfg = get_cfg('users', {})
             field_phone = users_cfg.get('field_phone')
             if not field_phone:
                 return
             phone = self.form_data.get(field_phone)
             try:
                 pn = phonenumbers.parse(phone)
             except phonenumbers.NumberParseException:
                 try:
                     pn = phonenumbers.parse(phone, country_code)
                 except phonenumbers.NumberParseException:
                     return phone
             if phonenumbers.is_valid_number(pn):
                 return phonenumbers.format_number(pn, phonenumbers.PhoneNumberFormat.NATIONAL)
             else:
                 return phone
         @invalidate_substitution_cache
         def store(self, *args, **kwargs):
             return super().store(*args, **kwargs)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0003-fields-prefill-users-phone-number-value-69838.patch