Revision d0d3646d
b/snf-astakos-app/astakos/im/forms.py | ||
---|---|---|
410 | 410 |
try: |
411 | 411 |
user = AstakosUser.objects.get_by_identifier(email) |
412 | 412 |
self.users_cache = [user] |
413 |
if not user.has_auth_provider('local', auth_backend='astakos'): |
|
414 |
provider = auth_providers.get_provider('local', user) |
|
415 |
msg = mark_safe(provider.get_unusable_password_msg) |
|
416 |
raise forms.ValidationError(msg) |
|
417 |
|
|
413 | 418 |
if not user.is_active: |
414 | 419 |
msg = mark_safe(user.get_inactive_message('local')) |
415 | 420 |
raise forms.ValidationError(msg) |
b/snf-astakos-app/astakos/im/models.py | ||
---|---|---|
743 | 743 |
'token': token_generator.make_token(self)}) |
744 | 744 |
|
745 | 745 |
def get_inactive_message(self, provider_module, identifier=None): |
746 |
provider = self.get_auth_provider(provider_module, identifier) |
|
746 |
try: |
|
747 |
provider = self.get_auth_provider(provider_module, identifier) |
|
748 |
except AstakosUserAuthProvider.DoesNotExist: |
|
749 |
provider = auth.get_provider(provider_module, self) |
|
747 | 750 |
|
748 | 751 |
msg_extra = '' |
749 | 752 |
message = '' |
b/snf-astakos-app/astakos/im/tests/auth.py | ||
---|---|---|
193 | 193 |
r = client.post(signup_url, post_data) |
194 | 194 |
self.assertEqual(r.status_code, 404) |
195 | 195 |
|
196 |
r = client.post(reverse('astakos.im.views.target.local.password_reset'), |
|
197 |
{'email': 'kpap@synnefo.org'}) |
|
198 |
self.assertContains(r, 'Classic login is not enabled for your account') |
|
199 |
|
|
196 | 200 |
# admin activates the user |
197 | 201 |
u = AstakosUser.objects.get(username="kpap@synnefo.org") |
198 | 202 |
backend = activation_backends.get_backend() |
Also available in: Unified diff