Merge pull request #1425 from IFRCGo/develop

End-of-April Release

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.441
+
+### Added
+ - Password policy enhancements
+ - Return also visibility to event properties
+ - EmergencyProject should have visibility itself
+
+## 1.1.440
 ## 1.1.439
 
 ### Added
@@ -1975,7 +1983,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.439...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.441...HEAD
+[1.1.441]: https://github.com/IFRCGo/go-api/compare/1.1.440...1.1.441
+[1.1.440]: https://github.com/IFRCGo/go-api/compare/1.1.439...1.1.440
 [1.1.439]: https://github.com/IFRCGo/go-api/compare/1.1.438...1.1.439
 [1.1.438]: https://github.com/IFRCGo/go-api/compare/1.1.437...1.1.438
 [1.1.437]: https://github.com/IFRCGo/go-api/compare/1.1.436...1.1.437

api/serializers.py

@@ -666,7 +666,7 @@ class Meta:
             'is_featured_region', 'field_reports', 'hide_attached_field_reports', 'hide_field_report_map', 'updated_at',
             'id', 'slug', 'tab_one_title', 'ifrc_severity_level', 'ifrc_severity_level_display', 'parent_event', 'glide',
             'featured_documents', 'links', 'emergency_response_contact_email', 'countries_for_preview',
-            'response_activity_count'
+            'response_activity_count', 'visibility'
         )
         lookup_field = 'slug'
 

api/snapshots/snap_test_views.py

@@ -83,7 +83,8 @@
     'tab_one_title': 'XKANObFOIsPtEpZZRztDeSdkCAEDnvMjuTuUwziWxGJgupDhrC',
     'tab_three_title': 'zxczdKJmxJseyGCWJrNRNhigzxYvJxWjmMGzGccciTvZEHDjMG',
     'tab_two_title': 'pjgdsyNApkuKUumWkFGDFtFbfzGDpnLwddsFMPREsIagBiqUxW',
-    'updated_at': '2008-01-01T00:00:00.123456Z'
+    'updated_at': '2008-01-01T00:00:00.123456Z',
+    'visibility': 3
 }
 
 snapshots['EventSnaphostTest::test_event_link_api 1'] = {
@@ -157,5 +158,6 @@
     'tab_one_title': 'XKANObFOIsPtEpZZRztDeSdkCAEDnvMjuTuUwziWxGJgupDhrC',
     'tab_three_title': 'zxczdKJmxJseyGCWJrNRNhigzxYvJxWjmMGzGccciTvZEHDjMG',
     'tab_two_title': 'pjgdsyNApkuKUumWkFGDFtFbfzGDpnLwddsFMPREsIagBiqUxW',
-    'updated_at': '2008-01-01T00:00:00.123456Z'
+    'updated_at': '2008-01-01T00:00:00.123456Z',
+    'visibility': 3
 }

deployments/migrations/0065_emergencyproject_visibility.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.27 on 2022-04-27 11:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployments', '0064_auto_20220414_0842'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='emergencyproject',
+            name='visibility',
+            field=models.CharField(choices=[('logged_in_user', 'Membership'), ('ifrc_only', 'IFRC Only'), ('public', 'Public'), ('ifrc_ns', 'IFRC_NS')], default='public', max_length=32, verbose_name='visibility'),
+        ),
+    ]

deployments/models.py

@@ -653,6 +653,12 @@ class ActivityStatus(TextChoices):
         on_delete=models.CASCADE,
         related_name='+',
     )  # Country to be among the country in event
+    visibility = models.CharField(
+        max_length=32,
+        verbose_name=_('visibility'),
+        choices=VisibilityCharChoices.CHOICES,
+        default=VisibilityCharChoices.PUBLIC,
+    )
 
     def __str__(self):
         return self.title

deployments/serializers.py

@@ -534,6 +534,7 @@ class EmergencyProjectSerializer(
     activity_lead_display = serializers.CharField(source='get_activity_lead_display', read_only=True)
     status_display = serializers.CharField(source='get_status_display', read_only=True)
     country_details = MiniCountrySerializer(source='country', read_only=True)
+    visibility_display = serializers.CharField(source='get_visibility_display', read_only=True)
 
     class Meta:
         model = EmergencyProject

main/__init__.py

@@ -3,4 +3,4 @@
 from .celery import app as celery_app
 
 __all__ = ['celery_app']
-__version__ = '1.1.439'
+__version__ = '1.1.441'

main/settings.py

@@ -245,18 +245,14 @@
 }
 
 AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
+    {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',  },
+    {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',  },
+    {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',  },
+    {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',  },
+    {'NAME': 'main.validators.NumberValidator', },
+    {'NAME': 'main.validators.UppercaseValidator', },
+    {'NAME': 'main.validators.LowercaseValidator', },
+    {'NAME': 'main.validators.SymbolValidator', },
 ]
 
 TINYMCE_DEFAULT_CONFIG = {

main/validators.py

@@ -0,0 +1,61 @@
+import re
+from django.core.exceptions import ValidationError
+from django.utils.translation import ugettext_lazy as _
+
+
+class NumberValidator(object):
+    def validate(self, password, user=None):
+        if not re.findall('\d', password):
+            raise ValidationError(
+                _("The password must contain at least 1 digit, 0-9."),
+                code='password_no_number',
+            )
+
+    def get_help_text(self):
+        return _(
+            "Your password must contain at least 1 digit, 0-9."
+        )
+
+
+class UppercaseValidator(object):
+    def validate(self, password, user=None):
+        if not re.findall('[A-Z]', password):
+            raise ValidationError(
+                _("The password must contain at least 1 uppercase letter, A-Z."),
+                code='password_no_upper',
+            )
+
+    def get_help_text(self):
+        return _(
+            "Your password must contain at least 1 uppercase letter, A-Z."
+        )
+
+
+class LowercaseValidator(object):
+    def validate(self, password, user=None):
+        if not re.findall('[a-z]', password):
+            raise ValidationError(
+                _("The password must contain at least 1 lowercase letter, a-z."),
+                code='password_no_lower',
+            )
+
+    def get_help_text(self):
+        return _(
+            "Your password must contain at least 1 lowercase letter, a-z."
+        )
+
+
+class SymbolValidator(object):
+    def validate(self, password, user=None):
+        if not re.findall('[()[\]{}|\\`~!@#$%^&*_\-+=;:\'",<>./?]', password):
+            raise ValidationError(
+                _("The password must contain at least 1 symbol: " +
+                  "()[]{}|\`~!@#$%^&*_-+=;:'\",<>./?"),
+                code='password_no_symbol',
+            )
+
+    def get_help_text(self):
+        return _(
+            "Your password must contain at least 1 symbol: " +
+            "()[]{}|\`~!@#$%^&*_-+=;:'\",<>./?"
+        )