Revision 9d20fe23 snf-astakos-app/astakos/im/target/local.py

b/snf-astakos-app/astakos/im/target/local.py
51 51
import astakos.im.messages as astakos_messages
52 52
from astakos.im.views import requires_auth_provider
53 53
from astakos.im import settings
54
from astakos.im import auth_providers
54
from astakos.im import auth_providers as auth
55 55

  
56 56
from ratelimit.decorators import ratelimit
57 57

  
......
59 59
rate = str(retries) + '/m'
60 60

  
61 61

  
62
@requires_auth_provider('local', login=True)
62
@requires_auth_provider('local')
63 63
@require_http_methods(["GET", "POST"])
64 64
@csrf_exempt
65 65
@requires_anonymous
......
74 74
                     request=request)
75 75
    next = get_query(request).get('next', '')
76 76
    third_party_token = get_query(request).get('key', False)
77
    provider = auth.get_provider('local')
77 78

  
78 79
    if not form.is_valid():
79 80
        if third_party_token:
80
            messages.info(request, astakos_messages.AUTH_PROVIDER_LOGIN_TO_ADD)
81
            messages.info(request, astakos_messages.get_login_to_add_msg)
81 82

  
82 83
        return render_to_response(
83 84
            on_failure,
......
88 89

  
89 90
    # get the user from the cache
90 91
    user = form.user_cache
92
    provider = auth.get_provider('local', user)
91 93

  
92 94
    message = None
93 95
    if not user:
94
        message = _(astakos_messages.ACCOUNT_AUTHENTICATION_FAILED)
96
        message = provider.get_authentication_failed_msg
95 97
    elif not user.is_active:
96
        message = user.get_inactive_message()
98
        message = user.get_inactive_message('local')
97 99

  
98
    elif not user.can_login_with_auth_provider('local'):
100
    elif not user.has_auth_provider('local'):
99 101
        # valid user logged in with no auth providers set, add local provider
100 102
        # and let him log in
101
        if user.auth_providers.count() == 0:
103
        if not user.get_available_auth_providers():
102 104
            user.add_auth_provider('local')
103 105
        else:
104 106
            message = _(astakos_messages.NO_LOCAL_AUTH)
......
116 118
        try:
117 119
            request.user.add_pending_auth_provider(third_party_token)
118 120
        except PendingThirdPartyUser.DoesNotExist:
119
            messages.error(request, _(astakos_messages.AUTH_PROVIDER_ADD_FAILED))
121
            provider = auth.get_provider('local', request.user)
122
            messages.error(request, provider.get_add_failed_msg)
120 123

  
121
    provider = auth_providers.get_provider('local')
122
    messages.success(request, _(astakos_messages.LOCAL_LOGIN_SUCCESS))
124
    provider = user.get_auth_provider('local')
125
    messages.success(request, provider.get_login_success_msg)
123 126
    response.set_cookie('astakos_last_login_method', 'local')
124 127
    return response
125 128

  
......
165 168
        if form.is_valid():
166 169
            form.save()
167 170
            if create_password:
168
                provider = auth_providers.get_provider('local')
169
                message = _(astakos_messages.AUTH_PROVIDER_ADDED) % provider.get_method_prompt_display
170
                messages.success(request, message)
171
                provider = auth.get_provider('local', request.user)
172
                messages.success(request, provider.get_added_msg)
171 173
            else:
172 174
                messages.success(request,
173 175
                                 astakos_messages.PASSWORD_RESET_CONFIRM_DONE)

Also available in: Unified diff