From 2ce540fb3fde011113d5939750ac4db92a7b237a Mon Sep 17 00:00:00 2001 From: Elijah Date: Wed, 31 Jan 2024 10:55:09 +0100 Subject: [PATCH 01/39] Updated pipeline to run testing job on pull requests against main and release --- .gitea/workflows/ci-pipeline.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/ci-pipeline.yaml b/.gitea/workflows/ci-pipeline.yaml index a39158c..f7d4633 100644 --- a/.gitea/workflows/ci-pipeline.yaml +++ b/.gitea/workflows/ci-pipeline.yaml @@ -6,6 +6,10 @@ on: - main - release - testing-pipeline + pull_request: + branches: + - main + - release jobs: test: From fb41f1b2fe6f011288a3e94651b02e702d97b0f1 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 1 Feb 2024 13:32:28 +0100 Subject: [PATCH 02/39] add 3 checkbox for terms and conditions --- idhub/admin/views.py | 2 +- idhub/templates/idhub/user/profile.html | 7 +++- .../idhub/user/terms_conditions.html | 38 +++++++------------ idhub/user/forms.py | 38 +++++++++++++++++-- idhub/user/views.py | 16 +++++++- 5 files changed, 70 insertions(+), 31 deletions(-) diff --git a/idhub/admin/views.py b/idhub/admin/views.py index 3773cab..77c83b4 100644 --- a/idhub/admin/views.py +++ b/idhub/admin/views.py @@ -62,7 +62,7 @@ class TermsAndConditionsView(AdminView, FormView): template_name = "idhub/admin/terms_conditions.html" title = _("GDPR") section = "" - subtitle = _('Accept Terms and Conditions') + subtitle = _('Terms and Conditions') icon = 'bi bi-file-earmark-medical' form_class = TermsConditionsForm success_url = reverse_lazy('idhub:admin_dashboard') diff --git a/idhub/templates/idhub/user/profile.html b/idhub/templates/idhub/user/profile.html index 6efdc48..cfbc4b9 100644 --- a/idhub/templates/idhub/user/profile.html +++ b/idhub/templates/idhub/user/profile.html @@ -11,7 +11,12 @@
- {% trans 'ARCO Forms' %} + {% if lang == 'es' %} + {% trans 'ARCO Forms' %} + {% else %} + {% trans 'ARCO Forms' %} + {% endif %} + {% trans 'Notice of Privacy' %}
diff --git a/idhub/templates/idhub/user/terms_conditions.html b/idhub/templates/idhub/user/terms_conditions.html index 8a02175..f021b4d 100644 --- a/idhub/templates/idhub/user/terms_conditions.html +++ b/idhub/templates/idhub/user/terms_conditions.html @@ -20,38 +20,28 @@ {% endif %} -
+
- You must read the terms and conditions of this service and accept the - Read GDPR + {{ form.accept_privacy }} + {{ form.privacy_label|safe }}
-
-
- {% bootstrap_form form %} +
+
+ {{ form.accept_legal }} + {{ form.legal_label|safe }}
-
+
+
+ {{ form.accept_cookies }} + {{ form.cookies_label|safe }} +
+
+
{% translate "Cancel" %}
- - {% endblock %} diff --git a/idhub/user/forms.py b/idhub/user/forms.py index bad06be..0c16171 100644 --- a/idhub/user/forms.py +++ b/idhub/user/forms.py @@ -15,8 +15,16 @@ class ProfileForm(forms.ModelForm): class TermsConditionsForm(forms.Form): - accept = forms.BooleanField( - label=_("Accept terms and conditions of the service"), + accept_privacy = forms.BooleanField( + widget=forms.CheckboxInput(attrs={'class': 'form-check-input'}), + required=False + ) + accept_legal = forms.BooleanField( + widget=forms.CheckboxInput(attrs={'class': 'form-check-input'}), + required=False + ) + accept_cookies = forms.BooleanField( + widget=forms.CheckboxInput(attrs={'class': 'form-check-input'}), required=False ) @@ -24,9 +32,33 @@ class TermsConditionsForm(forms.Form): self.user = kwargs.pop('user', None) super().__init__(*args, **kwargs) + def get_label(self, url, read): + label = _('You must read the terms and conditions of this service and accept the') + label += f' {read}' + return label + + def privacy_label(self): + url = "https://laweb.pangea.org/politica-de-privacitat/" + read = _("Read privacy policy") + return self.get_label(url, read) + + def legal_label(self): + url = "https://laweb.pangea.org/avis-legal/" + read = _("Read legal policy") + return self.get_label(url, read) + + def cookies_label(self): + url = "https://laweb.pangea.org/politica-de-cookies-2/" + read = _("Read cookies policy") + return self.get_label(url, read) + def clean(self): data = self.cleaned_data - if data.get("accept"): + privacy = data.get("accept_privacy") + legal = data.get("accept_legal") + cookies = data.get("accept_cookies") + if privacy and legal and cookies: self.user.accept_gdpr = True else: self.user.accept_gdpr = False diff --git a/idhub/user/views.py b/idhub/user/views.py index 82c5337..fcd622d 100644 --- a/idhub/user/views.py +++ b/idhub/user/views.py @@ -100,6 +100,13 @@ class ProfileView(MyProfile, UpdateView, SingleTableView): def form_valid(self, form): return super().form_valid(form) + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({ + 'lang': self.request.LANGUAGE_CODE, + }) + return context class RolesView(MyProfile, SingleTableView): @@ -137,7 +144,7 @@ class TermsAndConditionsView(UserView, FormView): template_name = "idhub/user/terms_conditions.html" title = _("GDPR") section = "" - subtitle = _('Accept Terms and Conditions') + subtitle = _('Terms and Conditions') icon = 'bi bi-file-earmark-medical' form_class = TermsConditionsForm success_url = reverse_lazy('idhub:user_dashboard') @@ -145,7 +152,12 @@ class TermsAndConditionsView(UserView, FormView): def get_form_kwargs(self): kwargs = super().get_form_kwargs() kwargs['user'] = self.request.user - kwargs['initial'] = {"accept": self.request.user.accept_gdpr} + if self.request.user.accept_gdpr: + kwargs['initial'] = { + "accept_privacy": True, + "accept_legal": True, + "accept_cookies": True + } return kwargs def form_valid(self, form): From 1026762190f8118405537648978c08b2c7a2c101 Mon Sep 17 00:00:00 2001 From: Elijah Date: Thu, 1 Feb 2024 21:04:08 +0100 Subject: [PATCH 03/39] Test calling build script from passing pipeline --- .gitea/workflows/ci-pipeline.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitea/workflows/ci-pipeline.yaml b/.gitea/workflows/ci-pipeline.yaml index f7d4633..6154ab1 100644 --- a/.gitea/workflows/ci-pipeline.yaml +++ b/.gitea/workflows/ci-pipeline.yaml @@ -69,3 +69,17 @@ jobs: source venv/bin/activate python manage.py test + + deploy: + needs: test + runs-on: self-hosted + steps: + - uses: actions/checkout@v4 + - name: Trigger Remote Script + run: | + response=$(curl -s -o /dev/null -w "%{http_code}" -X POST http://your-server-ip:5000/trigger-script -H "Authorization: SecretToken") + if [ "$response" -ne 200 ]; then + echo "Script execution failed with HTTP status $response" + exit 1 + fi + if: success() && github.ref == 'refs/heads/main' From 186d7e33a660e7c0540e48ec302cb57a15674cfa Mon Sep 17 00:00:00 2001 From: Elijah Date: Thu, 1 Feb 2024 21:05:28 +0100 Subject: [PATCH 04/39] Fix script step --- .gitea/workflows/ci-pipeline.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/ci-pipeline.yaml b/.gitea/workflows/ci-pipeline.yaml index 6154ab1..ef60af2 100644 --- a/.gitea/workflows/ci-pipeline.yaml +++ b/.gitea/workflows/ci-pipeline.yaml @@ -77,9 +77,9 @@ jobs: - uses: actions/checkout@v4 - name: Trigger Remote Script run: | - response=$(curl -s -o /dev/null -w "%{http_code}" -X POST http://your-server-ip:5000/trigger-script -H "Authorization: SecretToken") - if [ "$response" -ne 200 ]; then + response=$(curl -s -o /dev/null -w "%{http_code}" -X POST http://your-server-ip:5000/trigger-script -H "Authorization: SecretToken") + if [ "$response" -ne 200 ]; then echo "Script execution failed with HTTP status $response" exit 1 - fi - if: success() && github.ref == 'refs/heads/main' + fi + if: success() && github.ref == 'refs/heads/main' From 2c720e80ab62625d374deaf708418d21d9e93a76 Mon Sep 17 00:00:00 2001 From: Elijah Date: Thu, 1 Feb 2024 21:21:10 +0100 Subject: [PATCH 05/39] Fix deploy job exit codes and webhook ip --- .gitea/workflows/ci-pipeline.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ci-pipeline.yaml b/.gitea/workflows/ci-pipeline.yaml index ef60af2..4cf964f 100644 --- a/.gitea/workflows/ci-pipeline.yaml +++ b/.gitea/workflows/ci-pipeline.yaml @@ -77,9 +77,12 @@ jobs: - uses: actions/checkout@v4 - name: Trigger Remote Script run: | - response=$(curl -s -o /dev/null -w "%{http_code}" -X POST http://your-server-ip:5000/trigger-script -H "Authorization: SecretToken") + response=$(curl -s -o /dev/null -w "%{http_code}" -X POST http://45.150.187.54:5000/trigger-script -H "Authorization: SecretToken") if [ "$response" -ne 200 ]; then echo "Script execution failed with HTTP status $response" exit 1 + else + echo "Script execution successful" + exit 0 fi if: success() && github.ref == 'refs/heads/main' From 9a90d87d69b9a333a560474286775651f31606a5 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 2 Feb 2024 09:18:15 +0100 Subject: [PATCH 06/39] fix setem fluw --- oidc4vp/views.py | 3 +-- promotion/forms.py | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/oidc4vp/views.py b/oidc4vp/views.py index d6eec81..7161aed 100644 --- a/oidc4vp/views.py +++ b/oidc4vp/views.py @@ -137,8 +137,7 @@ class VerifyView(View): vp_token.verifing() response = vp_token.get_response_verify() vp_token.save() - if not vp_token.authorization.promotions.exists(): - response["response"] = "Validation Code {}".format(code) + response["response"] = "Validation Code {}".format(code) return JsonResponse(response) diff --git a/promotion/forms.py b/promotion/forms.py index 5b96423..30dce87 100644 --- a/promotion/forms.py +++ b/promotion/forms.py @@ -14,7 +14,10 @@ from promotion.models import Promotion class WalletForm(forms.Form): - organization = forms.ChoiceField(choices=[]) + organization = forms.ChoiceField( + choices=[], + widget=forms.Select(attrs={'class': 'form-select'}) + ) def __init__(self, *args, **kwargs): self.presentation_definition = kwargs.pop('presentation_definition', []) From 3d7741f3dffed5827f6f9d856c5c6548a17443e7 Mon Sep 17 00:00:00 2001 From: Elijah Date: Fri, 2 Feb 2024 09:21:19 +0100 Subject: [PATCH 07/39] Print git refs to check if the deploy job is entering the if statement --- .gitea/workflows/ci-pipeline.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitea/workflows/ci-pipeline.yaml b/.gitea/workflows/ci-pipeline.yaml index 4cf964f..3b62690 100644 --- a/.gitea/workflows/ci-pipeline.yaml +++ b/.gitea/workflows/ci-pipeline.yaml @@ -75,6 +75,13 @@ jobs: runs-on: self-hosted steps: - uses: actions/checkout@v4 + + - name: Check refs + run: | + echo $GITHUB_REF_NAME + echo $GITHUB_REF + echo $GITHUB_REF_TYPE + - name: Trigger Remote Script run: | response=$(curl -s -o /dev/null -w "%{http_code}" -X POST http://45.150.187.54:5000/trigger-script -H "Authorization: SecretToken") From 8c21ae3b1eda93719ae7a69da8bfda2f34ebea8e Mon Sep 17 00:00:00 2001 From: Elijah Date: Fri, 2 Feb 2024 09:25:44 +0100 Subject: [PATCH 08/39] Add dummy if statement to ensure it works --- .gitea/workflows/ci-pipeline.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/ci-pipeline.yaml b/.gitea/workflows/ci-pipeline.yaml index 3b62690..f69fe5f 100644 --- a/.gitea/workflows/ci-pipeline.yaml +++ b/.gitea/workflows/ci-pipeline.yaml @@ -81,6 +81,7 @@ jobs: echo $GITHUB_REF_NAME echo $GITHUB_REF echo $GITHUB_REF_TYPE + if: success() && github.ref == 'refs/heads/testing-pipeline' - name: Trigger Remote Script run: | From bc46ca851efd17e71ad079db1212244dcff2c413 Mon Sep 17 00:00:00 2001 From: Elijah Date: Fri, 2 Feb 2024 09:36:04 +0100 Subject: [PATCH 09/39] Remove main branch check to test webhook --- .gitea/workflows/ci-pipeline.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitea/workflows/ci-pipeline.yaml b/.gitea/workflows/ci-pipeline.yaml index f69fe5f..844c50f 100644 --- a/.gitea/workflows/ci-pipeline.yaml +++ b/.gitea/workflows/ci-pipeline.yaml @@ -76,13 +76,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Check refs - run: | - echo $GITHUB_REF_NAME - echo $GITHUB_REF - echo $GITHUB_REF_TYPE - if: success() && github.ref == 'refs/heads/testing-pipeline' - - name: Trigger Remote Script run: | response=$(curl -s -o /dev/null -w "%{http_code}" -X POST http://45.150.187.54:5000/trigger-script -H "Authorization: SecretToken") @@ -93,4 +86,4 @@ jobs: echo "Script execution successful" exit 0 fi - if: success() && github.ref == 'refs/heads/main' + #if: success() && github.ref == 'refs/heads/main' From fe82e261e92bb4dd04d2e53d97496013d6ad0f32 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 2 Feb 2024 10:11:25 +0100 Subject: [PATCH 10/39] change color select setem --- promotion/templates/select_wallet_setem.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/promotion/templates/select_wallet_setem.html b/promotion/templates/select_wallet_setem.html index 5861f15..5b4104e 100644 --- a/promotion/templates/select_wallet_setem.html +++ b/promotion/templates/select_wallet_setem.html @@ -36,7 +36,7 @@ -
+
From 04fda4e9bc14867a0c61f6de9f3c522d481c008d Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 2 Feb 2024 10:12:11 +0100 Subject: [PATCH 11/39] fix eye for credential user table --- idhub/user/tables.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/idhub/user/tables.py b/idhub/user/tables.py index 28045e9..eacdcb8 100644 --- a/idhub/user/tables.py +++ b/idhub/user/tables.py @@ -117,6 +117,13 @@ class DIDTable(tables.Table): class CredentialsTable(tables.Table): description = tables.Column(verbose_name="Details", empty_values=()) + view_credential = ButtonColumn( + linkify={ + "viewname": "idhub:user_credential", + "args": [tables.A("pk")] + }, + orderable=False + ) def render_description(self, record): return record.get_description() @@ -131,6 +138,9 @@ class CredentialsTable(tables.Table): return (queryset, True) + def render_view_credential(self): + return format_html('') + class Meta: model = VerificableCredential template_name = "idhub/custom_table.html" From 18d26de9ce0421e5db52036d68b460fab5675a38 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 2 Feb 2024 15:40:52 +0100 Subject: [PATCH 12/39] fix reset password --- idhub/admin/views.py | 6 ++++-- idhub/urls.py | 19 ++----------------- idhub/views.py | 26 ++++++++++++++++++++++++-- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/idhub/admin/views.py b/idhub/admin/views.py index 77c83b4..c4cac98 100644 --- a/idhub/admin/views.py +++ b/idhub/admin/views.py @@ -25,7 +25,7 @@ from django.contrib import messages from utils import credtools from idhub_auth.models import User from idhub_auth.forms import ProfileForm -from idhub.mixins import AdminView +from idhub.mixins import AdminView, Http403 from idhub.email.views import NotifyActivateUserByEmail from idhub.admin.forms import ( ImportForm, @@ -82,7 +82,9 @@ class DobleFactorAuthView(AdminView, View): url = reverse_lazy('idhub:admin_dashboard') def get(self, request, *args, **kwargs): - self.check_valid_user() + if not self.request.user.is_admin: + raise Http403() + if not self.request.session.get("2fauth"): return redirect(self.url) diff --git a/idhub/urls.py b/idhub/urls.py index d107b3f..30338b3 100644 --- a/idhub/urls.py +++ b/idhub/urls.py @@ -19,6 +19,7 @@ from django.views.generic import RedirectView from django.urls import path, reverse_lazy from .views import ( LoginView, + PasswordResetView, PasswordResetConfirmView, serve_did, DobleFactorSendView, @@ -34,16 +35,7 @@ urlpatterns = [ permanent=False)), path('login/', LoginView.as_view(), name='login'), path('logout/', auth_views.LogoutView.as_view(), name='logout'), - path('auth/password_reset/', - auth_views.PasswordResetView.as_view( - template_name='auth/password_reset.html', - email_template_name='auth/password_reset_email.txt', - html_email_template_name='auth/password_reset_email.html', - subject_template_name='auth/password_reset_subject.txt', - success_url=reverse_lazy('idhub:password_reset_done') - ), - name='password_reset' - ), + path('auth/password_reset/', PasswordResetView.as_view(), name='password_reset'), path('auth/password_reset/done/', auth_views.PasswordResetDoneView.as_view( template_name='auth/password_reset_done.html' @@ -53,13 +45,6 @@ urlpatterns = [ path('auth/reset///', PasswordResetConfirmView.as_view(), name='password_reset_confirm' ), - # path('auth/reset///', - # auth_views.PasswordResetConfirmView.as_view( - # template_name='auth/password_reset_confirm.html', - # success_url=reverse_lazy('idhub:password_reset_complete') - # ), - # name='password_reset_confirm' - # ), path('auth/reset/done/', auth_views.PasswordResetCompleteView.as_view( template_name='auth/password_reset_complete.html' diff --git a/idhub/views.py b/idhub/views.py index 9c2d595..b161633 100644 --- a/idhub/views.py +++ b/idhub/views.py @@ -1,4 +1,5 @@ import uuid +import logging from django.conf import settings from django.core.cache import cache @@ -16,6 +17,9 @@ from idhub.email.views import NotifyActivateUserByEmail from trustchain_idhub import settings +logger = logging.getLogger(__name__) + + class LoginView(auth_views.LoginView): template_name = 'auth/login.html' extra_context = { @@ -69,13 +73,31 @@ class PasswordResetConfirmView(auth_views.PasswordResetConfirmView): success_url = reverse_lazy('idhub:password_reset_complete') def form_valid(self, form): - password = form.cleaned_data.get("password") - user = form.get_user() + password = form.cleaned_data.get("new_password1") + user = form.user + user.set_password(password) user.set_encrypted_sensitive_data(password) user.save() return HttpResponseRedirect(self.success_url) +class PasswordResetView(auth_views.PasswordResetView): + template_name = 'auth/password_reset.html' + email_template_name = 'auth/password_reset_email.txt' + html_email_template_name = 'auth/password_reset_email.html' + subject_template_name = 'auth/password_reset_subject.txt' + success_url = reverse_lazy('idhub:password_reset_done') + + def form_valid(self, form): + try: + return super().form_valid(form) + except Exception as err: + logger.error(err) + # url_error = reverse_lazy('idhub:password_reset_error') + # return HttpResponseRedirect(url_error) + return HttpResponseRedirect(self.success_url) + + def serve_did(request, did_id): id_did = f'did:web:{settings.DOMAIN}:did-registry:{did_id}' did = get_object_or_404(DID, did=id_did) From 426ddf9aaafbb72d89da5fa7b9dab0c4d974c3dd Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 2 Feb 2024 16:16:35 +0100 Subject: [PATCH 13/39] fix schema loads --- idhub/admin/views.py | 19 ++-- schemas/device-purchase.json | 176 ----------------------------------- 2 files changed, 10 insertions(+), 185 deletions(-) delete mode 100644 schemas/device-purchase.json diff --git a/idhub/admin/views.py b/idhub/admin/views.py index c4cac98..31a9994 100644 --- a/idhub/admin/views.py +++ b/idhub/admin/views.py @@ -907,19 +907,20 @@ class SchemasImportAddView(SchemasMix): def get(self, request, *args, **kwargs): self.check_valid_user() - file_name = kwargs['file_schema'] + self.file_name = kwargs['file_schema'] schemas_files = os.listdir(settings.SCHEMAS_DIR) - if file_name not in schemas_files: + if self.file_name not in schemas_files: + file_name = self.file_name messages.error(self.request, f"The schema {file_name} not exist!") return redirect('idhub:admin_schemas_import') - schema = self.create_schema(file_name) + schema = self.create_schema() if schema: messages.success(self.request, _("The schema was added sucessfully")) return redirect('idhub:admin_schemas') - def create_schema(self, file_name): - data = self.open_file(file_name) + def create_schema(self): + data = self.open_file() try: ldata = json.loads(data) assert credtools.validate_schema(ldata) @@ -935,7 +936,7 @@ class SchemasImportAddView(SchemasMix): _description = json.dumps(ldata.get('description', '')) schema = Schemas.objects.create( - file_schema=file_name, + file_schema=self.file_name, data=data, type=title, _name=_name, @@ -946,9 +947,9 @@ class SchemasImportAddView(SchemasMix): schema.save() return schema - def open_file(self, file_name): + def open_file(self): data = '' - filename = Path(settings.SCHEMAS_DIR).joinpath(file_name) + filename = Path(settings.SCHEMAS_DIR).joinpath(self.file_name) with filename.open() as schema_file: data = schema_file.read() @@ -957,7 +958,7 @@ class SchemasImportAddView(SchemasMix): def get_template_description(self): context = {} template_name = 'credentials/{}'.format( - self.schema.file_schema + self.file_name ) tmpl = get_template(template_name) return tmpl.render(context) diff --git a/schemas/device-purchase.json b/schemas/device-purchase.json deleted file mode 100644 index 6267ae9..0000000 --- a/schemas/device-purchase.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "$id": "https://idhub.pangea.org/vc_schemas/devicePurchase.json", - "$schema": "https://json-schema.org/draft/2020-12/schema", - "title": "Purchase of an eReuse device", - "description": "A device purchase credential is a proof of purchase of a device from a seller by a buyer", - "name": [ - { - "value": "Device purchase credential", - "lang": "en" - }, - { - "value": "Credencial d'adquisició d'un dispositiu", - "lang": "ca_ES" - }, - { - "value": "Credencial de adquisición de un dispositivo", - "lang": "es" - } - ], - "type": "object", - "allOf": [ - { - "$ref": "https://idhub.pangea.org/vc_schemas/ebsi/attestation.json" - }, - { - "properties": { - "credentialSubject": { - "description": "Defines additional properties on credentialSubject: the purchase act, to qualify as simplified invoice (ES)", - "type": "object", - "properties": { - "id": { - "description": "Defines a unique identifier (DID) of the credential subject: the purchase act/transaction", - "type": "string" - }, - "invoiceNumber": { - "description": "The invoice number of the purchase act/transaction", - "type": "string" - }, - "totalAmount": { - "description": "The total amount of the transaction in local currency units: Euro by default", - "type": "string" - }, - "sellerId": { - "description": "Defines a unique identifier (DID) of the seller actor", - "type": "string" - }, - "sellerBusinessName": { - "description": "Business name of the credential subject in the seller role", - "type": "string" - }, - "sellerName": { - "description": "Name of the credential subject in the seller role", - "type": "string" - }, - "sellerSurname": { - "description": "Surname of the credential subject in the seller role, if natural person", - "type": "string" - }, - "sellerEmail": { - "type": "string", - "format": "email" - }, - "sellerPhoneNumber": { - "type": "string" - }, - "sellerIdentityDocType": { - "description": "Type of the Identity Document of the credential subject in the seller role", - "type": "string" - }, - "sellerIdentityNumber": { - "description": "Number of the Identity Document of the credential subject in the seller role", - "type": "string" - }, - "buyerId": { - "description": "Defines a unique identifier (DID) of the credential subject: the buyer actor", - "type": "string" - }, - "buyerBusinessName": { - "description": "Business name of the credential subject in the buyer role", - "type": "string" - }, - "buyerName": { - "description": "Name of the credential subject in the buyer role", - "type": "string" - }, - "buyerSurname": { - "description": "Surname of the credential subject in the buyer role, if natural person", - "type": "string" - }, - "buyerEmail": { - "type": "string", - "format": "email" - }, - "buyerPhoneNumber": { - "type": "string" - }, - "buyerIdentityDocType": { - "description": "Type of the Identity Document of the credential subject in the buyer role", - "type": "string" - }, - "buyerIdentityNumber": { - "description": "Number of the Identity Document of the credential subject in the buyer role", - "type": "string" - }, - "deliveryStreetAddress": { - "description": "Postal address of the credential Subject in the buyer role", - "type": "string" - }, - "deliveryPostCode": { - "description": "Postal code of the credential Subject in the buyer role", - "type": "string" - }, - "deliveryCity": { - "description": "City of the credential Subject in the buyer role", - "type": "string" - }, - "supplyDescription": { - "description": "Description of the product/device supplied, needed in a simplified invoice", - "type": "string" - }, - "taxRate": { - "description": "Description of Tax rate (VAT) and optionally also the expression VAT included, or special circumstances such as REBU, needed in a simplified invoice", - "type": "string" - }, - "deviceChassisId": { - "description": "Chassis identifier of the device", - "type": "string" - }, - "devicePreciseHardwareId": { - "description": "Chassis precise hardware configuration identifier of the device", - "type": "string" - }, - "depositId": { - "description": "Identifier of an economic deposit left on loan to be returned under conditions", - "type": "string" - }, - "sponsorId": { - "description": "Identifier of the sponsor of this purchase that paid the economic cost of the purchase", - "type": "string" - }, - "sponsorName": { - "description": "Name of the sponsor of this purchase that paid the economic cost of the purchase", - "type": "string" - }, - "purchaseDate": { - "type": "string", - "format": "date-time" - }, - "invoiceDate": { - "type": "string", - "format": "date-time" - } - }, - "required": [ - "id", - "invoiceNumber", - "totalAmount", - "sellerId", - "sellerName", - "sellerBusinessName", - "sellerSurname", - "sellerEmail", - "sellerIdentityDocType", - "sellerIdentityNumber", - "buyerId", - "buyerEmail", - "supplyDescription", - "taxRate", - "deviceChassisId", - "purchaseDate" - ] - } - } - } - ] -} \ No newline at end of file From 2d4273032c4325353a83820ed498d616d95b5b33 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 2 Feb 2024 18:01:59 +0100 Subject: [PATCH 14/39] fix upload excel --- idhub/admin/forms.py | 2 +- requirements.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/idhub/admin/forms.py b/idhub/admin/forms.py index 5476507..b8fcec4 100644 --- a/idhub/admin/forms.py +++ b/idhub/admin/forms.py @@ -189,7 +189,7 @@ class ImportForm(forms.Form): cred = VerificableCredential( verified=False, user=user, - csv_data=json.dumps(row), + csv_data=json.dumps(row, default=str), issuer_did=self._did, schema=self._schema, eidas1_did=self._eidas1 diff --git a/requirements.txt b/requirements.txt index 27dd8c6..db0d96e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,4 +27,5 @@ uharfbuzz==0.38.0 fontTools==4.47.0 weasyprint==60.2 ujson==5.9.0 +openpyxl==3.1.2 ./didkit-0.3.2-cp311-cp311-manylinux_2_34_x86_64.whl From a09d969dba530e9867fe6502d5a566c2b82a8324 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 5 Feb 2024 12:25:02 +0100 Subject: [PATCH 15/39] add terms and conditions for admin too --- idhub/admin/forms.py | 61 ++++++++++++++++++- idhub/admin/views.py | 9 ++- idhub/templates/auth/2fadmin.html | 4 +- idhub/templates/auth/2fadmin_email.html | 2 +- idhub/templates/auth/2fadmin_email.txt | 2 +- .../idhub/admin/terms_conditions.html | 56 +++++++++++++---- idhub/templates/idhub/base.html | 7 ++- .../idhub/user/terms_conditions.html | 44 ++++++++++++- idhub/user/forms.py | 2 +- idhub/user/views.py | 4 +- 10 files changed, 164 insertions(+), 27 deletions(-) diff --git a/idhub/admin/forms.py b/idhub/admin/forms.py index b8fcec4..1895195 100644 --- a/idhub/admin/forms.py +++ b/idhub/admin/forms.py @@ -23,7 +23,7 @@ from idhub.models import ( from idhub_auth.models import User -class TermsConditionsForm(forms.Form): +class TermsConditionsForm2(forms.Form): accept = forms.BooleanField( label=_("Accept terms and conditions of the service"), required=False @@ -50,6 +50,65 @@ class TermsConditionsForm(forms.Form): return +class TermsConditionsForm(forms.Form): + accept_privacy = forms.BooleanField( + widget=forms.CheckboxInput(attrs={'class': 'form-check-input'}), + required=False + ) + accept_legal = forms.BooleanField( + widget=forms.CheckboxInput(attrs={'class': 'form-check-input'}), + required=False + ) + accept_cookies = forms.BooleanField( + widget=forms.CheckboxInput(attrs={'class': 'form-check-input'}), + required=False + ) + + def __init__(self, *args, **kwargs): + self.user = kwargs.pop('user', None) + super().__init__(*args, **kwargs) + + def get_label(self, url, read): + label = _('I read and accepted the') + label += f' {read}' + return label + + def privacy_label(self): + url = "https://laweb.pangea.org/politica-de-privacitat/" + read = _("Read privacy policy") + return self.get_label(url, read) + + def legal_label(self): + url = "https://laweb.pangea.org/avis-legal/" + read = _("Read legal policy") + return self.get_label(url, read) + + def cookies_label(self): + url = "https://laweb.pangea.org/politica-de-cookies-2/" + read = _("Read cookies policy") + return self.get_label(url, read) + + def clean(self): + data = self.cleaned_data + privacy = data.get("accept_privacy") + legal = data.get("accept_legal") + cookies = data.get("accept_cookies") + if privacy and legal and cookies: + self.user.accept_gdpr = True + else: + self.user.accept_gdpr = False + return data + + def save(self, commit=True): + + if commit: + self.user.save() + return self.user + + return + + class ImportForm(forms.Form): did = forms.ChoiceField(label=_("Did"), choices=[]) eidas1 = forms.ChoiceField( diff --git a/idhub/admin/views.py b/idhub/admin/views.py index 31a9994..f680698 100644 --- a/idhub/admin/views.py +++ b/idhub/admin/views.py @@ -60,7 +60,7 @@ from idhub.models import ( class TermsAndConditionsView(AdminView, FormView): template_name = "idhub/admin/terms_conditions.html" - title = _("GDPR") + title = _('Data protection') section = "" subtitle = _('Terms and Conditions') icon = 'bi bi-file-earmark-medical' @@ -70,7 +70,12 @@ class TermsAndConditionsView(AdminView, FormView): def get_form_kwargs(self): kwargs = super().get_form_kwargs() kwargs['user'] = self.request.user - kwargs['initial'] = {"accept": self.request.user.accept_gdpr} + if self.request.user.accept_gdpr: + kwargs['initial'] = { + "accept_privacy": True, + "accept_legal": True, + "accept_cookies": True + } return kwargs def form_valid(self, form): diff --git a/idhub/templates/auth/2fadmin.html b/idhub/templates/auth/2fadmin.html index 4dc2ae6..e96d1b7 100644 --- a/idhub/templates/auth/2fadmin.html +++ b/idhub/templates/auth/2fadmin.html @@ -5,14 +5,14 @@
-

{% trans 'Doble Factor of Authentication' %}

+

{% trans 'Two-factor Authentication' %}

- {% trans "We have sent an email with a link that you have to select in order to login." %} + {% trans "We have sent you an email with a link that you have to click to log in." %}
diff --git a/idhub/templates/auth/2fadmin_email.html b/idhub/templates/auth/2fadmin_email.html index d2253c5..6ea0793 100644 --- a/idhub/templates/auth/2fadmin_email.html +++ b/idhub/templates/auth/2fadmin_email.html @@ -1,6 +1,6 @@ {% load i18n %}{% autoescape off %}

-{% blocktrans %}You're receiving this email because you try to access in {{ site_name }}.{% endblocktrans %} +{% blocktrans %}You're receiving this email because you tried to access {{ site_name }}.{% endblocktrans %}

diff --git a/idhub/templates/auth/2fadmin_email.txt b/idhub/templates/auth/2fadmin_email.txt index a9ef3e5..6328f66 100644 --- a/idhub/templates/auth/2fadmin_email.txt +++ b/idhub/templates/auth/2fadmin_email.txt @@ -1,5 +1,5 @@ {% load i18n %}{% autoescape off %} -{% blocktrans %}You're receiving this email because you try to access in {{ site_name }}.{% endblocktrans %} +{% blocktrans %}You're receiving this email because you tried to access {{ site_name }}.{% endblocktrans %} {% trans "Please go to the following page" %} {% block reset_link %} diff --git a/idhub/templates/idhub/admin/terms_conditions.html b/idhub/templates/idhub/admin/terms_conditions.html index 51f8b6c..c73f953 100644 --- a/idhub/templates/idhub/admin/terms_conditions.html +++ b/idhub/templates/idhub/admin/terms_conditions.html @@ -20,38 +20,68 @@

{% endif %} -
+ +
- You must read the terms and conditions of this service and accept the - Read GDPR + {{ form.accept_privacy }} + {{ form.privacy_label|safe }}
-
-
- {% bootstrap_form form %} +
+
+ {{ form.accept_legal }} + {{ form.legal_label|safe }}
-
- {% translate "Cancel" %} - +
+
+ {{ form.accept_cookies }} + {{ form.cookies_label|safe }} +
+
+
+ {% trans 'Confirm' %}
- + +{% endblock %} + +{% block extrascript %} + {% endblock %} diff --git a/idhub/templates/idhub/base.html b/idhub/templates/idhub/base.html index e579a81..c2524ad 100644 --- a/idhub/templates/idhub/base.html +++ b/idhub/templates/idhub/base.html @@ -88,7 +88,7 @@
  • - {% trans 'GDPR info' %} + {% trans 'Data protection' %}
    • @@ -150,9 +150,12 @@
    + {% block script %} + - + {% block extrascript %}{% endblock %} + {% endblock %} diff --git a/idhub/templates/idhub/user/terms_conditions.html b/idhub/templates/idhub/user/terms_conditions.html index f021b4d..4175a60 100644 --- a/idhub/templates/idhub/user/terms_conditions.html +++ b/idhub/templates/idhub/user/terms_conditions.html @@ -39,9 +39,49 @@
    - {% translate "Cancel" %} - + {% trans 'Confirm' %}
    + + {% endblock %} + +{% block extrascript %} + +{% endblock %} diff --git a/idhub/user/forms.py b/idhub/user/forms.py index 0c16171..79e3d17 100644 --- a/idhub/user/forms.py +++ b/idhub/user/forms.py @@ -33,7 +33,7 @@ class TermsConditionsForm(forms.Form): super().__init__(*args, **kwargs) def get_label(self, url, read): - label = _('You must read the terms and conditions of this service and accept the') + label = _('I read and accepted the') label += f' {read}' return label diff --git a/idhub/user/views.py b/idhub/user/views.py index fcd622d..27c8f77 100644 --- a/idhub/user/views.py +++ b/idhub/user/views.py @@ -123,7 +123,7 @@ class RolesView(MyProfile, SingleTableView): class GDPRView(MyProfile, TemplateView): template_name = "idhub/user/gdpr.html" - subtitle = _('GDPR info') + subtitle = _('Data protection') icon = 'bi bi-file-earmark-medical' @@ -142,7 +142,7 @@ class CredentialsView(MyWallet, SingleTableView): class TermsAndConditionsView(UserView, FormView): template_name = "idhub/user/terms_conditions.html" - title = _("GDPR") + title = _("Data Protection") section = "" subtitle = _('Terms and Conditions') icon = 'bi bi-file-earmark-medical' From 0018932999ae58923aa170686f7202d8c7ac1a64 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 5 Feb 2024 12:27:45 +0100 Subject: [PATCH 16/39] change issues #104 --- idhub/admin/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idhub/admin/views.py b/idhub/admin/views.py index f680698..6cc4c74 100644 --- a/idhub/admin/views.py +++ b/idhub/admin/views.py @@ -978,7 +978,7 @@ class SchemasImportAddView(SchemasMix): class ImportView(ImportExport, SingleTableView): template_name = "idhub/admin/import.html" table_class = DataTable - subtitle = _('Import data') + subtitle = _('Imported data') icon = '' model = File_datas From 7d4a3d3e60d0a00d5cc6b85a0d4071b3af966dfd Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 5 Feb 2024 14:58:54 +0100 Subject: [PATCH 17/39] change read privacy for Privacy --- idhub/admin/forms.py | 6 +++--- idhub/user/forms.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idhub/admin/forms.py b/idhub/admin/forms.py index 1895195..59d0eb3 100644 --- a/idhub/admin/forms.py +++ b/idhub/admin/forms.py @@ -76,17 +76,17 @@ class TermsConditionsForm(forms.Form): def privacy_label(self): url = "https://laweb.pangea.org/politica-de-privacitat/" - read = _("Read privacy policy") + read = _("Privacy policy") return self.get_label(url, read) def legal_label(self): url = "https://laweb.pangea.org/avis-legal/" - read = _("Read legal policy") + read = _("Legal policy") return self.get_label(url, read) def cookies_label(self): url = "https://laweb.pangea.org/politica-de-cookies-2/" - read = _("Read cookies policy") + read = _("Cookies policy") return self.get_label(url, read) def clean(self): diff --git a/idhub/user/forms.py b/idhub/user/forms.py index 79e3d17..9561eb7 100644 --- a/idhub/user/forms.py +++ b/idhub/user/forms.py @@ -40,17 +40,17 @@ class TermsConditionsForm(forms.Form): def privacy_label(self): url = "https://laweb.pangea.org/politica-de-privacitat/" - read = _("Read privacy policy") + read = _("Privacy policy") return self.get_label(url, read) def legal_label(self): url = "https://laweb.pangea.org/avis-legal/" - read = _("Read legal policy") + read = _("Legal policy") return self.get_label(url, read) def cookies_label(self): url = "https://laweb.pangea.org/politica-de-cookies-2/" - read = _("Read cookies policy") + read = _("Cookies policy") return self.get_label(url, read) def clean(self): From 0e0bad18fba34007d0d75fd6146e9eeef2485259 Mon Sep 17 00:00:00 2001 From: Elijah Date: Tue, 6 Feb 2024 11:10:13 +0100 Subject: [PATCH 18/39] Added main check to only deploy on the main branch --- .gitea/workflows/ci-pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci-pipeline.yaml b/.gitea/workflows/ci-pipeline.yaml index 844c50f..13fbcaf 100644 --- a/.gitea/workflows/ci-pipeline.yaml +++ b/.gitea/workflows/ci-pipeline.yaml @@ -86,4 +86,4 @@ jobs: echo "Script execution successful" exit 0 fi - #if: success() && github.ref == 'refs/heads/main' + if: success() && github.ref == 'refs/heads/main' From e6fddbf956b4b2c908ca427d408f4a338f645313 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 6 Feb 2024 18:12:20 +0100 Subject: [PATCH 19/39] add 5 users for test --- idhub/management/commands/initial_datas.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/idhub/management/commands/initial_datas.py b/idhub/management/commands/initial_datas.py index 69c1ef5..00224d9 100644 --- a/idhub/management/commands/initial_datas.py +++ b/idhub/management/commands/initial_datas.py @@ -23,11 +23,12 @@ class Command(BaseCommand): def handle(self, *args, **kwargs): ADMIN_EMAIL = config('ADMIN_EMAIL', 'admin@example.org') ADMIN_PASSWORD = config('ADMIN_PASSWORD', '1234') - USER_EMAIL = config('USER_EMAIL', 'user1@example.org') - USER_PASSWORD = config('USER_PASSWORD', '1234') self.create_admin_users(ADMIN_EMAIL, ADMIN_PASSWORD) - self.create_users(USER_EMAIL, USER_PASSWORD) + if settings.CREATE_TEST_USERS: + for u in range(1, 6): + user = 'user{}@example.org'.format(u) + self.create_users(user, '1234') BASE_DIR = Path(__file__).resolve().parent.parent.parent.parent ORGANIZATION = os.path.join(BASE_DIR, settings.ORG_FILE) From d15fc0726de49437d27d2c7a0b762011ae050be8 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 6 Feb 2024 18:12:45 +0100 Subject: [PATCH 20/39] change gdpr for endpoint terms and conditions --- idhub/templates/idhub/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idhub/templates/idhub/base.html b/idhub/templates/idhub/base.html index c2524ad..46dee02 100644 --- a/idhub/templates/idhub/base.html +++ b/idhub/templates/idhub/base.html @@ -87,7 +87,7 @@
  • - + {% trans 'Data protection' %}
    • From 98ffdd0e3f0ac54fe4417b3ebd130490394a07e9 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 6 Feb 2024 18:13:57 +0100 Subject: [PATCH 21/39] fix bug: admnin see all dids --- idhub/admin/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idhub/admin/views.py b/idhub/admin/views.py index 6cc4c74..25ac28d 100644 --- a/idhub/admin/views.py +++ b/idhub/admin/views.py @@ -707,12 +707,13 @@ class DidsView(Credentials, SingleTableView): def get_context_data(self, **kwargs): queryset = kwargs.pop('object_list', None) + dids = DID.objects.filter(user=self.request.user) if queryset is None: - self.object_list = self.model.objects.all() + self.object_list = dids.all() context = super().get_context_data(**kwargs) context.update({ - 'dids': DID.objects.filter(user=self.request.user), + 'dids': dids }) return context From ddd25d0655a11a20f65ba71176c38fd0dc11efbd Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 6 Feb 2024 18:14:25 +0100 Subject: [PATCH 22/39] add new vars of 2factor and send emails --- idhub/email/views.py | 9 +++++---- idhub/views.py | 2 +- trustchain_idhub/settings.py | 5 ++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/idhub/email/views.py b/idhub/email/views.py index f14e2a5..caa9370 100644 --- a/idhub/email/views.py +++ b/idhub/email/views.py @@ -57,12 +57,13 @@ class NotifyActivateUserByEmail: html_email = loader.render_to_string(self.html_email_template_name, context) email_message.attach_alternative(html_email, 'text/html') try: - if settings.DEVELOPMENT: - logger.warning(to_email) - logger.warning(body) + if settings.ENABLE_EMAIL: + email_message.send() return - email_message.send() + logger.warning(to_email) + logger.warning(body) + except Exception as err: logger.error(err) return diff --git a/idhub/views.py b/idhub/views.py index b161633..9adf9f4 100644 --- a/idhub/views.py +++ b/idhub/views.py @@ -56,7 +56,7 @@ class LoginView(auth_views.LoginView): # ) # cache.set("KEY_DIDS", encryption_key, None) cache.set("KEY_DIDS", sensitive_data_encryption_key, None) - if not settings.DEVELOPMENT: + if settings.AUTH2FACTOR: self.request.session["2fauth"] = str(uuid.uuid4()) return redirect(reverse_lazy('idhub:confirm_send_2f')) diff --git a/trustchain_idhub/settings.py b/trustchain_idhub/settings.py index 6ab3b83..d243e55 100644 --- a/trustchain_idhub/settings.py +++ b/trustchain_idhub/settings.py @@ -31,7 +31,6 @@ SECRET_KEY = config('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! DEBUG = config('DEBUG', default=False, cast=bool) -DEVELOPMENT = config('DEVELOPMENT', default=False, cast=bool) ALLOWED_HOSTS = config('ALLOWED_HOSTS', default='', cast=Csv()) CSRF_TRUSTED_ORIGINS = config('CSRF_TRUSTED_ORIGINS', default='', cast=Csv()) @@ -226,3 +225,7 @@ LOGGING = { ORGANIZATION = config('ORGANIZATION', 'Pangea') SYNC_ORG_DEV = config('SYNC_ORG_DEV', 'y') ORG_FILE = config('ORG_FILE', 'examples/organizations.csv') +ENABLE_EMAIL = config('ENABLE_EMAIL', default=True, cast=bool) +CREATE_TEST_USERS = config('CREATE_TEST_USERS', default=False, cast=bool) +AUTH2FACTOR = config('AUTH2FACTOR', default=True, cast=bool) + From 1433949c4a7302b1c2cebdca9292078b2f697e07 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 6 Feb 2024 18:25:50 +0100 Subject: [PATCH 23/39] change AUTH2FACTOR -> ENABLE_2FACTOR_AUTH --- idhub/views.py | 2 +- trustchain_idhub/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/idhub/views.py b/idhub/views.py index 9adf9f4..06aeed0 100644 --- a/idhub/views.py +++ b/idhub/views.py @@ -56,7 +56,7 @@ class LoginView(auth_views.LoginView): # ) # cache.set("KEY_DIDS", encryption_key, None) cache.set("KEY_DIDS", sensitive_data_encryption_key, None) - if settings.AUTH2FACTOR: + if settings.ENABLE_2FACTOR_AUTH: self.request.session["2fauth"] = str(uuid.uuid4()) return redirect(reverse_lazy('idhub:confirm_send_2f')) diff --git a/trustchain_idhub/settings.py b/trustchain_idhub/settings.py index d243e55..043054d 100644 --- a/trustchain_idhub/settings.py +++ b/trustchain_idhub/settings.py @@ -227,5 +227,5 @@ SYNC_ORG_DEV = config('SYNC_ORG_DEV', 'y') ORG_FILE = config('ORG_FILE', 'examples/organizations.csv') ENABLE_EMAIL = config('ENABLE_EMAIL', default=True, cast=bool) CREATE_TEST_USERS = config('CREATE_TEST_USERS', default=False, cast=bool) -AUTH2FACTOR = config('AUTH2FACTOR', default=True, cast=bool) +ENABLE_2FACTOR_AUTH = config('ENABLE_2FACTOR_AUTH', default=True, cast=bool) From 25c7d9eee0789ff07f35359672df725e2cbec5e4 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 7 Feb 2024 10:32:28 +0100 Subject: [PATCH 24/39] add email as required --- schemas/course-credential.json | 7 ++++++- schemas/federation-membership.json | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/schemas/course-credential.json b/schemas/course-credential.json index eae8f21..94cc700 100644 --- a/schemas/course-credential.json +++ b/schemas/course-credential.json @@ -1,5 +1,5 @@ { - "$id": "https://idhub.pangea.org/vc_schemas/courseCredential", + "$id": "https://idhub.pangea.org/vc_schemas/course-credential", "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "NGO Course Credential Schema", "description": "A NGO Course Credential Schema awarded by a NGO federation and their NGO members, as proposed by Lafede.cat", @@ -40,6 +40,10 @@ "type": "string", "description": "The family name of the student" }, + "email": { + "type": "string", + "format": "email" + }, "personalIdentifier": { "type": "string", "description": "The personal identifier of the student, such as ID number" @@ -116,6 +120,7 @@ "id", "firstName", "lastName", + "email", "personalIdentifier", "issuedDate", "modeOfInstruction", diff --git a/schemas/federation-membership.json b/schemas/federation-membership.json index b1f5a9d..d1e999e 100644 --- a/schemas/federation-membership.json +++ b/schemas/federation-membership.json @@ -1,5 +1,5 @@ { - "$id": "https://idhub.pangea.org/vc_schemas/federationMembership.json", + "$id": "https://idhub.pangea.org/vc_schemas/federation-membership.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Federation membership", "description": "The federation membership specifies participation of a NGO into a NGO federation, as proposed by Lafede.cat", @@ -113,6 +113,7 @@ "membershipStatus", "federation", "membershipSince", + "email", "certificationDate" ] } From c8e802c9586f470fea3e80e3d1c9c7e280f08045 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 7 Feb 2024 11:45:44 +0100 Subject: [PATCH 25/39] fix firstname --- idhub/models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/idhub/models.py b/idhub/models.py index fea0156..c1feadd 100644 --- a/idhub/models.py +++ b/idhub/models.py @@ -674,7 +674,6 @@ class VerificableCredential(models.Model): 'organisation': settings.ORGANIZATION or '', } context.update(d) - context['firstName'] = "" return context def render(self, domain): From 8561ab08969f167517ef0df4b098baf78993f62a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 7 Feb 2024 11:46:08 +0100 Subject: [PATCH 26/39] fix form --- promotion/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/promotion/views.py b/promotion/views.py index 996314f..87f2a5e 100644 --- a/promotion/views.py +++ b/promotion/views.py @@ -68,9 +68,9 @@ class ContractView(FormView): return kwargs self.vp_token.get_user_info() - kwargs['initial']["nif"] = self.vp_token.user_info.get("nif", '') - kwargs['initial']["name"] = self.vp_token.user_info.get("name", '') - kwargs['initial']["first_last_name"] = self.vp_token.user_info.get("first_last_name", '') + kwargs['initial']["nif"] = self.vp_token.user_info.get("identityNumber", '') + kwargs['initial']["name"] = self.vp_token.user_info.get("firstName", '') + kwargs['initial']["first_last_name"] = self.vp_token.user_info.get("lastName", '') kwargs['initial']["second_last_name"] = self.vp_token.user_info.get("second_last_name", '') kwargs['initial']["email"] = self.vp_token.user_info.get("email", '') kwargs['initial']["email_repeat"] = self.vp_token.user_info.get("email", '') From 5a55a6c104831b0b794df263210a19cb83fb7419 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 7 Feb 2024 12:21:49 +0100 Subject: [PATCH 27/39] example of financial vulnerability --- examples/financial-vulnerability.xlsx | Bin 0 -> 8012 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 examples/financial-vulnerability.xlsx diff --git a/examples/financial-vulnerability.xlsx b/examples/financial-vulnerability.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..eb016f3f39058675d8626b647bd91cdd95dc3006 GIT binary patch literal 8012 zcmaKR1ys~+6EEEz0!nvxOLupsF(jg!%-3?MpOG`+Dgcp3@`^o3M zpR;H8JbTX0{P+1y&!{QF!r?(7At6CoY0K(CJtEZm^GgSiwIdtr!)IB1yGkcJTF9Yi z1mgwIq8L(kL6eeP69qSE8@27T+VI@2z~gf%TpYCM>dqK@AKyEZ{3Rt@<|TGoMWb-- z7vV51v_S8|uE9HdcQ)SP9G@O+epwB$B%{L{RfW@`Rq=s5Pp4P~lEtF%-9ngF7iHxQz{)4t6G|2*b@dLG0#E zp2}3-a!LnT_#|8}6(RwdH-nqFYKn+R!D-xS2lpV1z(7H%{ZE*l-v7eQn(ZH?T)_@j zCSb4?tDBAWKd8kiTm3@q7GLI~TOJV@#orPoUU7Q~-J`xX*2Nn?UHj9A^_e~jXm2cG zZ04j@?rfJkdN-^~5)Gj^2QIk1+Xbn`|Mp;il}KkeXKBTP=1nCTPDwNFtRI0q8{p#! z{|i==j@ajhdHo71MKk@4f&1!ggU9ld@1TeAHOus2Yiya+njAZRRsv_xF<$0+X0i97 zBM&=}#&L~nyfIl}V&gh~*;iTiug{1q9@e~@{MNwj9aErcDb<$?)r$%e(q@>w#hZe1+Y zB35C4YP`%7s|dV4d+WmO&#qE0UPqjd1yYZ6@PW-Tllis)9;2^H#~964*Q2C z%w5-Uw4v%lzhb$iM=J0c4mKg_=(xcQVO5Oll-cTiiswR(KrL$mW*XP410+jy0B2%* z(>J*)!d*H*BR5}|_A7b@-F*0Y89=?I>k}|MfSt*=d(YS9NbDI>b?t)eNTaS3Maj7} zXp<<+zq#SrRe%0kwu1$(#byIgylq;rU;u_}x|PXDsjvTx*qav@{yua*a+07HEYcmN zz{Y}_Dg?y44`uhD-hKw^*igT8PnnB^?j_QOpuyohJzn6#1?2H4Q?EMeFM|3=9BX# zf-s1M26lta5UVR~to&$Z(O@54ZoSK%5Keq{t%FDu;Iv#4pI315(lVZsYiy@iKHOcF z%H;g(Eq5C2$Jg9p)2kL(A&~x+P75KTJP3DwJ59Q2<{kA5fhl-l`QGK6Y~OX#fyH1Q z&zQOMcYy}aRYdZg!Lq}LG*v&~A1p^*+WGx0G!zsV_HRCg{*UE2I=Nee93OmX|HZg% zIy;{CvaX&_X${TlEeTjW`~Yc)csp*xDqtke|Bjx4x8YDf{D64xo+ zYHgCQDAF48+bXraYYmEkSi|@uyY@&*Z*ZCEk)xDFk4%<35&~XZ;_r^#=_HLgQjSc! zn~xC+(S3%W2`lEWbHU`_fC+P3l~^WAl1;_WpRLcJP(U znp2K3DlqEP6d!7-g^h7RYh@?VV6Hmw6!?-{K&1;(AWN9P$f9s|pWuk7CkhA#f*9#=FEv|LYN&tC>N1N~7vg>0Y)5(b)9D7C0+Gv-pn9ow$ESk}E*);65 zEL~5VKp_!I(<2*tIk%Rxj*#Q z#jF`Kl4e4&4WUERKr3>tSfV~OQv^;(Y%1~IM7o2?AzpgFN)^!|PWo3v%E=dbs#&Qc z!X>9^!=LpE-lFL3qesn+)VOelLTpWS#tp0H2X0n7J#CuOWc$rTjp{yC;(BFkT)&Y{ z7b+XO+a(AUBdWAuqIIv+cM!HWXdTDoe&eCY8y}50JpCCqWap>xaH-|l_>bcG7vbDG z??2}?eJ{Cdm(Z_fNe)uzP#SDR<^TFR!qV4s9-4Ro6-rb_^x0S`Y?=)mOK=-A{nH_1 zL@sxv$$salb`sl;3}CkTG=jr|zY?GLdGcPw(X+Z4(p;7?^(&!iRWY7vUr6)I2fsU8 zkI)gm_qpn4fAc%4-x1r<0t9k${5P%r`oi&_q}CGOZuu*zc}J{V@8yvI6R8)oNlq&V zw@JnL6-+Gkdt5&5?QhvyTfGnDPg=H6ZGm01qF%AGvRnPdsF8@CyAG0B0rp39TO6BceZAt z1oemDjjx8#JzBr52$>=G&v0E_PaaRsItNL)2ha~54J`s!eKLP?E^^#aYDDG3qBw9k zYBEG}jpEuza8Y}dwh0WC5{||OskWX=wR0$(=0tg9A7Zwk#VxS#ygRzsepP}Wegq%M zM>GN|3Iaw@r?6>ggaIH{$E@DSvd`^m>k2_@(gKs)s6R-&iNXbNt!X?t1{o(CjZ~WZ zrZgkym;Y&j3-9+@e6Upfm+APG&dRhPoj(@ncpixaD7dX04yt}83DnrZZyx5aD+uo zB7oru=Z&G!d1A-)qnSiDc+_seyjqO7elbUYR`^JB+wu;1aT+GPZWztt1*Z%>W3brI z%0oeL6zB~{4pv^H0|f#QmY7PG(5bMsP}_W!2VOLrKNTx za1$)7WdfLx z9c;v0@gE4OA3m4Ne&p=bip*9`g{Rc9~06hufEZEh?CBjapng(TI%vg&;Jhp0R;hOx00B?Wnk5dpD0p zAL$wJc1H;7c2*`>?FgOu06uW(m6OMSv9v&qW=O)MW(?y%Tr}tIS?>LjX`m|F;gljB zsG+XHoS6NS!U(~~8}5>K0@IGu0)qrngo`2CGyG!#Sz@piEfDin>1alq%l9^3hQ-qX zV9U+xVCpng0f>MBP;vJd!D4o|q?u$Y#JlS~xwgNx3u`*bM(zpt0$K^n^rHr#e z;+-pYJBP`*bWm?tBrBz$jDZXGEwHOPl8~6HyfJK*W34fgkc7&%G3hEx0rn^E*cGqh#>c%YHOX1JoZ`W?9QipvP|kw-%nBKqoBGq2?=}R+Ph`T8AlzogiLu7%W>_kB*}OSF z8+dbUQ=&Ro7GO9A%(0yJBYN19xT`1SND-2?;jg$=cmYdZz1Z)2XnHbdlOL|VDd%1 zERbPZngr}qkyXi_{r%N8~w0{}H)SUem-Tq;X? ztk{Mt#6Pa4;Xij9#MeJxP4d1IUbBMf(&8KQ0c+JxeIXQ75e}gAHp96uR+4sG4ZP6< zUJ=9j5TbXE9d@SS11Cf_c)+OXFaSVUJC%Fq24;uOb?Gv3aTc}s*<4LVd9Id_-Ed~5 z;a%d|4RmwR?I1FL5m~UAZF~KCnApb~CH0$Q8daY>Dc(^+l@9f9{p2Cj?(LjsjnrB* zS!D2MIplUd^pm?5q|_WtNYgZB5t6c?B3P*WN`QEmV*|AT@rS2JlJN$%nC25+1MzuY z2Yx88qmA_}nY)MUm3gx?nq`h!Jz515^KAQ@H|K2c_#UG03-JsQG5Gr^jQh8ohWBqR zX<_UDGSzf)cx`L`tE5ayY`2{h!wNYR3a)iEDHNN~sZ*503ksT$kQ7kelW#V0ogOOB z4f(VR?H18W2*lD*wQ#6pKJ@uHG$Q(y1x(s97}Gb7P(0+Mk%Cr)T$V2hYPFtWV^e;D ztA@&orL!3{zA(i$K&VNp5s|c`v0HH>#7p84mM})uKO#~YN}c7^2OLGR*~3b3y^>ZR za==Vhnhx^U02wJO^TytatQ;S9bSD)JT6{ZJjsG?)N!383ASIGhbde04_v__UbxwV= z?rVW)-lh@g%vgQc6*s)%+Q+z5C)Zyv$;b`Stav^wI!yH1#N^0*ysjF@IbuxD?j@|R zq|WuJfs-ivYiCbIvD{N*yCAgZ-|||oX)9GQeTd^gv8mnXi#xo|eW;LKMjIGx-hNV= z4Vx^}P0{%jCwCy8XiE(cUfy-;xza#pi}`k2$(Z=kd@)62Bam8FiF zog7`|)q0W0v6|X7#(nNg4ve@F61w%+bY<1`x_$PbaBVzkqKf10G&PI1S6A;R3QJ%w~eNi7ooTA;9dDf#a4XH zWQy3+d0H9`%4?r1k!889tGV(c%g8R)5D8UPT7dC~9A{(A?ZcTtU2x4BT6@47Xw(+j zY4b>e6GmS2kRgR*Sc1k8f#Imt;vR%cYFf0l7qXV*gUP%hxD%ybPG97Kn9vgD)|lUXpAd%gJgOe4gH3#&61s) ze$H?RE!K*79XPEZ_Vv^7Gn}JxV%V);b6rOgrxpVOM=qzN-Vzm? zHFF*N1KB>+G`+E17k2hhpiT5yVK?jMwi!#}NK=1jBZ(ptT*noEK{THWq>3LqDz8p z4U(KN(TfZ{1GU8TTjrb6>gH)E*+2<8rS$ytsU}uEsXlUwV`}yWH4>!6lVt^RR!N6x zA{8QAJakvyx(1raa%JzI7VGwBz87jE;s*94$nc z>m}AdmLoet;*^VoZqvw%m#kUI;oQjR=)))>& z7e!WoytL~U-|IHF>-K*egj+>L&P#~XwEdn0wbBjdT%&D-VD-hTTQ?XN;J>J`no7K@6`?AR*yzob4$4(znL?Y>I=cGek;L?c5}e+W7LM@{JYd1 zQkWq|c=ReIDR$Mk)LwpAbU;_+D9-awQ7T;`d{sxWvt1~;&@KYdo>doJs~!69pn1ca zS1>Ea9oEiL-IPO`P52w)z%RvC?a=yqehELy{n)fdeOe&u+T&N6?bODMVD`2>jPzrF zLQ0DzQ|k}(2al924S|-w?=;_#{>>w??>*8K3{-Of+c~lU!49B@<}zAi@P5RM)qH{< zcNl&`5C1}*@n}0-L5>B+o@<1crz-~3qb@HXN{% zm;3|rI|)GtLo4yJz{akKYBm5&Os8E0ydFSJ(cWsiWE`7>1(g?2Tvjd^7-0NC%&!JP zRy;@*fC@;7#1!0AVyG9Uucs&JQ*Yt(!sAuO<(8*&zLmYSIjY%{Icu=i?S|Ueslx8y zRznTmLX&%G`^qTcI`j+ihCQL`4f}cL4r5yEHwI+zlIG1fZ>!nf+7bP8I0FMe<20sk zwzCPMI2gKG$@-tZ6G#25-=hW=3xlMi4eN6&1n^uDx9lnSoTy_OenvTcjG*L{m&417 z<|cGX;@NY%zBtZf66~n6`gnT@XLcPYvtlx61MlsD^z)|o=2t59&z6NZzmJ=czjm$%b2hl=|o2ZH8f39^AyHp452<}sk^!B6*IEV=) z6H%EIzLhM+n!~niU}Iu{VnN5CV*%gh^UJsQue>4+dcT3d+~hK2Km{Mx4;{%&ZY5BN zXPG}cvV#6r0LV%u4c5rC*WivB=}6sMgH90C`l3D;jC)1tC2)1L%X6!UVY+;Hxdf*0 zw8`}`hY&ni-|94!-`o3teRTi+-!uD%65&7AXKZKp>r%1G;Esp=#x=fnSFL=}G)6YJ z#bgccgv<7rt#)#KEW=9$4Y;2^(A+CRS$i|n!0Y^y!0~QU39S(qix?&?KYSI&ru{MV zpE|5+*tnnKt<19}Wy37GNw;O~NF_9|B9$tuB%2a%;$!JuUb%HO*f^RywSP|>tfa9e zPV&>GqlM*-Yb*x9gu>|rFyG>bv36~U+!8Qm@GlbZ-Hw}+<_Z&5xWmZwv+NtLHR>Yh zX`0^x#?23FafCpMvjA^IH_=0K)%tdpa&s$CVdwW+i_r6``e%g4n4;u3uZ!mf^Jl*HtgI-0eV) zh7ZWKB>jurO+@ib5&9mxvZjCMY|OKXS@(gbZ_T*L6eRq8MGF)C>m))y@YhD)w!Yby zdd+DRNlD+XSH8|p+;z(imCD$&;YHXwnwfiTC$vlRF&g37tMZyoc2^ZqER#uMxZ0`- za*lWgst=v2Ty$v#sDg+Nki+FTEqTNV=@HMMTvHe#!zZk6fUn2Nk;m+A3!Cm!?0EnJ zp?r+aE?N295iw&`B*lIoZGtaJ-5*LFtVe2F1XRWx?oiu;4~HuFm|D5H6^o%PjqDdf zxR45_>IoRx{k<+#S6)F~sqQeazPU2KWrl;ZKqY$O353tiXR9f2>r0#r6?;sU z$c^XPgdh!T=K1ud0Y4`zZQ$pxM3tZSj3kQ5*0+DTw!u~Pa^$@pRS_R_2@Qh>^?Sef zc%}8Q-}`TRwC($o@$tszVdM3i=*I;t!<6$ko!rCp?{oh)^ZZlbVH`U*Ny}#Ih^+A7fKTg&UMe=VN#QDYjze?sm1wGCu z54rs}89sRwYyWSi|C9Z3*nWsIzX|pp-2a4X;D1ukp8_5Su>Xbu@>syXvHnl)$1d~V fkH@(;_Ww`FQ&WV$??IuU(C=S*_r=cAFYx{kGkl(d literal 0 HcmV?d00001 From 7a2c48248b8d6a3f5a57cb13458bc36b85f66dca Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 8 Feb 2024 10:37:31 +0100 Subject: [PATCH 28/39] fix templates --- .../credentials/course-credential.json | 21 ++----------------- .../credentials/e-operator-claim.json | 12 +++-------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/idhub/templates/credentials/course-credential.json b/idhub/templates/credentials/course-credential.json index f3c299b..d4a97cb 100644 --- a/idhub/templates/credentials/course-credential.json +++ b/idhub/templates/credentials/course-credential.json @@ -2,25 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://idhub.pangea.org/credentials/base/v1", - { - "firstName": "https://idhub.pangea.org/context/#firstName", - "lastName": "https://idhub.pangea.org/context/#lastName", - "personalIdentifier": "https://idhub.pangea.org/context/#personalIdentifier", - "issuedDate": "https://idhub.pangea.org/context/#issuedDate", - "modeOfInstruction": "https://idhub.pangea.org/context/#modeOfInstruction", - "courseDuration": "https://idhub.pangea.org/context/#courseDuration", - "courseDays": "https://idhub.pangea.org/context/#courseDays", - "courseName": "https://idhub.pangea.org/context/#courseName", - "courseDescription": "https://idhub.pangea.org/context/#courseDescription", - "gradingScheme": "https://idhub.pangea.org/context/#gradingScheme", - "scoreAwarded": "https://idhub.pangea.org/context/#scoreAwarded", - "qualificationAwarded": "https://idhub.pangea.org/context/#qualificationAwarded", - "courseLevel": "https://idhub.pangea.org/context/#courseLevel", - "courseFramework": "https://idhub.pangea.org/context/#courseFramework", - "courseCredits": "https://idhub.pangea.org/context/#courseCredits", - "dateOfAssessment": "https://idhub.pangea.org/context/#dateOfAssessment", - "evidenceAssessment": "https://idhub.pangea.org/context/#evidenceAssessment" - } + "https://idhub.pangea.org/credentials/course-credential/v1" ], "id": "{{ vc_id }}", "type": [ @@ -59,6 +41,7 @@ "id": "{{ subject_did }}", "firstName": "{{ firstName }}", "lastName": "{{ lastName }}", + "email": "{{ email }}", "personalIdentifier": "{{ personalIdentifier }}", "issuedDate": "{{ issuedDate }}", "modeOfInstruction": "{{ modeOfInstruction }}", diff --git a/idhub/templates/credentials/e-operator-claim.json b/idhub/templates/credentials/e-operator-claim.json index 959472c..1b85bbe 100644 --- a/idhub/templates/credentials/e-operator-claim.json +++ b/idhub/templates/credentials/e-operator-claim.json @@ -2,14 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://idhub.pangea.org/credentials/base/v1", - { - "legalName": "https://idhub.pangea.org/context/#legalName", - "accreditedBy": "https://idhub.pangea.org/context/#accreditedBy", - "operatorNumber": "https://idhub.pangea.org/context/#operatorNumber", - "limitJurisdiction": "https://idhub.pangea.org/context/#limitJurisdiction", - "accreditedFor": "https://idhub.pangea.org/context/#accreditedFor", - "role": "https://idhub.pangea.org/context/#role" - } + "https://idhub.pangea.org/credentials/e-operator-claim/v1" ], "id": "{{ vc_id }}", "type": [ @@ -59,7 +52,8 @@ "operatorNumber": "{{ operatorNumber }}", "limitJurisdiction": "{{ limitJurisdiction }}", "accreditedFor": "{{ accreditedFor }}", - "role": "{{ role }}" + "role": "{{ role }}", + "email": "{{ email }}" }, "credentialSchema": { "id": "https://idhub.pangea.org/vc_schemas/federation-membership.json", From 3d3d8443955a7e2d0f65404efcc48e9dbff04f60 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 9 Feb 2024 08:55:40 +0100 Subject: [PATCH 29/39] change templates promotion --- promotion/templates/select_wallet.html | 1203 ++-------------- promotion/templates/somconnexio_contract.html | 1255 ++-------------- .../templates/somconnexio_tarifes_mobil.html | 1272 +---------------- 3 files changed, 237 insertions(+), 3493 deletions(-) diff --git a/promotion/templates/select_wallet.html b/promotion/templates/select_wallet.html index ba813ee..9199d1d 100644 --- a/promotion/templates/select_wallet.html +++ b/promotion/templates/select_wallet.html @@ -1,1126 +1,93 @@ - - - - - - - - - - - - +{% load i18n static %} + + + + + + + + + + {% block title %}{% if title %}{{ title }} – {% endif %}Pangea{% endblock %} + + + + + + + - - Escull la teva tarifa mòbil - Som Connexió - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    - - Tarifes
    - -
    -
    -
    - Persones sòcies 9.257 - Contractes 22.303 -
    -
    -
    - Blog  |  - Contacte -
    - - - Vols que et truquem? -
    -
    -
    -
    - - - - - - -
    - -
    - - -
    - - -
    - - - -
    - - -{% load i18n %} -{% load django_bootstrap5 %} -
    -{% csrf_token %} -{% if form.errors %} - -{% endif %} -
    -
    - {% bootstrap_form form %} -
    -
    -
    - {% trans "Cancel" %} - -
    - -
    -
    - -
    - - -
    - - -
    - - - -
    - - - - - - - - - - -
    - - -
    - - - - -Back To Top - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -