Settings names and messages fix

README.md

@@ -56,13 +56,13 @@ To install ckanext-password-policy:
 
    	```
 	Minimum length of the user password. Default is 12
-	ckan.password_policy.password_length = 12
+	ckanext.password_policy.password_length = 12
 
 	Number of failed logins before the user is locked. Default is 3
- 	ckan.password_policy.failed_logins = 3
+ 	ckanext.password_policy.failed_logins = 3
 
 	Time after the locked user is allowed to log in again in seconds. Default is 600 
-	ckan.password_policy.user_locked_time = 600
+	ckanext.password_policy.user_locked_time = 600
 	```
 
 

ckanext/password_policy/helpers.py

@@ -7,7 +7,7 @@ def user_login_count(username):
     redis_conn = connect_to_redis()
     user_cached = redis_conn.get(username)
     if user_cached == None:
-        expiry = config.get('ckan.password_policy.user_locked_time', 600)
+        expiry = config.get('ckanext.password_policy.user_locked_time', 600)
         # user will be cached in redis with count 1
         redis_conn.set(username, 1, ex=expiry)
     else:
@@ -38,7 +38,7 @@ def custom_password_check(password):
         1 uppercase letter or more
         1 lowercase letter or more
     """
-    password_length = int(config.get('ckan.password_policy.password_length', 12))
+    password_length = int(config.get('ckanext.password_policy.password_length', 12))
     # calculating the length
     length_error = len(password) < password_length
 

ckanext/password_policy/plugin.py

@@ -10,7 +10,7 @@
 Missing = df.Missing
 missing = df.missing
 
-password_length = config.get('ckan.password_policy.password_length')
+password_length = int(config.get('ckanext.password_policy.password_length', 12))
 
 
 def user_custom_password_validator(key, data, errors, context):
@@ -24,9 +24,7 @@ def user_custom_password_validator(key, data, errors, context):
     elif value == '':
         pass
     elif not valid_pass['password_ok']:
-        errors[('password',)].append(_(f'Your password must be {password_length} characters or '
-                                       'longer and contain uppercase, lowercase, '
-                                       'digit and special character'))
+        errors[('password',)].append('Your password must be 12 characters or longer and contain uppercase, lowercase, digit and special character')
 
 
 class PasswordPolicyPlugin(plugins.SingletonPlugin):

ckanext/password_policy/views.py

@@ -102,14 +102,12 @@ def _get_form_password(self):
         password1 = request.form.get(u'password1')
         password2 = request.form.get(u'password2')
 
-        password_length = config.get('ckan.password_policy.password_length')
+        password_length = int(config.get('ckanext.password_policy.password_length', 12))
 
         valid_pass = helper.custom_password_check(password1)
         if valid_pass['password_ok']==False:
             raise ValueError(
-                _(f"u'Your password must be {password_length} characters or '"
-                  u'longer and contain uppercase, lowercase, '
-                  u'digit and special character'))
+                _(f'Your password must be 12 characters or longer and contain uppercase, lowercase, digit and special character'))
         elif password1 != password2:
             raise ValueError(
                 _(u'The passwords you entered'
@@ -128,7 +126,7 @@ def identify(self, environ):
         the ``environ``.
 
         '''
-        allowed_failes_logins = int(config.get('ckan.password_policy.failed_logins', 3))
+        allowed_failes_logins = int(config.get('ckanext.password_policy.failed_logins', 3))
         request = Request(environ, charset=self.charset)
 
         path_info = environ[u'PATH_INFO']