Merge pull request #52 from aababilov/master
Fix keystone compatibility issues, hide password on login
This commit is contained in:
commit
1937e9a3a9
@ -247,10 +247,10 @@ def account_api(request):
|
|||||||
LOG.debug('account_api connection created using token "%s"'
|
LOG.debug('account_api connection created using token "%s"'
|
||||||
' and url "%s"' %
|
' and url "%s"' %
|
||||||
(request.session['token'],
|
(request.session['token'],
|
||||||
url_for(request, 'keystone', True)))
|
url_for(request, 'identity', True)))
|
||||||
return openstackx.extras.Account(
|
return openstackx.extras.Account(
|
||||||
auth_token=request.session['token'],
|
auth_token=request.session['token'],
|
||||||
management_url=url_for(request, 'keystone', True))
|
management_url=url_for(request, 'identity', True))
|
||||||
|
|
||||||
|
|
||||||
def glance_api(request):
|
def glance_api(request):
|
||||||
|
@ -34,7 +34,7 @@ LOG = logging.getLogger('django_openstack.auth')
|
|||||||
|
|
||||||
class Login(forms.SelfHandlingForm):
|
class Login(forms.SelfHandlingForm):
|
||||||
username = forms.CharField(max_length="20", label="User Name")
|
username = forms.CharField(max_length="20", label="User Name")
|
||||||
password = forms.CharField(max_length="20", label="Password")
|
password = forms.CharField(max_length="20", label="Password", widget=forms.PasswordInput(render_value=False))
|
||||||
|
|
||||||
def handle(self, request, data):
|
def handle(self, request, data):
|
||||||
try:
|
try:
|
||||||
|
@ -443,9 +443,9 @@ class AccountApiTests(test.TestCase):
|
|||||||
|
|
||||||
self.mox.StubOutWithMock(api, 'url_for')
|
self.mox.StubOutWithMock(api, 'url_for')
|
||||||
api.url_for(
|
api.url_for(
|
||||||
IsA(http.HttpRequest), 'keystone', True).AndReturn(TEST_URL)
|
IsA(http.HttpRequest), 'identity', True).AndReturn(TEST_URL)
|
||||||
api.url_for(
|
api.url_for(
|
||||||
IsA(http.HttpRequest), 'keystone', True).AndReturn(TEST_URL)
|
IsA(http.HttpRequest), 'identity', True).AndReturn(TEST_URL)
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user