diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-06-28 19:00:22 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-06-28 19:00:22 -0400 |
| commit | 5f055c4b2cae52325817ffa1153e3c97f6d62c44 (patch) | |
| tree | 3111ee61b126e3dc66e0773b208eee253beb3894 | |
| parent | 406081f495d8b4ccbfcc4dc585fa62aed4507f67 (diff) | |
| download | askbot-5f055c4b2cae52325817ffa1153e3c97f6d62c44.tar.gz askbot-5f055c4b2cae52325817ffa1153e3c97f6d62c44.tar.bz2 askbot-5f055c4b2cae52325817ffa1153e3c97f6d62c44.zip | |
changes in the ldap procedure
| -rw-r--r-- | askbot/deps/django_authopenid/backends.py | 6 | ||||
| -rw-r--r-- | askbot/deps/django_authopenid/views.py | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/askbot/deps/django_authopenid/backends.py b/askbot/deps/django_authopenid/backends.py index 54ce35a6..01a19e4d 100644 --- a/askbot/deps/django_authopenid/backends.py +++ b/askbot/deps/django_authopenid/backends.py @@ -26,6 +26,8 @@ def ldap_authenticate(username, password): import ldap user_information = None try: + import pdb + pdb.set_trace() ldap_session = ldap.initialize(askbot_settings.LDAP_URL) #set protocol version @@ -58,8 +60,8 @@ def ldap_authenticate(username, password): ) get_attrs = ( - askbot_settings.LDAP_EMAIL_FIELD, - #askbot_settings.LDAP_SCREEN_NAME_FIELD + str(askbot_settings.LDAP_EMAIL_FIELD), + #str(askbot_settings.LDAP_USERID_FIELD) #todo: here we have a chance to get more data from LDAP #maybe a point for some plugin ) diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py index 2f80d366..a3ecbbab 100644 --- a/askbot/deps/django_authopenid/views.py +++ b/askbot/deps/django_authopenid/views.py @@ -322,14 +322,8 @@ def signin(request): login(request, user) return HttpResponseRedirect(next_url) else: - return finalize_generic_signin( - request = request, - user = user, - user_identifier = username, - login_provider_name = provider_name, - redirect_url = next_url - ) - + user.message_set.create(_('incorrect user name or password')) + return HttpResponseRedirect(request.path) else: if password_action == 'login': user = authenticate( |