Resolve conflict

Cadasta · Jan 3, 2017 · 407449b · 407449b
1 parent 92e34b8
commit 407449b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/cadasta/config/settings/default.py b/cadasta/config/settings/default.py
@@ -501,3 +501,14 @@
     'csv': 'organization.importers.csv.CSVImporter',
     'xls': 'organization.importers.xls.XLSImporter'
 }
+
+# the first hasher in this list is the preferred algorithm.  any
+# password using different algorithms will be converted automatically
+# upon login
+PASSWORD_HASHERS = [
+    'django.contrib.auth.hashers.Argon2PasswordHasher',
+    'django.contrib.auth.hashers.PBKDF2PasswordHasher',
+    'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+    'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
+    'django.contrib.auth.hashers.BCryptPasswordHasher',
+]
diff --git a/requirements/common.txt b/requirements/common.txt
@@ -32,3 +32,4 @@ gdal==1.10.0
 pylibmc==1.5.1
 awscli==1.11.23
 pandas==0.19.0
+argon2-cffi==16.3.0