Code cleanup

Author: blagojabozinovski

ckanext/password_policy/views.py

@@ -1,5 +1,7 @@
-from ckan.views.user import RegisterView, EditView, PerformResetView, rotate_token, next_page_or_default
-# from ckan.lib.repoze_plugins.friendly_form import FriendlyFormPlugin
+from ckan.views.user import (
+    RegisterView, EditView, PerformResetView, 
+    rotate_token, next_page_or_default
+    )
 import ckan.logic as logic
 import ckan.plugins as plugins
 import ckan.lib.base as base
@@ -9,20 +11,13 @@
 import ckan.plugins.toolkit as tk
 import ckan.lib.helpers as h
 import ckanext.password_policy.helpers as helper
-# from webob import Request
-# from webob.exc import HTTPFound, HTTPUnauthorized
 from typing import Any, Optional, Union
-from six import text_type
-from six.moves.urllib.parse import urlencode
 from ckan.common import (
     _, config, g, current_user, login_user, logout_user, 
     session, config, g, request, repr_untrusted
 )
 from ckan.types import Context, Schema, Response, Validator
-# try:
-#     from webob.multidict import MultiDict
-# except ImportError:
-#     from webob import UnicodeMultiDict as MultiDict
+
 
 
 custom_user = Blueprint(u'custom_user', __name__, url_prefix=u'/user')
@@ -124,98 +119,6 @@ def _get_form_password(self):
         return password1
         msg = _(u'You must provide a password')
         raise ValueError(msg)
-
-
-# class FriendlyFormPlugin_(FriendlyFormPlugin):
-
-#     def identify(self, environ):
-#         u'''
-#         Override the parent's identifier to introduce a login counter
-#         (possibly along with a post-login page) and load the login counter into
-#         the ``environ``.
-
-#         '''
-#         allowed_failes_logins = int(config.get('ckanext.password_policy.failed_logins', 3))
-#         request = Request(environ, charset=self.charset)
-
-#         path_info = environ[u'PATH_INFO']
-#         script_name = environ.get(u'SCRIPT_NAME') or u'/'
-#         query = request.GET
-#         if path_info == self.login_handler_path:
-#             # We are on the URL where repoze.who processes authentication. #
-#             # Let's append the login counter to the query string of the
-#             # 'came_from' URL. It will be used by the challenge below if
-#             # authorization is denied for this request.
-#             form = dict(request.POST)
-#             form.update(query)
-#             try:
-#                 login = form[u'login']
-#                 password = form[u'password']
-#             except KeyError:
-#                 credentials = None
-#             else:
-#                 if request.charset == u'us-ascii':
-#                     credentials = {
-#                         u'login': str(login),
-#                         u'password': str(password),
-#                     }
-#                 else:
-#                     credentials = {u'login': login, u'password': password}
-
-#             try:
-#                 credentials[u'max_age'] = form[u'remember']
-#             except KeyError:
-#                 pass
-#             if helper.user_login_count(login) < allowed_failes_logins:
-#                 referer = environ.get(u'HTTP_REFERER', script_name)
-#                 destination = form.get(u'came_from', referer)
-
-#                 if self.post_login_url:
-#                     # There's a post-login page, so we have to replace the
-#                     # destination with it.
-#                     destination = self._get_full_path(self.post_login_url,
-#                                                     environ)
-#                     if u'came_from' in query:
-#                         # There's a referrer URL defined, so we have to pass it to
-#                         # the post-login page as a GET variable.
-#                         destination = self._insert_qs_variable(destination,
-#                                                             u'came_from',
-#                                                             query[u'came_from'])
-#                 failed_logins = self._get_logins(environ, True)
-#                 new_dest = self._set_logins_in_url(destination, failed_logins)
-
-#                 environ[u'repoze.who.application'] = HTTPFound(location=new_dest)
-#                 return credentials
-#             else:
-#                 new_dest = 'user/locked'
-#                 environ[u'repoze.who.application'] = HTTPFound(location=new_dest)
-#                 extra_vars = {}
-#                 return extra_vars
-                   
-#         elif path_info == self.logout_handler_path:
-#             #    We are on the URL where repoze.who logs the user out.    #
-#             r = Request(environ)
-#             params = dict(list(r.GET.items()) + list(r.POST.items()))
-#             form = MultiDict(params)
-#             form.update(query)
-#             referer = environ.get(u'HTTP_REFERER', script_name)
-#             came_from = form.get(u'came_from', referer)
-#             # set in environ for self.challenge() to find later
-#             environ[u'came_from'] = came_from
-#             environ[u'repoze.who.application'] = HTTPUnauthorized()
-#             return None
-
-#         elif path_info == self.login_form_url or self._get_logins(environ):
-#             #  We are on the URL that displays the from OR any other page  #
-#             #   where the login counter is included in the query string.   #
-#             # So let's load the counter into the environ and then hide it from
-#             # the query string (it will cause problems in frameworks like TG2,
-#             # where this unexpected variable would be passed to the controller)
-#             environ[u'repoze.who.logins'] = self._get_logins(environ, True)
-#             # Hiding the GET variable in the environ:
-#             if self.login_counter_name in query:
-#                 del query[self.login_counter_name]
-#                 environ[u'QUERY_STRING'] = urlencode(query, doseq=True)
 
 
 def _get_repoze_handler(handler_name):
@@ -230,10 +133,7 @@ def custom_login() -> Union[Response, str]:
         response = item.login()
         if response:
             return response
-
-    print("================================")
-    print("custom login")
-    print("================================")
+        
     extra_vars: dict[str, Any] = {}
 
     if current_user.is_authenticated: