External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into devel

Browse Source
This commit is contained in:
Yunfan Zhang
2018-06-04 15:54:23 -04:00
committed by GitHub
parent 9945a3bc64 a45ccfdc79
commit 64b612921d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/api/serializers.py
View File

@@ -949,7 +949,6 @@ class UserSerializer(BaseSerializer):
tokens = self.reverse('api:o_auth2_token_list', kwargs={'pk': obj.pk}), tokens = self.reverse('api:o_auth2_token_list', kwargs={'pk': obj.pk}),
authorized_tokens = self.reverse('api:user_authorized_token_list', kwargs={'pk': obj.pk}), authorized_tokens = self.reverse('api:user_authorized_token_list', kwargs={'pk': obj.pk}),
personal_tokens = self.reverse('api:o_auth2_personal_token_list', kwargs={'pk': obj.pk}), personal_tokens = self.reverse('api:o_auth2_personal_token_list', kwargs={'pk': obj.pk}),
)) ))
return res return res

2
awx/main/management/commands/create_oauth2_token.py
View File

@@ -1,5 +1,4 @@
# Django # Django
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
@@ -17,6 +16,7 @@ class Command(BaseCommand):
def handle(self, *args, **options): def handle(self, *args, **options):
if not options['user']: if not options['user']:
raise CommandError('Username not supplied. Usage: awx-manage create_oauth2_token --user=username.') raise CommandError('Username not supplied. Usage: awx-manage create_oauth2_token --user=username.')
try: try:
user = User.objects.get(username=options['user']) user = User.objects.get(username=options['user'])

8
awx/main/tests/functional/commands/test_oauth2_token_create.py
View File

@@ -1,12 +1,18 @@
# Python
import pytest import pytest
import string import string
import random import random
import StringIO import StringIO
# Django
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.management import call_command from django.core.management import call_command
from awx.main.models.oauth import OAuth2AccessToken
from django.core.management.base import CommandError from django.core.management.base import CommandError
# AWX
from awx.main.models.oauth import OAuth2AccessToken
@pytest.mark.django_db @pytest.mark.django_db
@pytest.mark.inventory_import @pytest.mark.inventory_import