From ab97e736d9d6fd689ffde63f2ee70385bde23f67 Mon Sep 17 00:00:00 2001
From: Matt Wright <mdw1980@gmail.com>
Date: Tue, 10 Jul 2012 15:57:16 -0400
Subject: [PATCH] Remove forms from config, pretty sure there's a better way to
 do this or its not necessary

---
 flask_security/core.py  | 15 +++++++--------
 flask_security/views.py | 10 ++++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/flask_security/core.py b/flask_security/core.py
index 5509efc..922ed12 100644
--- a/flask_security/core.py
+++ b/flask_security/core.py
@@ -31,10 +31,6 @@ _default_config = {
     'FLASH_MESSAGES': True,
     'PASSWORD_HASH': 'plaintext',
     'AUTH_PROVIDER': 'flask.ext.security::AuthenticationProvider',
-    'LOGIN_FORM': 'flask.ext.security.forms::LoginForm',
-    'REGISTER_FORM': 'flask.ext.security.forms::RegisterForm',
-    'RESET_PASSWORD_FORM': 'flask.ext.security.forms::ResetPasswordForm',
-    'FORGOT_PASSWORD_FORM': 'flask.ext.security.forms::ForgotPasswordForm',
     'AUTH_URL': '/auth',
     'LOGOUT_URL': '/logout',
     'REGISTER_URL': '/register',
@@ -177,27 +173,30 @@ class Security(object):
         pw_hash = utils.config_value(app, 'PASSWORD_HASH')
 
         self.login_manager = login_manager
+
         self.pwd_context = CryptContext(schemes=[pw_hash], default=pw_hash)
+
         self.auth_provider = Provider()
+
         self.principal = Principal(app, use_sessions=False)
         self.principal.identity_loader(_identity_loader)
+
         self.datastore = datastore
-        self.LoginForm = utils.get_class_from_string(app, 'LOGIN_FORM')
-        self.RegisterForm = utils.get_class_from_string(app, 'REGISTER_FORM')
-        self.ResetPasswordForm = utils.get_class_from_string(app, 'RESET_PASSWORD_FORM')
-        self.ForgotPasswordForm = utils.get_class_from_string(app, 'FORGOT_PASSWORD_FORM')
+
         self.auth_url = utils.config_value(app, 'AUTH_URL')
         self.logout_url = utils.config_value(app, 'LOGOUT_URL')
         self.reset_url = utils.config_value(app, 'RESET_URL')
         self.register_url = utils.config_value(app, 'REGISTER_URL')
         self.confirm_url = utils.config_value(app, 'CONFIRM_URL')
         self.forgot_url = utils.config_value(app, 'FORGOT_URL')
+
         self.post_login_view = utils.config_value(app, 'POST_LOGIN_VIEW')
         self.post_logout_view = utils.config_value(app, 'POST_LOGOUT_VIEW')
         self.post_register_view = utils.config_value(app, 'POST_REGISTER_VIEW')
         self.post_confirm_view = utils.config_value(app, 'POST_CONFIRM_VIEW')
         self.post_forgot_view = utils.config_value(app, 'POST_FORGOT_VIEW')
         self.reset_password_error_view = utils.config_value(app, 'RESET_PASSWORD_ERROR_VIEW')
+
         self.default_roles = utils.config_value(app, "DEFAULT_ROLES")
         self.login_without_confirmation = utils.config_value(app, 'LOGIN_WITHOUT_CONFIRMATION')
         self.confirmable = utils.config_value(app, 'CONFIRMABLE')
diff --git a/flask_security/views.py b/flask_security/views.py
index 7805634..890b980 100644
--- a/flask_security/views.py
+++ b/flask_security/views.py
@@ -21,6 +21,8 @@ from .confirmable import confirm_by_token, \
      reset_confirmation_token, send_confirmation_instructions
 from .exceptions import TokenExpiredError, UserNotFoundError, \
      ConfirmationError, BadCredentialsError, ResetPasswordError
+from .forms import LoginForm, RegisterForm, ForgotPasswordForm, \
+     ResetPasswordForm
 from .recoverable import reset_by_token, \
      reset_password_reset_token
 from .signals import user_registered
@@ -67,7 +69,7 @@ def _do_login(user, remember=True):
 def authenticate():
     """View function which handles an authentication request."""
 
-    form = _security.LoginForm()
+    form = LoginForm()
 
     try:
         user = _security.auth_provider.authenticate(form)
@@ -108,7 +110,7 @@ def logout():
 def register():
     """View function which handles a registration request."""
 
-    form = _security.RegisterForm(csrf_enabled=not app.testing)
+    form = RegisterForm(csrf_enabled=not app.testing)
 
     # Exit early if the form doesn't validate
     if form.validate_on_submit():
@@ -165,7 +167,7 @@ def confirm():
 def forgot():
     """View function that handles a forgotten password request."""
 
-    form = _security.ForgotPasswordForm(csrf_enabled=not app.testing)
+    form = ForgotPasswordForm(csrf_enabled=not app.testing)
 
     if form.validate_on_submit():
         try:
@@ -188,7 +190,7 @@ def forgot():
 def reset():
     """View function that handles a reset password request."""
 
-    form = _security.ResetPasswordForm(csrf_enabled=not app.testing)
+    form = ResetPasswordForm(csrf_enabled=not app.testing)
 
     if form.validate_on_submit():
         try: