Mercurial > kallithea
changeset 6082:cd697cb12765
routing: introduce 'edit_user_api_keys_delete' url and use POST instead of DELETE
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 04 Aug 2016 14:23:36 +0200 |
| parents | 4b4aab8082b7 |
| children | 9313feb209eb |
| files | kallithea/config/routing.py kallithea/templates/admin/users/user_edit_api_keys.html kallithea/tests/functional/test_admin_users.py |
| diffstat | 3 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/config/routing.py Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/config/routing.py Thu Aug 04 14:23:36 2016 +0200 @@ -193,8 +193,8 @@ action="edit_api_keys", conditions=dict(method=["GET"])) m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys", action="add_api_key", conditions=dict(method=["POST"])) - m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys", - action="delete_api_key", conditions=dict(method=["DELETE"])) + m.connect("edit_user_api_keys_delete", "/users/{id}/edit/api_keys/delete", + action="delete_api_key", conditions=dict(method=["POST"])) m.connect("edit_user_perms", "/users/{id}/edit/permissions", action="edit_perms", conditions=dict(method=["GET"]))
--- a/kallithea/templates/admin/users/user_edit_api_keys.html Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Thu Aug 04 14:23:36 2016 +0200 @@ -7,7 +7,7 @@ </td> <td>${_('Expires')}: ${_('Never')}</td> <td> - ${h.form(url('edit_user_api_keys', id=c.user.user_id),method='delete')} + ${h.form(url('edit_user_api_keys_delete', id=c.user.user_id))} ${h.hidden('del_api_key',c.user.api_key)} ${h.hidden('del_api_key_builtin',1)} <button class="btn btn-mini btn-danger" type="submit" @@ -34,7 +34,7 @@ %endif </td> <td> - ${h.form(url('edit_user_api_keys', id=c.user.user_id),method='delete')} + ${h.form(url('edit_user_api_keys_delete', id=c.user.user_id))} ${h.hidden('del_api_key',api_key.api_key)} <button class="btn btn-mini btn-danger" type="submit" onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');">
--- a/kallithea/tests/functional/test_admin_users.py Thu Aug 04 14:23:36 2016 +0200 +++ b/kallithea/tests/functional/test_admin_users.py Thu Aug 04 14:23:36 2016 +0200 @@ -487,8 +487,8 @@ keys = UserApiKeys.query().filter(UserApiKeys.user_id == user_id).all() assert 1 == len(keys) - response = self.app.post(url('edit_user_api_keys', id=user_id), - {'_method': 'delete', 'del_api_key': keys[0].api_key, '_authentication_token': self.authentication_token()}) + response = self.app.post(url('edit_user_api_keys_delete', id=user_id), + {'del_api_key': keys[0].api_key, '_authentication_token': self.authentication_token()}) self.checkSessionFlash(response, 'API key successfully deleted') keys = UserApiKeys.query().filter(UserApiKeys.user_id == user_id).all() assert 0 == len(keys) @@ -502,8 +502,8 @@ response.mustcontain(api_key) response.mustcontain('Expires: Never') - response = self.app.post(url('edit_user_api_keys', id=user_id), - {'_method': 'delete', 'del_api_key_builtin': api_key, '_authentication_token': self.authentication_token()}) + response = self.app.post(url('edit_user_api_keys_delete', id=user_id), + {'del_api_key_builtin': api_key, '_authentication_token': self.authentication_token()}) self.checkSessionFlash(response, 'API key successfully reset') response = response.follow() response.mustcontain(no=[api_key]) @@ -557,8 +557,8 @@ def test_delete_api_keys_default_user(self): self.log_user() user = User.get_default_user() - response = self.app.post(url('edit_user_api_keys', id=user.user_id), - {'_method': 'delete', '_authentication_token': self.authentication_token()}, status=404) + response = self.app.post(url('edit_user_api_keys_delete', id=user.user_id), + {'_authentication_token': self.authentication_token()}, status=404) # Permissions def test_edit_perms_default_user(self):